@skaile/workspaces 6.8.0 → 6.9.0

package/dist/bridge/harnesses/continue.js

@@ -1,20 +1,20 @@
 import { harnessSessionConfigHome, removeSessionConfigFile, writeSessionConfigFile } from '../../chunk-NBAGV6L2.js';
-import { SubprocessCliHarness, extractText, extractCost, extractTokens } from '../../chunk-QGA2OBUJ.js';
+import { SubprocessCliHarness, extractText, extractCost, extractTokens } from '../../chunk-72BDCGBB.js';
 import { HARNESS_BINARIES } from '../../chunk-WWSRIT3J.js';
-import { resolveEnvHarnessSession, continueRoleBinding, credentialsForEveryProvider, registryModelEntries, selectableEntries, entrySurface, harnessProviderName, entryBaseUrl, versionedAnthropicBaseUrl } from '../../chunk-I6XH46Q6.js';
+import { resolveEnvHarnessSession, continueRoleBinding, credentialsForEveryProvider, registryModelEntries, selectableEntries, entrySurface, harnessProviderName, entryBaseUrl, versionedAnthropicBaseUrl } from '../../chunk-4WB4KSSQ.js';
 import '../../chunk-5DE3DGVR.js';
 import '../../chunk-7DN6JKP2.js';
-import { getBridgeLogger, registryHarnessConfig } from '../../chunk-ORXV3UB6.js';
-import { BUILTIN_HARNESS_CATALOG, entryCredentialValue, providerCredentialEnvName } from '../../chunk-SILFO5RY.js';
+import { getBridgeLogger, registryHarnessConfig } from '../../chunk-CFTTXUM2.js';
+import { BUILTIN_HARNESS_CATALOG, entryCredentialValue, providerCredentialEnvName } from '../../chunk-SQMDFM4N.js';
 import '../../chunk-G5SUWZEU.js';
 import '../../chunk-6UP2EDFN.js';
-import '../../chunk-TMJBEGS4.js';
+import '../../chunk-4KPQ6ILH.js';
 import '../../chunk-4GY63JU6.js';
-import '../../chunk-G7NMF5WQ.js';
+import '../../chunk-4ROXSQEG.js';
 import '../../chunk-5KRMNUL4.js';
 import '../../chunk-C5HFK34M.js';
 import '../../chunk-MWXYN6NY.js';
-import '../../chunk-O7ADRMCR.js';
+import '../../chunk-FZO64PLQ.js';
 import '../../chunk-L5VSIPQD.js';
 import '../../chunk-VTETQCR6.js';
 import '../../chunk-QC5BYUED.js';
@@ -23,7 +23,7 @@ import '../../chunk-RVRB27AN.js';
 import '../../chunk-V5KG6CCV.js';
 import '../../chunk-VSX2G7LA.js';
 import { parseModelRef } from '../../chunk-RXGPFAMN.js';
-import '../../chunk-SGI5MRKP.js';
+import '../../chunk-MDCI4RSG.js';
 import '../../chunk-C3CAXQMA.js';
 import '../../chunk-BOFL7GIF.js';
 import '../../chunk-NSBPE2FW.js';

package/dist/bridge/harnesses/echo.js

@@ -1,12 +1,12 @@
 import { dispatchCapability } from '../../chunk-YEOG7CWQ.js';
-import { AgentHarness, getBridgeLogger, registryHarnessConfig } from '../../chunk-ORXV3UB6.js';
-import { BUILTIN_HARNESS_CATALOG } from '../../chunk-SILFO5RY.js';
+import { AgentHarness, getBridgeLogger, registryHarnessConfig } from '../../chunk-CFTTXUM2.js';
+import { BUILTIN_HARNESS_CATALOG } from '../../chunk-SQMDFM4N.js';
 import '../../chunk-G5SUWZEU.js';
 import '../../chunk-6UP2EDFN.js';
 import '../../chunk-7NN3P6VF.js';
 import '../../chunk-VSX2G7LA.js';
 import '../../chunk-RXGPFAMN.js';
-import '../../chunk-SGI5MRKP.js';
+import '../../chunk-MDCI4RSG.js';
 import '../../chunk-C3CAXQMA.js';
 import '../../chunk-BOFL7GIF.js';
 import '../../chunk-NSBPE2FW.js';

