orkestrator 2.32.0-beta → 2.33.0-beta

package/resources/codex-bridge/dist/index.js

@@ -331,7 +331,7 @@ function createBridgeDiagnostics(bridge, state, metrics) {
 import { execFile as execFileCallback2 } from "node:child_process";
 import { randomBytes, timingSafeEqual } from "node:crypto";
 import { appendFile as appendFile5, mkdir as mkdir8, readFile as readFile7, writeFile as writeFile6 } from "node:fs/promises";
-import { join as join17 } from "node:path";
+import { join as join18 } from "node:path";
 import { promisify as promisify2 } from "node:util";
 
 // ../../node_modules/.bun/@hono+node-server@2.1.5+c539cad7f494f5c9/node_modules/@hono/node-server/dist/constants-BLSFu_RU.mjs
@@ -8861,6 +8861,58 @@ function toBridgeModel(model) {
     defaultReasoningEffort: fallbackReasoningId(model.supportedReasoningEfforts.map((entry) => entry.effort), model.defaultReasoningEffort) ?? model.defaultReasoningEffort
   };
 }
+// ../protocol/src/human-prompts.ts
+var HUMAN_PROMPT_SCAN_BYTES = 16 * 1024;
+function humanPromptObservation(messages, tasks) {
+  const object = (value) => !!value && typeof value === "object" && !Array.isArray(value);
+  const parts = [];
+  let remaining = 64 * 1024;
+  let visited = 0;
+  const walk = (value, depth = 0) => {
+    if (!Array.isArray(value) || depth > 8)
+      return;
+    for (const part of value) {
+      if (++visited > 2048 || remaining <= 0 || parts.length >= 32)
+        return;
+      if (!object(part))
+        continue;
+      if (typeof part.toolOutput === "string" && (part.toolState === "pending" || part.toolOutput.includes("Output is being written to:"))) {
+        const output = part.toolOutput.slice(-Math.min(HUMAN_PROMPT_SCAN_BYTES, remaining));
+        remaining -= output.length;
+        const args = object(part.toolArgs) ? part.toolArgs : {};
+        const command = args.command ?? args.cmd;
+        parts.push({
+          toolUseId: String(part.toolUseId ?? part.id ?? "").slice(0, 200),
+          toolName: String(part.toolName ?? "").slice(0, 100),
+          toolState: part.toolState,
+          toolOutput: output,
+          ...typeof command === "string" ? { toolArgs: { command: command.slice(0, 500) } } : {}
+        });
+      }
+      walk(part.parts, depth + 1);
+      walk(part.childTools, depth + 1);
+      if (object(part.task))
+        walk([part.task], depth + 1);
+    }
+  };
+  if (Array.isArray(messages)) {
+    for (let i = messages.length - 1;i >= Math.max(0, messages.length - 64); i--) {
+      const message = messages[i];
+      if (object(message))
+        walk(message.parts);
+    }
+  }
+  const taskList = Array.isArray(tasks) ? tasks : object(tasks) ? Object.values(tasks) : [];
+  const backgroundTasks = taskList.filter(object).filter((task) => task.status === "running" || task.status === "pending").slice(-64).map((task) => ({
+    id: String(task.id ?? "").slice(0, 200),
+    status: task.status,
+    kind: task.kind,
+    ...typeof task.outputFile === "string" ? { outputFile: task.outputFile.slice(0, 2048) } : {},
+    ...typeof task.toolUseId === "string" ? { toolUseId: task.toolUseId.slice(0, 200) } : {}
+  }));
+  return { messages: [{ parts }], backgroundTasks };
+}
+
 // ../../bridges/codex-bridge/src/codex-collaboration.ts
 var CODEX_TIMELINE_ITEM_PREFIX = "item:";
 var CODEX_TIMELINE_SUBAGENT_PREFIX = "subagent:";
@@ -12500,6 +12552,7 @@ function codeModeMcpCallPart(call, toolUseId) {
 }
 
 // ../protocol/src/coordinator.ts
