@pleri/olam-cli 0.1.170 → 0.1.174

package/dist/mcp-server.js

@@ -12331,10 +12331,10 @@ var init_runbooks = __esm({
 // ../core/dist/global-config/port-validator.js
 import * as net2 from "node:net";
 import * as childProcess from "node:child_process";
-import { createRequire as createRequire3 } from "node:module";
+import { createRequire as createRequire4 } from "node:module";
 function getRequire() {
   if (!_require3) {
-    _require3 = createRequire3(import.meta.url);
+    _require3 = createRequire4(import.meta.url);
   }
   return _require3;
 }
@@ -14165,9 +14165,9 @@ var init_file_lock = __esm({
 });
 
 // ../core/dist/lib/min-version-filter.js
-import { existsSync as existsSync27, readFileSync as readFileSync23 } from "node:fs";
+import { existsSync as existsSync28, readFileSync as readFileSync23 } from "node:fs";
 function readOlamMinVersion(filepath) {
-  if (!existsSync27(filepath))
+  if (!existsSync28(filepath))
     return void 0;
   let text;
   try {
@@ -14790,7 +14790,7 @@ var init_meta_hook_injector = __esm({
 
 // ../core/dist/lib/markdown-merger.js
 import { createHash as createHash5 } from "node:crypto";
-import { readFileSync as readFileSync27, existsSync as existsSync30, statSync as statSync8 } from "node:fs";
+import { readFileSync as readFileSync27, existsSync as existsSync31, statSync as statSync8 } from "node:fs";
 function parseFrontmatter(text) {
   const match = FM_RE2.exec(text);
   if (match === null)
@@ -14910,7 +14910,7 @@ function mergeMarkdown(upstreamText, overlayText, labelForError, upstreamPath, o
   return { merged: fmBlock !== "" ? fmBlock + mergedBody : mergedBody };
 }
 function sha256OfPath(p) {
-  if (!existsSync30(p) || !statSync8(p).isFile())
+  if (!existsSync31(p) || !statSync8(p).isFile())
     return "MISSING";
   return createHash5("sha256").update(readFileSync27(p)).digest("hex");
 }
@@ -15123,7 +15123,7 @@ var init_prefix_deploy = __esm({
 });
 
 // ../core/dist/skill-sync/resolve-source-config.js
-import { readFileSync as readFileSync29, existsSync as existsSync31 } from "node:fs";
+import { readFileSync as readFileSync29, existsSync as existsSync32 } from "node:fs";
 import { join as join31 } from "node:path";
 import { parse as parseYaml4 } from "yaml";
 function sourceConfigPath(clonePath) {
@@ -15131,7 +15131,7 @@ function sourceConfigPath(clonePath) {
 }
 function readSourceConfig(clonePath, sourceId) {
   const path53 = sourceConfigPath(clonePath);
-  if (!existsSync31(path53))
+  if (!existsSync32(path53))
     return void 0;
   let raw;
   try {
@@ -27600,10 +27600,111 @@ var init_exports = {};
 __export(init_exports, {
   register: () => register
 });
-init_v3();
 import * as fs from "node:fs";
 import * as path from "node:path";
 import { execSync } from "node:child_process";
+
+// ../skill-runtime/dist/skills/init.js
+init_v3();
+
+// ../skill-runtime/dist/define-skill.js
+init_v3();
+var KEBAB_RE = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
+function defineSkill(spec) {
+  if (!KEBAB_RE.test(spec.name)) {
+    throw new Error(`defineSkill: name "${spec.name}" must be kebab-case (lowercase letters, digits, and hyphens only; no leading/trailing/double hyphens).`);
+  }
+  if (!(spec.inputSchema instanceof external_exports.ZodObject)) {
+    throw new Error(`defineSkill: inputSchema for skill "${spec.name}" must be a ZodObject (z.object({...})). Non-object schemas (z.string(), z.array(), etc.) are not supported because McpServer.tool() requires a ZodRawShape (the .shape of a ZodObject).`);
+  }
+  return {
+    asMcpTool() {
+      return {
+        name: spec.name,
+        description: spec.description,
+        inputSchema: spec.inputSchema.shape,
+        async handler(params) {
+          try {
+            const parsed = spec.inputSchema.safeParse(params);
+            if (!parsed.success) {
+              return {
+                content: [
+                  {
+                    type: "text",
+                    text: `Invalid input: ${parsed.error.message}`
+                  }
+                ],
+                isError: true
+              };
+            }
+            const output = await spec.handler(parsed.data);
+            return {
+              content: [
+                {
+                  type: "text",
+                  text: typeof output === "string" ? output : JSON.stringify(output)
+                }
+              ]
+            };
+          } catch (err) {
+            const message = err instanceof Error ? err.message : String(err);
+            return {
+              content: [{ type: "text", text: `Error: ${message}` }],
+              isError: true
+            };
+          }
+        }
+      };
+    },
+    asHttpHandler() {
+      return async (req, res) => {
+        const parsed = spec.inputSchema.safeParse(req.body);
+        if (!parsed.success) {
+          res.status(400).json({
+            error: "Invalid input",
+            issues: parsed.error.issues
+          });
+          return;
+        }
+        try {
+          const output = await spec.handler(parsed.data);
+          res.status(200).json({ result: output });
+        } catch (err) {
+          const message = err instanceof Error ? err.message : String(err);
+          res.status(500).json({ error: message });
+        }
+      };
+    },
+    toJsonSchema() {
+      return zodToJsonSchema(spec.inputSchema, { target: "openApi3" });
+    }
+  };
+}
+
+// ../skill-runtime/dist/skills/init.js
+var initInputSchema = external_exports.object({
+  projectPath: external_exports.string().optional().describe("Path to the project root. Defaults to cwd."),
+  pleriBaseUrl: external_exports.string().optional().describe("Pleri API base URL"),
+  pleriPlaneId: external_exports.string().optional().describe("Pleri plane ID"),
+  pleriApiKey: external_exports.string().optional().describe("Pleri API key from device code flow"),
+  skipPleri: external_exports.boolean().optional().default(false).describe("Skip Pleri setup for now")
+});
+var initSkill = defineSkill({
+  name: "init",
+  description: "Initialize Olam in the current project. Creates .olam/ directory with configuration.",
+  inputSchema: initInputSchema,
+  handler: (input) => {
+    const root = input.projectPath ?? process.cwd();
+    const pleriStatus = input.skipPleri ? "skipped" : input.pleriApiKey ? "configured" : "pending";
+    return [
+      `Would initialize Olam at ${root}/.olam/`,
+      `  pleri: ${pleriStatus}`,
+      "Use the MCP tool for actual file system execution."
+    ].join("\n");
+  }
+});
+
+// ../mcp-server/src/tools/init.ts
 function detectProjectType(projectRoot) {
   if (fs.existsSync(path.join(projectRoot, "Gemfile")) || fs.existsSync(path.join(projectRoot, "config", "routes.rb"))) {
     return "rails";
@@ -27663,16 +27764,11 @@ function updateGitignore(projectRoot, entries) {
   }
 }
 function register(server, _ctx, _initError) {
+  const { description, inputSchema } = initSkill.asMcpTool();
   server.tool(
     "olam_init",
-    "Initialize Olam in the current project. Creates .olam/ directory with configuration.",
-    {
-      projectPath: external_exports.string().optional().describe("Path to the project root. Defaults to cwd."),
-      pleriBaseUrl: external_exports.string().optional().describe("Pleri API base URL"),
-      pleriPlaneId: external_exports.string().optional().describe("Pleri plane ID"),
-      pleriApiKey: external_exports.string().optional().describe("Pleri API key from device code flow"),
-      skipPleri: external_exports.boolean().optional().default(false).describe("Skip Pleri setup for now")
-    },
+    description,
+    inputSchema,
     async (params) => {
       try {
         const startDir = params.projectPath ?? process.cwd();
@@ -27799,7 +27895,6 @@ __export(auth_exports, {
   formatAccountFlag: () => formatAccountFlag,
   register: () => register2
 });
-init_v3();
 
 // ../core/dist/auth/secret.js
 import * as crypto from "node:crypto";
@@ -28202,6 +28297,52 @@ function describe2(err) {
   return err instanceof Error ? err.message : "unknown error";
 }
 
+// ../skill-runtime/dist/skills/auth-status.js
+init_v3();
+var authStatusInputSchema = external_exports.object({});
+var authStatusSkill = defineSkill({
+  name: "auth-status",
+  description: "Show the local auth container state and stored Claude accounts. The container runs the OAuth PKCE dance once and persists tokens across world creations.",
+  inputSchema: authStatusInputSchema,
+  handler: (_input) => "Auth status requires an active AuthClient. Use the MCP tool surface or HTTP endpoint with a configured host."
+});
+
+// ../skill-runtime/dist/skills/auth-up.js
+init_v3();
+var authUpInputSchema = external_exports.object({});
+var authUpSkill = defineSkill({
+  name: "auth-up",
+  description: "Start the local auth container (idempotent). Builds the image on first run. After this, run olam_auth_login to store a Claude account.",
+  inputSchema: authUpInputSchema,
+  handler: (_input) => "Auth container control requires an active AuthContainerController. Use the MCP tool surface or HTTP endpoint with a configured host."
+});
+
+// ../skill-runtime/dist/skills/auth-login.js
+init_v3();
+var authLoginInputSchema = external_exports.object({
+  label: external_exports.string().default("primary").describe("Account label shown in olam_auth_status (e.g. personal, team)."),
+  provider: external_exports.enum(["claude", "codex"]).default("claude")
+});
+var authLoginSkill = defineSkill({
+  name: "auth-login",
+  description: "Begin the OAuth PKCE flow. Returns a login URL to open in a browser and a state token. After approving, call olam_auth_complete with the returned authorization code.",
+  inputSchema: authLoginInputSchema,
+  handler: (input) => `OAuth PKCE login requires an active AuthClient. Would initiate login for account "${input.label}" (${input.provider}). Use the MCP tool surface or HTTP endpoint with a configured host.`
+});
+
+// ../skill-runtime/dist/skills/auth-complete.js
+init_v3();
+var authCompleteInputSchema = external_exports.object({
+  state: external_exports.string().describe("State token returned by olam_auth_login."),
+  code: external_exports.string().describe("Authorization code copied from the Claude redirect page.")
+});
+var authCompleteSkill = defineSkill({
+  name: "auth-complete",
+  description: "Complete a PKCE login flow by exchanging the authorization code for tokens. Uses the state returned by olam_auth_login.",
+  inputSchema: authCompleteInputSchema,
+  handler: (input) => `Token exchange requires an active AuthClient. Would complete PKCE flow for state "${input.state}". Use the MCP tool surface or HTTP endpoint with a configured host.`
+});
+
 // ../mcp-server/src/tools/auth.ts
 function formatAccountFlag(a, now = Date.now()) {
   if (a.state === "disabled") return "disabled";
@@ -28219,10 +28360,11 @@ function formatAccountFlag(a, now = Date.now()) {
   return "valid";
 }
 function register2(server, _ctx, _initError) {
+  const authStatus = authStatusSkill.asMcpTool();
   server.tool(
     "olam_auth_status",
-    "Show the local auth container state and stored Claude accounts. The container runs the OAuth PKCE dance once and persists tokens across world creations.",
-    {},
+    authStatus.description,
+    authStatus.inputSchema,
     async () => {
       const controller = new AuthContainerController();
       const state = controller.status();
@@ -28247,10 +28389,11 @@ function register2(server, _ctx, _initError) {
       return { content: [{ type: "text", text: lines.join("\n") }] };
     }
   );
+  const authUp = authUpSkill.asMcpTool();
   server.tool(
     "olam_auth_up",
-    "Start the local auth container (idempotent). Builds the image on first run. After this, run olam_auth_login to store a Claude account.",
-    {},
+    authUp.description,
+    authUp.inputSchema,
     async () => {
       const controller = new AuthContainerController();
       const initial = controller.status();
@@ -28277,13 +28420,11 @@ function register2(server, _ctx, _initError) {
       };
     }
   );
+  const authLogin = authLoginSkill.asMcpTool();
   server.tool(
     "olam_auth_login",
-    "Begin the OAuth PKCE flow. Returns a login URL to open in a browser and a state token. After approving, call olam_auth_complete with the returned authorization code.",
-    {
-      label: external_exports.string().default("primary").describe("Account label shown in olam_auth_status (e.g. personal, team)."),
-      provider: external_exports.enum(["claude", "codex"]).default("claude")
-    },
+    authLogin.description,
+    authLogin.inputSchema,
     async ({ label, provider }) => {
       const client = new AuthClient();
       const controller = new AuthContainerController();
@@ -28318,13 +28459,11 @@ function register2(server, _ctx, _initError) {
       }
     }
   );
+  const authComplete = authCompleteSkill.asMcpTool();
   server.tool(
     "olam_auth_complete",
-    "Complete a PKCE login flow by exchanging the authorization code for tokens. Uses the state returned by olam_auth_login.",
-    {
-      state: external_exports.string().describe("State token returned by olam_auth_login."),
-      code: external_exports.string().describe("Authorization code copied from the Claude redirect page.")
-    },
+    authComplete.description,
+    authComplete.inputSchema,
     async ({ state, code }) => {
       const client = new AuthClient();
       try {
@@ -28350,7 +28489,6 @@ var pr_exports = {};
 __export(pr_exports, {
   register: () => register3
 });
-init_v3();
 
 // ../core/dist/world/registry.js
 import { createRequire } from "node:module";
@@ -28580,6 +28718,21 @@ var WorldRegistry = class {
     const row = this.db.prepare("SELECT * FROM worlds WHERE id = ?").get(worldId);
     return row ? rowToMetadata(row) : void 0;
   }
+  /**
+   * Find all worlds with a given `name`. Returns rows of every lifecycle
+   * status — callers filter as needed (e.g. active-only for dedup, error-
+   * only for cleanup).
+   *
+   * The schema has UNIQUE on `id` but NOT on `name`, so a single name can
+   * legitimately have multiple rows (e.g. one destroyed + one new). Issue
+   * #962: `olam create <name>` was generating fresh ids without checking
+   * for an existing row, accumulating orphan error rows under the same
+   * name. This is the registry-level primitive the manager's dedup uses.
+   */
+  findByName(name) {
+    const rows = this.db.prepare("SELECT * FROM worlds WHERE name = ? ORDER BY created_at DESC").all(name);
+    return rows.map(rowToMetadata);
+  }
   list(filter) {
     if (filter?.status) {
       const rows2 = this.db.prepare("SELECT * FROM worlds WHERE status = ? ORDER BY created_at DESC").all(filter.status);
@@ -28685,6 +28838,81 @@ async function decideGate(portOffset, id, payload) {
   return await res.json();
 }
 
+// ../skill-runtime/dist/skills/pr-list.js
+init_v3();
+var prListInputSchema = external_exports.object({});
+var prListSkill = defineSkill({
+  name: "pr-list",
+  description: "List every PR-gate request across every running world. A gate is opened by the in-world PreToolUse hook whenever Claude is about to run `gh pr create`.",
+  inputSchema: prListInputSchema,
+  handler: (_input) => "PR gate listing requires an active WorldRegistry. Use the MCP tool surface."
+});
+
+// ../skill-runtime/dist/skills/pr-show.js
+init_v3();
+var prShowInputSchema = external_exports.object({
+  id: external_exports.string().describe("Gate id (full UUID).")
+});
+var prShowSkill = defineSkill({
+  name: "pr-show",
+  description: "Show full detail for a gate: diff, commit log, branch, base, and any prior decision.",
+  inputSchema: prShowInputSchema,
+  handler: (input) => `PR gate detail for "${input.id}" requires an active WorldRegistry. Use the MCP tool surface.`
+});
+
+// ../skill-runtime/dist/skills/pr-approve.js
+init_v3();
+var prApproveInputSchema = external_exports.object({
+  id: external_exports.string().describe("Gate id (full UUID)."),
+  reason: external_exports.string().optional().describe("Short free-text reason surfaced back to Claude on block."),
+  by: external_exports.string().optional().describe('Deciding identity (defaults to "mcp").')
+});
+var prApproveSkill = defineSkill({
+  name: "pr-approve",
+  description: "Approve a pending PR-gate so the in-world `gh pr create` proceeds.",
+  inputSchema: prApproveInputSchema,
+  handler: (input) => `Approve gate "${input.id}" by "${input.by ?? "mcp"}" requires an active WorldRegistry. Use the MCP tool surface.`
+});
+
+// ../skill-runtime/dist/skills/pr-reject.js
+init_v3();
+var prRejectInputSchema = external_exports.object({
+  id: external_exports.string().describe("Gate id (full UUID)."),
+  reason: external_exports.string().optional().describe("Short free-text reason surfaced back to Claude on block."),
+  by: external_exports.string().optional().describe('Deciding identity (defaults to "mcp").')
+});
+var prRejectSkill = defineSkill({
+  name: "pr-reject",
+  description: "Block a pending PR-gate. The in-world hook exits non-zero so Claude sees a tool error and can address or retry.",
+  inputSchema: prRejectInputSchema,
+  handler: (input) => `Block gate "${input.id}" by "${input.by ?? "mcp"}" requires an active WorldRegistry. Use the MCP tool surface.`
+});
+
+// ../skill-runtime/dist/skills/pr-track.js
+init_v3();
+var prTrackInputSchema = external_exports.object({
+  worldId: external_exports.string().describe("World ID"),
+  prUrl: external_exports.string().url().describe("Full GitHub PR URL (e.g. https://github.com/org/repo/pull/123)"),
+  prNumber: external_exports.number().int().positive().optional().describe("PR number"),
+  prRepo: external_exports.string().optional().describe("Repo slug (owner/repo)")
+});
+var prTrackSkill = defineSkill({
+  name: "pr-track",
+  description: "Record a PR association for a world after gh pr create succeeds. Call this after the PR is created to enable auto-destroy when the PR merges.",
+  inputSchema: prTrackInputSchema,
+  handler: (input) => {
+    const urlMatch = input.prUrl.match(/github\.com\/([^/]+\/[^/]+)\/pull\/(\d+)/);
+    const resolvedRepo = input.prRepo ?? (urlMatch ? urlMatch[1] : void 0);
+    const resolvedNumber = input.prNumber ?? (urlMatch ? parseInt(urlMatch[2], 10) : void 0);
+    return [
+      `PR tracked for world ${input.worldId}: ${input.prUrl}`,
+      resolvedRepo ? `  repo: ${resolvedRepo}` : "",
+      resolvedNumber ? `  number: ${resolvedNumber}` : "",
+      "Auto-destroy will fire when PR merges (after grace period)."
+    ].filter(Boolean).join("\n");
+  }
+});
+
 // ../mcp-server/src/tools/pr.ts
 function runningWorlds() {
   const registry2 = new WorldRegistry();
@@ -28709,10 +28937,11 @@ function asMessage2(err) {
   return err instanceof Error ? err.message : String(err);
 }
 function register3(server, _ctx, _initError) {
+  const prListTool = prListSkill.asMcpTool();
   server.tool(
     "olam_pr_list",
-    "List every PR-gate request across every running world. A gate is opened by the in-world PreToolUse hook whenever Claude is about to run `gh pr create`.",
-    {},
+    prListTool.description,
+    prListTool.inputSchema,
     async () => {
       const worlds = runningWorlds();
       const rows = [];
@@ -28739,10 +28968,11 @@ function register3(server, _ctx, _initError) {
       return { content: [{ type: "text", text: lines.join("\n") }] };
     }
   );
+  const prShowTool = prShowSkill.asMcpTool();
   server.tool(
     "olam_pr_show",
-    "Show full detail for a gate: diff, commit log, branch, base, and any prior decision.",
-    { id: external_exports.string().describe("Gate id (full UUID).") },
+    prShowTool.description,
+    prShowTool.inputSchema,
     async ({ id }) => {
       const found = await findGate(id);
       if (!found) {
@@ -28771,14 +29001,11 @@ function register3(server, _ctx, _initError) {
     }
   );
   const decideTool = (name, decision) => {
+    const skillTool = decision === "approve" ? prApproveSkill.asMcpTool() : prRejectSkill.asMcpTool();
     server.tool(
       name,
-      decision === "approve" ? "Approve a pending PR-gate so the in-world `gh pr create` proceeds." : "Block a pending PR-gate. The in-world hook exits non-zero so Claude sees a tool error and can address or retry.",
-      {
-        id: external_exports.string().describe("Gate id (full UUID)."),
-        reason: external_exports.string().optional().describe("Short free-text reason surfaced back to Claude on block."),
-        by: external_exports.string().optional().describe('Deciding identity (defaults to "mcp").')
-      },
+      skillTool.description,
+      skillTool.inputSchema,
       async ({ id, reason, by }) => {
         const found = await findGate(id);
         if (!found) {
@@ -28807,15 +29034,11 @@ function register3(server, _ctx, _initError) {
   };
   decideTool("olam_pr_approve", "approve");
   decideTool("olam_pr_reject", "block");
+  const prTrackTool = prTrackSkill.asMcpTool();
   server.tool(
     "olam_pr_track",
-    "Record a PR association for a world after gh pr create succeeds. Call this after the PR is created to enable auto-destroy when the PR merges.",
-    {
-      worldId: external_exports.string().describe("World ID"),
-      prUrl: external_exports.string().url().describe("Full GitHub PR URL (e.g. https://github.com/org/repo/pull/123)"),
-      prNumber: external_exports.number().int().positive().optional().describe("PR number"),
-      prRepo: external_exports.string().optional().describe("Repo slug (owner/repo)")
-    },
+    prTrackTool.description,
+    prTrackTool.inputSchema,
     async ({ worldId, prUrl, prNumber, prRepo }) => {
       const urlMatch = prUrl.match(/github\.com\/([^/]+\/[^/]+)\/pull\/(\d+)/);
       const resolvedRepo = prRepo ?? (urlMatch ? urlMatch[1] : void 0);
@@ -28874,7 +29097,6 @@ var workspace_exports = {};
 __export(workspace_exports, {
   register: () => register4
 });
-init_v3();
 import { stringify as stringifyYaml2 } from "yaml";
 
 // ../core/dist/workspace/index.js
@@ -29007,7 +29229,30 @@ function logRuntimeReconciliation(repoName, runtime) {
   console.warn(`[manifest] repo "${repoName}" supersedes central stack: ${validated.join(", ")}`);
 }
 
-// ../mcp-server/src/tools/workspace.ts
+// ../skill-runtime/dist/skills/workspace-list.js
+init_v3();
+var workspaceListInputSchema = external_exports.object({});
+var workspaceListSkill = defineSkill({
+  name: "workspace-list",
+  description: "List every workspace in the local catalog. A workspace is a named bundle of repos that worlds instantiate from. Returns CF-compatible summaries: { name, repoCount, updatedAt }.",
+  inputSchema: workspaceListInputSchema,
+  handler: (_input) => JSON.stringify({ note: "workspace listing requires local catalog access; use MCP surface" }, null, 2)
+});
+
+// ../skill-runtime/dist/skills/workspace-show.js
+init_v3();
+var workspaceShowInputSchema = external_exports.object({
+  name: external_exports.string().describe("Workspace name.")
+});
+var workspaceShowSkill = defineSkill({
+  name: "workspace-show",
+  description: "Return the full workspace definition as YAML (name, repos, defaults, updatedAt).",
+  inputSchema: workspaceShowInputSchema,
+  handler: ({ name }) => JSON.stringify({ name, note: "workspace lookup requires local catalog access; use MCP surface" }, null, 2)
+});
+
+// ../skill-runtime/dist/skills/workspace-add.js
+init_v3();
 var repoInputSchema = external_exports.object({
   name: external_exports.string().min(1).optional().describe("Repo name; defaults to last URL segment."),
   url: external_exports.string().min(1),
@@ -29015,6 +29260,32 @@ var repoInputSchema = external_exports.object({
   submodules: external_exports.boolean().optional(),
   setupCmd: external_exports.string().optional()
 });
+var workspaceAddInputSchema = external_exports.object({
+  name: external_exports.string().describe("Workspace name (lowercase alphanumerics + dashes, 1\u201364 chars)."),
+  repos: external_exports.array(repoInputSchema).min(1),
+  defaultBranch: external_exports.string().optional().describe("Fallback branch for repos without an explicit branch."),
+  force: external_exports.boolean().optional().describe("Overwrite if a workspace with this name already exists.")
+});
+var workspaceAddSkill = defineSkill({
+  name: "workspace-add",
+  description: "Create a new workspace. Pass an array of repos (each with url + optional branch, submodules, setupCmd). Rejects duplicate names unless force:true.",
+  inputSchema: workspaceAddInputSchema,
+  handler: ({ name, repos }) => JSON.stringify({ name, repoCount: repos.length, note: "workspace creation requires local catalog access; use MCP surface" }, null, 2)
+});
+
+// ../skill-runtime/dist/skills/workspace-remove.js
+init_v3();
+var workspaceRemoveInputSchema = external_exports.object({
+  name: external_exports.string().describe("Workspace name.")
+});
+var workspaceRemoveSkill = defineSkill({
+  name: "workspace-remove",
+  description: "Delete a workspace. Does not affect already-created worlds that referenced it.",
+  inputSchema: workspaceRemoveInputSchema,
+  handler: ({ name }) => JSON.stringify({ name, note: "workspace removal requires local catalog access; use MCP surface" }, null, 2)
+});
+
+// ../mcp-server/src/tools/workspace.ts
 function deriveRepoName(url2) {
   return url2.replace(/\.git$/, "").split(/[\/:]/).filter(Boolean).at(-1) ?? "repo";
 }
@@ -29022,10 +29293,11 @@ function asMessage3(err) {
   return err instanceof Error ? err.message : String(err);
 }
 function register4(server, _ctx, _initError) {
+  const listTool = workspaceListSkill.asMcpTool();
   server.tool(
     "olam_workspace_list",
-    "List every workspace in the local catalog. A workspace is a named bundle of repos that worlds instantiate from. Returns CF-compatible summaries: { name, repoCount, updatedAt }.",
-    {},
+    listTool.description,
+    listTool.inputSchema,
     async () => {
       const all = listWorkspaces();
       if (all.length === 0) {
@@ -29039,10 +29311,11 @@ function register4(server, _ctx, _initError) {
       return { content: [{ type: "text", text: lines.join("\n") }] };
     }
   );
+  const showTool = workspaceShowSkill.asMcpTool();
   server.tool(
     "olam_workspace_show",
-    "Return the full workspace definition as YAML (name, repos, defaults, updatedAt).",
-    { name: external_exports.string().describe("Workspace name.") },
+    showTool.description,
+    showTool.inputSchema,
     async ({ name }) => {
       try {
         const ws = readWorkspace(name);
@@ -29058,15 +29331,11 @@ function register4(server, _ctx, _initError) {
       }
     }
   );
+  const addTool = workspaceAddSkill.asMcpTool();
   server.tool(
     "olam_workspace_add",
-    "Create a new workspace. Pass an array of repos (each with url + optional branch, submodules, setupCmd). Rejects duplicate names unless force:true.",
-    {
-      name: external_exports.string().describe("Workspace name (lowercase alphanumerics + dashes, 1\u201364 chars)."),
-      repos: external_exports.array(repoInputSchema).min(1),
-      defaultBranch: external_exports.string().optional().describe("Fallback branch for repos without an explicit branch."),
-      force: external_exports.boolean().optional().describe("Overwrite if a workspace with this name already exists.")
-    },
+    addTool.description,
+    addTool.inputSchema,
     async ({ name, repos, defaultBranch, force }) => {
       try {
         const filled = repos.map((r) => ({
@@ -29097,10 +29366,11 @@ function register4(server, _ctx, _initError) {
       }
     }
   );
+  const removeTool = workspaceRemoveSkill.asMcpTool();
   server.tool(
     "olam_workspace_remove",
-    "Delete a workspace. Does not affect already-created worlds that referenced it.",
-    { name: external_exports.string().describe("Workspace name.") },
+    removeTool.description,
+    removeTool.inputSchema,
     async ({ name }) => {
       try {
         const removed = removeWorkspace(name);
@@ -29124,10 +29394,35 @@ __export(role_exports, {
   register: () => register5
 });
 init_v3();
+
+// ../skill-runtime/dist/skills/role-assign.js
+init_v3();
+var ROLE_ARCHETYPES = [
+  "user",
+  "workspace-curator",
+  "policy-admin",
+  "bootstrapper",
+  "admin",
+  "dev"
+];
+var roleAssignInputSchema = external_exports.object({
+  email: external_exports.string().email().describe("Target user email."),
+  archetype: external_exports.enum(ROLE_ARCHETYPES).describe("Named archetype preset."),
+  capabilities: external_exports.array(external_exports.string()).optional().describe("Optional additive capabilities on top of the archetype.")
+});
 var ROLE_DEPRECATED_MESSAGE = "olam_role_* tools were deprecated in PR #31 \u2014 role management now lives in Pylon. Use `pylon role grant --app=olam --email=<email> --archetype=<name>`, `pylon role list --app=olam`, or `pylon role revoke --email-hash=<sha256>` directly. Install via `npm install -g @pleri/pylon-cli`.";
+var roleAssignSkill = defineSkill({
+  name: "role-assign",
+  description: "DEPRECATED \u2014 use `pylon role grant --app=olam --email=<email> --archetype=<name>` instead. Role management moved to Pylon in PR #31.",
+  inputSchema: roleAssignInputSchema,
+  handler: (_input) => ROLE_DEPRECATED_MESSAGE
+});
+
+// ../mcp-server/src/tools/role.ts
+var ROLE_DEPRECATED_MESSAGE2 = "olam_role_* tools were deprecated in PR #31 \u2014 role management now lives in Pylon. Use `pylon role grant --app=olam --email=<email> --archetype=<name>`, `pylon role list --app=olam`, or `pylon role revoke --email-hash=<sha256>` directly. Install via `npm install -g @pleri/pylon-cli`.";
 function deprecatedResult() {
   return {
-    content: [{ type: "text", text: ROLE_DEPRECATED_MESSAGE }],
+    content: [{ type: "text", text: ROLE_DEPRECATED_MESSAGE2 }],
     isError: true
   };
 }
@@ -29138,15 +29433,14 @@ function register5(server, _ctx, _initError) {
     {},
     async () => deprecatedResult()
   );
+  const roleAssignTool = roleAssignSkill.asMcpTool();
   server.tool(
     "olam_role_assign",
-    "DEPRECATED \u2014 use `pylon role grant --app=olam --email=<email> --archetype=<name>` instead. Role management moved to Pylon in PR #31.",
-    {
-      email: external_exports.string().email().describe("Target user email."),
-      archetype: external_exports.enum(["user", "workspace-curator", "policy-admin", "bootstrapper", "admin", "dev"]).describe("Named archetype preset."),
-      capabilities: external_exports.array(external_exports.string()).optional().describe("Optional additive capabilities on top of the archetype.")
-    },
-    async () => deprecatedResult()
+    roleAssignTool.description,
+    roleAssignTool.inputSchema,
+    async (params) => roleAssignTool.handler(
+      params
+    )
   );
   server.tool(
     "olam_role_revoke",
@@ -29163,7 +29457,6 @@ var world_create_exports = {};
 __export(world_create_exports, {
   register: () => register6
 });
-init_v3();
 
 // ../mcp-server/src/utils/logger.ts
 var LEVEL_ORDER = {
@@ -31126,7 +31419,8 @@ function createSshProvider(config2) {
   return new SSHProvider(hosts);
 }
 
-// ../mcp-server/src/tools/world-create.ts
+// ../skill-runtime/dist/skills/world-create.js
+init_v3();
 var taskContextSchema = external_exports.object({
   source: external_exports.enum(["linear", "github", "manual"]),
   ticketId: external_exports.string().optional(),
@@ -31138,27 +31432,49 @@ var taskContextSchema = external_exports.object({
   githubRepo: external_exports.string().optional(),
   githubBranch: external_exports.string().optional()
 }).optional();
+var worldCreateInputSchema = external_exports.object({
+  name: external_exports.string(),
+  repos: external_exports.array(external_exports.string()).optional(),
+  workspace: external_exports.string().optional().describe("Named workspace from the host catalog (~/.olam/workspaces/<name>.yaml). Inline `repos` wins over this."),
+  task: external_exports.string().optional(),
+  linearTicketId: external_exports.string().optional(),
+  branchName: external_exports.string().optional().describe("Override the default branch name (e.g., feat/ATL-1234-payment-webhook)"),
+  planFile: external_exports.string().optional().describe("Path to a plan file on the host to inject into the world"),
+  taskContext: taskContextSchema.describe("Structured task context from Linear, GitHub, or manual entry"),
+  carryUncommitted: external_exports.boolean().optional().describe("Preserve operator's uncommitted edits in the world's worktree (B3); default false"),
+  runbookName: external_exports.string().optional().describe("Named runbook profile from ~/.olam/config.json \u2014 seeds ports, env overrides, and fixture-copy steps")
+});
+var worldCreateSkill = defineSkill({
+  name: "world-create",
+  description: "Provision a new isolated development world with optional repository cloning, initial task, and Linear/GitHub task context.",
+  inputSchema: worldCreateInputSchema,
+  handler: (input) => {
+    const hasTask = Boolean(input.task?.trim() || input.linearTicketId?.trim() || input.taskContext?.ticketId?.trim());
+    if (!hasTask) {
+      return "olam_create requires one of: `task`, `linearTicketId`, or `taskContext.ticketId`. Worlds are only created with an actionable input.";
+    }
+    return JSON.stringify({
+      name: input.name,
+      repos: input.repos ?? [],
+      workspace: input.workspace,
+      task: input.task,
+      linearTicketId: input.linearTicketId,
+      branchName: input.branchName,
+      planFile: input.planFile,
+      taskContext: input.taskContext,
+      carryUncommitted: input.carryUncommitted ?? false,
+      runbookName: input.runbookName
+    }, null, 2);
+  }
+});
+
+// ../mcp-server/src/tools/world-create.ts
 function register6(server, ctx, initError) {
+  const { description, inputSchema } = worldCreateSkill.asMcpTool();
   server.tool(
     "olam_create",
-    "Provision a new isolated development world with optional repository cloning, initial task, and Linear/GitHub task context.",
-    {
-      name: external_exports.string(),
-      repos: external_exports.array(external_exports.string()).optional(),
-      workspace: external_exports.string().optional().describe("Named workspace from the host catalog (~/.olam/workspaces/<name>.yaml). Inline `repos` wins over this."),
-      task: external_exports.string().optional(),
-      linearTicketId: external_exports.string().optional(),
-      branchName: external_exports.string().optional().describe("Override the default branch name (e.g., feat/ATL-1234-payment-webhook)"),
-      planFile: external_exports.string().optional().describe("Path to a plan file on the host to inject into the world"),
-      taskContext: taskContextSchema.describe("Structured task context from Linear, GitHub, or manual entry"),
-      // Phase B B3 (olam-session-stability): mirror of CLI's
-      // --carry-uncommitted flag. Default OFF (clean tree). Skips B1's
-      // strip step so any operator-side uncommitted edits survive into
-      // the world's worktree. The baseline-diff snapshot still runs
-      // unconditionally (Phase C reaper still needs it).
-      carryUncommitted: external_exports.boolean().optional().describe("Preserve operator's uncommitted edits in the world's worktree (B3); default false"),
-      runbookName: external_exports.string().optional().describe("Named runbook profile from ~/.olam/config.json \u2014 seeds ports, env overrides, and fixture-copy steps")
-    },
+    description,
+    inputSchema,
     async (params) => {
       if (!ctx) {
         const errorMsg = initError?.message ?? "Olam is not configured. Run /olam:init to set up.";
@@ -31314,14 +31630,26 @@ var world_destroy_exports = {};
 __export(world_destroy_exports, {
   register: () => register7
 });
+
+// ../skill-runtime/dist/skills/world-destroy.js
 init_v3();
+var worldDestroyInputSchema = external_exports.object({
+  worldId: external_exports.string()
+});
+var worldDestroySkill = defineSkill({
+  name: "world-destroy",
+  description: "Destroy an existing world and clean up all associated resources.",
+  inputSchema: worldDestroyInputSchema,
+  handler: ({ worldId }) => `Destroy requested for world: ${worldId}`
+});
+
+// ../mcp-server/src/tools/world-destroy.ts
 function register7(server, ctx, initError) {
+  const { description, inputSchema } = worldDestroySkill.asMcpTool();
   server.tool(
     "olam_destroy",
-    "Destroy an existing world and clean up all associated resources.",
-    {
-      worldId: external_exports.string()
-    },
+    description,
+    inputSchema,
     async (params) => {
       if (!ctx) {
         const errorMsg = initError?.message ?? "Olam is not configured. Run /olam:init to set up.";
@@ -31355,11 +31683,24 @@ var world_list_exports = {};
 __export(world_list_exports, {
   register: () => register8
 });
+
+// ../skill-runtime/dist/skills/world-list.js
+init_v3();
+var worldListInputSchema = external_exports.object({});
+var worldListSkill = defineSkill({
+  name: "world-list",
+  description: "List all active development worlds and their current status.",
+  inputSchema: worldListInputSchema,
+  handler: (_input) => "World listing requires an active OlamContext. Use the MCP tool surface or HTTP endpoint with a configured host."
+});
+
+// ../mcp-server/src/tools/world-list.ts
 function register8(server, ctx, initError) {
+  const { description, inputSchema } = worldListSkill.asMcpTool();
   server.tool(
     "olam_list",
-    "List all active development worlds and their current status.",
-    {},
+    description,
+    inputSchema,
     async () => {
       if (!ctx) {
         const errorMsg = initError?.message ?? "Olam is not configured. Run /olam:init to set up.";
@@ -31415,7 +31756,6 @@ __export(world_dispatch_exports, {
   dispatchInputSchema: () => dispatchInputSchema,
   register: () => register9
 });
-init_v3();
 import "node:path";
 
 // ../core/dist/world-paths.js
@@ -31881,7 +32221,8 @@ var MCP_SERVER_ALLOWLIST = /* @__PURE__ */ new Set([
   "command",
   "args",
   "type",
-  "url"
+  "url",
+  "alwaysLoad"
 ]);
 function stripMcpServers(mcpServers) {
   const out = {};
@@ -31902,6 +32243,8 @@ function stripMcpServers(mcpServers) {
         stripped.type = value;
       } else if (key === "url" && typeof value === "string") {
         stripped.url = value;
+      } else if (key === "alwaysLoad" && typeof value === "boolean") {
+        stripped.alwaysLoad = value;
       }
     }
     out[svc] = stripped;
@@ -32021,8 +32364,8 @@ function copyDirRecursive(src, dest, depth = 0, skipFiles = /* @__PURE__ */ new
   }
 }
 async function copyClaudeConfigIntoContainer(containerName) {
-  const { execSync: execSync7 } = await import("node:child_process");
-  const dockerExec = (cmd) => execSync7(`docker exec ${containerName} sh -c '${cmd}'`, { stdio: "pipe" });
+  const { execSync: execSync8 } = await import("node:child_process");
+  const dockerExec = (cmd) => execSync8(`docker exec ${containerName} sh -c '${cmd}'`, { stdio: "pipe" });
   dockerExec("mkdir -p $HOME/.claude");
   dockerExec("test -f /home/olam/workspace/.claude-host-config/settings.json && cp /home/olam/workspace/.claude-host-config/settings.json $HOME/.claude/settings.json || true");
   dockerExec("test -f /home/olam/workspace/.claude-host-config/CLAUDE.md && cp /home/olam/workspace/.claude-host-config/CLAUDE.md $HOME/.claude/CLAUDE.md || true");
@@ -32038,7 +32381,7 @@ async function copyClaudeConfigIntoContainer(containerName) {
   await sanitizeContainerClaudeHooks(containerName);
 }
 async function sanitizeContainerClaudeHooks(containerName) {
-  const { execSync: execSync7 } = await import("node:child_process");
+  const { execSync: execSync8 } = await import("node:child_process");
   const script = `
 const fs = require('fs');
 const p = (process.env.HOME || '/home/olam') + '/.claude/settings.json';
@@ -32082,7 +32425,7 @@ if (changed) {
 }
 `;
   try {
-    execSync7(`docker exec ${containerName} /usr/local/bin/node -e ${shQuote(script)}`, { stdio: "pipe" });
+    execSync8(`docker exec ${containerName} /usr/local/bin/node -e ${shQuote(script)}`, { stdio: "pipe" });
   } catch {
   }
 }
@@ -32518,28 +32861,59 @@ async function verifyCommentPosted(spec, worldId, execGh) {
   };
 }
 
-// ../mcp-server/src/tools/world-dispatch.ts
-var dispatchInputSchema = {
+// ../skill-runtime/dist/skills/world-dispatch.js
+init_v3();
+var goalSpecSchema = external_exports.object({
+  type: external_exports.enum([
+    "pr-merged",
+    "pr-green",
+    "file-exists",
+    "test-passes",
+    "comment-posted"
+  ]),
+  spec: external_exports.string().min(1).describe("Type-specific spec: PR number, file path, test name, or comment marker"),
+  timeoutMinutes: external_exports.number().int().min(1).max(720).default(90)
+}).describe("Optional structured completion condition; when set, the world loops between turns checking this until met or timeout");
+var worldDispatchInputSchema = external_exports.object({
   worldId: external_exports.string(),
   prompt: external_exports.string(),
   maxTurns: external_exports.number().optional(),
-  mode: external_exports.enum(["deep", "fast", "auto"]).optional().describe(
-    "Execution mode: 'deep' appends ultrathink + sub-agent instructions for complex/generative tasks, 'fast' for simple chores, 'auto' (default) detects from prompt complexity"
-  ),
-  goal: GoalSpecSchema.optional().describe(
-    "Optional structured completion condition. When set, the world's dispatch loop checks this condition after each turn until met or the timeout window closes. v1 ships a single post-dispatch check; v2 will close the loop. /goal-mode parity with Claude Code 2.1.139."
-  ),
-  escalationTiers: external_exports.array(external_exports.enum(["haiku", "sonnet", "opus"])).optional().default(["sonnet"]).describe(
-    "Ordered model-tier escalation chain for dispatch retries. On each retry, host-cp advances to the next tier instead of repeating the failed model. Default ['sonnet'] = no escalation (current behaviour, no cost surprise). Operators opt in via e.g. ['sonnet','opus'] or ['haiku','sonnet','opus']."
-  )
-};
-var dispatchInputObject = external_exports.object(dispatchInputSchema);
+  mode: external_exports.enum(["deep", "fast", "auto"]).optional().describe("Execution mode: 'deep' appends ultrathink + sub-agent instructions for complex/generative tasks, 'fast' for simple chores, 'auto' (default) detects from prompt complexity"),
+  goal: goalSpecSchema.optional().describe("Optional structured completion condition. When set, the world's dispatch loop checks this condition after each turn until met or the timeout window closes. v1 ships a single post-dispatch check; v2 will close the loop. /goal-mode parity with Claude Code 2.1.139."),
+  escalationTiers: external_exports.array(external_exports.enum(["haiku", "sonnet", "opus"])).optional().default(["sonnet"]).describe("Ordered model-tier escalation chain for dispatch retries. On each retry, host-cp advances to the next tier instead of repeating the failed model. Default ['sonnet'] = no escalation (current behaviour, no cost surprise). Operators opt in via e.g. ['sonnet','opus'] or ['haiku','sonnet','opus'].")
+});
+var worldDispatchSkill = defineSkill({
+  name: "world-dispatch",
+  description: "Send a task prompt to a world for autonomous execution.",
+  inputSchema: worldDispatchInputSchema,
+  handler: (input) => {
+    const lines = [
+      `Dispatch queued.`,
+      ``,
+      `  worldId: ${input.worldId}`,
+      `  mode:    ${input.mode ?? "auto"}`,
+      `  prompt:  ${input.prompt.slice(0, 120)}${input.prompt.length > 120 ? "\u2026" : ""}`
+    ];
+    if (input.goal) {
+      lines.push(`  goal:    ${input.goal.type} (${input.goal.spec})`);
+    }
+    if (input.escalationTiers && input.escalationTiers.length > 0) {
+      lines.push(`  tiers:   ${input.escalationTiers.join(", ")}`);
+    }
+    return lines.join("\n");
+  }
+});
+
+// ../mcp-server/src/tools/world-dispatch.ts
+var dispatchInputObject = worldDispatchInputSchema;
+var dispatchInputSchema = worldDispatchSkill.asMcpTool().inputSchema;
 function register9(server, ctx, initError, deps) {
   const verify = deps?.verifyGoal ?? verifyGoal;
+  const { description, inputSchema } = worldDispatchSkill.asMcpTool();
   server.tool(
     "olam_dispatch",
-    "Send a task prompt to a world for autonomous execution.",
-    dispatchInputSchema,
+    description,
+    inputSchema,
     async (params) => {
       if (!ctx) {
         const errorMsg = initError?.message ?? "Olam is not configured. Run /olam:init to set up.";
@@ -32680,17 +33054,116 @@ function register9(server, ctx, initError, deps) {
 // ../mcp-server/src/tools/world-observe.ts
 var world_observe_exports = {};
 __export(world_observe_exports, {
+  readWorldChunks: () => readWorldChunks,
   register: () => register10
 });
+import { createRequire as createRequire3 } from "node:module";
+import { existsSync as existsSync11 } from "node:fs";
+
+// ../skill-runtime/dist/skills/world-observe.js
 init_v3();
+var worldObserveInputSchema = external_exports.object({
+  worldId: external_exports.string(),
+  sessionId: external_exports.string().optional(),
+  sinceChunkId: external_exports.string().optional(),
+  limit: external_exports.number().int().min(1).max(1e3).optional()
+});
+var worldObserveSkill = defineSkill({
+  name: "world-observe",
+  description: "Stream a world's reasoning chunks (thought_nodes feed). Returns JSON `{ chunks: [{ chunkId, sessionId, role, content, createdAt, nodeType }], metadata: { pane_state, count } }`, most-recent-last. Supports pagination via `sinceChunkId` (returns only chunks newer than the given id) and `limit` (default 100, max 1000). Use `olam_list` first to discover worldIds.",
+  inputSchema: worldObserveInputSchema,
+  handler: (_input) => "World observation requires an active OlamContext. Use the MCP tool surface to read a world's chunks."
+});
+
+// ../mcp-server/src/tools/world-observe.ts
+var require2 = createRequire3(import.meta.url);
+var SYSTEM_NODE_TYPES = /* @__PURE__ */ new Set(["lifecycle", "dispatch_error"]);
+var DEFAULT_LIMIT = 100;
+var BUSY_WINDOW_MS = 3e4;
+function roleFor(nodeType) {
+  return SYSTEM_NODE_TYPES.has(nodeType) ? "system" : "assistant";
+}
+function rowToChunk(row) {
+  return {
+    chunkId: row.id,
+    sessionId: row.session_id,
+    role: roleFor(row.node_type),
+    content: row.content,
+    summary: row.summary,
+    createdAt: row.created_at,
+    nodeType: row.node_type,
+    sequenceNum: row.sequence_num
+  };
+}
+function readWorldChunks(dbPath, params) {
+  const limit = params.limit ?? DEFAULT_LIMIT;
+  const now = params.now ?? Date.now();
+  const empty = () => ({
+    worldId: params.worldId,
+    chunks: [],
+    metadata: {
+      count: 0,
+      pane_state: "idle",
+      sessionFilter: params.sessionId ?? null,
+      sinceChunkId: params.sinceChunkId ?? null,
+      limit
+    }
+  });
+  if (!existsSync11(dbPath)) return empty();
+  const Sqlite = require2("better-sqlite3");
+  const db = new Sqlite(dbPath, { readonly: true, fileMustExist: true });
+  try {
+    let minSeq = -1;
+    if (params.sinceChunkId) {
+      const seqRow = db.prepare("SELECT sequence_num FROM thought_nodes WHERE id = ?").get(params.sinceChunkId);
+      if (!seqRow) {
+        return empty();
+      }
+      minSeq = seqRow.sequence_num;
+    }
+    const where = ["sequence_num > ?"];
+    const bind = [minSeq];
+    if (params.sessionId !== void 0) {
+      where.push("session_id = ?");
+      bind.push(params.sessionId);
+    }
+    const sql = `SELECT id, node_type, summary, content, source_ref, sequence_num, created_at, session_id, hook_event_name, turn_index, token_usage, duration_ms FROM thought_nodes WHERE ${where.join(" AND ")} ORDER BY sequence_num DESC LIMIT ?`;
+    const rows = db.prepare(sql).all(...bind, limit);
+    rows.reverse();
+    const lastRow = rows[rows.length - 1];
+    let paneState = "idle";
+    if (lastRow) {
+      const ageMs = now - new Date(lastRow.created_at).getTime();
+      paneState = ageMs <= BUSY_WINDOW_MS ? "busy" : "idle";
+    } else {
+      const maxRow = db.prepare("SELECT MAX(created_at) AS max_at FROM thought_nodes").get();
+      if (maxRow?.max_at) {
+        const ageMs = now - new Date(maxRow.max_at).getTime();
+        paneState = ageMs <= BUSY_WINDOW_MS ? "busy" : "idle";
+      }
+    }
+    return {
+      worldId: params.worldId,
+      chunks: rows.map(rowToChunk),
+      metadata: {
+        count: rows.length,
+        pane_state: paneState,
+        sessionFilter: params.sessionId ?? null,
+        sinceChunkId: params.sinceChunkId ?? null,
+        limit
+      }
+    };
+  } finally {
+    db.close();
+  }
+}
 function register10(server, ctx, initError) {
+  const { description, inputSchema } = worldObserveSkill.asMcpTool();
   server.tool(
     "olam_observe",
-    "Watch a world's reasoning process and retrieve its current thought stream.",
-    {
-      worldId: external_exports.string()
-    },
-    async (_params) => {
+    description,
+    inputSchema,
+    async (params) => {
       if (!ctx) {
         const errorMsg = initError?.message ?? "Olam is not configured. Run /olam:init to set up.";
         return {
@@ -32698,20 +33171,43 @@ function register10(server, ctx, initError) {
           isError: true
         };
       }
-      return {
-        content: [{ type: "text", text: "Observation is coming in a future release. This feature will stream a world's reasoning in real-time." }],
-        isError: true
-      };
-    }
-  );
-}
-
-// ../mcp-server/src/tools/world-enter.ts
-var world_enter_exports = {};
+      const { worldId, sessionId, sinceChunkId, limit } = params;
+      const world = ctx.worldManager.getWorld(worldId);
+      if (!world) {
+        return {
+          content: [
+            {
+              type: "text",
+              text: `World "${worldId}" not found. Use olam_list to discover available worlds.`
+            }
+          ],
+          isError: true
+        };
+      }
+      try {
+        const dbPath = getWorldDbPath(world.workspacePath);
+        const output = readWorldChunks(dbPath, { worldId, sessionId, sinceChunkId, limit });
+        return {
+          content: [{ type: "text", text: JSON.stringify(output, null, 2) }]
+        };
+      } catch (err) {
+        const message = err instanceof Error ? err.message : String(err);
+        return {
+          content: [
+            { type: "text", text: `Failed to read chunks for world "${worldId}": ${message}` }
+          ],
+          isError: true
+        };
+      }
+    }
+  );
+}
+
+// ../mcp-server/src/tools/world-enter.ts
+var world_enter_exports = {};
 __export(world_enter_exports, {
   register: () => register11
 });
-init_v3();
 
 // ../core/dist/orchestrator/enter.js
 function getEnterCommand(worldId, containerId, provider, sshHost) {
@@ -32747,14 +33243,25 @@ function getEnterCommand(worldId, containerId, provider, sshHost) {
   };
 }
 
+// ../skill-runtime/dist/skills/world-enter.js
+init_v3();
+var worldEnterInputSchema = external_exports.object({
+  worldId: external_exports.string()
+});
+var worldEnterSkill = defineSkill({
+  name: "world-enter",
+  description: "Enter a world for interactive collaboration within its isolated environment.",
+  inputSchema: worldEnterInputSchema,
+  handler: ({ worldId }) => `Enter requested for world: ${worldId}`
+});
+
 // ../mcp-server/src/tools/world-enter.ts
 function register11(server, ctx, initError) {
+  const { description, inputSchema } = worldEnterSkill.asMcpTool();
   server.tool(
     "olam_enter",
-    "Enter a world for interactive collaboration within its isolated environment.",
-    {
-      worldId: external_exports.string()
-    },
+    description,
+    inputSchema,
     async ({ worldId }) => {
       if (!ctx) {
         const errorMsg = initError?.message ?? "Olam is not configured. Run /olam:init to set up.";
@@ -32805,7 +33312,6 @@ var world_crystallize_exports = {};
 __export(world_crystallize_exports, {
   register: () => register12
 });
-init_v3();
 import "node:path";
 import * as fs10 from "node:fs";
 
@@ -32818,14 +33324,25 @@ function computeGraphChecksum(nodes, edges) {
   return createHash2("sha256").update(payload).digest("hex");
 }
 
+// ../skill-runtime/dist/skills/world-crystallize.js
+init_v3();
+var worldCrystallizeInputSchema = external_exports.object({
+  worldId: external_exports.string()
+});
+var worldCrystallizeSkill = defineSkill({
+  name: "world-crystallize",
+  description: "Save a world's current thoughts and reasoning into a persistent thought graph via Pleri Plane.",
+  inputSchema: worldCrystallizeInputSchema,
+  handler: (_input) => "Crystallization requires an active OlamContext with a configured Pleri connection. Use the MCP tool surface or HTTP endpoint with a configured host."
+});
+
 // ../mcp-server/src/tools/world-crystallize.ts
 function register12(server, ctx, initError) {
+  const { description, inputSchema } = worldCrystallizeSkill.asMcpTool();
   server.tool(
     "olam_crystallize",
-    "Save a world's current thoughts and reasoning into a persistent thought graph via Pleri Plane.",
-    {
-      worldId: external_exports.string()
-    },
+    description,
+    inputSchema,
     async (params) => {
       if (!ctx) {
         const errorMsg = initError?.message ?? "Olam is not configured. Run /olam:init to set up.";
@@ -32953,78 +33470,6 @@ init_v3();
 
 // ../skill-runtime/dist/skills/olam-status.js
 init_v3();
-
-// ../skill-runtime/dist/define-skill.js
-var KEBAB_RE = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
-function defineSkill(spec) {
-  if (!KEBAB_RE.test(spec.name)) {
-    throw new Error(`defineSkill: name "${spec.name}" must be kebab-case (lowercase letters, digits, and hyphens only; no leading/trailing/double hyphens).`);
-  }
-  return {
-    asMcpTool() {
-      return {
-        name: spec.name,
-        description: spec.description,
-        inputSchema: spec.inputSchema,
-        async handler(params) {
-          try {
-            const parsed = spec.inputSchema.safeParse(params);
-            if (!parsed.success) {
-              return {
-                content: [
-                  {
-                    type: "text",
-                    text: `Invalid input: ${parsed.error.message}`
-                  }
-                ],
-                isError: true
-              };
-            }
-            const output = await spec.handler(parsed.data);
-            return {
-              content: [
-                {
-                  type: "text",
-                  text: typeof output === "string" ? output : JSON.stringify(output)
-                }
-              ]
-            };
-          } catch (err) {
-            const message = err instanceof Error ? err.message : String(err);
-            return {
-              content: [{ type: "text", text: `Error: ${message}` }],
-              isError: true
-            };
-          }
-        }
-      };
-    },
-    asHttpHandler() {
-      return async (req, res) => {
-        const parsed = spec.inputSchema.safeParse(req.body);
-        if (!parsed.success) {
-          res.status(400).json({
-            error: "Invalid input",
-            issues: parsed.error.issues
-          });
-          return;
-        }
-        try {
-          const output = await spec.handler(parsed.data);
-          res.status(200).json({ result: output });
-        } catch (err) {
-          const message = err instanceof Error ? err.message : String(err);
-          res.status(500).json({ error: message });
-        }
-      };
-    },
-    toJsonSchema() {
-      return zodToJsonSchema(spec.inputSchema, { target: "openApi3" });
-    }
-  };
-}
-
-// ../skill-runtime/dist/skills/olam-status.js
 var olamStatusInputSchema = external_exports.object({
   world: external_exports.object({
     id: external_exports.string(),
@@ -33135,11 +33580,24 @@ var control_plane_exports = {};
 __export(control_plane_exports, {
   register: () => register14
 });
+
+// ../skill-runtime/dist/skills/control-plane.js
+init_v3();
+var controlPlaneInputSchema = external_exports.object({});
+var controlPlaneSkill = defineSkill({
+  name: "control-plane",
+  description: "Access the Olam control plane dashboard URL and status.",
+  inputSchema: controlPlaneInputSchema,
+  handler: (_input) => "Control plane access requires an active OlamContext. Use the MCP tool surface or HTTP endpoint with a configured host."
+});
+
+// ../mcp-server/src/tools/control-plane.ts
 function register14(server, ctx, initError) {
+  const { description, inputSchema } = controlPlaneSkill.asMcpTool();
   server.tool(
     "olam_control_plane",
-    "Access the Olam control plane dashboard URL and status.",
-    {},
+    description,
+    inputSchema,
     async () => {
       if (!ctx) {
         const errorMsg = initError?.message ?? "Olam is not configured. Run /olam:init to set up.";
@@ -33170,18 +33628,36 @@ var lane_create_exports = {};
 __export(lane_create_exports, {
   register: () => register15
 });
+
+// ../skill-runtime/dist/skills/lane-create.js
 init_v3();
+var laneCreateInputSchema = external_exports.object({
+  worldId: external_exports.string(),
+  name: external_exports.string().describe("Kebab-case lane name (e.g., auth-fix, add-tests)"),
+  task: external_exports.string().describe("Task description for the lane agent"),
+  scope: external_exports.array(external_exports.string()).describe("File globs this lane is allowed to modify"),
+  avoids: external_exports.array(external_exports.string()).optional().describe("File globs this lane must not touch")
+});
+var laneCreateSkill = defineSkill({
+  name: "lane-create",
+  description: "Create a new parallel lane within a world for isolated task execution with file-level locking.",
+  inputSchema: laneCreateInputSchema,
+  handler: (input) => JSON.stringify({
+    worldId: input.worldId,
+    name: input.name,
+    task: input.task,
+    scope: input.scope,
+    avoids: input.avoids ?? []
+  }, null, 2)
+});
+
+// ../mcp-server/src/tools/lane-create.ts
 function register15(server, ctx, initError) {
+  const { description, inputSchema } = laneCreateSkill.asMcpTool();
   server.tool(
     "olam_create_lane",
-    "Create a new parallel lane within a world for isolated task execution with file-level locking.",
-    {
-      worldId: external_exports.string(),
-      name: external_exports.string().describe("Kebab-case lane name (e.g., auth-fix, add-tests)"),
-      task: external_exports.string().describe("Task description for the lane agent"),
-      scope: external_exports.array(external_exports.string()).describe("File globs this lane is allowed to modify"),
-      avoids: external_exports.array(external_exports.string()).optional().describe("File globs this lane must not touch")
-    },
+    description,
+    inputSchema,
     async (params) => {
       if (!ctx) {
         const errorMsg = initError?.message ?? "Olam is not configured. Run /olam:init to set up.";
@@ -33253,14 +33729,26 @@ var lane_list_exports = {};
 __export(lane_list_exports, {
   register: () => register16
 });
+
+// ../skill-runtime/dist/skills/lane-list.js
 init_v3();
+var laneListInputSchema = external_exports.object({
+  worldId: external_exports.string()
+});
+var laneListSkill = defineSkill({
+  name: "lane-list",
+  description: "List all lanes in a world and their current status.",
+  inputSchema: laneListInputSchema,
+  handler: (_input) => "Lane listing requires an active OlamContext. Use the MCP tool surface or HTTP endpoint with a configured host."
+});
+
+// ../mcp-server/src/tools/lane-list.ts
 function register16(server, ctx, initError) {
+  const { description, inputSchema } = laneListSkill.asMcpTool();
   server.tool(
     "olam_list_lanes",
-    "List all lanes in a world and their current status.",
-    {
-      worldId: external_exports.string()
-    },
+    description,
+    inputSchema,
     async (params) => {
       if (!ctx) {
         const errorMsg = initError?.message ?? "Olam is not configured. Run /olam:init to set up.";
@@ -33324,16 +33812,37 @@ var lane_dispatch_exports = {};
 __export(lane_dispatch_exports, {
   register: () => register17
 });
+
+// ../skill-runtime/dist/skills/lane-dispatch.js
 init_v3();
+var laneDispatchInputSchema = external_exports.object({
+  worldId: external_exports.string(),
+  laneName: external_exports.string(),
+  prompt: external_exports.string()
+});
+var laneDispatchSkill = defineSkill({
+  name: "lane-dispatch",
+  description: "Send a task prompt to a specific lane within a world.",
+  inputSchema: laneDispatchInputSchema,
+  handler: (input) => {
+    const lines = [
+      `Dispatch queued for lane.`,
+      ``,
+      `  worldId: ${input.worldId}`,
+      `  lane:    ${input.laneName}`,
+      `  prompt:  ${input.prompt.slice(0, 100)}${input.prompt.length > 100 ? "..." : ""}`
+    ];
+    return lines.join("\n");
+  }
+});
+
+// ../mcp-server/src/tools/lane-dispatch.ts
 function register17(server, ctx, initError) {
+  const { description, inputSchema } = laneDispatchSkill.asMcpTool();
   server.tool(
     "olam_dispatch_lane",
-    "Send a task prompt to a specific lane within a world.",
-    {
-      worldId: external_exports.string(),
-      laneName: external_exports.string(),
-      prompt: external_exports.string()
-    },
+    description,
+    inputSchema,
     async (params) => {
       if (!ctx) {
         const errorMsg = initError?.message ?? "Olam is not configured. Run /olam:init to set up.";
@@ -33399,15 +33908,27 @@ var lane_destroy_exports = {};
 __export(lane_destroy_exports, {
   register: () => register18
 });
+
+// ../skill-runtime/dist/skills/lane-destroy.js
 init_v3();
+var laneDestroyInputSchema = external_exports.object({
+  worldId: external_exports.string(),
+  laneName: external_exports.string()
+});
+var laneDestroySkill = defineSkill({
+  name: "lane-destroy",
+  description: "Destroy a lane within a world and release its file locks.",
+  inputSchema: laneDestroyInputSchema,
+  handler: (input) => `Lane destruction requires an active OlamContext. Target: world="${input.worldId}", lane="${input.laneName}".`
+});
+
+// ../mcp-server/src/tools/lane-destroy.ts
 function register18(server, ctx, initError) {
+  const { description, inputSchema } = laneDestroySkill.asMcpTool();
   server.tool(
     "olam_destroy_lane",
-    "Destroy a lane within a world and release its file locks.",
-    {
-      worldId: external_exports.string(),
-      laneName: external_exports.string()
-    },
+    description,
+    inputSchema,
     async (params) => {
       if (!ctx) {
         const errorMsg = initError?.message ?? "Olam is not configured. Run /olam:init to set up.";
@@ -33459,15 +33980,32 @@ var lane_merge_exports = {};
 __export(lane_merge_exports, {
   register: () => register19
 });
+
+// ../skill-runtime/dist/skills/lane-merge.js
 init_v3();
+var laneMergeInputSchema = external_exports.object({
+  worldId: external_exports.string(),
+  laneName: external_exports.string()
+});
+var laneMergeSkill = defineSkill({
+  name: "lane-merge",
+  description: "Merge a lane's changes back into the world's main branch.",
+  inputSchema: laneMergeInputSchema,
+  handler: (input) => {
+    return `Lane merge queued.
+
+  worldId: ${input.worldId}
+  lane:    ${input.laneName}`;
+  }
+});
+
+// ../mcp-server/src/tools/lane-merge.ts
 function register19(server, ctx, initError) {
+  const { description, inputSchema } = laneMergeSkill.asMcpTool();
   server.tool(
     "olam_merge_lane",
-    "Merge a lane's changes back into the world's main branch.",
-    {
-      worldId: external_exports.string(),
-      laneName: external_exports.string()
-    },
+    description,
+    inputSchema,
     async (params) => {
       if (!ctx) {
         const errorMsg = initError?.message ?? "Olam is not configured. Run /olam:init to set up.";
@@ -34282,6 +34820,67 @@ function checkLiteral(host, allowLoopback) {
   return null;
 }
 
+// ../skill-runtime/dist/skills/capture-view.js
+init_v3();
+var SHOT_NAME_RE = /^[A-Za-z0-9._-]+$/;
+var shotSpec = external_exports.object({
+  name: external_exports.string().min(1).max(64).regex(SHOT_NAME_RE, "name must match /^[A-Za-z0-9._-]+$/ \u2014 no slashes, spaces, or path separators").describe("Shot identifier; written as `<name>.png` in `outDir`. Must be unique within a `capture_view` call."),
+  url: external_exports.string().describe("Page URL. May be absolute (`https://\u2026`) or world-relative (`world://<world_id>/<path>`). Rejects `file://`, `chrome-extension://`, `about:`, `javascript:`, `data:`, RFC1918, link-local, cloud-metadata."),
+  viewport: external_exports.object({
+    width: external_exports.number().int().min(320).max(3840),
+    height: external_exports.number().int().min(240).max(2160)
+  }).optional().describe("Browser viewport in CSS pixels. Default `{1280,800}`."),
+  deviceScaleFactor: external_exports.number().int().min(1).max(2).optional().describe("Default 1; cap 2 to keep mobile GPUs sane."),
+  media: external_exports.object({
+    reducedMotion: external_exports.enum(["no-preference", "reduce"]).optional(),
+    colorScheme: external_exports.enum(["light", "dark"]).optional()
+  }).optional().describe("CSS media-feature emulation. Use to capture reduced-motion fallbacks, dark-mode renders, etc."),
+  waitForSelector: external_exports.string().optional().describe("CSS selector to wait for before screenshot."),
+  waitForNetworkIdle: external_exports.boolean().optional().describe("Wait for `networkidle` event before screenshot. Default true."),
+  afterLoadMs: external_exports.number().int().min(0).max(1e4).optional().describe("Sleep N ms after load before screenshot. Use to let WebGL/canvas animations reach a non-zero frame."),
+  fill: external_exports.record(external_exports.string(), external_exports.string()).optional().describe("Selector \u2192 value map. Filled before `submit` (if any). Keys are CSS selectors, values are literal strings."),
+  submit: external_exports.string().optional().describe("Form selector to `requestSubmit()` after `fill`."),
+  afterSubmitMs: external_exports.number().int().min(0).max(1e4).optional().describe("Sleep N ms after submit before screenshot. Use to let success-card render."),
+  mockFetch: external_exports.array(external_exports.object({
+    pattern: external_exports.string().min(1).describe("URL match pattern. Forms: `/regex/` treats inner as RegExp source; otherwise matched as a literal substring."),
+    method: external_exports.enum(["GET", "POST", "PUT", "DELETE", "PATCH", "HEAD", "OPTIONS"]).optional().describe("HTTP method filter. When set, only requests with this method are intercepted."),
+    status: external_exports.number().int().default(200),
+    bodyJson: external_exports.unknown().optional(),
+    bodyText: external_exports.string().optional()
+  })).max(64).optional().describe("Intercept fetch/XHR matching the pattern; return the canned response. Max 64 entries per shot."),
+  setStorage: external_exports.record(external_exports.enum(["local", "session"]), external_exports.record(external_exports.string().min(1).max(128), external_exports.string().max(64 * 1024))).refine((s) => {
+    let total = 0;
+    if (s.local)
+      total += Object.keys(s.local).length;
+    if (s.session)
+      total += Object.keys(s.session).length;
+    return total <= 50;
+  }, { message: "setStorage entries (local + session combined) must not exceed 50 keys" }).optional().describe("Pre-load LocalStorage / SessionStorage entries before navigation. Per scope: keys \u2264 128 chars, values \u2264 64 KB. Combined (local + session) total \u2264 50 entries."),
+  eval: external_exports.string().optional().describe("Raw page-script run after navigation, before screenshot. Gated behind `--allow-eval` on the calling skill.")
+});
+var captureViewInputSchema = external_exports.object({
+  shots: external_exports.array(shotSpec).min(1).max(50).refine((shots) => new Set(shots.map((s) => s.name)).size === shots.length, { message: "shot.name must be unique within a single capture_view call" }).describe("Shots to capture. One Chromium boot per call; reused across shots. Names must be unique within the call."),
+  outDir: external_exports.string().describe("Host-side directory to write artifacts. Created if missing. Files are `<name>.png` plus `manifest.json`."),
+  format: external_exports.enum(["png", "jpeg"]).default("png").describe("Output format. Default `png`."),
+  jpegQuality: external_exports.number().int().min(50).max(100).default(85).describe("JPEG quality if `format='jpeg'`."),
+  ttlSeconds: external_exports.number().int().min(30).max(600).default(120).describe("Capability token TTL. Capped at 60 when called from inside a world."),
+  allowEval: external_exports.boolean().default(false).describe("Permit `eval` page-scripts in shots. Default false.")
+});
+var captureViewSkill = defineSkill({
+  name: "capture-view",
+  description: "Brokered screenshot primitive: take spec-driven screenshots of a web app via the supervisor's Chromium. Used by the olam:ui-shoot skill (host) and by autonomous in-world agents (which cannot run Playwright themselves). Worlds never get raw browser access; they request artifacts here, the supervisor renders.",
+  inputSchema: captureViewInputSchema,
+  handler: (input) => {
+    const shotNames = input.shots.map((s) => s.name).join(", ");
+    return [
+      `Would capture ${input.shots.length} shot(s) to ${input.outDir}`,
+      `  shots: ${shotNames}`,
+      `  format: ${input.format}`,
+      "Use the MCP tool for actual Chromium execution (requires OlamContext + Playwright)."
+    ].join("\n");
+  }
+});
+
 // ../mcp-server/src/tools/capture-view.ts
 var CHROMIUM_CONCURRENCY_CAP = Math.max(
   1,
@@ -34400,9 +34999,9 @@ async function rewriteShotUrl(ctx, shotUrl, cache2) {
     url: `http://${endpoint.host}:${endpoint.port}${parsed.pathname}${parsed.search}`
   };
 }
-var SHOT_NAME_RE = /^[A-Za-z0-9._-]+$/;
-var shotSpec = external_exports.object({
-  name: external_exports.string().min(1).max(64).regex(SHOT_NAME_RE, "name must match /^[A-Za-z0-9._-]+$/ \u2014 no slashes, spaces, or path separators").describe(
+var SHOT_NAME_RE2 = /^[A-Za-z0-9._-]+$/;
+var shotSpec2 = external_exports.object({
+  name: external_exports.string().min(1).max(64).regex(SHOT_NAME_RE2, "name must match /^[A-Za-z0-9._-]+$/ \u2014 no slashes, spaces, or path separators").describe(
     "Shot identifier; written as `<name>.png` in `outDir`. Must be unique within a `capture_view` call. Letters/digits/dots/dashes/underscores only \u2014 schema-level guard against path traversal via filename."
   ),
   url: external_exports.string().describe(
@@ -34472,7 +35071,7 @@ var shotSpec = external_exports.object({
   )
 });
 var captureViewInput = {
-  shots: external_exports.array(shotSpec).min(1).max(50).refine(
+  shots: external_exports.array(shotSpec2).min(1).max(50).refine(
     (shots) => new Set(shots.map((s) => s.name)).size === shots.length,
     // Without this refine, two shots with the same name would silently
     // overwrite each other on disk while the success envelope reports
@@ -34623,10 +35222,11 @@ async function runShot(browser, shot, outDir, format, jpegQuality, allowEval, as
   }
 }
 function register20(server, ctx, initError) {
+  const { description, inputSchema } = captureViewSkill.asMcpTool();
   server.tool(
     "olam_capture_view",
-    "Brokered screenshot primitive: take spec-driven screenshots of a web app via the supervisor's Chromium. Used by the olam:ui-shoot skill (host) and by autonomous in-world agents (which cannot run Playwright themselves). Worlds never get raw browser access; they request artifacts here, the supervisor renders.",
-    captureViewInput,
+    description,
+    inputSchema,
     async (params) => {
       if (!ctx) {
         const errorMsg = initError?.message ?? "Olam is not configured. Run /olam:init to set up.";
@@ -34889,7 +35489,47 @@ var create_from_prompt_exports = {};
 __export(create_from_prompt_exports, {
   register: () => register21
 });
+
+// ../skill-runtime/dist/skills/create-from-prompt.js
 init_v3();
+var createFromPromptInputSchema = external_exports.object({
+  prompt: external_exports.string().min(1).describe("Natural-language task. Repo names extracted via heuristic; falls back to picker on ambiguity."),
+  repos: external_exports.array(external_exports.string()).optional().describe("Explicit repos. Bypasses NL inference."),
+  workspace: external_exports.string().optional().describe("Named workspace. Bypasses inference + match."),
+  name: external_exports.string().optional().describe("World name. Defaults to slugified prompt."),
+  autoCodexReview: external_exports.boolean().optional().describe("Spawn parallel codex-review sub-lane (Phase C9)."),
+  noOpen: external_exports.boolean().optional().describe("Suppress browser auto-open after world is up."),
+  carryUncommitted: external_exports.boolean().optional().describe("Preserve operator's uncommitted edits in the world's worktree (B3); default false")
+});
+var createFromPromptSkill = defineSkill({
+  name: "create-from-prompt",
+  description: "Phase D one-shot world creator: NL prompt \u2192 workspace match \u2192 world create + auto-dispatch + browser open. Returns picker payload on inference ambiguity.",
+  inputSchema: createFromPromptInputSchema,
+  handler: (input) => {
+    const parts = [
+      `Create-from-prompt requires an active OlamContext with WorldManager.`,
+      ``,
+      `  prompt:           ${input.prompt.slice(0, 80)}${input.prompt.length > 80 ? "\u2026" : ""}`
+    ];
+    if (input.repos && input.repos.length > 0) {
+      parts.push(`  repos:            ${input.repos.join(", ")}`);
+    }
+    if (input.workspace) {
+      parts.push(`  workspace:        ${input.workspace}`);
+    }
+    if (input.name) {
+      parts.push(`  name:             ${input.name}`);
+    }
+    if (input.autoCodexReview) {
+      parts.push(`  autoCodexReview:  true`);
+    }
+    if (input.carryUncommitted) {
+      parts.push(`  carryUncommitted: true`);
+    }
+    parts.push(``, `Use the MCP tool surface or HTTP endpoint with a configured host.`);
+    return parts.join("\n");
+  }
+});
 
 // ../core/dist/world/infer-repos.js
 var PICKER_CONFIDENCE_THRESHOLD = 0.7;
@@ -35106,20 +35746,11 @@ function defaultNameFromPrompt(prompt) {
   return slug || "unnamed";
 }
 function register21(server, ctx, initError) {
+  const { description, inputSchema } = createFromPromptSkill.asMcpTool();
   server.tool(
     "olam_create_from_prompt",
-    "Phase D one-shot world creator: NL prompt \u2192 workspace match \u2192 world create + auto-dispatch + browser open. Returns picker payload on inference ambiguity.",
-    {
-      prompt: external_exports.string().min(1).describe("Natural-language task. Repo names extracted via heuristic; falls back to picker on ambiguity."),
-      repos: external_exports.array(external_exports.string()).optional().describe("Explicit repos. Bypasses NL inference."),
-      workspace: external_exports.string().optional().describe("Named workspace. Bypasses inference + match."),
-      name: external_exports.string().optional().describe("World name. Defaults to slugified prompt."),
-      autoCodexReview: external_exports.boolean().optional().describe("Spawn parallel codex-review sub-lane (Phase C9)."),
-      noOpen: external_exports.boolean().optional().describe("Suppress browser auto-open after world is up."),
-      // Phase B B3 (olam-session-stability): mirror of CLI's
-      // --carry-uncommitted flag. Default OFF.
-      carryUncommitted: external_exports.boolean().optional().describe("Preserve operator's uncommitted edits in the world's worktree (B3); default false")
-    },
+    description,
+    inputSchema,
     async (params) => {
       if (!ctx) {
         const errorMsg = initError?.message ?? "Olam is not configured. Run /olam:init to set up.";
@@ -35297,16 +35928,80 @@ var repo_exports = {};
 __export(repo_exports, {
   register: () => register22
 });
-init_v3();
 init_global_config();
+
+// ../skill-runtime/dist/skills/repo-list.js
+init_v3();
+var repoListInputSchema = external_exports.object({});
+var repoListSkill = defineSkill({
+  name: "repo-list",
+  description: "List every repo registered in ~/.olam/config.json. Returns { repos: RepoEntry[] }.",
+  inputSchema: repoListInputSchema,
+  handler: (_input) => "Repo listing requires access to ~/.olam/config.json. Use the MCP tool surface."
+});
+
+// ../skill-runtime/dist/skills/repo-add.js
+init_v3();
+var repoAddInputSchema = external_exports.object({
+  name: external_exports.string().min(1).describe("Repo name (lowercase, digits, dash; 1\u201364 chars)."),
+  path: external_exports.string().min(1).describe("Absolute or ~/... path to the local repo directory."),
+  description: external_exports.string().optional().describe("Optional human-readable description."),
+  defaultBranch: external_exports.string().optional().describe("Default branch name (e.g. main).")
+});
+var repoAddSkill = defineSkill({
+  name: "repo-add",
+  description: "Register a local repo path in the global registry. The path must exist on disk. Rejects duplicate names.",
+  inputSchema: repoAddInputSchema,
+  handler: (input) => `Would register repo "${input.name}" at ${input.path}. Use the MCP tool for actual file system execution.`
+});
+
+// ../skill-runtime/dist/skills/repo-remove.js
+init_v3();
+var repoRemoveInputSchema = external_exports.object({
+  name: external_exports.string().min(1).describe("Repo name to remove.")
+});
+var repoRemoveSkill = defineSkill({
+  name: "repo-remove",
+  description: "Remove a repo from the global registry. Does not delete any files on disk.",
+  inputSchema: repoRemoveInputSchema,
+  handler: (input) => `Would remove repo "${input.name}" from the global registry. Use the MCP tool for actual execution.`
+});
+
+// ../skill-runtime/dist/skills/repo-update.js
+init_v3();
+var repoUpdateInputSchema = external_exports.object({
+  name: external_exports.string().min(1).describe("Repo name to update."),
+  path: external_exports.string().optional().describe("New local path."),
+  description: external_exports.string().optional().describe("New description."),
+  defaultBranch: external_exports.string().optional().describe("New default branch.")
+});
+var repoUpdateSkill = defineSkill({
+  name: "repo-update",
+  description: "Update a registered repo's path, description, or default branch.",
+  inputSchema: repoUpdateInputSchema,
+  handler: (input) => {
+    const fields = [];
+    if (input.path)
+      fields.push(`path: ${input.path}`);
+    if (input.description)
+      fields.push(`description: "${input.description}"`);
+    if (input.defaultBranch)
+      fields.push(`defaultBranch: ${input.defaultBranch}`);
+    const changes = fields.length > 0 ? fields.join(", ") : "(no changes specified)";
+    return `Would update repo "${input.name}": ${changes}. Use the MCP tool for actual execution.`;
+  }
+});
+
+// ../mcp-server/src/tools/repo.ts
 function asMessage4(err) {
   return err instanceof Error ? err.message : String(err);
 }
 function register22(server, _ctx, _initError) {
+  const repoListTool = repoListSkill.asMcpTool();
   server.tool(
     "olam_repo_list",
-    "List every repo registered in ~/.olam/config.json. Returns { repos: RepoEntry[] }.",
-    {},
+    repoListTool.description,
+    repoListTool.inputSchema,
     async () => {
       const repos = listRepos();
       return {
@@ -35317,15 +36012,11 @@ function register22(server, _ctx, _initError) {
       };
     }
   );
+  const repoAddTool = repoAddSkill.asMcpTool();
   server.tool(
     "olam_repo_add",
-    "Register a local repo path in the global registry. The path must exist on disk. Rejects duplicate names.",
-    {
-      name: external_exports.string().min(1).describe("Repo name (lowercase, digits, dash; 1\u201364 chars)."),
-      path: external_exports.string().min(1).describe("Absolute or ~/... path to the local repo directory."),
-      description: external_exports.string().optional().describe("Optional human-readable description."),
-      defaultBranch: external_exports.string().optional().describe("Default branch name (e.g. main).")
-    },
+    repoAddTool.description,
+    repoAddTool.inputSchema,
     async ({ name, path: path53, description, defaultBranch }) => {
       try {
         const entry = addRepo({ name, path: path53, description, defaultBranch });
@@ -35340,12 +36031,11 @@ function register22(server, _ctx, _initError) {
       }
     }
   );
+  const repoRemoveTool = repoRemoveSkill.asMcpTool();
   server.tool(
     "olam_repo_remove",
-    "Remove a repo from the global registry. Does not delete any files on disk.",
-    {
-      name: external_exports.string().min(1).describe("Repo name to remove.")
-    },
+    repoRemoveTool.description,
+    repoRemoveTool.inputSchema,
     async ({ name }) => {
       try {
         removeRepo(name);
@@ -35360,15 +36050,11 @@ function register22(server, _ctx, _initError) {
       }
     }
   );
+  const repoUpdateTool = repoUpdateSkill.asMcpTool();
   server.tool(
     "olam_repo_update",
-    "Update a registered repo's path, description, or default branch.",
-    {
-      name: external_exports.string().min(1).describe("Repo name to update."),
-      path: external_exports.string().optional().describe("New local path."),
-      description: external_exports.string().optional().describe("New description."),
-      defaultBranch: external_exports.string().optional().describe("New default branch.")
-    },
+    repoUpdateTool.description,
+    repoUpdateTool.inputSchema,
     async ({ name, path: path53, description, defaultBranch }) => {
       try {
         const entry = updateRepo(name, { path: path53, description, defaultBranch });
@@ -35391,10 +36077,49 @@ __export(process_port_exports, {
   register: () => register23,
   resolveHostCpToken: () => resolveHostCpToken
 });
-init_v3();
 import fs35 from "node:fs";
 import os20 from "node:os";
 import path34 from "node:path";
+
+// ../skill-runtime/dist/skills/process-list.js
+init_v3();
+var processListInputSchema = external_exports.object({
+  world_id: external_exports.string().describe("World ID.")
+});
+var processListSkill = defineSkill({
+  name: "process-list",
+  description: "List running processes inside a world container. Returns a process table snapshot via host-cp. Fields per process: pid, user, cpu, mem, started, state, command.",
+  inputSchema: processListInputSchema,
+  handler: (input) => `Process listing requires a host-cp connection. Would fetch processes for world "${input.world_id}". Use the MCP tool surface or HTTP endpoint with a configured host.`
+});
+
+// ../skill-runtime/dist/skills/port-expose.js
+init_v3();
+var portExposeInputSchema = external_exports.object({
+  world_id: external_exports.string().describe("World ID."),
+  port: external_exports.number().int().min(1).max(65535).describe("Container port to expose on the host.")
+});
+var portExposeSkill = defineSkill({
+  name: "port-expose",
+  description: "Expose a port inside a world container to the host by creating a socat bridge. Returns the host-side URL and bridge metadata. The bridge persists until removed with olam_port_unexpose.",
+  inputSchema: portExposeInputSchema,
+  handler: (input) => `Port expose requires a host-cp connection. Would create socat bridge for world "${input.world_id}" port ${input.port}. Use the MCP tool surface or HTTP endpoint with a configured host.`
+});
+
+// ../skill-runtime/dist/skills/port-unexpose.js
+init_v3();
+var portUnexposeInputSchema = external_exports.object({
+  world_id: external_exports.string().describe("World ID."),
+  port: external_exports.number().int().min(1).max(65535).describe("Container port whose bridge should be removed.")
+});
+var portUnexposeSkill = defineSkill({
+  name: "port-unexpose",
+  description: "Tear down a port bridge for a world container. Removes the socat sidecar and frees the host port.",
+  inputSchema: portUnexposeInputSchema,
+  handler: (input) => `Port unexpose requires a host-cp connection. Would remove socat bridge for world "${input.world_id}" port ${input.port}. Use the MCP tool surface or HTTP endpoint with a configured host.`
+});
+
+// ../mcp-server/src/tools/process-port.ts
 var HOST_CP_BASE = "http://127.0.0.1:19000";
 function resolveHostCpToken() {
   const envToken = process.env["OLAM_HOST_CP_TOKEN"];
@@ -35416,12 +36141,11 @@ function asMessage5(err) {
   return err instanceof Error ? err.message : String(err);
 }
 function register23(server, _ctx, _initError) {
+  const processList = processListSkill.asMcpTool();
   server.tool(
     "olam_process_list",
-    "List running processes inside a world container. Returns a process table snapshot via host-cp. Fields per process: pid, user, cpu, mem, started, state, command.",
-    {
-      world_id: external_exports.string().describe("World ID.")
-    },
+    processList.description,
+    processList.inputSchema,
     async ({ world_id }) => {
       const token = resolveHostCpToken();
       if (!token) return tokenMissingError();
@@ -35446,13 +36170,11 @@ function register23(server, _ctx, _initError) {
       }
     }
   );
+  const portExpose = portExposeSkill.asMcpTool();
   server.tool(
     "olam_port_expose",
-    "Expose a port inside a world container to the host by creating a socat bridge. Returns the host-side URL and bridge metadata. The bridge persists until removed with olam_port_unexpose.",
-    {
-      world_id: external_exports.string().describe("World ID."),
-      port: external_exports.number().int().min(1).max(65535).describe("Container port to expose on the host.")
-    },
+    portExpose.description,
+    portExpose.inputSchema,
     async ({ world_id, port: port2 }) => {
       const token = resolveHostCpToken();
       if (!token) return tokenMissingError();
@@ -35474,16 +36196,20 @@ function register23(server, _ctx, _initError) {
           };
         }
         const data = JSON.parse(body);
+        const payload = {
+          url: `http://localhost:${data.hostPort}`,
+          host_port: data.hostPort,
+          sidecar_container_id: data.containerId,
+          container_port: data.containerPort,
+          container_name: data.containerName
+        };
+        if (data.pulledImage === true) {
+          payload["pulled_image"] = "alpine/socat:latest (first-call fallback)";
+        }
         return {
           content: [{
             type: "text",
-            text: JSON.stringify({
-              url: `http://localhost:${data.hostPort}`,
-              host_port: data.hostPort,
-              sidecar_container_id: data.containerId,
-              container_port: data.containerPort,
-              container_name: data.containerName
-            }, null, 2)
+            text: JSON.stringify(payload, null, 2)
           }]
         };
       } catch (err) {
@@ -35491,13 +36217,11 @@ function register23(server, _ctx, _initError) {
       }
     }
   );
+  const portUnexpose = portUnexposeSkill.asMcpTool();
   server.tool(
     "olam_port_unexpose",
-    "Tear down a port bridge for a world container. Removes the socat sidecar and frees the host port.",
-    {
-      world_id: external_exports.string().describe("World ID."),
-      port: external_exports.number().int().min(1).max(65535).describe("Container port whose bridge should be removed.")
-    },
+    portUnexpose.description,
+    portUnexpose.inputSchema,
     async ({ world_id, port: port2 }) => {
       const token = resolveHostCpToken();
       if (!token) return tokenMissingError();
@@ -35527,8 +36251,90 @@ var runbook_exports = {};
 __export(runbook_exports, {
   register: () => register24
 });
-init_v3();
 init_global_config();
+
+// ../skill-runtime/dist/skills/runbook-list.js
+init_v3();
+var runbookListInputSchema = external_exports.object({});
+var runbookListSkill = defineSkill({
+  name: "runbook-list",
+  description: "List all runbooks in ~/.olam/config.json. Returns { runbooks: Runbook[] }.",
+  inputSchema: runbookListInputSchema,
+  handler: (_input) => JSON.stringify({ note: "runbook listing requires global config access; use MCP surface" }, null, 2)
+});
+
+// ../skill-runtime/dist/skills/runbook-show.js
+init_v3();
+var runbookShowInputSchema = external_exports.object({
+  name: external_exports.string().min(1).describe("Runbook name.")
+});
+var runbookShowSkill = defineSkill({
+  name: "runbook-show",
+  description: "Show a single runbook by name. Returns { runbook: Runbook }.",
+  inputSchema: runbookShowInputSchema,
+  handler: ({ name }) => JSON.stringify({ name, note: "runbook lookup requires global config access; use MCP surface" }, null, 2)
+});
+
+// ../skill-runtime/dist/skills/runbook-add.js
+init_v3();
+var seedSchema = external_exports.union([
+  external_exports.object({
+    type: external_exports.literal("sql-file"),
+    repo: external_exports.string(),
+    service: external_exports.string(),
+    path: external_exports.string()
+  }),
+  external_exports.object({ type: external_exports.literal("command"), repo: external_exports.string(), run: external_exports.string() }),
+  external_exports.object({
+    type: external_exports.literal("fixture-copy"),
+    repo: external_exports.string(),
+    src: external_exports.string(),
+    dest: external_exports.string()
+  })
+]);
+var runbookAddInputSchema = external_exports.object({
+  name: external_exports.string().min(1).describe("Runbook name (lowercase, digits, dash; 1\u201364 chars)."),
+  repos: external_exports.array(external_exports.string().min(1)).min(1).describe("Repo names (must exist in registry)."),
+  description: external_exports.string().optional().describe("Optional human-readable description."),
+  portMap: external_exports.record(external_exports.string().min(1), external_exports.record(external_exports.string().min(1), external_exports.number().int())).optional().describe("Port mappings: { repoName: { serviceName: hostPort } }."),
+  seeds: external_exports.array(seedSchema).optional().describe("Optional seed operations to run when applying the runbook."),
+  env: external_exports.record(external_exports.string().min(1), external_exports.record(external_exports.string().min(1), external_exports.string())).optional().describe("Per-repo environment variable overrides.")
+});
+var runbookAddSkill = defineSkill({
+  name: "runbook-add",
+  description: "Create a new runbook. Validates that all referenced repos exist in the global registry and that portMap has no duplicates.",
+  inputSchema: runbookAddInputSchema,
+  handler: ({ name, repos }) => JSON.stringify({ name, repos, note: "runbook creation requires config store + registry access; use MCP surface" }, null, 2)
+});
+
+// ../skill-runtime/dist/skills/runbook-remove.js
+init_v3();
+var runbookRemoveInputSchema = external_exports.object({
+  name: external_exports.string().min(1).describe("Runbook name to remove.")
+});
+var runbookRemoveSkill = defineSkill({
+  name: "runbook-remove",
+  description: "Remove a runbook from the global config. Does not affect any running worlds.",
+  inputSchema: runbookRemoveInputSchema,
+  handler: ({ name }) => JSON.stringify({ name, note: "runbook removal requires config store access; use MCP surface" }, null, 2)
+});
+
+// ../skill-runtime/dist/skills/runbook-apply.js
+init_v3();
+var runbookApplyInputSchema = external_exports.object({
+  name: external_exports.string().min(1).describe("Runbook name."),
+  worldName: external_exports.string().optional().describe("Override the world name."),
+  task: external_exports.string().optional().describe("Initial task to dispatch into the world."),
+  branchName: external_exports.string().optional().describe("Override the default branch name.")
+});
+var runbookApplySkill = defineSkill({
+  name: "runbook-apply",
+  description: "Validate ports then create a world from a runbook. Errors (isError: true) on port conflicts. Returns world metadata on success.",
+  inputSchema: runbookApplyInputSchema,
+  handler: ({ name, worldName, task }) => JSON.stringify({ name, worldName: worldName ?? name, task: task ?? `Apply runbook "${name}"`, note: "apply requires OlamContext + port validation; use MCP surface" }, null, 2)
+});
+
+// ../mcp-server/src/tools/runbook.ts
 function asMessage6(err) {
   return err instanceof Error ? err.message : String(err);
 }
@@ -35540,10 +36346,11 @@ function formatConflicts(conflicts) {
   return lines.join("\n");
 }
 function register24(server, ctx, _initError) {
+  const listTool = runbookListSkill.asMcpTool();
   server.tool(
     "olam_runbook_list",
-    "List all runbooks in ~/.olam/config.json. Returns { runbooks: Runbook[] }.",
-    {},
+    listTool.description,
+    listTool.inputSchema,
     async () => {
       const runbooks = listRunbooks();
       return {
@@ -35551,12 +36358,11 @@ function register24(server, ctx, _initError) {
       };
     }
   );
+  const showTool = runbookShowSkill.asMcpTool();
   server.tool(
     "olam_runbook_show",
-    "Show a single runbook by name. Returns { runbook: Runbook }.",
-    {
-      name: external_exports.string().min(1).describe("Runbook name.")
-    },
+    showTool.description,
+    showTool.inputSchema,
     async ({ name }) => {
       try {
         const runbook = getRunbook(name);
@@ -35568,23 +36374,11 @@ function register24(server, ctx, _initError) {
       }
     }
   );
+  const addTool = runbookAddSkill.asMcpTool();
   server.tool(
     "olam_runbook_add",
-    "Create a new runbook. Validates that all referenced repos exist in the global registry and that portMap has no duplicates.",
-    {
-      name: external_exports.string().min(1).describe("Runbook name (lowercase, digits, dash; 1\u201364 chars)."),
-      repos: external_exports.array(external_exports.string().min(1)).min(1).describe("Repo names (must exist in registry)."),
-      description: external_exports.string().optional().describe("Optional human-readable description."),
-      portMap: external_exports.record(external_exports.string().min(1), external_exports.record(external_exports.string().min(1), external_exports.number().int())).optional().describe("Port mappings: { repoName: { serviceName: hostPort } }."),
-      seeds: external_exports.array(
-        external_exports.union([
-          external_exports.object({ type: external_exports.literal("sql-file"), repo: external_exports.string(), service: external_exports.string(), path: external_exports.string() }),
-          external_exports.object({ type: external_exports.literal("command"), repo: external_exports.string(), run: external_exports.string() }),
-          external_exports.object({ type: external_exports.literal("fixture-copy"), repo: external_exports.string(), src: external_exports.string(), dest: external_exports.string() })
-        ])
-      ).optional().describe("Optional seed operations to run when applying the runbook."),
-      env: external_exports.record(external_exports.string().min(1), external_exports.record(external_exports.string().min(1), external_exports.string())).optional().describe("Per-repo environment variable overrides.")
-    },
+    addTool.description,
+    addTool.inputSchema,
     async ({ name, repos, description, portMap, seeds, env }) => {
       try {
         const runbook = addRunbook({ name, repos, description, portMap, seeds, env });
@@ -35599,12 +36393,11 @@ function register24(server, ctx, _initError) {
       }
     }
   );
+  const removeTool = runbookRemoveSkill.asMcpTool();
   server.tool(
     "olam_runbook_remove",
-    "Remove a runbook from the global config. Does not affect any running worlds.",
-    {
-      name: external_exports.string().min(1).describe("Runbook name to remove.")
-    },
+    removeTool.description,
+    removeTool.inputSchema,
     async ({ name }) => {
       try {
         removeRunbook(name);
@@ -35619,15 +36412,11 @@ function register24(server, ctx, _initError) {
       }
     }
   );
+  const applyTool = runbookApplySkill.asMcpTool();
   server.tool(
     "olam_runbook_apply",
-    "Validate ports then create a world from a runbook. Errors (isError: true) on port conflicts. Returns world metadata on success.",
-    {
-      name: external_exports.string().min(1).describe("Runbook name."),
-      worldName: external_exports.string().optional().describe("Override the world name."),
-      task: external_exports.string().optional().describe("Initial task to dispatch into the world."),
-      branchName: external_exports.string().optional().describe("Override the default branch name.")
-    },
+    applyTool.description,
+    applyTool.inputSchema,
     async ({ name, worldName, task, branchName }) => {
       if (!ctx) {
         return {
@@ -35686,8 +36475,70 @@ var skill_source_exports = {};
 __export(skill_source_exports, {
   register: () => register25
 });
-init_v3();
 init_skill_sources();
+
+// ../skill-runtime/dist/skills/skills-source-list.js
+init_v3();
+var skillsSourceListInputSchema = external_exports.object({});
+var skillsSourceListSkill = defineSkill({
+  name: "skills-source-list",
+  description: "List every registered skill source. Returns { skillSources: SkillSource[] }.",
+  inputSchema: skillsSourceListInputSchema,
+  handler: (_input) => JSON.stringify({ note: "skillSource listing requires global config access; use MCP surface" }, null, 2)
+});
+
+// ../skill-runtime/dist/skills/skills-source-add.js
+init_v3();
+var skillsSourceAddInputSchema = external_exports.object({
+  name: external_exports.string().min(1).describe("Display name (lowercase, digits, dash; 1\u201364 chars)."),
+  gitUrl: external_exports.string().min(1).describe("Git URL (https://, git@, ssh://, file://, or absolute path)."),
+  branch: external_exports.string().min(1).optional().describe('Branch to track. Defaults to "main".'),
+  trust: external_exports.boolean().optional().describe("Explicit trust (T6 capability-class). MCP context is non-interactive \u2014 must be true to register; otherwise the call is refused with an audit-log entry.")
+});
+var skillsSourceAddSkill = defineSkill({
+  name: "skills-source-add",
+  description: "Register and clone a skill source. Clones to ~/.olam/state/skill-sources/<id>/. Atomic: rolls back the state-store entry if the clone fails.",
+  inputSchema: skillsSourceAddInputSchema,
+  handler: ({ name, gitUrl, branch, trust }) => JSON.stringify({ name, gitUrl, branch: branch ?? "main", trust: trust ?? false, note: "add/clone requires fs + config store; use MCP surface" }, null, 2)
+});
+
+// ../skill-runtime/dist/skills/skills-source-remove.js
+init_v3();
+var skillsSourceRemoveInputSchema = external_exports.object({
+  id: external_exports.string().length(12).describe("Skill source id (from olam_skills_source_list).")
+});
+var skillsSourceRemoveSkill = defineSkill({
+  name: "skills-source-remove",
+  description: "Remove a registered skill source. Deletes the clone directory and the state entry.",
+  inputSchema: skillsSourceRemoveInputSchema,
+  handler: ({ id }) => JSON.stringify({ id, note: "remove requires config store + fs access; use MCP surface" }, null, 2)
+});
+
+// ../skill-runtime/dist/skills/skills-source-pull.js
+init_v3();
+var skillsSourcePullInputSchema = external_exports.object({
+  id: external_exports.string().length(12).describe("Skill source id.")
+});
+var skillsSourcePullSkill = defineSkill({
+  name: "skills-source-pull",
+  description: "Fetch + reset the clone to upstream HEAD. Updates lastPulledSha.",
+  inputSchema: skillsSourcePullInputSchema,
+  handler: ({ id }) => JSON.stringify({ id, note: "pull requires git + config store access; use MCP surface" }, null, 2)
+});
+
+// ../skill-runtime/dist/skills/skills-source-show.js
+init_v3();
+var skillsSourceShowInputSchema = external_exports.object({
+  id: external_exports.string().length(12).describe("Skill source id.")
+});
+var skillsSourceShowSkill = defineSkill({
+  name: "skills-source-show",
+  description: "Show details for a single skill source (state-store entry + resolved clone path).",
+  inputSchema: skillsSourceShowInputSchema,
+  handler: ({ id }) => JSON.stringify({ id, note: "show requires config store access; use MCP surface" }, null, 2)
+});
+
+// ../mcp-server/src/tools/skill-source.ts
 function asMessage7(err) {
   return err instanceof Error ? err.message : String(err);
 }
@@ -35703,23 +36554,20 @@ function fail(err) {
   };
 }
 function register25(server, _ctx, _initError) {
+  const listTool = skillsSourceListSkill.asMcpTool();
   server.tool(
     "olam_skills_source_list",
-    "List every registered skill source. Returns { skillSources: SkillSource[] }.",
-    {},
+    listTool.description,
+    listTool.inputSchema,
     async () => {
       return ok({ skillSources: listSkillSources() });
     }
   );
+  const addTool = skillsSourceAddSkill.asMcpTool();
   server.tool(
     "olam_skills_source_add",
-    "Register and clone a skill source. Clones to ~/.olam/state/skill-sources/<id>/. Atomic: rolls back the state-store entry if the clone fails.",
-    {
-      name: external_exports.string().min(1).describe("Display name (lowercase, digits, dash; 1\u201364 chars)."),
-      gitUrl: external_exports.string().min(1).describe("Git URL (https://, git@, ssh://, file://, or absolute path)."),
-      branch: external_exports.string().min(1).optional().describe('Branch to track. Defaults to "main".'),
-      trust: external_exports.boolean().optional().describe("Explicit trust (T6 capability-class). MCP context is non-interactive \u2014 must be true to register; otherwise the call is refused with an audit-log entry.")
-    },
+    addTool.description,
+    addTool.inputSchema,
     async ({ name, gitUrl, branch, trust }) => {
       if (trust !== true) {
         try {
@@ -35763,12 +36611,11 @@ function register25(server, _ctx, _initError) {
       }
     }
   );
+  const removeTool = skillsSourceRemoveSkill.asMcpTool();
   server.tool(
     "olam_skills_source_remove",
-    "Remove a registered skill source. Deletes the clone directory and the state entry.",
-    {
-      id: external_exports.string().length(12).describe("Skill source id (from olam_skills_source_list).")
-    },
+    removeTool.description,
+    removeTool.inputSchema,
     async ({ id }) => {
       try {
         removeSkillSourceClone(id);
@@ -35779,12 +36626,11 @@ function register25(server, _ctx, _initError) {
       }
     }
   );
+  const pullTool = skillsSourcePullSkill.asMcpTool();
   server.tool(
     "olam_skills_source_pull",
-    "Fetch + reset the clone to upstream HEAD. Updates lastPulledSha.",
-    {
-      id: external_exports.string().length(12).describe("Skill source id.")
-    },
+    pullTool.description,
+    pullTool.inputSchema,
     async ({ id }) => {
       const entry = getSkillSource(id);
       if (!entry) {
@@ -35806,12 +36652,11 @@ function register25(server, _ctx, _initError) {
       }
     }
   );
+  const showTool = skillsSourceShowSkill.asMcpTool();
   server.tool(
     "olam_skills_source_show",
-    "Show details for a single skill source (state-store entry + resolved clone path).",
-    {
-      id: external_exports.string().length(12).describe("Skill source id.")
-    },
+    showTool.description,
+    showTool.inputSchema,
     async ({ id }) => {
       const entry = getSkillSource(id);
       if (!entry) {
@@ -35830,10 +36675,65 @@ var skills_exports = {};
 __export(skills_exports, {
   register: () => register26
 });
-init_v3();
 init_skill_sources();
 import * as fs36 from "node:fs";
 import * as path35 from "node:path";
+
+// ../skill-runtime/dist/skills/skills-sync.js
+init_v3();
+var skillsSyncInputSchema = external_exports.object({
+  dryRun: external_exports.boolean().optional().describe("Resolve artifacts but do not deploy or merge. Returns the summary that sync would produce."),
+  atlasUser: external_exports.string().optional().describe("Override atlas-user identifier (defaults to ~/.claude/.atlas-user).")
+});
+var skillsSyncSkill = defineSkill({
+  name: "skills-sync",
+  description: "Sync all registered skill sources to ~/.claude/. Returns SyncSummary with per-source artifact breakdown, deploy result, and merge result.",
+  inputSchema: skillsSyncInputSchema,
+  handler: (input) => {
+    const mode = input.dryRun ? "dry-run" : "live";
+    const userNote = input.atlasUser ? ` (atlas-user: ${input.atlasUser})` : "";
+    return `Skills sync (${mode}${userNote}) requires the skill-sources engine. Use the MCP tool surface or HTTP endpoint with a configured host.`;
+  }
+});
+
+// ../skill-runtime/dist/skills/skills-diff.js
+init_v3();
+var skillsDiffInputSchema = external_exports.object({
+  atlasUser: external_exports.string().optional().describe("Override atlas-user identifier.")
+});
+var skillsDiffSkill = defineSkill({
+  name: "skills-diff",
+  description: "Show what `olam skills sync` would deploy without making on-disk changes. Equivalent to sync with dryRun=true.",
+  inputSchema: skillsDiffInputSchema,
+  handler: (input) => {
+    const userNote = input.atlasUser ? ` (atlas-user: ${input.atlasUser})` : "";
+    return `Skills diff${userNote} requires the skill-sources engine. Use the MCP tool surface or HTTP endpoint with a configured host.`;
+  }
+});
+
+// ../skill-runtime/dist/skills/skills-list.js
+init_v3();
+var skillsListInputSchema = external_exports.object({});
+var skillsListSkill = defineSkill({
+  name: "skills-list",
+  description: "List artifacts currently deployed under ~/.claude/{skills,agents,scripts,rules,commands}/ along with their source-id (if from a registered olam source).",
+  inputSchema: skillsListInputSchema,
+  handler: (_input) => "Skills listing requires filesystem access to ~/.claude/. Use the MCP tool surface or HTTP endpoint with a configured host."
+});
+
+// ../skill-runtime/dist/skills/skills-show.js
+init_v3();
+var skillsShowInputSchema = external_exports.object({
+  name: external_exports.string().min(1).describe("Artifact name (basename under any of the managed buckets).")
+});
+var skillsShowSkill = defineSkill({
+  name: "skills-show",
+  description: 'Show details for a deployed artifact by name (e.g. "plan-hard" or "codex-second-opinion.md"). Returns one or more matches across buckets.',
+  inputSchema: skillsShowInputSchema,
+  handler: (input) => `Skills show for "${input.name}" requires filesystem access to ~/.claude/. Use the MCP tool surface or HTTP endpoint with a configured host.`
+});
+
+// ../mcp-server/src/tools/skills.ts
 function asMessage8(err) {
   return err instanceof Error ? err.message : String(err);
 }
@@ -35879,13 +36779,11 @@ function listDeployed() {
   return entries;
 }
 function register26(server, _ctx, _initError) {
+  const skillsSync = skillsSyncSkill.asMcpTool();
   server.tool(
     "olam_skills_sync",
-    "Sync all registered skill sources to ~/.claude/. Returns SyncSummary with per-source artifact breakdown, deploy result, and merge result.",
-    {
-      dryRun: external_exports.boolean().optional().describe("Resolve artifacts but do not deploy or merge. Returns the summary that sync would produce."),
-      atlasUser: external_exports.string().optional().describe("Override atlas-user identifier (defaults to ~/.claude/.atlas-user).")
-    },
+    skillsSync.description,
+    skillsSync.inputSchema,
     async ({ dryRun, atlasUser }) => {
       try {
         const summary = await syncSkills({ dryRun, atlasUser });
@@ -35895,12 +36793,11 @@ function register26(server, _ctx, _initError) {
       }
     }
   );
+  const skillsDiff = skillsDiffSkill.asMcpTool();
   server.tool(
     "olam_skills_diff",
-    "Show what `olam skills sync` would deploy without making on-disk changes. Equivalent to sync with dryRun=true.",
-    {
-      atlasUser: external_exports.string().optional().describe("Override atlas-user identifier.")
-    },
+    skillsDiff.description,
+    skillsDiff.inputSchema,
     async ({ atlasUser }) => {
       try {
         const summary = await syncSkills({ dryRun: true, atlasUser });
@@ -35910,10 +36807,11 @@ function register26(server, _ctx, _initError) {
       }
     }
   );
+  const skillsList = skillsListSkill.asMcpTool();
   server.tool(
     "olam_skills_list",
-    "List artifacts currently deployed under ~/.claude/{skills,agents,scripts,rules,commands}/ along with their source-id (if from a registered olam source).",
-    {},
+    skillsList.description,
+    skillsList.inputSchema,
     async () => {
       try {
         const entries = listDeployed();
@@ -35923,12 +36821,11 @@ function register26(server, _ctx, _initError) {
       }
     }
   );
+  const skillsShow = skillsShowSkill.asMcpTool();
   server.tool(
     "olam_skills_show",
-    'Show details for a deployed artifact by name (e.g. "plan-hard" or "codex-second-opinion.md"). Returns one or more matches across buckets.',
-    {
-      name: external_exports.string().min(1).describe("Artifact name (basename under any of the managed buckets).")
-    },
+    skillsShow.description,
+    skillsShow.inputSchema,
     async ({ name }) => {
       try {
         const entries = listDeployed().filter((e) => e.name === name);
@@ -35948,19 +36845,18 @@ var skills_search_exports = {};
 __export(skills_search_exports, {
   register: () => register27
 });
-init_v3();
 import * as path37 from "node:path";
 import * as os22 from "node:os";
 
 // ../mcp-server/src/lib/skills-index.mjs
-import { createRequire as createRequire4 } from "node:module";
+import { createRequire as createRequire5 } from "node:module";
 import * as fs37 from "node:fs";
 import * as path36 from "node:path";
 import * as os21 from "node:os";
 var VECTOR_DIM = 256;
 var SCHEMA_VERSION3 = "1";
 var SCHEMA_KEY = "skills_index_schema_version";
-var _require4 = createRequire4(import.meta.url);
+var _require4 = createRequire5(import.meta.url);
 var _Database3 = null;
 function getDatabase3() {
   if (_Database3 === null) {
@@ -36090,6 +36986,19 @@ function searchIndex(dbPath, query, k = 5) {
 var DEFAULT_DB_PATH = path36.join(os21.homedir(), ".olam", "skills.vec.db");
 var DEFAULT_SOURCE_DIR = path36.join(os21.homedir(), ".claude", "skills");
 
+// ../skill-runtime/dist/skills/skills-search.js
+init_v3();
+var skillsSearchInputSchema = external_exports.object({
+  query: external_exports.string().min(1).describe('Natural-language description of the kind of skill you want (e.g. "stage and commit my changes" or "roll out a new release").'),
+  k: external_exports.number().int().min(1).max(50).optional().describe("Number of hits to return (default 5, max 50).")
+});
+var skillsSearchSkill = defineSkill({
+  name: "skills-search",
+  description: "Semantic search over the local Claude skills index. Returns top-k skills ranked by cosine similarity against a deterministic bag-of-words embedding. Requires `scripts/skills-index-build.mjs` to have been run; set `SKILLS_INDEX_PATH` to override the index location (defaults to ~/.olam/skills.vec.db).",
+  inputSchema: skillsSearchInputSchema,
+  handler: ({ query, k }) => JSON.stringify({ query, k: k ?? 5, note: "searchIndex call requires on-disk DB; use MCP surface" }, null, 2)
+});
+
 // ../mcp-server/src/tools/skills-search.ts
 function defaultDbPath() {
   const override = process.env["SKILLS_INDEX_PATH"];
@@ -36111,13 +37020,11 @@ function fail3(err) {
   };
 }
 function register27(server, _ctx, _initError) {
+  const tool = skillsSearchSkill.asMcpTool();
   server.tool(
     "olam_skills_search",
-    "Semantic search over the local Claude skills index. Returns top-k skills ranked by cosine similarity against a deterministic bag-of-words embedding. Requires `scripts/skills-index-build.mjs` to have been run; set `SKILLS_INDEX_PATH` to override the index location (defaults to ~/.olam/skills.vec.db).",
-    {
-      query: external_exports.string().min(1).describe('Natural-language description of the kind of skill you want (e.g. "stage and commit my changes" or "roll out a new release").'),
-      k: external_exports.number().int().min(1).max(50).optional().describe("Number of hits to return (default 5, max 50).")
-    },
+    tool.description,
+    tool.inputSchema,
     async ({ query, k }) => {
       try {
         const hits = searchIndex(defaultDbPath(), query, k ?? 5);
@@ -36134,7 +37041,6 @@ var kg_classify_exports = {};
 __export(kg_classify_exports, {
   register: () => register28
 });
-init_v3();
 
 // ../core/dist/kg/kg-service-client.js
 var KG_SERVICE_PORT_DEFAULT = 9997;
@@ -36206,15 +37112,34 @@ async function status(opts = {}) {
   return getJson(kgServiceStatusUrl(), opts.timeoutMs);
 }
 
+// ../skill-runtime/dist/skills/kg-classify.js
+init_v3();
+var kgClassifyInputSchema = external_exports.object({
+  question: external_exports.string().describe("The natural-language question to route"),
+  workspace: external_exports.string().optional().describe("Optional workspace name to scope the L2 probe gate (defaults to no probe)")
+});
+var kgClassifySkill = defineSkill({
+  name: "kg-classify",
+  description: "Route a question to kg | grep | both via the 4-layer classifier (kg-service container). Returns route + layer + reason + matched exemplar. Requires olam-kg-service running (see `olam services up`).",
+  inputSchema: kgClassifyInputSchema,
+  handler: (input) => {
+    return JSON.stringify({
+      route: "grep",
+      layer: 0,
+      reason: "skill-runtime stub \u2014 kg-service not available outside MCP context",
+      question: input.question,
+      workspace: input.workspace ?? null
+    }, null, 2);
+  }
+});
+
 // ../mcp-server/src/tools/kg-classify.ts
 function register28(server, _ctx, _initError) {
+  const { description, inputSchema } = kgClassifySkill.asMcpTool();
   server.tool(
     "olam_kg_classify",
-    "Route a question to kg | grep | both via the 4-layer classifier (kg-service container). Returns route + layer + reason + matched exemplar. Requires olam-kg-service running (see `olam services up`).",
-    {
-      question: external_exports.string().describe("The natural-language question to route"),
-      workspace: external_exports.string().optional().describe("Optional workspace name to scope the L2 probe gate (defaults to no probe)")
-    },
+    description,
+    inputSchema,
     async (params) => {
       try {
         const result = await classify({ q: params.question, workspace: params.workspace });
@@ -36257,6 +37182,29 @@ var kg_doctor_exports = {};
 __export(kg_doctor_exports, {
   register: () => register29
 });
+
+// ../skill-runtime/dist/skills/kg-doctor.js
+init_v3();
+var kgDoctorInputSchema = external_exports.object({});
+var kgDoctorSkill = defineSkill({
+  name: "kg-doctor",
+  description: "Diagnostic report for olam-kg-service over HTTP: /health readiness, workspace inventory, and /classify round-trip. Returns a JSON `probes` array. If the container isn't running, all probes fail with a hint to run `olam services up`.",
+  inputSchema: kgDoctorInputSchema,
+  handler: (_input) => {
+    return JSON.stringify({
+      probes: [
+        {
+          name: "health",
+          status: "fail",
+          detail: "skill-runtime stub \u2014 kg-service not available outside MCP context",
+          remedy: "`olam services up`"
+        }
+      ]
+    }, null, 2);
+  }
+});
+
+// ../mcp-server/src/tools/kg-doctor.ts
 async function runProbes() {
   const results = [];
   try {
@@ -36306,10 +37254,11 @@ async function runProbes() {
   return results;
 }
 function register29(server, _ctx, _initError) {
+  const { description, inputSchema } = kgDoctorSkill.asMcpTool();
   server.tool(
     "olam_kg_doctor",
-    "Diagnostic report for olam-kg-service over HTTP: /health readiness, workspace inventory, and /classify round-trip. Returns a JSON `probes` array. If the container isn't running, all probes fail with a hint to run `olam services up`.",
-    {},
+    description,
+    inputSchema,
     async () => {
       try {
         const probes = await runProbes();
@@ -36343,7 +37292,6 @@ var kg_install_hook_exports = {};
 __export(kg_install_hook_exports, {
   register: () => register30
 });
-init_v3();
 init_merge_settings();
 import * as fs38 from "node:fs";
 import * as path38 from "node:path";
@@ -36394,6 +37342,29 @@ function buildHookMatcherEntry(opts) {
   };
 }
 
+// ../skill-runtime/dist/skills/kg-install-hook.js
+init_v3();
+var kgInstallHookInputSchema = external_exports.object({
+  scope: external_exports.enum(["project", "user"]).optional().describe("project (default) or user"),
+  projectPath: external_exports.string().optional().describe("Override the project root. Defaults to cwd. Ignored when scope=user.")
+});
+var kgInstallHookSkill = defineSkill({
+  name: "kg-install-hook",
+  description: "Install the kg-service PreToolUse hook into .claude/settings.json. Idempotent (sentinel-detected). Default scope=project (writes <cwd>/.claude/settings.json); scope=user writes ~/.claude/settings.json.",
+  inputSchema: kgInstallHookInputSchema,
+  handler: (input) => {
+    const scope = input.scope === "user" ? "user" : "project";
+    return JSON.stringify({
+      ok: false,
+      status: "skill-runtime-stub",
+      scope,
+      filePath: null,
+      backup: null,
+      message: "skill-runtime stub \u2014 filesystem access not available outside MCP context"
+    }, null, 2);
+  }
+});
+
 // ../mcp-server/src/tools/kg-install-hook.ts
 function settingsPathFor2(scope, projectPath) {
   if (scope === "user") {
@@ -36403,13 +37374,11 @@ function settingsPathFor2(scope, projectPath) {
   return path38.join(root, ".claude", "settings.json");
 }
 function register30(server, _ctx, _initError) {
+  const { description, inputSchema } = kgInstallHookSkill.asMcpTool();
   server.tool(
     "olam_kg_install_hook",
-    "Install the kg-service PreToolUse hook into .claude/settings.json. Idempotent (sentinel-detected). Default scope=project (writes <cwd>/.claude/settings.json); scope=user writes ~/.claude/settings.json.",
-    {
-      scope: external_exports.enum(["project", "user"]).optional().describe("project (default) or user"),
-      projectPath: external_exports.string().optional().describe("Override the project root. Defaults to cwd. Ignored when scope=user.")
-    },
+    description,
+    inputSchema,
     async (params) => {
       const scope = params.scope === "user" ? "user" : "project";
       const filePath = settingsPathFor2(scope, params.projectPath);
@@ -36473,10 +37442,28 @@ var kg_uninstall_hook_exports = {};
 __export(kg_uninstall_hook_exports, {
   register: () => register31
 });
-init_v3();
 import * as fs39 from "node:fs";
 import * as path39 from "node:path";
 import * as os24 from "node:os";
+
+// ../skill-runtime/dist/skills/kg-uninstall-hook.js
+init_v3();
+var kgUninstallHookInputSchema = external_exports.object({
+  scope: external_exports.enum(["project", "user"]).optional().describe("project (default) or user"),
+  projectPath: external_exports.string().optional().describe("Override the project root. Defaults to cwd.")
+});
+var kgUninstallHookSkill = defineSkill({
+  name: "kg-uninstall-hook",
+  description: "Remove the kg-service PreToolUse hook from .claude/settings.json. Sentinel-matched: only the olam entry is removed; other PreToolUse hooks are preserved.",
+  inputSchema: kgUninstallHookInputSchema,
+  handler: (input) => {
+    const scope = input.scope ?? "project";
+    const where = input.projectPath ? ` at ${input.projectPath}` : "";
+    return `Would remove kg-service hook from ${scope} settings.json${where}. Use the MCP tool for actual execution.`;
+  }
+});
+
+// ../mcp-server/src/tools/kg-uninstall-hook.ts
 function settingsPathFor3(scope, projectPath) {
   if (scope === "user") {
     return path39.join(os24.homedir(), ".claude", "settings.json");
@@ -36505,13 +37492,11 @@ function dropSentinel(matchers) {
   return { matchers: out, changed };
 }
 function register31(server, _ctx, _initError) {
+  const { description, inputSchema } = kgUninstallHookSkill.asMcpTool();
   server.tool(
     "olam_kg_uninstall_hook",
-    "Remove the kg-service PreToolUse hook from .claude/settings.json. Sentinel-matched: only the olam entry is removed; other PreToolUse hooks are preserved.",
-    {
-      scope: external_exports.enum(["project", "user"]).optional().describe("project (default) or user"),
-      projectPath: external_exports.string().optional().describe("Override the project root. Defaults to cwd.")
-    },
+    description,
+    inputSchema,
     async (params) => {
       const scope = params.scope === "user" ? "user" : "project";
       const filePath = settingsPathFor3(scope, params.projectPath);
@@ -36883,8 +37868,8 @@ function createServer4(ctx, initError) {
 }
 
 // ../mcp-server/src/utils/native-probe.ts
-import { createRequire as createRequire5 } from "node:module";
-var PROBE_REQUIRE = createRequire5(import.meta.url);
+import { createRequire as createRequire6 } from "node:module";
+var PROBE_REQUIRE = createRequire6(import.meta.url);
 function runtimeModuleVersion() {
   return Number.parseInt(process.versions.modules, 10);
 }
@@ -37000,7 +37985,7 @@ init_loader();
 
 // ../core/dist/world/manager.js
 import * as crypto8 from "node:crypto";
-import { execSync as execSync5, spawnSync as spawnSync4 } from "node:child_process";
+import { execSync as execSync6, spawnSync as spawnSync4 } from "node:child_process";
 import * as fs49 from "node:fs";
 import * as os29 from "node:os";
 import * as path50 from "node:path";
@@ -37542,7 +38527,7 @@ function extractStderr(err) {
 function carryUncommittedEdits(repos, workspacePath, deps = {}) {
   const exec = deps.exec ?? ((cmd, args, opts) => execFileSync6(cmd, args, opts));
   const homedir30 = deps.homedir ?? (() => os26.homedir());
-  const existsSync48 = deps.existsSync ?? ((p) => fs43.existsSync(p));
+  const existsSync49 = deps.existsSync ?? ((p) => fs43.existsSync(p));
   const copyFileSync9 = deps.copyFileSync ?? ((src, dest) => fs43.copyFileSync(src, dest));
   const mkdirSync30 = deps.mkdirSync ?? ((dirPath, opts) => {
     fs43.mkdirSync(dirPath, opts);
@@ -37553,9 +38538,9 @@ function carryUncommittedEdits(repos, workspacePath, deps = {}) {
       continue;
     const repoPath = expandHome2(repo.path, homedir30);
     const worktreePath = path43.join(workspacePath, repo.name);
-    if (!existsSync48(repoPath))
+    if (!existsSync49(repoPath))
       continue;
-    if (!existsSync48(worktreePath)) {
+    if (!existsSync49(worktreePath)) {
       console.warn(`[carry] ${repo.name}: world worktree ${worktreePath} missing; skipping carry for this repo`);
       continue;
     }
@@ -37615,7 +38600,7 @@ function carryUncommittedEdits(repos, workspacePath, deps = {}) {
     for (const rel of plan.diff.untracked) {
       const src = path43.join(plan.repoPath, rel);
       const dest = path43.join(plan.worktreePath, rel);
-      if (!existsSync48(src))
+      if (!existsSync49(src))
         continue;
       try {
         mkdirSync30(path43.dirname(dest), { recursive: true });
@@ -39134,6 +40119,54 @@ async function runSeedHooks(seeds, containerName, servicePortMap, exec) {
   }
 }
 
+// ../core/dist/world/create-dedup.js
+import { execSync as execSync5 } from "node:child_process";
+var ACTIVE_STATUSES = /* @__PURE__ */ new Set([
+  "creating",
+  "running",
+  "paused",
+  "crystallizing"
+]);
+var defaultContainerProbe = (containerName) => {
+  try {
+    const out = execSync5(`docker ps --filter name=^/${containerName}$ --format '{{.Names}}'`, { stdio: ["pipe", "pipe", "pipe"], timeout: 5e3 }).toString().trim();
+    return out.length > 0;
+  } catch {
+    return false;
+  }
+};
+function resolveCreateDedup(opts) {
+  const { registry: registry2, name } = opts;
+  const probe = opts.probeContainer ?? defaultContainerProbe;
+  const containerName = `olam-${name}-devbox`;
+  const existing = registry2.findByName(name);
+  const active = existing.find((w) => ACTIVE_STATUSES.has(w.status));
+  if (active) {
+    return { action: "reuse", world: active };
+  }
+  const errorRows = existing.filter((w) => w.status === "error");
+  for (const er of errorRows) {
+    registry2.remove(er.id);
+  }
+  if (probe(containerName)) {
+    return {
+      action: "container-orphan",
+      containerName,
+      remediation: `A container '${containerName}' is running on this host but no worlds.db row exists for it. Either destroy the orphan with 'docker rm -f ${containerName}' and re-run, or wait for the reconciler (issue #963) to insert a row.`
+    };
+  }
+  return { action: "fresh", cleanedErrorRows: errorRows.length };
+}
+var ContainerOrphanError = class extends Error {
+  containerName;
+  kind = "container-orphan";
+  constructor(message, containerName) {
+    super(message);
+    this.containerName = containerName;
+    this.name = "ContainerOrphanError";
+  }
+};
+
 // ../core/dist/world/tmux-supervisor.js
 function injectBindAll(start) {
   let result = start;
@@ -39267,7 +40300,7 @@ var BotIdentityError = class extends Error {
     this.name = "BotIdentityError";
   }
 };
-function getTokenScopes(ghToken, _exec = execSync5) {
+function getTokenScopes(ghToken, _exec = execSync6) {
   try {
     const out = _exec("gh auth status 2>&1", {
       encoding: "utf-8",
@@ -39284,13 +40317,13 @@ function getTokenScopes(ghToken, _exec = execSync5) {
   }
 }
 async function setupContainerGit(containerName, repos, branch) {
-  const dockerExec = (cmd) => execSync5(`docker exec ${containerName} sh -c '${cmd.replace(/'/g, "'\\''")}'`, {
+  const dockerExec = (cmd) => execSync6(`docker exec ${containerName} sh -c '${cmd.replace(/'/g, "'\\''")}'`, {
     stdio: "pipe",
     timeout: 6e4
   }).toString();
   let ghToken = "";
   try {
-    ghToken = execSync5("gh auth token 2>/dev/null", { encoding: "utf-8", timeout: 5e3 }).trim();
+    ghToken = execSync6("gh auth token 2>/dev/null", { encoding: "utf-8", timeout: 5e3 }).trim();
   } catch {
   }
   const actorName = process.env.OLAM_BOT_NAME ?? "Claude Code (olam)";
@@ -39310,7 +40343,7 @@ async function setupContainerGit(containerName, repos, branch) {
         continue;
       const ownerRepo = ghMatch[1];
       try {
-        execSync5(`gh api repos/${ownerRepo} --silent`, {
+        execSync6(`gh api repos/${ownerRepo} --silent`, {
           stdio: "pipe",
           timeout: 5e3,
           env: { ...process.env, GH_TOKEN: ghToken }
@@ -39358,7 +40391,7 @@ ${stderr.split("\n").slice(0, 3).join(" ")}`);
     if (!olamUserPresent) {
       const imageName = (() => {
         try {
-          return execSync5(`docker inspect ${containerName} --format '{{.Config.Image}}'`, {
+          return execSync6(`docker inspect ${containerName} --format '{{.Config.Image}}'`, {
             encoding: "utf8",
             timeout: 5e3
           }).trim() || "(unknown)";
@@ -39401,7 +40434,7 @@ ${stderr.split("\n").slice(0, 3).join(" ")}`);
 function makeHostExecFn() {
   return async (cmd) => {
     try {
-      const stdout = execSync5(cmd, { encoding: "utf-8", timeout: 5e3 });
+      const stdout = execSync6(cmd, { encoding: "utf-8", timeout: 5e3 });
       return { stdout, stderr: "", exitCode: 0 };
     } catch {
       return { stdout: "", stderr: "", exitCode: 1 };
@@ -39411,7 +40444,7 @@ function makeHostExecFn() {
 function makeContainerExecFn(containerName) {
   return async (cmd) => {
     try {
-      const result = execSync5(`docker exec ${containerName} sh -c '${cmd.replace(/'/g, "'\\''")}'`, { stdio: "pipe", timeout: 6e5 });
+      const result = execSync6(`docker exec ${containerName} sh -c '${cmd.replace(/'/g, "'\\''")}'`, { stdio: "pipe", timeout: 6e5 });
       return { stdout: result.toString(), stderr: "", exitCode: 0 };
     } catch (err) {
       const execErr = err;
@@ -39425,7 +40458,7 @@ function makeContainerExecFn(containerName) {
 }
 function defaultDockerExec() {
   return (containerName, cmd) => {
-    const result = execSync5(
+    const result = execSync6(
       `docker exec ${containerName} sh -c '${cmd.replace(/'/g, "'\\''")}'`,
       // Phase E E5 raise: 10min was too tight on cold-boot for atlas-core's
       // `rails db:create` chain (Rails 7 boot + initializer load + first
@@ -39625,7 +40658,7 @@ function buildManifestRuntime(worldId, repos) {
   }
   return { worldId, repos: runtimeRepos };
 }
-function exposeWorldOverTailscale(appPortUrls, worldId, registry2, _exec = execSync5) {
+function exposeWorldOverTailscale(appPortUrls, worldId, registry2, _exec = execSync6) {
   if (process.env["OLAM_TAILSCALE_SERVE"] !== "true")
     return;
   if (appPortUrls.length === 0)
@@ -39653,7 +40686,7 @@ function exposeWorldOverTailscale(appPortUrls, worldId, registry2, _exec = execS
     registry2.storeTailscalePaths(worldId, registeredPaths);
   }
 }
-function cleanupWorldTailscale(worldId, registry2, _exec = execSync5) {
+function cleanupWorldTailscale(worldId, registry2, _exec = execSync6) {
   const paths = registry2.loadTailscalePaths(worldId);
   if (paths.length === 0)
     return;
@@ -39672,7 +40705,7 @@ function cleanupWorldTailscale(worldId, registry2, _exec = execSync5) {
     }
   }
 }
-function resolveTailscaleBin(_exec = execSync5) {
+function resolveTailscaleBin(_exec = execSync6) {
   const candidates = [
     process.env["TAILSCALE_BIN"],
     "/Applications/Tailscale.app/Contents/MacOS/Tailscale",
@@ -39697,19 +40730,38 @@ var WorldManager = class {
   dashboardManager;
   pleriClient;
   dockerExec;
+  containerProbe;
   manifestRuntimes = /* @__PURE__ */ new Map();
-  constructor(config2, provider, registry2, dashboardManager, pleriClient, dockerExec) {
+  constructor(config2, provider, registry2, dashboardManager, pleriClient, dockerExec, containerProbe) {
     this.config = config2;
     this.provider = provider;
     this.registry = registry2;
     this.dashboardManager = dashboardManager;
     this.pleriClient = pleriClient;
     this.dockerExec = dockerExec ?? defaultDockerExec();
+    this.containerProbe = containerProbe;
   }
   // -----------------------------------------------------------------------
   // createWorld
   // -----------------------------------------------------------------------
   async createWorld(opts) {
+    {
+      const dedupOpts = {
+        registry: this.registry,
+        name: opts.name,
+        ...this.containerProbe ? { probeContainer: this.containerProbe } : {}
+      };
+      const dedup = resolveCreateDedup(dedupOpts);
+      if (dedup.action === "reuse") {
+        return dedup.world;
+      }
+      if (dedup.action === "container-orphan") {
+        throw new ContainerOrphanError(dedup.remediation, dedup.containerName);
+      }
+      if (dedup.cleanedErrorRows > 0) {
+        console.log(`[manager] removed ${dedup.cleanedErrorRows} stale error row(s) for world name "${opts.name}" before fresh create (issue #962)`);
+      }
+    }
     if (!opts.noAuth) {
       const preflight = await runAuthPreflight({ autoStart: true });
       if (preflight.verdict !== "ok") {
@@ -40393,7 +41445,7 @@ ${detail}`);
         const escapedDir = `/home/olam/workspace/${repo.name.replace(/["$`\\]/g, "\\$&")}`;
         for (const cmd of repo.setup_commands) {
           try {
-            execSync5(`docker exec ${containerName} sh -c 'cd "${escapedDir}" && ${cmd.replace(/'/g, "'\\''")}'`, { stdio: "pipe", timeout: 6e5 });
+            execSync6(`docker exec ${containerName} sh -c 'cd "${escapedDir}" && ${cmd.replace(/'/g, "'\\''")}'`, { stdio: "pipe", timeout: 6e5 });
           } catch (err) {
             const msg = err instanceof Error ? err.message : String(err);
             console.warn(`[WorldManager] setup command failed for ${repo.name}: ${msg}`);
@@ -40414,11 +41466,11 @@ ${detail}`);
       });
       if (allPolicies.length > 0) {
         try {
-          execSync5(`docker exec ${containerName} mkdir -p /home/olam/.olam/policies`, { stdio: "pipe", timeout: 1e4 });
+          execSync6(`docker exec ${containerName} mkdir -p /home/olam/.olam/policies`, { stdio: "pipe", timeout: 1e4 });
           for (const repo of repos) {
             const policiesDir = path50.join(workspacePath, repo.name, ".olam", "policies");
             if (fs49.existsSync(policiesDir)) {
-              execSync5(`docker cp "${policiesDir}/." "${containerName}:/home/olam/.olam/policies/"`, { stdio: "pipe", timeout: 15e3 });
+              execSync6(`docker cp "${policiesDir}/." "${containerName}:/home/olam/.olam/policies/"`, { stdio: "pipe", timeout: 15e3 });
             }
           }
         } catch (err) {
@@ -41924,11 +42976,11 @@ function isDashboardRunning() {
 }
 
 // ../core/dist/dashboard/tunnel.js
-import { spawn as spawn4, execSync as execSync6 } from "node:child_process";
+import { spawn as spawn4, execSync as execSync7 } from "node:child_process";
 var tunnelProcess = null;
 function isCloudflaredAvailable() {
   try {
-    execSync6("which cloudflared", { stdio: "ignore" });
+    execSync7("which cloudflared", { stdio: "ignore" });
     return true;
   } catch {
     return false;
@@ -42186,7 +43238,7 @@ var PleriClient = class {
 };
 
 // ../mcp-server/src/env-loader.ts
-import { readFileSync as readFileSync39, existsSync as existsSync47, statSync as statSync14 } from "node:fs";
+import { readFileSync as readFileSync39, existsSync as existsSync48, statSync as statSync14 } from "node:fs";
 import { join as join52, dirname as dirname29, resolve as resolve14 } from "node:path";
 var PROJECT_MARKERS = [
   ".olam/config.yaml",
@@ -42199,10 +43251,10 @@ function findProjectRoot2(startDir) {
   const root = resolve14("/");
   while (true) {
     for (const marker of PROJECT_MARKERS) {
-      if (existsSync47(join52(dir, marker))) return dir;
+      if (existsSync48(join52(dir, marker))) return dir;
     }
     const pkg = join52(dir, "package.json");
-    if (existsSync47(pkg)) {
+    if (existsSync48(pkg)) {
       try {
         const json = JSON.parse(readFileSync39(pkg, "utf8"));
         const isOlamWorkspace = typeof json.name === "string" && json.name.startsWith("@olam/");
@@ -42242,7 +43294,7 @@ function loadProjectEnv(startDir = process.cwd()) {
   const merged = {};
   for (const name of [".env", ".env.local"]) {
     const p = join52(root, name);
-    if (existsSync47(p) && statSync14(p).isFile()) {
+    if (existsSync48(p) && statSync14(p).isFile()) {
       Object.assign(merged, parseEnvFile(p));
       filesRead.push(p);
     }