package/dist/bridge/harnesses/gemini.js

@@ -1,18 +1,18 @@
-export { GeminiFamilyHarness, GeminiHarness, geminiHarnessTarget } from '../../chunk-LL5GMUQG.js';
-import '../../chunk-QGA2OBUJ.js';
-import '../../chunk-SBNUXJ6E.js';
+export { GeminiFamilyHarness, GeminiHarness, geminiHarnessTarget } from '../../chunk-SE6OL7Y5.js';
+import '../../chunk-72BDCGBB.js';
+import '../../chunk-3AIEJSQR.js';
 import '../../chunk-WWSRIT3J.js';
-import '../../chunk-I6XH46Q6.js';
+import '../../chunk-4WB4KSSQ.js';
 import '../../chunk-5DE3DGVR.js';
 import '../../chunk-7DN6JKP2.js';
-import '../../chunk-ORXV3UB6.js';
-import '../../chunk-SILFO5RY.js';
+import '../../chunk-CFTTXUM2.js';
+import '../../chunk-SQMDFM4N.js';
 import '../../chunk-G5SUWZEU.js';
 import '../../chunk-6UP2EDFN.js';
-import '../../chunk-VT6G5AJV.js';
+import '../../chunk-WS3BOCAT.js';
 import '../../chunk-VSX2G7LA.js';
 import '../../chunk-RXGPFAMN.js';
-import '../../chunk-SGI5MRKP.js';
+import '../../chunk-MDCI4RSG.js';
 import '../../chunk-C3CAXQMA.js';
 import '../../chunk-BOFL7GIF.js';
 import '../../chunk-NSBPE2FW.js';

package/dist/bridge/harnesses/goose.js

@@ -1,20 +1,20 @@
 import { harnessSessionConfigHome, pruneSessionConfigDir, writeSessionConfigFile } from '../../chunk-NBAGV6L2.js';
-import { SubprocessCliHarness, extractText, extractCost, extractTokens } from '../../chunk-QGA2OBUJ.js';
+import { SubprocessCliHarness, extractText, extractCost, extractTokens } from '../../chunk-72BDCGBB.js';
 import { HARNESS_BINARIES } from '../../chunk-WWSRIT3J.js';
-import { resolveEnvHarnessSession, resolveRegistryBinding, credentialsForEveryProvider, registryModelEntries, selectableEntries, isStockCatalogEndpoint, entrySurface, entryBaseUrl, entryModelIds } from '../../chunk-I6XH46Q6.js';
+import { resolveEnvHarnessSession, resolveRegistryBinding, credentialsForEveryProvider, registryModelEntries, selectableEntries, isStockCatalogEndpoint, entrySurface, entryBaseUrl, entryModelIds } from '../../chunk-4WB4KSSQ.js';
 import '../../chunk-5DE3DGVR.js';
 import '../../chunk-7DN6JKP2.js';
-import { getBridgeLogger, registryHarnessConfig } from '../../chunk-ORXV3UB6.js';
-import { BUILTIN_HARNESS_CATALOG, providerCredentialEnvName } from '../../chunk-SILFO5RY.js';
+import { getBridgeLogger, registryHarnessConfig } from '../../chunk-CFTTXUM2.js';
+import { BUILTIN_HARNESS_CATALOG, providerCredentialEnvName } from '../../chunk-SQMDFM4N.js';
 import '../../chunk-G5SUWZEU.js';
 import '../../chunk-6UP2EDFN.js';
-import '../../chunk-TMJBEGS4.js';
+import '../../chunk-4KPQ6ILH.js';
 import '../../chunk-4GY63JU6.js';
-import '../../chunk-G7NMF5WQ.js';
+import '../../chunk-4ROXSQEG.js';
 import '../../chunk-5KRMNUL4.js';
 import '../../chunk-C5HFK34M.js';
 import '../../chunk-MWXYN6NY.js';
-import '../../chunk-O7ADRMCR.js';
+import '../../chunk-FZO64PLQ.js';
 import '../../chunk-L5VSIPQD.js';
 import '../../chunk-VTETQCR6.js';
 import '../../chunk-QC5BYUED.js';
