orkestrator 2.34.4-beta → 2.34.5-beta

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

@@ -2666,14 +2666,30 @@ import { join as join2 } from "node:path";
 
 // ../../bridges/claude-bridge/src/services/claude-home.ts
 import { homedir } from "node:os";
-import { join } from "node:path";
+import { join, resolve } from "node:path";
 var overrideHome = null;
+var overrideAccountHome;
+var CLAUDE_ACCOUNT_HOME_ENV = "ORKESTRATOR_CLAUDE_ACCOUNT_HOME";
 function claudeHome() {
   return overrideHome ?? homedir();
 }
 function claudeJsonPath() {
   return join(claudeHome(), ".claude.json");
 }
+function claudeAccountJsonPath() {
+  let home = overrideAccountHome;
+  if (home === undefined) {
+    if (overrideHome !== null)
+      return null;
+    const marked = process.env[CLAUDE_ACCOUNT_HOME_ENV]?.trim();
+    const configDir = process.env.CLAUDE_CONFIG_DIR?.trim();
+    home = marked && configDir && resolve(marked) === resolve(configDir) ? configDir : null;
+  }
+  if (!home)
+    return null;
+  const file = join(home, ".claude.json");
+  return resolve(file) === resolve(claudeJsonPath()) ? null : file;
+}
 function claudeUserSettingsPath() {
   const configDir = overrideHome === null ? process.env.CLAUDE_CONFIG_DIR?.trim() : undefined;
   return join(configDir || join(claudeHome(), ".claude"), "settings.json");
@@ -4117,6 +4133,43 @@ import { tmpdir } from "node:os";
 import path from "node:path";
 import { promisify } from "node:util";
 
+// ../protocol/src/native-agent-goal.ts
+var NATIVE_AGENT_GOAL_LIMITS = Object.freeze({
+  objectiveMaxChars: 4000,
+  checkMaxBytes: 4 * 1024,
+  reportMessageMaxBytes: 2 * 1024,
+  checkOutputMaxBytes: 8 * 1024,
+  statusDetailMaxBytes: 1024,
+  maxIterationsDefault: 20,
+  maxIterationsLimit: 100,
+  noProgressLimit: 3,
+  checkTimeoutDefaultMs: 10 * 60000,
+  checkTimeoutMaxMs: 30 * 60000,
+  verifierModelMaxChars: 200,
+  verifierTimeoutDefaultMs: 30 * 60000,
+  verdictSummaryMaxBytes: 2 * 1024,
+  verdictReasonsMax: 16,
+  verdictReasonMaxBytes: 512,
+  historyLimit: 5
+});
+var AGENT_GOAL_TOOL_NAMES = Object.freeze(["report_goal"]);
+var GOAL_QUALIFIED_PLATFORMS = Object.freeze([
+  "claude",
+  "codex",
+  "opencode",
+  "cursor",
+  "grok",
+  "pi"
+]);
+var GOAL_TOKEN_BUDGET_PLATFORMS = Object.freeze([
+  "claude",
+  "codex",
+  "opencode",
+  "cursor",
+  "grok",
+  "pi"
+]);
+
 // ../protocol/src/native-agent-transcript-patch.ts
 var FORBIDDEN_KEYS = new Set(["__proto__", "constructor", "prototype"]);
 
@@ -4517,6 +4570,7 @@ var PROJECTION_FIELD_SET = new Set([
   "queue",
   "asyncQuestionResponses",
   "contextUsage",
+  "goal",
   "rateLimits",
   "runtime",
   "runtimeHealthAuthoritative",
@@ -4541,6 +4595,7 @@ var OPTIONAL_PROJECTION_FIELD_SET = new Set([
   "queue",
   "asyncQuestionResponses",
   "contextUsage",
+  "goal",
   "rateLimits",
   "runtime",
   "runtimeHealthAuthoritative",
@@ -4642,6 +4697,15 @@ async function runtimeEnvironmentForSessionQuery(policy, env = process.env, opti
   const ghConfigDir = await (options.ghConfigDir ?? emptyGhConfigDir)();
   return withheldGitHubCredentialEnvironment(env, { ghConfigDir });
 }
+var UNATTENDED_OVERLOAD_RETRY_ENV = {
+  CLAUDE_CODE_OVERLOADED_RETRY_BASE_DELAY_MS: "4000",
+  CLAUDE_CODE_OVERLOADED_RETRY_MAX_DELAY_MS: "64000"
+};
+function withUnattendedOverloadRetry(sessionPolicy, environment) {
+  if (sessionPolicy?.id !== "pipeline")
+    return environment;
+  return { ...UNATTENDED_OVERLOAD_RETRY_ENV, ...environment };
+}
 
 // ../../bridges/claude-bridge/src/services/coordinator-skills.ts
 import { createHash as createHash4, randomBytes } from "node:crypto";
@@ -4669,16 +4733,19 @@ var COORDINATOR_CONTROL_TOOL_NAMES = Object.freeze([
   "add_ticket_comment",
   "address_multi_review",
   "adopt_workflow",
+  "answer_worker_question",
   "cancel_build_pipeline",
   "cancel_graph_run",
   "cancel_multi_review",
   "cancel_schedule",
+  "clear_worker_goal",
   "compare_project_files",
   "create_pr",
   "create_schedule",
   "create_ticket",
   "custom_fix_multi_review",
   "edit_worker_tab",
+  "fork_worker",
   "get_build_pipeline",
   "get_environment",
   "get_feature_plan",
@@ -4691,6 +4758,9 @@ var COORDINATOR_CONTROL_TOOL_NAMES = Object.freeze([
   "get_tab_state",
   "get_tab_transcript",
   "get_ticket",
+  "get_usage_limits",
+  "get_worker_changes",
+  "get_worker_goal",
   "launch_environment",
   "launch_feature_plan",
   "launch_graph",
@@ -4705,14 +4775,18 @@ var COORDINATOR_CONTROL_TOOL_NAMES = Object.freeze([
   "list_node_environments",
   "list_nodes",
   "list_projects",
+  "list_provider_accounts",
   "list_schedules",
   "list_tabs",
   "list_tickets",
+  "list_worker_commands",
   "list_workflows",
   "open_multi_review",
   "open_multi_review_fix",
   "open_worker_browser",
   "pause_build_pipeline",
+  "pause_schedule",
+  "pause_worker_goal",
   "propose_agents_md_update",
   "read_messages",
   "read_node_environment",
@@ -4721,18 +4795,25 @@ var COORDINATOR_CONTROL_TOOL_NAMES = Object.freeze([
   "request_project_file_update",
   "request_project_on_node",
   "request_root_changes",
+  "resolve_conflicts",
   "resume_build_pipeline",
+  "resume_schedule",
+  "run_worker_command",
   "send_message",
   "send_node_message",
   "send_prompt_to_node_tab",
   "send_prompt_to_tab",
+  "set_worker_goal",
   "start_build_pipeline",
   "start_environment",
   "start_multi_review",
   "start_node_environment",
   "stop_environment",
   "stop_node_environment",
+  "stop_worker_turn",
+  "switch_provider_account",
   "transfer_files",
+  "update_schedule",
   "update_ticket"
 ]);
 
@@ -8931,7 +9012,7 @@ function noMessages() {
 // ../../bridges/claude-bridge/src/services/session-manager-persistence.ts
 import { constants as constants2 } from "node:fs";
 import { lstat as lstat2, open as open2, realpath as realpath2 } from "node:fs/promises";
-import { isAbsolute as isAbsolute3, join as join10, relative, resolve as resolve2, sep } from "node:path";
+import { isAbsolute as isAbsolute3, join as join10, relative, resolve as resolve3, sep } from "node:path";
 
 // ../protocol/src/node/command-change-journal.ts
 import { appendFile, mkdir as mkdir3, readFile as readFile5, rename as rename3, rm as rm3, stat as stat4, writeFile as writeFile3 } from "node:fs/promises";
@@ -9088,7 +9169,7 @@ import { randomUUID as randomUUID2 } from "node:crypto";
 import { rmSync } from "node:fs";
 import { copyFile, lstat, mkdtemp as mkdtemp2, rm as rm4 } from "node:fs/promises";
 import { tmpdir as tmpdir2 } from "node:os";
-import { delimiter as delimiter2, isAbsolute as isAbsolute2, join as join6, resolve } from "node:path";
+import { delimiter as delimiter2, isAbsolute as isAbsolute2, join as join6, resolve as resolve2 } from "node:path";
 var DEFAULT_MAX_UNTRACKED_FILE_BYTES = 2 * 1024 * 1024;
 var DEFAULT_MAX_UNTRACKED_FILES = 5000;
 var DEFAULT_SLOW_SNAPSHOT_MS = 500;
@@ -9370,8 +9451,8 @@ class WorkspaceChangeProbe {
           return;
         return {
           root,
-          indexPath: isAbsolute2(index) ? index : resolve(cwd, index),
-          objectsPath: isAbsolute2(objects) ? objects : resolve(cwd, objects)
+          indexPath: isAbsolute2(index) ? index : resolve2(cwd, index),
+          objectsPath: isAbsolute2(objects) ? objects : resolve2(cwd, objects)
         };
       }).catch(() => {
         return;
@@ -11777,13 +11858,13 @@ class ClaudeAttachmentError extends Error {
 var BRIDGE_ATTACHMENT_ROOT_ENV = "ORKESTRATOR_BRIDGE_ATTACHMENT_ROOT";
 function configuredAttachmentRoot(env = process.env) {
   const value = env[BRIDGE_ATTACHMENT_ROOT_ENV]?.trim();
-  return value && isAbsolute3(value) ? resolve2(value) : undefined;
+  return value && isAbsolute3(value) ? resolve3(value) : undefined;
 }
 function attachmentContainmentRoot(filePath, cwd, extraRoot = configuredAttachmentRoot()) {
-  if (extraRoot && isAbsolute3(filePath) && isPathWithin2(extraRoot, resolve2(filePath))) {
+  if (extraRoot && isAbsolute3(filePath) && isPathWithin2(extraRoot, resolve3(filePath))) {
     return extraRoot;
   }
-  return resolve2(cwd);
+  return resolve3(cwd);
 }
 function isPathWithin2(rootPath, targetPath) {
   const childPath = relative(rootPath, targetPath);
@@ -11831,7 +11912,7 @@ async function assertOpenedWorkspaceFile(targetPath, canonicalRoot, openedStats)
 }
 async function readWorkspaceImageAttachment(filePath, cwd, afterSymlinkValidation, afterCanonicalValidation, afterInitialValidation) {
   const lexicalRoot = attachmentContainmentRoot(filePath, cwd);
-  const targetPath = isAbsolute3(filePath) ? resolve2(filePath) : resolve2(lexicalRoot, filePath);
+  const targetPath = isAbsolute3(filePath) ? resolve3(filePath) : resolve3(lexicalRoot, filePath);
   if (!isPathWithin2(lexicalRoot, targetPath)) {
     throw new ClaudeAttachmentError("attachment_outside_workspace", "Image attachment must be contained in the current workspace.");
   }
@@ -13624,6 +13705,17 @@ async function loadScopedMcpServers(cwd, scope) {
   };
   return { configs, revision: { fingerprint: revisionFingerprint(sources), sources, scope } };
 }
+async function claudeAccountOnlyMcpServerNames(cwd, settingSources, declared, strictMcpConfig = false) {
+  const path = claudeAccountJsonPath();
+  if (!path || strictMcpConfig)
+    return [];
+  const [user, local] = await Promise.all([
+    settingSources.includes("user") ? readJsonSliceCached(path, "mcpServers", (config) => config?.mcpServers) : undefined,
+    settingSources.includes("local") ? readJsonSliceCached(path, `projects:${cwd}:mcpServers`, (config) => config?.projects?.[cwd]?.mcpServers) : undefined
+  ]);
+  const names = new Set([...Object.keys(user ?? {}), ...Object.keys(local ?? {})]);
+  return Array.from(names).filter((name) => !declared.has(name)).sort();
+}
 function revisionFingerprint(sources) {
   return createHash9("sha256").update(`user=${sources.user}\x00project=${sources.project}`).digest("base64url");
 }
@@ -15229,8 +15321,16 @@ function appendLocalCommandResult(session, content, key) {
 }
 
 // ../../bridges/claude-bridge/src/services/session-manager-prompt-mcp-sync.ts
-function createClaudeRuntimeMcp(servers, declared) {
-  return { servers, claimed: false, declared: new Set(declared), stale: new Set };
+function createClaudeRuntimeMcp(servers, declared, accountOnly = []) {
+  const declaredNames = new Set(declared);
+  const loadedOnlyByAccount = new Set(Array.from(accountOnly).filter((name) => !declaredNames.has(name)));
+  return {
+    servers,
+    claimed: false,
+    declared: declaredNames,
+    stale: new Set(loadedOnlyByAccount),
+    accountOnly: loadedOnlyByAccount
+  };
 }
 var FOREIGN_SOURCES = new Set(["plugin", "sdk", "claudeai"]);
 var MAX_REPORTED_STALE_SERVERS = 256;
@@ -15289,8 +15389,10 @@ async function syncClaudeRuntimeMcp(runtime, next) {
   }
   const stillRuns = (name) => statuses ? statuses.some((server) => server.name === name && server.status !== "disabled" && !FOREIGN_SOURCES.has(server.source ?? "")) : !removed?.has(name);
   for (const name of Array.from(mcp.stale)) {
-    if (next.names.has(name) || !stillRuns(name))
+    if (next.names.has(name) || !stillRuns(name)) {
       mcp.stale.delete(name);
+      mcp.accountOnly.delete(name);
+    }
   }
   for (const name of undeclared)
     if (stillRuns(name))
@@ -15332,7 +15434,7 @@ function createStaleMcpServerHook(mcp) {
       hookSpecificOutput: {
         hookEventName: "PreToolUse",
         permissionDecision: "deny",
-        permissionDecisionReason: `The MCP server "${server}" was removed from this session's configuration, so ${input.tool_name} is not available. This Claude process loaded it at launch and cannot unload it; it is gone once the process closes after an idle period, or when the session is stopped.`
+        permissionDecisionReason: mcp.accountOnly.has(server) ? `The MCP server "${server}" is only in this Claude account's own configuration, not in the user's Claude configuration, so ${input.tool_name} is not available. Orkestrator replaces an account's MCP servers with the user's when the account's Claude starts; add the server to the user's Claude configuration to use it.` : `The MCP server "${server}" was removed from this session's configuration, so ${input.tool_name} is not available. This Claude process loaded it at launch and cannot unload it; it is gone once the process closes after an idle period, or when the session is stopped.`
       }
     };
   };
@@ -15777,7 +15879,7 @@ function canAdmitInteraction(candidate, family) {
 // ../../bridges/claude-bridge/src/services/session-manager-interactions.ts
 import { readFile as readFile7 } from "node:fs/promises";
 
-// ../../bridges/claude-bridge/src/services/claude-elicitation-schema.ts
+// ../protocol/src/mcp-elicitation-form.ts
 function record2(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value);
 }
@@ -15802,7 +15904,7 @@ var FIELD_KEYS = new Set([
   "minimum",
   "maximum"
 ]);
-function isSupportedClaudeForm(schema) {
+function isSupportedMcpForm(schema) {
   if (!record2(schema) || schema.type !== "object" || Object.keys(schema).some((key) => !ROOT_KEYS.has(key)))
     return false;
   if (schema.additionalProperties !== undefined && schema.additionalProperties !== false)
@@ -15832,8 +15934,8 @@ function isSupportedClaudeForm(schema) {
     return true;
   });
 }
-function isValidClaudeFormContent(schema, content) {
-  if (!isSupportedClaudeForm(schema) || !record2(content))
+function isValidMcpFormContent(schema, content) {
+  if (!isSupportedMcpForm(schema) || !record2(content))
     return false;
   const properties = schema.properties ?? {};
   if (schema.required?.some((key) => !Object.hasOwn(content, key)))
@@ -15954,7 +16056,7 @@ function respondToInteraction(requestId, response, sessionId) {
   const resolve = interactionResolvers.get(key);
   if (!resolve)
     return false;
-  if (response.action === "accept" && request.kind === "mcp-form" && !isValidClaudeFormContent(request.schema, response.content))
+  if (response.action === "accept" && request.kind === "mcp-form" && !isValidMcpFormContent(request.schema, response.content))
     return false;
   pendingInteractions.delete(key);
   interactionResolvers.delete(key);
@@ -16182,7 +16284,7 @@ async function answerClaudeElicitation(session, sessionId, request, options) {
   const url = request.mode === "url" ? bounded2(request.url) : undefined;
   const schema = request.mode === "url" ? undefined : request.requestedSchema ?? { type: "object" };
   const schemaText = schema === undefined ? "" : JSON.stringify(schema);
-  if (request.mode === "url" && (!url || url !== request.url) || new TextEncoder().encode(schemaText).byteLength > AGENT_INTERACTION_LIMITS.maxTextLength || schema !== undefined && !isSupportedClaudeForm(schema)) {
+  if (request.mode === "url" && (!url || url !== request.url) || new TextEncoder().encode(schemaText).byteLength > AGENT_INTERACTION_LIMITS.maxTextLength || schema !== undefined && !isSupportedMcpForm(schema)) {
     appendTranscriptNotice(session, sessionId, (event) => eventEmitter.emit(event), {
       type: "status",
       severity: "warning",
@@ -16230,9 +16332,9 @@ function proposedBashPrefix(suggestions) {
       const { toolName, ruleContent } = rule;
       if (toolName !== "Bash" || typeof ruleContent !== "string")
         continue;
-      const prefix = ruleContent.endsWith(":*") ? ruleContent.slice(0, -2) : ruleContent;
+      const prefix = ruleContent.replace(/(?::| )\*$/, "");
       const words = prefix.trim().split(/\s+/);
-      if (words.length === 0 || words.length > MAX_PROPOSED_PREFIX_TOKENS || words.some((word) => word.length === 0 || word.length > MAX_PROPOSED_PREFIX_TOKEN_LENGTH)) {
+      if (words.length === 0 || words.length > MAX_PROPOSED_PREFIX_TOKENS || words.some((word) => word.length === 0 || word.length > MAX_PROPOSED_PREFIX_TOKEN_LENGTH || word.includes("*"))) {
         continue;
       }
       return words;
@@ -16443,6 +16545,9 @@ function turnHook(turn, hook) {
 }
 
 // ../../bridges/claude-bridge/src/services/session-manager-prompt-query.ts
+function withNativeGoalClosed(disallowed) {
+  return [...disallowed ?? [], "ProposeGoal"];
+}
 var PLAN_MODE_INSTRUCTIONS = `The user has enabled planning mode. Use this phase to:
 1. Thoroughly explore the codebase and its existing patterns.
 2. Consider viable approaches and their trade-offs.
@@ -16472,6 +16577,7 @@ async function resolveQueryPlan(turn, sdkTextPrompt, testHooks) {
     resolveClaudeTurnPlugins(cwd, policy, settingSources)
   ]);
   turn.mcpServerNames = mcpServerNames;
+  const accountOnlyMcpServers = await claudeAccountOnlyMcpServerNames(cwd, settingSources, mcpServerNames, claudeUserMcpQueryOptions(policy).strictMcpConfig === true);
   const mcpServerCount = Object.keys(mcpServers).length;
   const pluginCount = plugins.length;
   const policyPermissionMode = claudePolicyPermissionMode(policy);
@@ -16492,7 +16598,7 @@ async function resolveQueryPlan(turn, sdkTextPrompt, testHooks) {
   ];
   const coordinatorReadOnly = isCoordinatorReadOnlyPolicy(policy);
   const grantedMcpServerNames = claudeAsksForApproval(policy, options) ? [] : claudeGrantedMcpServerNames(policy, mcpServerNames);
-  const agentMailTools = mcpServerNames.has(AGENT_MCP_SERVER_NAME) ? [...AGENT_MAIL_TOOL_NAMES, ...ARTIFACT_TOOL_NAMES].map((name) => `mcp__${AGENT_MCP_SERVER_NAME}__${name}`) : [];
+  const agentMailTools = mcpServerNames.has(AGENT_MCP_SERVER_NAME) ? [...AGENT_MAIL_TOOL_NAMES, ...ARTIFACT_TOOL_NAMES, ...AGENT_GOAL_TOOL_NAMES].map((name) => `mcp__${AGENT_MCP_SERVER_NAME}__${name}`) : [];
   const allowedTools = coordinatorReadOnly ? claudeReadOnlyAllowedTools({
     agentMcpServerNames: mcpServerNames.has(AGENT_MCP_SERVER_NAME) ? [AGENT_MCP_SERVER_NAME] : [],
     policy,
@@ -16506,7 +16612,7 @@ async function resolveQueryPlan(turn, sdkTextPrompt, testHooks) {
     ...claudeArtifactServerTools(mcpServerNames),
     ...grantedMcpServerNames.map((name) => `${claudeMcpToolPrefix(name)}*`)
   ];
-  const disallowedTools = coordinatorReadOnly ? claudeDeniedTools(policy) : claudeDisallowedTools(policy);
+  const disallowedTools = withNativeGoalClosed(coordinatorReadOnly ? claudeDeniedTools(policy) : claudeDisallowedTools(policy));
   const fastMode = options?.fastMode === true;
   const ultracode = requestsUltracode(options?.parameterValues);
   session.ultracode = ultracode;
@@ -16528,7 +16634,7 @@ async function resolveQueryPlan(turn, sdkTextPrompt, testHooks) {
   const envPath = process.env.PATH;
   debugLog("[session-manager] SDK env PATH", { path: envPath });
   const sdkPrompt = await buildSdkPrompt(sdkTextPrompt, options?.attachments, cwd, testHooks?.afterAttachmentSymlinkValidation, testHooks?.afterAttachmentCanonicalValidation, testHooks?.afterAttachmentInitialValidation);
-  const queryEnvironment = await runtimeEnvironmentForSessionQuery(policy);
+  const queryEnvironment = withUnattendedOverloadRetry(session.executionPolicy, await runtimeEnvironmentForSessionQuery(policy));
   const liveSettings = claudeLiveSettings({
     model: options?.model,
     permissionMode,
@@ -16544,6 +16650,7 @@ async function resolveQueryPlan(turn, sdkTextPrompt, testHooks) {
     effortLevel,
     mcpServers,
     mcpServerNames,
+    accountOnlyMcpServers,
     mcpConfigRevision,
     plugins,
     mcpServerCount,
@@ -17213,6 +17320,8 @@ function claudeStartupFailureMessage(reason) {
       return "Claude could not load the policy limits and managed settings your organization requires. Check connectivity and any proxy, then retry.";
     case "org_config_refused":
       return "Anthropic refused your organization's required Claude settings for this sign-in. Sign in to Claude again; if that does not help, ask an administrator to allow Claude Code for this account.";
+    case "sandbox_required_unavailable":
+      return "Claude requires a working command sandbox, and it cannot run here (for example, bubblewrap is missing or the platform is unsupported). Make the sandbox available or have the requirement changed, then retry.";
   }
 }
 var STOPPED_TERMINAL_REASONS = new Set([
@@ -18321,7 +18430,7 @@ function launchClaudeRuntime(turn, plan) {
   const { session, options, abortController, stream } = turn;
   const { plugins, sdkPrompt, queryEnvironment, mcpServers, mcpServerNames, mcpServersKey } = plan;
   const heldSdkPrompt = holdSdkPromptOpen(sdkPrompt, abortController.signal, turn.promptUuid);
-  const mcp = createClaudeRuntimeMcp(mcpServers, mcpServerNames);
+  const mcp = createClaudeRuntimeMcp(mcpServers, mcpServerNames, plan.accountOnlyMcpServers);
   const turnFor = (toolUseId) => (toolUseId ? turn.runtime?.toolOwners.get(toolUseId) : undefined) ?? turn.runtime?.latestTurn ?? turn.thisTurn;
   const queryIterator = query2({
     prompt: heldSdkPrompt.prompt,
@@ -19093,7 +19202,7 @@ function parseSessionActivityObservation(value) {
   if (!isRecord4(value))
     return;
   const { activity, readyForInput, completionPending, asyncQuestionItemIds, closing } = value;
-  const { contentRevision } = value;
+  const { contentRevision, turnFailed } = value;
   if (typeof activity !== "string" || !SESSION_ACTIVITY_STATES.has(activity))
     return;
   if (readyForInput !== undefined && typeof readyForInput !== "boolean")
@@ -19102,6 +19211,8 @@ function parseSessionActivityObservation(value) {
     return;
   if (closing !== undefined && typeof closing !== "boolean")
     return;
+  if (turnFailed !== undefined && typeof turnFailed !== "boolean")
+    return;
   if (contentRevision !== undefined && !isContentRevision(contentRevision))
     return;
   let itemIds;
@@ -19117,6 +19228,7 @@ function parseSessionActivityObservation(value) {
     ...completionPending !== undefined ? { completionPending } : {},
     ...itemIds !== undefined ? { asyncQuestionItemIds: itemIds } : {},
     ...closing !== undefined ? { closing } : {},
+    ...turnFailed === true ? { turnFailed } : {},
     ...contentRevision !== undefined ? { contentRevision } : {}
   };
 }
@@ -19248,6 +19360,7 @@ async function readSessionActivityObservation(sessionId) {
   return {
     activity: activity === "idle" && completionPending ? "working" : activity,
     ...resident?.status === "idle" ? { readyForInput: true, completionPending } : {},
+    ...resident?.status === "error" ? { turnFailed: true } : {},
     ...activity === "missing" ? {} : contentRevisionField(resident)
   };
 }
@@ -20725,7 +20838,7 @@ session.post("/:id/interactions/:interactionId", interactionBodyLimit, async (c)
   } else if (action === "accept" && pending.kind === "mcp-form") {
     return c.json({ error: "An MCP form answer requires 'content'" }, 400);
   }
-  if (action === "accept" && pending.kind === "mcp-form" && !isValidClaudeFormContent(pending.schema, content)) {
+  if (action === "accept" && pending.kind === "mcp-form" && !isValidMcpFormContent(pending.schema, content)) {
     return c.json({ error: "The answer does not match the MCP form schema" }, 400);
   }
   const response = action === "accept" ? content ? { action, content } : { action } : { action };