@pleri/olam-cli 0.1.97 → 0.1.99

package/dist/image-digests.json

@@ -4,6 +4,6 @@
   "host-cp": "sha256:37a8d675fe57b282a81568156eba4c2b9496e6371e8930674f91adb317247d7b",
   "mcp-auth": "sha256:e47169ad3fbc9cab216248fecbc56874343a5daab84b1f18d67529b7d415cf95",
   "$schema_version": 1,
-  "$published_version": "0.1.97",
+  "$published_version": "0.1.99",
   "$registry": "ghcr.io/pleri"
 }

package/dist/index.js

@@ -10282,6 +10282,7 @@ __export(manager_exports, {
   BotIdentityError: () => BotIdentityError,
   WorkspaceNotFoundError: () => WorkspaceNotFoundError,
   WorldManager: () => WorldManager,
+  applyPostgresNetworkOverrides: () => applyPostgresNetworkOverrides,
   buildManifestRuntimeForTest: () => buildManifestRuntime,
   deriveReadinessChain: () => deriveReadinessChain,
   getTokenScopes: () => getTokenScopes,
@@ -10548,31 +10549,33 @@ function planManifestPipeline(repos, baselineServices, worldId, branch, portOffs
   }
   return { services: mergedServices, crossRepoEnv };
 }
-async function runManifestRuntime(containerName, worldId, repos, exec) {
+async function runManifestRuntime(containerName, worldId, repos, exec, opts = {}) {
   const hasAnyManifest = repos.some((r) => r.manifest !== void 0);
   if (!hasAnyManifest)
     return {};
-  const bootstrapTasks = [];
-  for (const repo of repos) {
-    const bootstrap = repo.manifest?.bootstrap;
-    if (!bootstrap || bootstrap.length === 0)
-      continue;
-    if (repo.setup_commands.length > 0) {
-      console.warn(`[manifest] step 4e' both bootstrap[] and setup_commands populated for "${repo.name}". HARD-STOP semantics apply to bootstrap[] (OQ9): if any bootstrap step exits non-zero, the world transitions to 'error' and the legacy setup_commands path will NOT run as a fallback. Migrate setup_commands \u2192 manifest.bootstrap and remove the duplicate.`);
+  if (!opts.skipBootstrap) {
+    const bootstrapTasks = [];
+    for (const repo of repos) {
+      const bootstrap = repo.manifest?.bootstrap;
+      if (!bootstrap || bootstrap.length === 0)
+        continue;
+      if (repo.setup_commands.length > 0) {
+        console.warn(`[manifest] step 4e' both bootstrap[] and setup_commands populated for "${repo.name}". HARD-STOP semantics apply to bootstrap[] (OQ9): if any bootstrap step exits non-zero, the world transitions to 'error' and the legacy setup_commands path will NOT run as a fallback. Migrate setup_commands \u2192 manifest.bootstrap and remove the duplicate.`);
+      }
+      const workdir = `/home/olam/workspace/${repo.name}`;
+      const cmds = bootstrap.map(bootstrapStepCmd);
+      console.log(`[manifest] step 4e bootstrap "${repo.name}" (${cmds.length} steps)`);
+      bootstrapTasks.push((async () => {
+        await runBootstrap(containerName, workdir, cmds, exec);
+        console.log(`[manifest] step 4e bootstrap "${repo.name}" complete`);
+      })());
     }
-    const workdir = `/home/olam/workspace/${repo.name}`;
-    const cmds = bootstrap.map(bootstrapStepCmd);
-    console.log(`[manifest] step 4e bootstrap "${repo.name}" (${cmds.length} steps)`);
-    bootstrapTasks.push((async () => {
-      await runBootstrap(containerName, workdir, cmds, exec);
-      console.log(`[manifest] step 4e bootstrap "${repo.name}" complete`);
-    })());
-  }
-  if (bootstrapTasks.length > 0) {
-    const results = await Promise.allSettled(bootstrapTasks);
-    const firstFailure = results.find((r) => r.status === "rejected");
-    if (firstFailure && firstFailure.status === "rejected") {
-      throw firstFailure.reason;
+    if (bootstrapTasks.length > 0) {
+      const results = await Promise.allSettled(bootstrapTasks);
+      const firstFailure = results.find((r) => r.status === "rejected");
+      if (firstFailure && firstFailure.status === "rejected") {
+        throw firstFailure.reason;
+      }
     }
   }
   const supervisedRepos = [];
@@ -10631,6 +10634,17 @@ function buildManifestRuntime(worldId, repos) {
   }
   return { worldId, repos: runtimeRepos };
 }
+function applyPostgresNetworkOverrides(worldEnv, enrichedRepos) {
+  const hasPostgres = enrichedRepos.some((r) => r.manifest?.services?.["postgres"] !== void 0);
+  if (!hasPostgres)
+    return;
+  worldEnv["POSTGRESQL_HOST"] = "postgres";
+  worldEnv["POSTGRESQL_PORT"] = "5432";
+  if ("POSTGRESQL_COMMON_HOST" in worldEnv)
+    worldEnv["POSTGRESQL_COMMON_HOST"] = "postgres";
+  if ("POSTGRESQL_COMMON_PORT" in worldEnv)
+    worldEnv["POSTGRESQL_COMMON_PORT"] = "5432";
+}
 var BotIdentityError, ADJECTIVES, NOUNS, AuthPreflightError, WorkspaceNotFoundError, WorldManager;
 var init_manager = __esm({
   "../core/dist/world/manager.js"() {
@@ -10983,7 +10997,7 @@ ${detail}`);
           }
         }
         const appPorts = [];
-        for (const repo of repos) {
+        for (const repo of enrichedRepos) {
           const manifestPort = repo.manifest?.app?.port;
           const centralPort = repo.app_port;
           const port = manifestPort ?? centralPort;
@@ -11096,6 +11110,7 @@ ${detail}`);
               }
             }
           }
+          applyPostgresNetworkOverrides(worldEnv, enrichedRepos);
           await this.provider.createWorld({
             id: worldId,
             name: opts.name,
@@ -11236,6 +11251,25 @@ ${detail}`);
             const msg = err instanceof Error ? err.message : String(err);
             console.warn(`[manifest] WARN: bootstrap failure allowed by --allow-bootstrap-failure: ${msg}`);
             console.warn(`[manifest] WARN: world ${worldId} stays running; rerun the failing step manually inside the world if needed.`);
+            try {
+              await runManifestRuntime(containerName, worldId, enrichedRepos, this.dockerExec, { skipBootstrap: true });
+            } catch (supervisorErr) {
+              if (supervisorErr instanceof PortInUseError) {
+                sm.transition("error");
+                this.registry.update(worldId, { status: "error" });
+                try {
+                  await this.provider.destroyWorld(worldId);
+                } catch {
+                }
+                try {
+                  await removeWorktrees(repos, workspacePath);
+                } catch {
+                }
+                throw supervisorErr;
+              }
+              const supervisorMsg = supervisorErr instanceof Error ? supervisorErr.message : String(supervisorErr);
+              console.warn(`[manifest] WARN: step 4f/4g failed after bootstrap-failure escape hatch: ${supervisorMsg}`);
+            }
           } else if (err instanceof BootstrapStepError || err instanceof PortInUseError || err instanceof EnvSubstCycleError || err instanceof EnvSubstDepthExceededError) {
             sm.transition("error");
             this.registry.update(worldId, { status: "error" });

package/dist/mcp-server.js

@@ -31611,31 +31611,33 @@ function planManifestPipeline(repos, baselineServices, worldId, branch, portOffs
   }
   return { services: mergedServices, crossRepoEnv };
 }
-async function runManifestRuntime(containerName, worldId, repos, exec) {
+async function runManifestRuntime(containerName, worldId, repos, exec, opts = {}) {
   const hasAnyManifest = repos.some((r) => r.manifest !== void 0);
   if (!hasAnyManifest)
     return {};
-  const bootstrapTasks = [];
-  for (const repo of repos) {
-    const bootstrap = repo.manifest?.bootstrap;
-    if (!bootstrap || bootstrap.length === 0)
-      continue;
-    if (repo.setup_commands.length > 0) {
-      console.warn(`[manifest] step 4e' both bootstrap[] and setup_commands populated for "${repo.name}". HARD-STOP semantics apply to bootstrap[] (OQ9): if any bootstrap step exits non-zero, the world transitions to 'error' and the legacy setup_commands path will NOT run as a fallback. Migrate setup_commands \u2192 manifest.bootstrap and remove the duplicate.`);
+  if (!opts.skipBootstrap) {
+    const bootstrapTasks = [];
+    for (const repo of repos) {
+      const bootstrap = repo.manifest?.bootstrap;
+      if (!bootstrap || bootstrap.length === 0)
+        continue;
+      if (repo.setup_commands.length > 0) {
+        console.warn(`[manifest] step 4e' both bootstrap[] and setup_commands populated for "${repo.name}". HARD-STOP semantics apply to bootstrap[] (OQ9): if any bootstrap step exits non-zero, the world transitions to 'error' and the legacy setup_commands path will NOT run as a fallback. Migrate setup_commands \u2192 manifest.bootstrap and remove the duplicate.`);
+      }
+      const workdir = `/home/olam/workspace/${repo.name}`;
+      const cmds = bootstrap.map(bootstrapStepCmd);
+      console.log(`[manifest] step 4e bootstrap "${repo.name}" (${cmds.length} steps)`);
+      bootstrapTasks.push((async () => {
+        await runBootstrap(containerName, workdir, cmds, exec);
+        console.log(`[manifest] step 4e bootstrap "${repo.name}" complete`);
+      })());
     }
-    const workdir = `/home/olam/workspace/${repo.name}`;
-    const cmds = bootstrap.map(bootstrapStepCmd);
-    console.log(`[manifest] step 4e bootstrap "${repo.name}" (${cmds.length} steps)`);
-    bootstrapTasks.push((async () => {
-      await runBootstrap(containerName, workdir, cmds, exec);
-      console.log(`[manifest] step 4e bootstrap "${repo.name}" complete`);
-    })());
-  }
-  if (bootstrapTasks.length > 0) {
-    const results = await Promise.allSettled(bootstrapTasks);
-    const firstFailure = results.find((r) => r.status === "rejected");
-    if (firstFailure && firstFailure.status === "rejected") {
-      throw firstFailure.reason;
+    if (bootstrapTasks.length > 0) {
+      const results = await Promise.allSettled(bootstrapTasks);
+      const firstFailure = results.find((r) => r.status === "rejected");
+      if (firstFailure && firstFailure.status === "rejected") {
+        throw firstFailure.reason;
+      }
     }
   }
   const supervisedRepos = [];
@@ -32010,7 +32012,7 @@ ${detail}`);
       }
     }
     const appPorts = [];
-    for (const repo of repos) {
+    for (const repo of enrichedRepos) {
       const manifestPort = repo.manifest?.app?.port;
       const centralPort = repo.app_port;
       const port = manifestPort ?? centralPort;
@@ -32123,6 +32125,7 @@ ${detail}`);
           }
         }
       }
+      applyPostgresNetworkOverrides(worldEnv, enrichedRepos);
       await this.provider.createWorld({
         id: worldId,
         name: opts.name,
@@ -32263,6 +32266,25 @@ ${detail}`);
         const msg = err instanceof Error ? err.message : String(err);
         console.warn(`[manifest] WARN: bootstrap failure allowed by --allow-bootstrap-failure: ${msg}`);
         console.warn(`[manifest] WARN: world ${worldId} stays running; rerun the failing step manually inside the world if needed.`);
+        try {
+          await runManifestRuntime(containerName, worldId, enrichedRepos, this.dockerExec, { skipBootstrap: true });
+        } catch (supervisorErr) {
+          if (supervisorErr instanceof PortInUseError) {
+            sm.transition("error");
+            this.registry.update(worldId, { status: "error" });
+            try {
+              await this.provider.destroyWorld(worldId);
+            } catch {
+            }
+            try {
+              await removeWorktrees(repos, workspacePath);
+            } catch {
+            }
+            throw supervisorErr;
+          }
+          const supervisorMsg = supervisorErr instanceof Error ? supervisorErr.message : String(supervisorErr);
+          console.warn(`[manifest] WARN: step 4f/4g failed after bootstrap-failure escape hatch: ${supervisorMsg}`);
+        }
       } else if (err instanceof BootstrapStepError || err instanceof PortInUseError || err instanceof EnvSubstCycleError || err instanceof EnvSubstDepthExceededError) {
         sm.transition("error");
         this.registry.update(worldId, { status: "error" });
@@ -32566,6 +32588,17 @@ ${opts.task}`;
     return services;
   }
 };
+function applyPostgresNetworkOverrides(worldEnv, enrichedRepos) {
+  const hasPostgres = enrichedRepos.some((r) => r.manifest?.services?.["postgres"] !== void 0);
+  if (!hasPostgres)
+    return;
+  worldEnv["POSTGRESQL_HOST"] = "postgres";
+  worldEnv["POSTGRESQL_PORT"] = "5432";
+  if ("POSTGRESQL_COMMON_HOST" in worldEnv)
+    worldEnv["POSTGRESQL_COMMON_HOST"] = "postgres";
+  if ("POSTGRESQL_COMMON_PORT" in worldEnv)
+    worldEnv["POSTGRESQL_COMMON_PORT"] = "5432";
+}
 
 // ../core/dist/cost/tracker.js
 var CostTracker = class {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pleri/olam-cli",
-  "version": "0.1.97",
+  "version": "0.1.99",
   "type": "module",
   "bin": {
     "olam": "./bin/olam.cjs"