@@ -23,7 +23,7 @@ import '../../chunk-RVRB27AN.js';
 import '../../chunk-V5KG6CCV.js';
 import '../../chunk-VSX2G7LA.js';
 import '../../chunk-RXGPFAMN.js';
-import '../../chunk-SGI5MRKP.js';
+import '../../chunk-MDCI4RSG.js';
 import '../../chunk-C3CAXQMA.js';
 import '../../chunk-BOFL7GIF.js';
 import '../../chunk-NSBPE2FW.js';

package/dist/bridge/harnesses/omp.js

@@ -1,18 +1,18 @@
 import { checkToolInputSchema } from '../../chunk-3X7VTCPG.js';
-import { materializeOmpProviders, isCredentialOmissionWarning, materializeOmpIdentityDir, registryModelEntries } from '../../chunk-NW7Y5SNK.js';
+import { materializeOmpProviders, isCredentialOmissionWarning, materializeOmpIdentityDir, registryModelEntries } from '../../chunk-5AQLCRR7.js';
 import { dispatchCapability } from '../../chunk-YEOG7CWQ.js';
 import { HARNESS_BINARIES } from '../../chunk-WWSRIT3J.js';
-import '../../chunk-I6XH46Q6.js';
+import '../../chunk-4WB4KSSQ.js';
 import { RUNNER_AGENT_ENV_KEYS, ReconfigureLedger, stripRunnerPrivateEnv, classifyGenericErrorMessage } from '../../chunk-5DE3DGVR.js';
 import { wrapAgentCommand, resolveAgentExec } from '../../chunk-7DN6JKP2.js';
-import { AgentHarness, getBridgeLogger, TOOL_ALLOWLIST_UNSUPPORTED, registryHarnessConfig } from '../../chunk-ORXV3UB6.js';
-import { BUILTIN_HARNESS_CATALOG } from '../../chunk-SILFO5RY.js';
+import { AgentHarness, getBridgeLogger, TOOL_ALLOWLIST_UNSUPPORTED, registryHarnessConfig } from '../../chunk-CFTTXUM2.js';
+import { BUILTIN_HARNESS_CATALOG } from '../../chunk-SQMDFM4N.js';
 import '../../chunk-G5SUWZEU.js';
 import '../../chunk-6UP2EDFN.js';
 import { withActivityLabelJsonSchema } from '../../chunk-7NN3P6VF.js';
 import '../../chunk-VSX2G7LA.js';
 import '../../chunk-RXGPFAMN.js';
-import '../../chunk-SGI5MRKP.js';
+import '../../chunk-MDCI4RSG.js';
 import '../../chunk-C3CAXQMA.js';
 import '../../chunk-BOFL7GIF.js';
 import '../../chunk-NSBPE2FW.js';
@@ -184,6 +184,35 @@ function ompStartFailureCause(lines) {
   }
   return clean.at(-1) ?? "";
 }
