orkestrator 2.26.0-alpha → 2.26.2-beta

package/dist/client.js

@@ -7444,7 +7444,7 @@ import path4 from "path";
 // ../../apps/backend/package.json
 var package_default = {
   name: "@orkestrator/backend",
-  version: "2.26.0-alpha",
+  version: "2.26.2-beta",
   private: true,
   type: "module",
   exports: {
@@ -7458,7 +7458,7 @@ var package_default = {
     "start:web": "bun dist/main.js --fallback-host 127.0.0.1",
     "start:web-public": "bun dist/main.js --tailscale-serve --allowed-origins https://orkestrator.dev,https://www.orkestrator.dev",
     test: "bun test --preload ../../tests/setup-node.ts src tests --parallel",
-    "test:workspace": "bun test --preload ../../tests/setup-node.ts src tests --only-failures ${ORKESTRATOR_TEST_TIMINGS_DIR:+--timings=$ORKESTRATOR_TEST_TIMINGS_DIR/backend.json --update-timings} --parallel=${ORKESTRATOR_TEST_WORKERS:-2}",
+    "test:workspace": "bun test --preload ../../tests/setup-node.ts src tests --only-failures ${ORKESTRATOR_TEST_TIMINGS_DIR:+--timings=$ORKESTRATOR_TEST_TIMINGS_DIR/backend.json --update-timings} $ORKESTRATOR_BACKEND_TEST_IGNORE --parallel=${ORKESTRATOR_BACKEND_TEST_WORKERS:-${ORKESTRATOR_TEST_WORKERS:-2}}",
     typecheck: "bunx tsc --noEmit -p tsconfig.json && bunx tsc --noEmit -p tsconfig.test.json"
   },
   dependencies: {
@@ -7485,8 +7485,26 @@ var package_default = {
   }
 };
 
-// ../../apps/backend/src/core/constants.ts
-var APP_SLUG = "orkestrator-v2";
+// ../protocol/src/network-allowlist.ts
+var DEFAULT_ALLOWED_DOMAINS = Object.freeze([
+  "github.com",
+  "api.github.com",
+  "registry.npmjs.org",
+  "nodejs.org",
+  "bun.sh",
+  "mise.jdx.dev",
+  "mise-versions.jdx.dev",
+  "aube.jdx.dev",
+  "api.anthropic.com",
+  "sentry.io",
+  "statsig.anthropic.com",
+  "statsig.com",
+  "marketplace.visualstudio.com",
+  "vscode.blob.core.windows.net",
+  "update.code.visualstudio.com",
+  "mcp.context7.com",
+  "cdn.playwright.dev"
+]);
 var AGENT_NETWORK_DOMAINS_BY_PLATFORM = Object.freeze({
   codex: Object.freeze(["chatgpt.com", "auth.openai.com"]),
   cursor: Object.freeze([
@@ -7521,6 +7539,9 @@ var AGENT_NETWORK_DOMAINS_BY_PLATFORM = Object.freeze({
     "openrouter.ai"
   ])
 });
+
+// ../../apps/backend/src/core/constants.ts
+var APP_SLUG = "orkestrator-v2";
 var MAX_CODEX_CONCURRENT_THREADS = Number.MAX_SAFE_INTEGER - 1;
 function sanitizeAppVersion(raw) {
   const trimmed = raw?.trim() ?? "";
@@ -8306,8 +8327,63 @@ async function submit(context, action, input, options2) {
   const outcome = await session.mutate(action, input, stringOption(options2, "request-id"));
   return { session, ...outcome };
 }
-async function readOperation(session, operationId) {
-  const { receipt } = await session.readWithReceipt("run.get", { operationId });
+async function submitForWait(context, action, input, options2, timeoutMs) {
+  const deadline = Date.now() + timeoutMs;
+  const session = await context.session();
+  try {
+    return {
+      session,
+      ...await session.mutate(action, input, stringOption(options2, "request-id"))
+    };
+  } catch (error) {
+    const requestId = error instanceof CliError ? error.details?.requestId : undefined;
+    const namespace = error instanceof CliError ? error.details?.namespace : undefined;
+    if (!(error instanceof CliError) || error.code !== "transport-uncertain" || typeof requestId !== "string" || typeof namespace !== "string")
+      throw error;
+    let receipt;
+    try {
+      receipt = await observe(async () => {
+        if (Date.now() >= deadline)
+          throw new ObservationStopped("deadline");
+        try {
+          const found = await session.readWithReceipt("run.get", {
+            requestId,
+            action,
+            namespace,
+            submittedInput: input
+          }, Math.max(1, deadline - Date.now()));
+          return found.receipt ? { done: true, value: found.receipt } : { done: false };
+        } catch (lookup) {
+          if (lookup instanceof CliError && (lookup.code === "not-found" || lookup.code === "connection-failed"))
+            return { done: false };
+          throw lookup;
+        }
+      }, { timeoutMs: Math.max(0, deadline - Date.now()), signal: context.signal });
+    } catch (lookup) {
+      const stopped = context.signal?.aborted ? new ObservationStopped("signal", signalName(context.signal)) : lookup;
+      if (stopped instanceof ObservationStopped && stopped.reason === "deadline")
+        throw error;
+      const failure = stopped instanceof ObservationStopped ? stoppedError(stopped, action, undefined, "admission") : stopped;
+      if (failure instanceof CliError) {
+        throw new CliError(failure.code, failure.message, {
+          action,
+          receipt: failure.receipt,
+          retryable: failure.retryable,
+          details: { ...error.details, ...failure.details }
+        });
+      }
+      throw failure;
+    }
+    return {
+      session,
+      receipt,
+      deadline,
+      warnings: [`The ${action} response was lost; found the operation by its request key`]
+    };
+  }
+}
+async function readOperation(session, operationId, timeoutMs) {
+  const { receipt } = await session.readWithReceipt("run.get", { operationId }, timeoutMs);
   if (!receipt)
     throw new CliError("response-invalid", "run.get returned no receipt");
   return receipt;
@@ -8337,9 +8413,20 @@ function receiptFailure(receipt) {
 }
 async function waitForOperation(context, session, initial, timeoutMs, options2 = {}) {
   let latest = initial;
+  const deadline = Date.now() + timeoutMs;
   try {
     return await observe(async () => {
-      latest = await readOperation(session, initial.operationId);
+      if (Date.now() >= deadline)
+        throw new ObservationStopped("deadline");
+      try {
+        latest = await readOperation(session, initial.operationId, Math.max(1, deadline - Date.now()));
+      } catch (error) {
+        if (context.signal?.aborted)
+          throw new ObservationStopped("signal", signalName(context.signal));
+        if (Date.now() >= deadline && error instanceof CliError && error.code === "connection-failed")
+          throw new ObservationStopped("deadline");
+        throw error;
+      }
       if (isTerminalReceipt(latest))
         return { done: true, value: latest };
       const execution = latest.execution;
@@ -8820,14 +8907,23 @@ class GatewayTransport {
     if (Buffer.byteLength(body) > PUBLIC_API_LIMITS.requestMaxBytes) {
       throw new CliError("input-too-large", "The request is larger than the client's request limit");
     }
+    const deadline = options2.timeoutMs === undefined ? undefined : Date.now() + options2.timeoutMs;
+    const sendWithBudget = (token) => {
+      if (deadline === undefined)
+        return this.send(body, token, options2);
+      const remaining = deadline - Date.now();
+      if (remaining <= 0)
+        throw new CliError("connection-failed", "The request deadline passed", { retryable: true });
+      return this.send(body, token, { ...options2, timeoutMs: remaining });
+    };
     let token = await this.target.readToken();
-    let response = await this.send(body, token, options2);
+    let response = await sendWithBudget(token);
     if (response.status === 401 && !options2.mutation) {
       await response.body?.cancel().catch(() => {
         return;
       });
       token = await this.target.readToken();
-      response = await this.send(body, token, options2);
+      response = await sendWithBudget(token);
     }
     return this.decode(response, options2);
   }
@@ -8972,8 +9068,8 @@ class ClientSession {
       throw envelopeError(response);
     return response.result;
   }
-  async readWithReceipt(action, input) {
-    const response = await this.call(action, input, undefined, false);
+  async readWithReceipt(action, input, timeoutMs) {
+    const response = await this.call(action, input, undefined, false, timeoutMs);
     if (!response.ok)
       throw envelopeError(response);
     return { result: response.result, receipt: response.receipt };
@@ -8993,6 +9089,12 @@ class ClientSession {
     const key = requestId ?? `cli-${randomUUID2()}`;
     const intentDigest = createHash2("sha256").update(canonicalJson({ action, input })).digest("hex");
     const existing = await this.receipts.find(installationId, action, key);
+    if (existing && existing.intentDigest !== intentDigest) {
+      throw new CliError("request-conflict", "This saved request ID was used for a different intent", {
+        action,
+        details: { requestId: key, namespace: existing.namespace }
+      });
+    }
     const namespace = existing?.namespace ?? capabilities.requestKeys.currentNamespace;
     const now = new Date().toISOString();
     const local = {
@@ -9036,7 +9138,7 @@ class ClientSession {
       ...response.warnings ? { warnings: response.warnings } : {}
     };
   }
-  async call(action, input, request, mutation) {
+  async call(action, input, request, mutation, timeoutMs) {
     const body = {
       schemaVersion: PUBLIC_API_SCHEMA_VERSION,
       action,
@@ -9044,7 +9146,7 @@ class ClientSession {
       input,
       ...request ? { request } : {}
     };
-    const raw = await this.transport.invoke(PUBLIC_ACTION_COMMAND, body, { mutation, signal: this.options.signal });
+    const raw = await this.transport.invoke(PUBLIC_ACTION_COMMAND, body, { mutation, signal: this.options.signal, timeoutMs });
     if (!isPublicActionResponse(raw)) {
       throw new CliError(mutation ? "transport-uncertain" : "response-invalid", "The backend returned a response that does not match the public contract");
     }
@@ -11029,7 +11131,7 @@ var serviceCommands = [
             ["logs", path13.join(layout.logs, "service.log")]
           ]),
           "",
-          started ? "The service is running. Remote clients can update it from Settings \u2192 Updates or `orkestrator host update`." : `The unit is written but not loaded; load it with: ${serviceManagerCommands(unit).load.at(-1).join(" ")}`,
+          started ? "The service is running. Remote clients can update it from Settings \u2192 Machines or `orkestrator host update`." : `The unit is written but not loaded; load it with: ${serviceManagerCommands(unit).load.at(-1).join(" ")}`,
           ...unit.manager === "systemd" ? ["Run `loginctl enable-linger $USER` so it keeps running after you log out."] : []
         ]
       };
@@ -11612,15 +11714,26 @@ var CONTROL_OPTIONS = [
     description: "Conversation mode."
   }
 ];
-async function finishRun(context, parsed, base) {
+function waitBudget(options2) {
+  return options2.timeout ?? DEFAULT_WAIT_MS;
+}
+async function submitRun(context, action, input, options2) {
+  const submitted = options2.wait === true ? await submitForWait(context, action, input, options2, waitBudget(options2)) : await submit(context, action, input, options2);
+  return {
+    ...submitted,
+    recoveryDeadline: "deadline" in submitted ? submitted.deadline : undefined
+  };
+}
+async function finishRun(context, parsed, base, recoveryDeadline, fromReceipt) {
   if (parsed.options.wait !== true || !base.receipt) {
     return base;
   }
   const session = await context.session();
-  const final = await waitForOperation(context, session, base.receipt, parsed.options.timeout ?? DEFAULT_WAIT_MS, { continueOnInteraction: parsed.options["continue-on-interaction"] === true });
+  const final = await waitForOperation(context, session, base.receipt, recoveryDeadline === undefined ? waitBudget(parsed.options) : Math.max(0, recoveryDeadline - Date.now()), { continueOnInteraction: parsed.options["continue-on-interaction"] === true });
   const failure = receiptFailure(final);
   return {
     ...base,
+    ...fromReceipt?.(final),
     receipt: final,
     human: receiptLines(final),
     ...failure ? { failure } : {}
@@ -11804,27 +11917,32 @@ var sessionCommands = [
         throw new CliError("invalid-input", "--environment and --agent are required");
       }
       const prompt = await readPrompt(context.io, options2);
-      const { session, result, receipt, warnings } = await submit(context, "session.start", {
+      const { session, result, receipt, warnings, recoveryDeadline } = await submitRun(context, "session.start", {
         environmentId,
         agent,
         prompt,
         ...options2.title !== undefined ? { title: options2.title } : {},
         ...controlsInput(options2)
       }, options2);
+      const fromReceipt = (final) => ({
+        result: {
+          sessionId: final.resources.sessionId ?? null,
+          tabId: final.resources.tabId ?? null,
+          runId: final.operationId
+        },
+        ids: final.resources.sessionId ? [final.resources.sessionId] : []
+      });
       return finishRun(context, parsed, {
         action: "session.start",
-        result,
+        ...result ? { result, ids: [result.sessionId] } : fromReceipt(receipt),
         receipt,
         warnings,
         connection: session.identity,
-        ids: [result.sessionId],
-        human: [
-          ...keyValues([
-            ["session", result.sessionId],
-            ["run", result.runId]
-          ])
-        ]
-      });
+        human: result ? keyValues([
+          ["session", result.sessionId],
+          ["run", result.runId]
+        ]) : []
+      }, recoveryDeadline, result ? undefined : fromReceipt);
     }
   },
   {
@@ -11848,20 +11966,21 @@ var sessionCommands = [
       const options2 = parsed.options;
       validateWaitOptions(options2);
       const prompt = await readPrompt(context.io, options2);
-      const { session, result, receipt, warnings } = await submit(context, "session.prompt", {
+      const { session, result, receipt, warnings, recoveryDeadline } = await submitRun(context, "session.prompt", {
         sessionId: parsed.positionals.session,
         prompt,
         ...options2.mode !== undefined ? { mode: oneOf(options2.mode, ["plan", "build"], "--mode") } : {}
       }, options2);
+      const runId = result?.runId ?? receipt.operationId;
       return finishRun(context, parsed, {
         action: "session.prompt",
-        result,
+        result: result ?? { runId },
         receipt,
         warnings,
         connection: session.identity,
-        ids: [result.runId],
-        human: receipt ? receiptLines(receipt) : [`run ${result.runId}`]
-      });
+        ids: [runId],
+        human: receipt ? receiptLines(receipt) : [`run ${runId}`]
+      }, recoveryDeadline);
     }
   },
   {
@@ -12590,7 +12709,12 @@ class OutputWriter {
         action: context.action,
         ok: false,
         ...context.connection ? { connection: context.connection } : {},
-        error: { code: "observation-interrupted", message, exitCode: code, details: { signal } },
+        error: {
+          code: "observation-interrupted",
+          message,
+          exitCode: code,
+          details: { ...context.details, signal }
+        },
         ...context.receipt ? { receipt: context.receipt } : {}
       })}
 `);
@@ -12721,6 +12845,7 @@ async function runClient(argv, options2) {
     if (error instanceof CliError && error.code === "observation-interrupted") {
       return output.interrupted(signalName(signal), {
         action: error.action ?? action,
+        details: error.details,
         ...error.receipt ? { receipt: error.receipt } : {},
         ...connection ? { connection } : {}
       });