+var COORDINATOR_CODEX_USER_SKILLS_DIR_ENV = "ORKESTRATOR_COORDINATOR_CODEX_USER_SKILLS_DIR";
 var COORDINATOR_CONTROL_TOOL_NAMES = Object.freeze([
   "ack_message",
   "add_ticket_comment",
@@ -14372,7 +14425,7 @@ var ORKESTRATOR_ARTIFACT_MCP_PATH = "/artifact-mcp";
 // ../../bridges/codex-bridge/src/engine/app-server-engine.ts
 import { open as open6 } from "node:fs/promises";
 import { createHash as createHash9 } from "node:crypto";
-import { isAbsolute as isAbsolute8, join as join15 } from "node:path";
+import { isAbsolute as isAbsolute8, join as join16 } from "node:path";
 
 // ../../bridges/codex-bridge/src/app-server/process-supervisor.ts
 import { execFile as execFile3, spawn as spawn3 } from "node:child_process";
@@ -18425,8 +18478,9 @@ function coordinatorCapabilityPolicy(mode) {
 }
 
 // ../../bridges/codex-bridge/src/codex-config.ts
-import { realpathSync } from "node:fs";
-import { isAbsolute as isAbsolute7 } from "node:path";
+import { existsSync as existsSync3, readdirSync as readdirSync3, realpathSync, statSync as statSync2 } from "node:fs";
+import { homedir as homedir2 } from "node:os";
+import { isAbsolute as isAbsolute7, join as join15, relative as relative2, sep } from "node:path";
 var CODEX_MAX_CONCURRENT_THREADS_ENV = "CODEX_MAX_CONCURRENT_THREADS_PER_SESSION";
 var DEFAULT_CODEX_MAX_CONCURRENT_THREADS = 5;
 var ORKESTRATOR_AGENT_MCP_URL_ENV = "ORKESTRATOR_AGENT_MCP_URL";
@@ -18461,6 +18515,76 @@ function codexRequestUserInputConfig(policy) {
     return {};
   return { "features.default_mode_request_user_input": true };
 }
+function codexLoadsProjectSkills(policy, env = process.env) {
+  if (policy?.projectResources !== false)
+    return true;
+  return policy.id === "coordinator-read-only" && isCoordinatorReadOnlyEnvironment(env);
+}
+function codexCoordinatorSkillExtraRoots(env = process.env, cwd = env.CWD?.trim()) {
+  if (!isCoordinatorReadOnlyEnvironment(env))
+    return [];
+  const userDir = env[COORDINATOR_CODEX_USER_SKILLS_DIR_ENV]?.trim();
+  return [
+    ...userDir && isAbsolute7(userDir) ? [userDir] : [],
+    ...cwd && isAbsolute7(cwd) ? [join15(cwd, ".claude", "skills")] : []
+  ].filter((dir) => existsSync3(dir));
+}
+var MAX_SKILL_READ_GRANTS = 256;
+function isWithin(parent, child) {
+  const path = relative2(parent, child);
+  return path === "" || !path.startsWith(`..${sep}`) && path !== ".." && !isAbsolute7(path);
+}
+function codexCoordinatorSkillReadRoots(env = process.env, home = env.HOME?.trim() || homedir2()) {
+  const userDir = env[COORDINATOR_CODEX_USER_SKILLS_DIR_ENV]?.trim();
+  const roots = [
+    ...userDir && isAbsolute7(userDir) ? [userDir] : [],
+    join15(home, ".agents", "skills")
+  ];
+  const homeReal = (() => {
+    try {
+      return realpathSync(home);
+    } catch {
+      return home;
+    }
+  })();
+  const grants = new Set;
+  const grantable = (path) => path !== sep && !isWithin(path, homeReal) && !isWithin(path, home);
+  for (const root of roots) {
+    let real;
+    try {
+      real = realpathSync(root);
+      if (!statSync2(real).isDirectory())
+        continue;
+    } catch {
+      continue;
+    }
+    if (!grantable(real))
+      continue;
+    grants.add(real);
+    let entries;
+    try {
+      entries = readdirSync3(real).filter((name) => !name.startsWith("."));
+    } catch {
+      continue;
+    }
+    for (const entry of entries) {
+      if (grants.size >= MAX_SKILL_READ_GRANTS)
+        break;
+      let target;
+      try {
+        target = realpathSync(join15(real, entry));
+        if (!statSync2(target).isDirectory() || !existsSync3(join15(target, "SKILL.md")))
+          continue;
+      } catch {
+        continue;
+      }
+      if (isWithin(real, target) || !grantable(target))
+        continue;
+      grants.add(target);
+    }
+  }
+  return [...grants].slice(0, MAX_SKILL_READ_GRANTS);
+}
 var MAX_CODEX_DISABLED_SKILLS = 1024;
 var KEPT_SKILL_SCOPES = new Set(["user", "system", "admin"]);
 function codexProjectSkillsConfig(listed) {
@@ -18563,7 +18687,7 @@ function codexAppServerConfigOverrides(env = process.env) {
       throw new Error("Coordinator Codex permission profile configuration is invalid");
     }
     overrides.default_permissions = JSON.stringify(permissionProfile);
-    overrides[`permissions.${permissionProfile}.filesystem`] = `{ ":root" = "deny", ":minimal" = "read", ":tmpdir" = "deny", ` + `":slash_tmp" = "deny", ${JSON.stringify(readableRuntimeRoot)} = "read", ` + (attachmentRoot && isAbsolute7(attachmentRoot) ? `${JSON.stringify(attachmentRoot)} = "read", ` : "") + `":workspace_roots" = { "." = "read" } }`;
+    overrides[`permissions.${permissionProfile}.filesystem`] = `{ ":root" = "deny", ":minimal" = "read", ":tmpdir" = "deny", ` + `":slash_tmp" = "deny", ${JSON.stringify(readableRuntimeRoot)} = "read", ` + (attachmentRoot && isAbsolute7(attachmentRoot) ? `${JSON.stringify(attachmentRoot)} = "read", ` : "") + codexCoordinatorSkillReadRoots(env).map((root) => `${JSON.stringify(root)} = "read", `).join("") + `":workspace_roots" = { "." = "read" } }`;
     overrides[`permissions.${permissionProfile}.network.enabled`] = "false";
     overrides.web_search = JSON.stringify(codexNetworkDeniedSearchMode(codexCoordinatorPolicy(env)));
     overrides["features.standalone_web_search"] = "false";
@@ -18588,6 +18712,7 @@ function codexAppServerConfigOverrides(env = process.env) {
       "plugins",
       "remote_plugin",
       "skill_mcp_dependency_install",
+      "skill_env_var_dependency_prompt",
       "tool_call_mcp_elicitation",
       "tool_suggest",
       "workspace_dependencies"
@@ -19149,7 +19274,7 @@ function signedOutAccountRead(error) {
 }
 async function readStoredLoginFingerprint(codexHome) {
   try {
-    const file = await open6(join15(codexHome, "auth.json"), "r");
+    const file = await open6(join16(codexHome, "auth.json"), "r");
     let raw;
     try {
       const bytes = Buffer.alloc(65537);
@@ -19229,6 +19354,7 @@ class AppServerEngine {
   accountProofInvalidatedSequence = 0;
   accountProofTurns = new Map;
   hostedNetworkLockVerifiedGeneration = null;
+  skillExtraRootsGeneration = null;
   toolHistoryLockVerifiedGeneration = null;
   accountReloadFingerprint;
   pendingAccountReloadFingerprint;
@@ -19270,6 +19396,7 @@ class AppServerEngine {
         this.forgetSignIn();
         this.loginSequence++;
         this.hostedNetworkLockVerifiedGeneration = null;
+        this.skillExtraRootsGeneration = null;
         this.toolHistoryLockVerifiedGeneration = null;
         this.rejectAllWaiters();
         this.router.abandonGeneration(generation);
@@ -19636,8 +19763,28 @@ class AppServerEngine {
     }
     throw new Error("Codex model catalogue exceeded its page limit");
   }
+  async ensureSkillExtraRoots(generation) {
+    const extraRoots = this.options.skillExtraRoots ?? [];
+    if (extraRoots.length === 0)
+      return;
+    if (this.skillExtraRootsGeneration?.id !== generation) {
+      const set = this.supervisor.requestOnGeneration(generation, "skills/extraRoots/set", {
+        extraRoots: [...extraRoots]
+      }).then(() => {
+        return;
+      });
+      const entry = { id: generation, set };
+      this.skillExtraRootsGeneration = entry;
+      set.catch(() => {
+        if (this.skillExtraRootsGeneration === entry)
+          this.skillExtraRootsGeneration = null;
+      });
+    }
+    await this.skillExtraRootsGeneration.set;
+  }
   async projectResourceThreadConfig(generation, config) {
-    if (!config.policy || config.policy.projectResources)
+    await this.ensureSkillExtraRoots(generation);
+    if (!config.policy || codexLoadsProjectSkills(config.policy))
       return {};
     let listed;
     try {
@@ -19828,6 +19975,14 @@ class AppServerEngine {
       cwds: [options.cwd],
       ...options.forceReload ? { forceReload: true } : {}
     };
+    if ((this.options.skillExtraRoots ?? []).length > 0) {
+      const { id: generation } = await this.supervisor.ensureReady();
+      await this.ensureSkillExtraRoots(generation);
+      return {
+        result: await this.supervisor.requestOnGeneration(generation, "skills/list", params),
+        generation
+      };
+    }
     return this.supervisor.requestWithGeneration("skills/list", params);
   }
   async getRuntimeHealth(threadId) {
@@ -21576,6 +21731,9 @@ class CodexRuntimeSessions {
       return "idle";
     return this.hasParkedInput(session) ? "waiting" : "working";
   }
+  humanPromptOutput(sessionId) {
+    return humanPromptObservation(this.ctx.registry.getThreadForSession(sessionId)?.messages);
+  }
   getActivitySnapshot(sessionId) {
     const activity = this.getActivity(sessionId);
     if (activity === "missing")
@@ -22078,7 +22236,7 @@ function parseCommandToken(text, sigils = ["/"]) {
 // ../../bridges/codex-bridge/src/prompts/template-discovery.ts
 import { createHash as createHash11 } from "node:crypto";
 import { open as open7, readdir as readdir3, stat as stat7 } from "node:fs/promises";
-import { join as join16 } from "node:path";
+import { join as join17 } from "node:path";
 
 // ../../bridges/codex-bridge/src/prompts/template-format.ts
 var TEMPLATE_DESCRIPTION_MAX_BYTES = 1000;
@@ -22206,8 +22364,8 @@ var RESERVED_TEMPLATE_PREFIXES = ["/skill:", "/prompts:"];
 var TEMPLATE_ID_PREFIX = "codex-template:";
 function templateRoots(cwd, codexHome = getCodexHomeDir()) {
   return [
-    { origin: "project", dir: join16(cwd, ".codex", "prompts") },
-    { origin: "user", dir: join16(codexHome, "prompts") }
+    { origin: "project", dir: join17(cwd, ".codex", "prompts") },
+    { origin: "user", dir: join17(codexHome, "prompts") }
   ];
 }
 function templateCommandId(origin, relativePath) {
@@ -22312,7 +22470,7 @@ async function scanPromptTemplates(roots, limits = TEMPLATE_LIMITS) {
         return;
       }
       visited += 1;
-      const absolutePath = join16(dir, entry.name);
+      const absolutePath = join17(dir, entry.name);
       const relativePath = relative ? `${relative}/${entry.name}` : entry.name;
       if (entry.isDirectory()) {
         if (depth + 1 > limits.maxDepth) {
@@ -25149,7 +25307,7 @@ class CodexRuntimePrompt {
     const interpretCommands = input.allowProviderCommands !== false;
     let plan;
     if (input.command) {
-      plan = await this.ctx.commandCatalogue.resolveSelected(input.command, session.config.policy?.projectResources !== false);
+      plan = await this.ctx.commandCatalogue.resolveSelected(input.command, codexLoadsProjectSkills(session.config.policy));
       if (plan.kind === "refused")
         return commandRefusal(plan.message);
       if (plan.kind === "builtin" && input.outputSchema) {
@@ -25185,9 +25343,9 @@ class CodexRuntimePrompt {
     context = await this.ctx.callbacks.ensureAttached(session.id);
     this.ctx.registry.assertNoActiveTurn(context);
     if (!plan) {
-      plan = interpretCommands && !input.outputSchema ? await this.ctx.commandCatalogue.resolveTyped(input.prompt, session.config.policy?.projectResources !== false) : { kind: "text" };
+      plan = interpretCommands && !input.outputSchema ? await this.ctx.commandCatalogue.resolveTyped(input.prompt, codexLoadsProjectSkills(session.config.policy)) : { kind: "text" };
     } else if (plan.kind === "skill") {
-      const revalidated = await this.ctx.commandCatalogue.resolveSelected(input.command, session.config.policy?.projectResources !== false);
+      const revalidated = await this.ctx.commandCatalogue.resolveSelected(input.command, codexLoadsProjectSkills(session.config.policy));
       if (revalidated.kind === "refused")
         return commandRefusal(revalidated.message);
       plan = revalidated;
@@ -25197,7 +25355,7 @@ class CodexRuntimePrompt {
       return { ok: true, result: { status: "processing", requestId } };
     }
     if (plan.kind === "builtin") {
-      const response = plan.builtin === "help" ? await this.ctx.commandCatalogue.helpText(session.config.policy?.projectResources !== false) : await this.modelsListText(session);
+      const response = plan.builtin === "help" ? await this.ctx.commandCatalogue.helpText(codexLoadsProjectSkills(session.config.policy)) : await this.modelsListText(session);
       this.emitLocalResponse(session, input.prompt, response);
       return { ok: true, result: { status: "processing", requestId } };
     }
@@ -25217,7 +25375,7 @@ class CodexRuntimePrompt {
       skillInput = { name: plan.binding.name, path: plan.binding.path };
     }
     if (plan.kind === "skill") {
-      const unavailable = skillUnavailability(plan.binding, session.config.policy?.projectResources !== false);
+      const unavailable = skillUnavailability(plan.binding, codexLoadsProjectSkills(session.config.policy));
       if (unavailable)
         return commandRefusal(unavailable.message);
     }
@@ -25235,7 +25393,7 @@ class CodexRuntimePrompt {
       ...input.workflowResultTool ? { workflowResultTool: input.workflowResultTool } : {}
     });
     let projectSkillsRevision = this.ctx.projectSkillsRevision;
-    const needsThreadReload = (config) => Boolean(input.workflowResultTool) || context?.promptThreadConfig !== promptThreadConfig(config) || config.policy?.projectResources === false && context?.projectSkillsRevision !== projectSkillsRevision;
+    const needsThreadReload = (config) => Boolean(input.workflowResultTool) || context?.promptThreadConfig !== promptThreadConfig(config) || !codexLoadsProjectSkills(config.policy) && context?.projectSkillsRevision !== projectSkillsRevision;
     if (context && !context.materialized && needsThreadReload(promptConfig())) {
       await this.lifecycle.detachThread(context);
       context = undefined;
@@ -25269,7 +25427,7 @@ class CodexRuntimePrompt {
     if (hadAttachedContext && needsThreadReload(turnConfig)) {
       context = await this.resumeThreadForPrompt(session.id, context, turnConfig);
     }
-    for (let attempt = 0;turnConfig.policy?.projectResources === false && projectSkillsRevision !== this.ctx.projectSkillsRevision; attempt += 1) {
+    for (let attempt = 0;!codexLoadsProjectSkills(turnConfig.policy) && projectSkillsRevision !== this.ctx.projectSkillsRevision; attempt += 1) {
       if (attempt >= 3) {
         context.promptThreadConfig = undefined;
         return {
@@ -25867,7 +26025,7 @@ class CodexRuntimePrompt {
         commands: []
       };
     }
-    return this.ctx.commandCatalogue.list(this.ctx.registry.getSession(sessionId)?.config.policy?.projectResources !== false);
+    return this.ctx.commandCatalogue.list(codexLoadsProjectSkills(this.ctx.registry.getSession(sessionId)?.config.policy));
   }
   async refreshCommandCatalogue(sessionId) {
     if (!this.ctx.registry.getSession(sessionId)) {
@@ -26391,6 +26549,9 @@ class AppServerRuntime {
   getActivity(...args) {
     return this.sessions.getActivity(...args);
   }
+  humanPromptOutput(sessionId) {
+    return this.sessions.humanPromptOutput(sessionId);
+  }
   getActivitySnapshot(...args) {
     return this.sessions.getActivitySnapshot(...args);
   }
@@ -27022,7 +27183,7 @@ async function writeCodexRawLog(sessionId, entry, logDir = codexRawLogDir) {
   try {
     await mkdir8(logDir, { recursive: true });
     const filename = `${sanitizeLogFileComponent(sessionId)}.jsonl`;
-    await appendFile5(join17(logDir, filename), `${JSON.stringify({
+    await appendFile5(join18(logDir, filename), `${JSON.stringify({
       timestamp: new Date().toISOString(),
       sessionId,
       ...entry
@@ -27219,10 +27380,10 @@ function emit(event) {
   }
 }
 function bridgeCacheDir() {
-  return join17(getCodexHomeDir(), "orkestrator-bridge");
+  return join18(getCodexHomeDir(), "orkestrator-bridge");
 }
 function bridgeCachePath() {
-  return join17(bridgeCacheDir(), "models-cache.json");
+  return join18(bridgeCacheDir(), "models-cache.json");
 }
 var BRIDGE_MODEL_CACHE_VERSION = 2;
 async function readPersistedBridgeCache() {
@@ -27246,7 +27407,7 @@ async function writePersistedBridgeCache(models) {
 }
 async function readCodexCliModelCache() {
   try {
-    const raw = await readFile7(join17(getCodexHomeDir(), "models_cache.json"), "utf8");
+    const raw = await readFile7(join18(getCodexHomeDir(), "models_cache.json"), "utf8");
     const models = parseModelCatalog(raw);
     return models.length > 0 ? models : null;
   } catch {
@@ -27284,7 +27445,8 @@ function createCodexEngine(env = process.env, createEngine = (options) => new Ap
       title: "Orkestrator",
       version: env.ORKESTRATOR_VERSION || "0.0.0"
     },
-    configOverrides: codexAppServerConfigOverrides(env)
+    configOverrides: codexAppServerConfigOverrides(env),
+    skillExtraRoots: codexCoordinatorSkillExtraRoots(env, getWorkingDirectory())
   });
 }
 var codexEngine = createCodexEngine();
@@ -27669,6 +27831,9 @@ app.get("/session/:id/usage", async (c) => {
     return c.json({ error: "Account usage is temporarily unavailable" }, 503);
   }
 });
+app.get("/session/:id/human-prompts", (c) => {
+  return c.json(appServerRuntime.humanPromptOutput(c.req.param("id")));
+});
 app.get("/session/:id/activity", (c) => {
   return c.json(appServerRuntime.getActivitySnapshot(c.req.param("id")));
 });