+var KILLED_EXIT_WAIT_MS = 5e3;
+var EarlyOmpExit = class extends Error {
+  constructor(code, signal) {
+    super(`omp process crashed (exit code ${code})`);
+    this.code = code;
+    this.signal = signal;
+  }
+  code;
+  signal;
+};
+function removeHomeAfterExit(proc, home) {
+  let resolve;
+  const promise = new Promise((r) => {
+    resolve = r;
+  });
+  const timer = setTimeout(remove, KILLED_EXIT_WAIT_MS);
+  timer.unref?.();
+  function remove() {
+    clearTimeout(timer);
+    try {
+      rmSync(home, { recursive: true, force: true });
+    } catch {
+    }
+    resolve();
+  }
+  if (proc.exitCode !== null || proc.signalCode !== null) remove();
+  else proc.once("exit", remove);
+  return promise;
+}
 var OmpHarness = class extends AgentHarness {
   harnessInfo = {
     id: "omp",
@@ -203,6 +232,11 @@ var OmpHarness = class extends AgentHarness {
   prevText = "";
   /** OMP session ID captured via `get_state` after each turn. */
   _ompSessionId;
+  /**
+   * The omp session the last unexpected exit left behind, set as `config.resumeSessionId` for
+   * the respawn; cleared once a respawn on it fails (the next one starts empty).
+   */
+  exitResumeSessionId;
   /**
    * Usage of the most recent turn, summed over every model call in it (a tool
    * loop is one prompt but many assistant messages). Cleared when a turn
@@ -221,6 +255,8 @@ var OmpHarness = class extends AgentHarness {
   systemPromptFile = null;
   /** The private omp home of the running process, when it is the harness's own temporary one. */
   privateHome = null;
+  /** Settles when the process last killed has exited and its private home is deleted. */
+  homeGone = Promise.resolve();
   getTokenUsage() {
     return this._lastTokens;
   }
@@ -271,6 +307,14 @@ var OmpHarness = class extends AgentHarness {
   promptTail = Promise.resolve();
   /** `true` while `agent_end` is being delivered to listeners. */
   turnEnded = false;
+  /** `true` once the current turn showed model output (text, a thinking delta or a tool run). */
+  turnOutputSeen = false;
+  /** `true` once `runPrompt` sent the current prompt a second time after an early exit. */
+  promptRetried = false;
+  /** `true` once omp recorded the current prompt as a user message in its session. */
+  turnUserMessageSeen = false;
+  /** Counts `kill()` calls, so a prompt that restarts omp itself can tell it was killed meanwhile. */
+  killEpoch = 0;
   get runtimeSessionId() {
     return this._ompSessionId;
   }
@@ -377,9 +421,26 @@ var OmpHarness = class extends AgentHarness {
   async start() {
     if (this.startPromise) return this.startPromise;
     if (this.proc) return;
-    this.startPromise = this._start().catch((err) => {
+    this.startPromise = this._start().then(() => {
+      this.exitResumeSessionId = void 0;
+    }).catch(async (err) => {
       this.removeSystemPromptFile();
       this.removePrivateHome();
+      const resumeId = this.exitResumeSessionId;
+      if (resumeId !== void 0 && this.config.resumeSessionId === resumeId) {
+        this.log.warn("omp did not restart on its previous session; starting a new one", {
+          sessionId: resumeId,
+          error: err instanceof Error ? err.message : String(err)
+        });
+        this.exitResumeSessionId = void 0;
+        this._ompSessionId = void 0;
+        this.config = { ...this.config, resumeSessionId: void 0 };
+        return this._start().catch((retryErr) => {
+          this.removeSystemPromptFile();
+          this.removePrivateHome();
+          throw retryErr;
+        });
+      }
       throw err;
     });
     return this.startPromise;
@@ -497,13 +558,50 @@ var OmpHarness = class extends AgentHarness {
         }
         const lastStderr = this.stderrBuffer.slice(-10).join("\n");
         const crashed = code !== null && code !== 0;
-        if (crashed) {
+        const wasReady = this.ready;
+        const betweenTurns = wasReady && this.turnReject === null;
+        if (wasReady) {
+          const sessionId = this._ompSessionId;
+          if (sessionId) {
+            this.config = { ...this.config, resumeSessionId: sessionId };
+            this.exitResumeSessionId = sessionId;
+          }
+          if (betweenTurns) {
+            this.log.warn("omp exited between turns; it restarts on the next prompt", {
+              code,
+              signal,
+              resumeSessionId: sessionId ?? null,
+              stderr: lastStderr || null
+            });
+          } else if (lastStderr) {
+            this.log.warn("omp exited during a turn", { code, signal, stderr: lastStderr });
+          }
+        }
+        const resumeAttempt = !wasReady && this.exitResumeSessionId !== void 0 && this.config.resumeSessionId === this.exitResumeSessionId;
+        const wouldDuplicate = this.turnUserMessageSeen && this.config.resumeSessionId !== void 0;
+        const retryEarly = (crashed || signal !== null) && wasReady && !betweenTurns && !this.turnOutputSeen && !wouldDuplicate && !this.promptRetried && !resumeAttempt;
+        if (retryEarly) {
+          this.log.warn("omp exited in a turn before its first output", {
+            code,
+            signal,
+            stderr: lastStderr || null
+          });
+        } else if (crashed && !betweenTurns && !resumeAttempt) {
+          const sessionDir2 = path.join(this.config.cwd, ".omp", "sessions");
           const detail = {
             message: `omp process crashed (exit code ${code})${lastStderr ? `: ${lastStderr}` : ""}`,
             category: "process",
             retryable: true,
-            hint: lastStderr || "The agent process exited unexpectedly. Try sending your prompt again."
+            hint: lastStderr || `omp exited with code ${code}${signal ? ` (signal ${signal})` : ""} and wrote nothing to stderr; its session files are in ${sessionDir2}. Try sending your prompt again.`
           };
+          if (!lastStderr) {
+            this.log.warn("omp exited with no stderr", {
+              code,
+              signal,
+              sessionDir: sessionDir2,
+              sessionId: this._ompSessionId ?? null
+            });
+          }
           this.emit("agent-event", { type: "error", error: detail.message, detail });
         }
         if (!this.ready) {
@@ -521,7 +619,7 @@ var OmpHarness = class extends AgentHarness {
         }
         this.cleanup();
         this.rejectTurn(
-          new Error(
+          retryEarly ? new EarlyOmpExit(code, signal) : new Error(
             crashed ? `omp process crashed (exit code ${code})` : `omp process exited before the turn completed${signal ? ` (signal ${signal})` : ""}`
           )
         );
@@ -942,6 +1040,12 @@ var OmpHarness = class extends AgentHarness {
       this.emit(`response:${event.id}`, event);
       return;
     }
+    if (event.type === "message_start" && event.message?.role === "assistant" || event.type === "message_update" || event.type === "host_tool_call" || event.type === "extension_ui_request" || event.type.startsWith("tool_execution")) {
+      this.turnOutputSeen = true;
+    }
+    if (event.type === "message_end" && event.message?.role === "user") {
+      this.turnUserMessageSeen = true;
+    }
     if (event.type === "host_tool_call") {
       this.handleHostToolCall(event);
       return;
@@ -1273,22 +1377,42 @@ ${input.text}` : input.text;
    * Rejects if the child dies first.
    */
   async runPrompt(payload) {
-    await this.start();
-    await this.reconfig.flushBeforeTurn();
-    const id = this.nextId();
-    const turnPromise = new Promise((resolve, reject) => {
-      this.turnResolve = resolve;
-      this.turnReject = reject;
-    });
-    this.beginUsageTurn();
-    try {
-      this.send({ id, type: "prompt", ...payload });
-    } catch (err) {
-      this.turnResolve = null;
-      this.turnReject = null;
-      throw err;
+    this.promptRetried = false;
+    const epoch = this.killEpoch;
+    for (; ; ) {
+      await this.start();
+      if (this.killEpoch !== epoch) {
+        this.kill();
+        throw new Error("omp process killed");
+      }
+      await this.reconfig.flushBeforeTurn();
+      const id = this.nextId();
+      const turnPromise = new Promise((resolve, reject) => {
+        this.turnResolve = resolve;
+        this.turnReject = reject;
+      });
+      this.turnOutputSeen = false;
+      this.turnUserMessageSeen = false;
+      this.beginUsageTurn();
+      try {
+        this.send({ id, type: "prompt", ...payload });
+      } catch (err) {
+        this.turnResolve = null;
+        this.turnReject = null;
+        throw err;
+      }
+      try {
+        await turnPromise;
+        return;
+      } catch (err) {
+        if (!(err instanceof EarlyOmpExit)) throw err;
+        this.promptRetried = true;
+        this.log.warn("omp exited before its first output; sending the prompt again", {
+          code: err.code,
+          signal: err.signal
+        });
+      }
     }
-    await turnPromise;
   }
   /**
    * Sends an in-band abort RPC to the omp process, requesting it to stop the
@@ -1314,13 +1438,21 @@ ${input.text}` : input.text;
    * `OmpHarness` to start a fresh session.
    */
   kill() {
+    this.killEpoch++;
     const proc = this.proc;
     if (!proc) return;
     if (this.turnEnded) this.resolveTurn();
     else this.rejectTurn(new Error("omp process killed"));
     proc.kill("SIGTERM");
+    const home = this.privateHome;
+    this.homeGone = home ? removeHomeAfterExit(proc, home) : Promise.resolve();
     this.cleanup();
   }
+  /** Stop omp and wait until the process has exited and its private home is deleted. */
+  async dispose() {
+    this.kill();
+    await this.homeGone;
+  }
   async resetSession() {
     this.kill();
     this.config = { ...this.config, resumeSessionId: void 0 };