Skip to content

armgit / Ix

Public Imported from GitHub
0

Understand any codebase instantly. System intelligence for codebases, built for humans and AI.

fix: resolve end-to-end runtime issues for full stack deployment

riley02272ade4e142373
diff --git a/build.sbt b/build.sbt
index 91ba6cf2..04b37ba4 100644
--- a/build.sbt
+++ b/build.sbt
@@ -48,7 +48,13 @@ lazy val memoryLayer = (project in file("memory-layer"))
assembly / mainClass := Some("ix.memory.Main"),
assembly / assemblyJarName := "ix-memory-layer.jar",
assembly / assemblyMergeStrategy := {
- case PathList("META-INF", _*) => MergeStrategy.discard
- case _ => MergeStrategy.first
+ case PathList("META-INF", "services", _*) => MergeStrategy.concat
+ case PathList("META-INF", "versions", _*) => MergeStrategy.first
+ case PathList("META-INF", "vertx", _*) => MergeStrategy.first
+ case PathList("META-INF", "native-image", _*) => MergeStrategy.first
+ case PathList("META-INF", "MANIFEST.MF") => MergeStrategy.discard
+ case PathList("META-INF", _*) => MergeStrategy.discard
+ case "module-info.class" => MergeStrategy.discard
+ case _ => MergeStrategy.first
}
)
diff --git a/ix-cli/src/cli/commands/ingest.ts b/ix-cli/src/cli/commands/ingest.ts
index 97833a06..d17b8fa5 100644
--- a/ix-cli/src/cli/commands/ingest.ts
+++ b/ix-cli/src/cli/commands/ingest.ts
@@ -14,7 +14,7 @@ export function registerIngestCommand(program: Command): void {
if (opts.format === "json") {
console.log(JSON.stringify(result, null, 2));
} else {
- console.log(`Ingested: rev ${result.newRev} (${result.status})`);
+ console.log(`Ingested: ${(result as any).filesProcessed ?? 0} files, ${(result as any).patchesApplied ?? 0} patches (rev ${(result as any).latestRev ?? 0})`);
}
});
}
diff --git a/ix-cli/src/cli/commands/mcp-install.ts b/ix-cli/src/cli/commands/mcp-install.ts
index 1c8507d5..e7d11d9c 100644
--- a/ix-cli/src/cli/commands/mcp-install.ts
+++ b/ix-cli/src/cli/commands/mcp-install.ts
@@ -12,9 +12,12 @@ interface McpConfig {
}>;
}
+// Resolve server.ts relative to this file's location (works regardless of cwd)
+const serverPath = join(new URL(".", import.meta.url).pathname, "../../mcp/server.ts");
+
const ixMcpEntry = {
command: "npx",
- args: ["tsx", join(process.cwd(), "ix-cli/src/mcp/server.ts")],
+ args: ["tsx", serverPath],
env: {
IX_ENDPOINT: "http://localhost:8090",
},
diff --git a/ix-cli/src/cli/format.ts b/ix-cli/src/cli/format.ts
index 0d2044ab..e05d646a 100644
--- a/ix-cli/src/cli/format.ts
+++ b/ix-cli/src/cli/format.ts
@@ -116,10 +116,11 @@ export function formatIntents(intents: any[], format: string): void {
const roots: any[] = [];
for (const intent of intents) {
- if (intent.parentIntent) {
- const siblings = childrenMap.get(intent.parentIntent) || [];
+ const parentId = intent.attrs?.parent_intent ?? intent.parentIntent;
+ if (parentId) {
+ const siblings = childrenMap.get(parentId) || [];
siblings.push(intent);
- childrenMap.set(intent.parentIntent, siblings);
+ childrenMap.set(parentId, siblings);
} else {
roots.push(intent);
}
@@ -129,11 +130,13 @@ export function formatIntents(intents: any[], format: string): void {
const prefix = isChild
? `${indent}${chalk.dim("\u2514\u2500")} `
: `${indent}${chalk.magenta(">")} `;
- const conf = intent.confidence ?? 0;
+ const statement = intent.attrs?.statement ?? intent.statement ?? "(unknown)";
+ const status = intent.attrs?.status ?? intent.status ?? "unknown";
+ const conf = intent.attrs?.confidence ?? intent.confidence ?? 0;
const pctStr = `(${(conf * 100).toFixed(0)}%)`;
const color = confidenceColor(conf);
console.log(
- `${prefix}${intent.statement} [${intent.status}] ${color(pctStr)}`
+ `${prefix}${statement} [${status}] ${color(pctStr)}`
);
const children = childrenMap.get(intent.id) || [];
diff --git a/memory-layer/Dockerfile b/memory-layer/Dockerfile
index 4c7c93d2..949dc959 100644
--- a/memory-layer/Dockerfile
+++ b/memory-layer/Dockerfile
@@ -1,5 +1,5 @@
FROM eclipse-temurin:17-jre-jammy
WORKDIR /app
-COPY target/scala-2.13/ix-memory-assembly.jar app.jar
+COPY target/scala-2.13/ix-memory-layer.jar app.jar
EXPOSE 8090
CMD ["java", "-jar", "app.jar"]