orkestrator 2.26.3-beta → 2.28.0-beta

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orkestrator",
-  "version": "2.26.3-beta",
+  "version": "2.28.0-beta",
   "description": "Run the Orkestrator backend service without the desktop application",
   "homepage": "https://orkestrator.dev",
   "repository": {
@@ -34,13 +34,13 @@
     "typecheck": "bunx tsc --noEmit -p tsconfig.json"
   },
   "dependencies": {
-    "@anthropic-ai/claude-agent-sdk": "0.3.296",
+    "@anthropic-ai/claude-agent-sdk": "0.3.309",
     "playwright-core": "1.64.0",
     "sharp": "0.35.5"
   },
   "devDependencies": {
-    "@orkestrator/protocol": "2.26.3-beta",
-    "@orkestrator/toolchain": "2.26.3-beta"
+    "@orkestrator/protocol": "2.28.0-beta",
+    "@orkestrator/toolchain": "2.28.0-beta"
   },
   "engines": {
     "bun": ">=1.4.3"

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

@@ -3344,6 +3344,24 @@ function createStructuredUsageRefreshCoordinator(session, queryControl) {
     }
   };
 }
+var CLAUDE_CONTEXT_CATEGORY_IDS = {
+  system_prompt: "system-prompt",
+  system_tools: "tools",
+  system_tools_deferred: "deferred-tools",
+  mcp_tools: "mcp-tools",
+  mcp_tools_deferred: "deferred-mcp-tools",
+  mcp_instructions: "mcp-instructions",
+  custom_agents: "agents",
+  memory_files: "memory",
+  skills: "skills",
+  messages: "messages",
+  autocompact_buffer: "reserved",
+  compact_buffer: "reserved",
+  free_space: "free-space"
+};
+function claudeContextCategoryId(value) {
+  return typeof value === "string" && Object.hasOwn(CLAUDE_CONTEXT_CATEGORY_IDS, value) ? CLAUDE_CONTEXT_CATEGORY_IDS[value] : undefined;
+}
 function parseClaudeContextUsage(raw) {
   if (!raw || typeof raw !== "object")
     return;
@@ -3361,8 +3379,10 @@ function parseClaudeContextUsage(raw) {
       const tokens = parseTokenValue(item.tokens);
       if (!name || tokens === undefined)
         return [];
+      const id = claudeContextCategoryId(item.id);
       return [
         {
+          ...id ? { id } : {},
           name,
           tokens,
           color: typeof item.color === "string" ? item.color : undefined
@@ -3502,6 +3522,7 @@ async function buildClaudeUsageSnapshot(session, result, queryControl, fallbackM
   const turnId = typeof result.user_message_uuid === "string" && result.user_message_uuid.trim() || typeof result.uuid === "string" && result.uuid.trim() || `claude-turn-${session.latestTurnGeneration ?? updatedAt}`;
   const turn = {
     turnId,
+    at: updatedAt,
     costUsd: totals.cost,
     inputTokens: totals.input,
     outputTokens: totals.output,
@@ -4243,6 +4264,7 @@ var NATIVE_AGENT_APPROVAL_MODES = Object.freeze({
   ]
 });
 var DISPATCH_OUTCOME_LOST_KIND = "dispatch-outcome-lost";
+var NATIVE_AGENT_RETIRED_DISPATCH_TTL_MS = 24 * 60 * 60 * 1000;
 var SUPPRESSED_COMPOSER_PARAMETERS = Object.freeze({
   claude: Object.freeze(["parameter:thinking", "parameter:context1m"]),
   codex: Object.freeze(["parameter:summary"]),
@@ -4358,6 +4380,7 @@ var PROJECTION_FIELD_SET = new Set([
   "runtimeHealthAuthoritative",
   "notices",
   "recoverableDispatch",
+  "retiredDispatch",
   "backgroundTasks",
   "suggestedPrompt",
   "completionBlockedByBackgroundTasks",
@@ -4381,6 +4404,7 @@ var OPTIONAL_PROJECTION_FIELD_SET = new Set([
   "runtimeHealthAuthoritative",
   "notices",
   "recoverableDispatch",
+  "retiredDispatch",
   "backgroundTasks",
   "suggestedPrompt",
   "completionBlockedByBackgroundTasks",
@@ -4389,6 +4413,15 @@ var OPTIONAL_PROJECTION_FIELD_SET = new Set([
   "slashCommandCatalogue"
 ]);
 
+// ../../bridges/claude-bridge/src/services/mcp-tool-prefix.ts
+function claudeMcpToolPrefix(name) {
+  let normalized = name.replace(/[^a-zA-Z0-9_-]/g, "_");
+  if (name.startsWith("claude.ai ")) {
+    normalized = normalized.replace(/_+/g, "_").replace(/^_|_$/g, "");
+  }
+  return `mcp__${normalized}__`;
+}
+
 // ../../bridges/claude-bridge/src/services/read-only-policy.ts
 var CAPABILITY_TOOLS = new Map([
   ["file.write", ["Write", "NotebookEdit"]],
@@ -4414,8 +4447,7 @@ var WAITING_TOOLS = new Set([
   "CronCreate",
   "CronList",
   "CronDelete",
-  "SendMessage",
-  "TaskOutput"
+  "SendMessage"
 ]);
 var READ_ONLY_COMMANDS = Object.freeze(new Set([
   "awk",
@@ -4604,8 +4636,8 @@ function claudeReadOnlyAllowedTools(options) {
   return [
     ...READ_ONLY_TOOLS,
     ...options.policy && !nativeAgentPolicyDeniesWebSearch(options.policy) ? ["WebSearch"] : [],
-    ...(options.agentMcpServerNames ?? []).map((name) => `mcp__${name}__*`),
-    ...(options.researchMcpServerNames ?? []).map((name) => `mcp__${name}__*`)
+    ...(options.agentMcpServerNames ?? []).map((name) => `${claudeMcpToolPrefix(name)}*`),
+    ...(options.researchMcpServerNames ?? []).map((name) => `${claudeMcpToolPrefix(name)}*`)
   ];
 }
 function claudeReadOnlySandbox(policy) {
@@ -4676,8 +4708,8 @@ function deny(reason) {
 function createCoordinatorReadOnlyHook(policy, researchMcpServerNames = coordinatorResearchMcpServersFromEnv(process.env).map((server) => server.name)) {
   const deniedTools = new Set(claudeDeniedTools(policy));
   const allowedMcpPrefixes = [
-    "mcp__orkestrator__",
-    ...researchMcpServerNames.map((name) => `mcp__${name}__`)
+    claudeMcpToolPrefix("orkestrator"),
+    ...researchMcpServerNames.map(claudeMcpToolPrefix)
   ];
   return async (input) => {
     if (input.hook_event_name !== "PreToolUse")
@@ -5160,7 +5192,15 @@ async function stopBackgroundTask(sessionId, taskId) {
   }
   return { ok: true };
 }
+var backgroundTaskRevisions = new WeakMap;
+function noteBackgroundTasksChanged(session) {
+  backgroundTaskRevisions.set(session, (backgroundTaskRevisions.get(session) ?? 0) + 1);
+}
+function backgroundTaskRevision(session) {
+  return backgroundTaskRevisions.get(session) ?? 0;
+}
 function emitBackgroundTaskSnapshot(session) {
+  noteBackgroundTasksChanged(session);
   eventEmitter.emit({
     type: "session.updated",
     sessionId: session.id,
@@ -6771,6 +6811,34 @@ function getPromptDispatchState(sessionId, requestId) {
   }
   return "new";
 }
+function idleSteerUserMessageId(requestId) {
+  return `idle-steer:${requestId}`;
+}
+function restoredDispatchClaimLost(session, requestId) {
+  if (!session?.restoredDispatchedRequestIds?.has(requestId))
+    return false;
+  const localReplyId = idleSteerUserMessageId(requestId);
+  return !session.localTranscript?.some((message) => message.id === localReplyId);
+}
+async function persistedDispatchClaimLost(sessionId, requestId) {
+  if (sessions.has(sessionId))
+    return false;
+  const sdkSessionId = sdkSessionIdFromBridgeId(sessionId);
+  if (!sdkSessionId)
+    return false;
+  let preferences;
+  try {
+    preferences = await readSessionPreferences(sdkSessionId);
+  } catch {
+    return false;
+  }
+  if (!preferences || sessionPreferencesUnavailable(preferences))
+    return false;
+  if (!preferences.dispatchedRequestIds?.includes(requestId))
+    return false;
+  const localReplyId = idleSteerUserMessageId(requestId);
+  return !preferences.localTranscript?.some((entry) => entry.id === localReplyId);
+}
 async function claimPromptDispatch(sessionId, requestId, startDispatch, testHooks) {
   const session = sessions.get(sessionId);
   if (!session)
@@ -12179,7 +12247,7 @@ function displayCommandName(name) {
 function normalizeAvailability(value) {
   if (!isRecord(value))
     return;
-  if (value.state !== "available" && value.state !== "unavailable")
+  if (typeof value.state !== "string")
     return;
   const reason = typeof value.reason === "string" && UNAVAILABLE_REASONS.has(value.reason) ? value.reason : undefined;
   const message = boundedText(value.message, COMMAND_CATALOGUE_LIMITS.maxAvailabilityMessageBytes);
@@ -12696,7 +12764,10 @@ function idleSteerMessageIds(requestId) {
   if (!requestId) {
     return { userId: generateMessageId(), assistantId: generateMessageId() };
   }
-  return { userId: `idle-steer:${requestId}`, assistantId: `idle-steer-reply:${requestId}` };
+  return {
+    userId: idleSteerUserMessageId(requestId),
+    assistantId: `idle-steer-reply:${requestId}`
+  };
 }
 async function answerIdleSteerPrompt(session, prompt, requestId) {
   const reply = idleSteerPromptReply(prompt, "Claude");
@@ -13609,9 +13680,6 @@ function reportedStaleServers(mcp) {
     return;
   return Array.from(mcp.stale).sort().slice(0, MAX_REPORTED_STALE_SERVERS);
 }
-function claudeMcpToolPrefix(name) {
-  return `mcp__${name.replace(/[^a-zA-Z0-9_-]/g, "_")}__`;
-}
 function staleMcpServerFor(mcp, toolName, toolInput) {
   if (!mcp.stale.size)
     return;
@@ -15405,6 +15473,7 @@ async function handleResultMessage(turn, message) {
 
 // ../../bridges/claude-bridge/src/services/session-manager-prompt-handlers/system-tasks.ts
 function emitBackgroundTasks(turn) {
+  noteBackgroundTasksChanged(turn.session);
   eventEmitter.emit({
     type: "session.updated",
     sessionId: turn.sessionId,
@@ -16871,7 +16940,9 @@ var MCP_MANAGEMENT_LIMITS = {
   operationStoreMaxBytes: 4 * 1024 * 1024,
   runtimesPerOperation: 64,
   runtimesTrackedPerOperation: 256,
-  queuedApplyTargets: 32
+  queuedApplyTargets: 32,
+  overlayRecordMaxBytes: 3 * 1024 * 1024,
+  containerPathProbesMax: 32
 };
 var MCP_SCOPE_LABELS = Object.freeze({
   "backend-user": "Backend user",
@@ -17015,6 +17086,7 @@ var SESSION_ACTIVITY_BATCH_LIMITS = {
   maxResponseBytes: 512 * 1024,
   maxAsyncQuestionItemIds: 64,
   maxAsyncQuestionItemIdLength: 2048,
+  maxContentRevisionLength: 256,
   readConcurrency: 4
 };
 var SESSION_ACTIVITY_STATES = new Set(["idle", "working", "waiting", "missing"]);
@@ -17029,6 +17101,7 @@ function parseSessionActivityObservation(value) {
   if (!isRecord3(value))
     return;
   const { activity, readyForInput, completionPending, asyncQuestionItemIds, closing } = value;
+  const { contentRevision } = value;
   if (typeof activity !== "string" || !SESSION_ACTIVITY_STATES.has(activity))
     return;
   if (readyForInput !== undefined && typeof readyForInput !== "boolean")
@@ -17037,6 +17110,8 @@ function parseSessionActivityObservation(value) {
     return;
   if (closing !== undefined && typeof closing !== "boolean")
     return;
+  if (contentRevision !== undefined && !isContentRevision(contentRevision))
+    return;
   let itemIds;
   if (asyncQuestionItemIds !== undefined) {
     if (!Array.isArray(asyncQuestionItemIds) || asyncQuestionItemIds.length > SESSION_ACTIVITY_BATCH_LIMITS.maxAsyncQuestionItemIds || !asyncQuestionItemIds.every((itemId) => typeof itemId === "string" && itemId.length > 0 && itemId.length <= SESSION_ACTIVITY_BATCH_LIMITS.maxAsyncQuestionItemIdLength)) {
@@ -17049,9 +17124,13 @@ function parseSessionActivityObservation(value) {
     ...readyForInput !== undefined ? { readyForInput } : {},
     ...completionPending !== undefined ? { completionPending } : {},
     ...itemIds !== undefined ? { asyncQuestionItemIds: itemIds } : {},
-    ...closing !== undefined ? { closing } : {}
+    ...closing !== undefined ? { closing } : {},
+    ...contentRevision !== undefined ? { contentRevision } : {}
   };
 }
+function isContentRevision(value) {
+  return typeof value === "string" && value.length > 0 && value.length <= SESSION_ACTIVITY_BATCH_LIMITS.maxContentRevisionLength;
+}
 function parseSessionActivityBatchRequest(value) {
   if (!isRecord3(value))
     return { ok: false, error: "Expected a JSON object" };
@@ -17176,9 +17255,23 @@ async function readSessionActivityObservation(sessionId) {
   const completionPending = resident ? sessionCompletionPending(resident) : undefined;
   return {
     activity: activity === "idle" && completionPending ? "working" : activity,
-    ...resident?.status === "idle" ? { readyForInput: true, completionPending } : {}
+    ...resident?.status === "idle" ? { readyForInput: true, completionPending } : {},
+    ...activity === "missing" ? {} : contentRevisionField(resident)
   };
 }
+function contentRevisionField(resident) {
+  try {
+    return { contentRevision: sessionContentRevision(resident) };
+  } catch {
+    return {};
+  }
+}
+function sessionContentRevision(resident) {
+  if (!resident)
+    return eventEmitter.generation;
+  const transcript = readTranscriptVersion(resident);
+  return `${eventEmitter.generation}:${transcript.epoch}.${transcript.revision}:${backgroundTaskRevision(resident)}`;
+}
 var sessionActivityBatch = new Hono2;
 sessionActivityBatch.post(SESSION_ACTIVITY_BATCH_PATH, async (c) => {
   const answer = await answerSessionActivityBatch(c.req.raw.body, readSessionActivityObservation, {
@@ -18449,13 +18542,20 @@ session.get("/:id/activity", async (c) => {
 session.get("/:id/runtime-health", (c) => {
   return c.json(sessionRuntimeHealthBody(peekSession(c.req.param("id"))));
 });
-session.get("/:id/dispatch", (c) => {
+session.get("/:id/dispatch", async (c) => {
+  const answer = (dispatch) => c.json({ dispatch });
   const requestId = c.req.query("requestId")?.trim();
   if (!requestId)
-    return c.json({ dispatch: "unknown" });
-  const state = getPromptDispatchState(c.req.param("id"), requestId);
-  const dispatched = state === "processing" || state === "already-processed";
-  return c.json({ dispatch: dispatched ? "dispatched" : "unknown" });
+    return answer("unknown");
+  const id = c.req.param("id");
+  const state = getPromptDispatchState(id, requestId);
+  if (state === "processing" || state === "already-processed")
+    return answer("dispatched");
+  if (state === "new") {
+    return answer(restoredDispatchClaimLost(peekSession(id), requestId) ? "lost" : "unknown");
+  }
+  const lost = await persistedDispatchClaimLost(id, requestId).catch(() => false);
+  return answer(lost ? "lost" : "unknown");
 });
 session.get("/:id/questions", (c) => {
   const id = c.req.param("id");
@@ -18869,6 +18969,9 @@ function serializeEventData(event) {
 }
 var MAX_PENDING_SSE_FRAMES = 1000;
 var MAX_PENDING_SSE_BYTES = 16 * 1024 * 1024;
+function observationFrameData(sessionId) {
+  return JSON.stringify(sessionId === undefined ? {} : { sessionId });
+}
 var MAX_REPLAY_SSE_FRAMES = 512;
 var MAX_REPLAY_SSE_BYTES = 4 * 1024 * 1024;
 var REPLAY_IDLE_RETENTION_MS = 60000;
@@ -18885,7 +18988,8 @@ function createReplayBuffer(limits = {}) {
         id: `${generation}:${revision}`,
         event: event.type,
         data,
-        bytes: Buffer.byteLength(data) + Buffer.byteLength(event.type)
+        bytes: Buffer.byteLength(data) + Buffer.byteLength(event.type),
+        ...event.sessionId === undefined ? {} : { sessionId: event.sessionId }
       };
       frames.push(frame);
       bytes += frame.bytes;
@@ -19063,6 +19167,7 @@ function createEventsRouter(limits = {}) {
         if (!isOpen)
           throw new Error("SSE request aborted");
       }, () => closeConnection("write backlog exceeded its cap"), { maxPendingFrames, maxPendingBytes });
+      const observe = c.req.query("observe") === "1";
       const requestedCursorValue = c.req.header("last-event-id") ?? c.req.query("since");
       const requestedCursor = parseReplayCursor(requestedCursorValue);
       const cursorWasSupplied = requestedCursorValue !== undefined;
@@ -19071,12 +19176,12 @@ function createEventsRouter(limits = {}) {
       let replaying = true;
       let keepaliveInterval;
       let unsubscribe = () => {};
-      const releaseReplayRetention = replayRetention.acquire();
+      const releaseReplayRetention = observe ? () => {} : replayRetention.acquire();
       try {
         unsubscribe = eventEmitter.subscribe((event, revision) => {
           if (!isOpen)
             return;
-          const data = serializeEventData(event);
+          const data = observe ? observationFrameData(event.sessionId) : serializeEventData(event);
           const frame = {
             revision,
             id: formatReplayCursor(revision),
@@ -19113,7 +19218,8 @@ function createEventsRouter(limits = {}) {
             status: "connected",
             timestamp: connectedAt,
             replayed: replay.frames.length,
-            resetRequired: replay.resetRequired
+            resetRequired: replay.resetRequired,
+            ...observe ? { observe: true } : {}
           })
         });
         if (replay.resetRequired) {
@@ -19123,8 +19229,9 @@ function createEventsRouter(limits = {}) {
             data: JSON.stringify({ through: formatReplayCursor(replayCeiling) })
           });
         } else {
-          for (const frame of replay.frames)
-            await writeFrame(frame);
+          for (const frame of replay.frames) {
+            await writeFrame(observe ? { ...frame, data: observationFrameData(frame.sessionId) } : frame);
+          }
         }
         const drained = pendingLiveFrames.splice(0);
         pendingLiveBytes = 0;