@ponythewhite/base-context 1.0.14 → 1.0.16

package/dist/bundle/{chunk-NLRWERWA.js → chunk-T2OK7SRV.js}

@@ -352,7 +352,7 @@ import {
   watchWithErrorHandler,
   workerRosterEntryFromSummary,
   wrapTextWithAnsi
-} from "./chunk-SX7CAXWU.js";
+} from "./chunk-MSH6QRP5.js";
 import {
   array,
   boolean,
@@ -17249,6 +17249,7 @@ var DaemonWorkerClient = class {
     await new Promise((resolve26, reject) => {
       const timeout = setTimeout(() => {
         cleanup();
+        this.clearSocketReference(socket);
         socket.destroy();
         reject(new Error(`Timed out connecting to daemon worker socket: ${this.socketPath}`));
       }, timeoutMs);
@@ -17263,6 +17264,7 @@ var DaemonWorkerClient = class {
       };
       const onError = (error) => {
         cleanup();
+        this.clearSocketReference(socket);
         reject(error);
       };
       socket.once("connect", onConnect);
@@ -17476,6 +17478,12 @@ var DaemonWorkerClient = class {
       waiter.reject(error);
     }
   }
+  clearSocketReference(socket) {
+    if (this.socket !== socket)
+      return;
+    this.socket = void 0;
+    this.channel = void 0;
+  }
   notifyClosed(socket, error) {
     if (this.socket !== socket) {
       return;
@@ -50506,13 +50514,16 @@ ${warningLines}`, 0, 0));
   }
   async refreshConnectionCatalog() {
     this.invalidateConnectionModelRefresh();
+    const read = this.captureConnectionStateRead();
     const [state, commands, modelCatalog, resources] = await Promise.all([
       this.agentConnection.getState(),
       this.agentConnection.getCommands().catch(() => []),
       this.agentConnection.getModelCatalog(),
       this.agentConnection.getResourceSnapshot()
     ]);
-    this.applyConnectionStateSnapshot(state);
+    if (!this.isConnectionStateReadCurrent(read))
+      return;
+    this.applyConnectionStateSnapshot(state, read);
     this.connectionCommands = commands;
     this.applyConnectionModelCatalog(modelCatalog);
     this.connectionModelsFetchedAt = Date.now();
@@ -50549,7 +50560,21 @@ ${warningLines}`, 0, 0));
   getScopedHeartbeats() {
     return scopeHeartbeatsToSession(this.heartbeatCatalog, this.connectionState, this.subagentSnapshots.values());
   }
-  applyConnectionStateSnapshot(state) {
+  captureConnectionStateRead() {
+    return {
+      connection: this.agentConnection,
+      generation: this.sessionEventGeneration,
+      goal: this.connectionState?.goal
+    };
+  }
+  isConnectionStateReadCurrent(read) {
+    return read.connection === this.agentConnection && read.generation === this.sessionEventGeneration;
+  }
+  applyConnectionStateSnapshot(state, read) {
+    const current = this.connectionState;
+    if (read && current?.sessionId === state.sessionId && current.goal !== read.goal) {
+      state = { ...state, goal: current.goal };
+    }
     this.bindPromptStashSession(state.sessionId);
     this.connectionState = state;
     this.scheduleHeartbeatManagerRefresh();
@@ -53457,9 +53482,10 @@ ${message}`, ["Yes", "No"], opts);
         return `Goal paused (${this.formatGoalElapsed(goal.timeUsedSeconds)})`;
       case "budget_limited":
         return `Goal budget limited (${this.formatGoalElapsed(goal.timeUsedSeconds)})`;
+      case "error":
+        return theme.fg("error", "Goal error") + theme.getFgAnsi("muted");
       case "idle":
       case "complete":
-      case "error":
         return void 0;
       default: {
         const _exhaustive = goal.status;
@@ -53800,13 +53826,16 @@ ${message}`, ["Yes", "No"], opts);
     this.ui.requestRender();
   }
   async renderInitialMessages() {
+    const read = this.captureConnectionStateRead();
     const snapshot = await this.agentConnection.getInitialSnapshot();
+    if (!this.isConnectionStateReadCurrent(read))
+      return;
     const context = this.getSessionContextFromConnectionSnapshot(snapshot);
     const state = snapshot.state;
     const streamingMessage = snapshot.streamingMessage;
     this.rlmNodeId = snapshot.parent?.childId;
     this.seedSubagentSummary(snapshot.children);
-    this.applyConnectionStateSnapshot(state);
+    this.applyConnectionStateSnapshot(state, read);
     this.restoreTurnStartFromMessages(context.messages);
     await this.renderSessionContext(context, {
       updateFooter: true,
@@ -54563,10 +54592,13 @@ ${message}`, ["Yes", "No"], opts);
     return showFullPaneOverlay(this.ui, component, options);
   }
   async showSettingsSelector() {
+    const read = this.captureConnectionStateRead();
     let state;
     try {
       state = await this.agentConnection.getState();
-      this.applyConnectionStateSnapshot(state);
+      if (!this.isConnectionStateReadCurrent(read))
+        return;
+      this.applyConnectionStateSnapshot(state, read);
     } catch (error) {
       this.showError(error instanceof Error ? error.message : String(error));
       return;
@@ -66273,6 +66305,9 @@ Use prime_context read/search with selected lines or a query.`;
       if (!state || !state.clients.has(client)) {
         continue;
       }
+      const streamsSnapshot = client.transport === "private-framed" && daemonClientCapabilitiesForSession(client, activeSessionId).has("chunked_snapshot");
+      const snapshotSignal = streamsSnapshot ? markClientSnapshotStreaming(client, activeSessionId) : void 0;
+      let ownsSnapshot = streamsSnapshot;
       try {
         const result = await this.createAttachResult(client, state, {
           type: "attach",
@@ -66281,7 +66316,7 @@ Use prime_context read/search with selected lines or a query.`;
         if (this.sessions.get(activeSessionId) !== state || !state.clients.has(client)) {
           continue;
         }
-        if (client.transport === "private-framed" && daemonClientCapabilitiesForSession(client, activeSessionId).has("chunked_snapshot")) {
+        if (snapshotSignal) {
           if (purpose === "replacement") {
             this.write(client, {
               type: "session_replaced",
@@ -66293,20 +66328,14 @@ Use prime_context read/search with selected lines or a query.`;
             });
           }
           const snapshotId = `${result.activeSessionId}-${result.lastEventCursor?.generation}-${result.lastEventSequence}`;
-          const snapshotSignal = markClientSnapshotStreaming(client, activeSessionId);
-          let transcript;
-          try {
-            transcript = createSnapshotTranscriptChunks({
-              activeSessionId,
-              snapshotId,
-              messages: result.snapshot.messages,
-              targetChunkBytes: SNAPSHOT_TARGET_CHUNK_BYTES,
-              signal: snapshotSignal
-            });
-          } catch (error) {
-            finishClientSnapshotStreaming(client, activeSessionId);
-            throw error;
-          }
+          const transcript = createSnapshotTranscriptChunks({
+            activeSessionId,
+            snapshotId,
+            messages: result.snapshot.messages,
+            targetChunkBytes: SNAPSHOT_TARGET_CHUNK_BYTES,
+            signal: snapshotSignal
+          });
+          ownsSnapshot = false;
           await this.streamWorkerSnapshot(client, {
             ...result,
             messages: result.messages ? [] : void 0,
@@ -66340,6 +66369,9 @@ Use prime_context read/search with selected lines or a query.`;
         this.log(`could not catch up client ${client.id} for ${activeSessionId}: ${String(error)}`);
         this.scheduleClientCatchupRetry(client);
         return "retry-later";
+      } finally {
+        if (ownsSnapshot)
+          finishClientSnapshotStreaming(client, activeSessionId);
       }
     }
     return "drained";

package/dist/bundle/{cli-main-6GXXIMQQ.js → cli-main-WL2L5IEQ.js}

@@ -5,7 +5,7 @@ import {
   isOwnedSessionWorkerProcess,
   maybeRunOwnedSessionWorkerFrontend,
   maybeStartDaemonEarly
-} from "./chunk-SX7CAXWU.js";
+} from "./chunk-MSH6QRP5.js";
 import {
   APP_NAME
 } from "./chunk-IEM74GZ5.js";
@@ -39,7 +39,7 @@ async function runCli() {
     }
     const [{ EnvHttpProxyAgent, setGlobalDispatcher }, { main }] = await Promise.all([
       import("undici"),
-      import("./main-HF64B4HM.js")
+      import("./main-XPIEIEQJ.js")
     ]);
     setGlobalDispatcher(new EnvHttpProxyAgent({ bodyTimeout: 0, headersTimeout: 0 }));
     try {

package/dist/bundle/cli.js

@@ -52,6 +52,6 @@ var supported = assertNodeVersion({
   exit: (code) => process.exit(code)
 });
 if (supported) {
-  const { runCli } = await import("./cli-main-6GXXIMQQ.js");
+  const { runCli } = await import("./cli-main-WL2L5IEQ.js");
   await runCli();
 }

package/dist/bundle/{main-HF64B4HM.js → main-XPIEIEQJ.js}

@@ -17,8 +17,8 @@ import {
   shouldUseDaemonClientRuntime,
   shouldUseDaemonInteractive,
   shouldUseEphemeralSessionManagerForDaemonInteractive
-} from "./chunk-NLRWERWA.js";
-import "./chunk-SX7CAXWU.js";
+} from "./chunk-T2OK7SRV.js";
+import "./chunk-MSH6QRP5.js";
 import "./chunk-CFNASUYO.js";
 import "./chunk-V6LOBH6X.js";
 import "./chunk-IEM74GZ5.js";

package/dist/core/agent-session.d.ts

@@ -417,6 +417,7 @@ export declare class AgentSession {
     private _goalStateRevision;
     private _goalAccountingStartedAt;
     private _goalContinuationAwaitsRlmWork;
+    private _jobWatchController?;
     private _goalAccountedAssistantMessages;
     private _goalAbortInProgress;
     private _autonomousState;
@@ -1165,6 +1166,7 @@ export declare class AgentSession {
     private _selectNativeSkill;
     /** Read only the server-owned branch captured for this operation (including a batch). */
     recoverNativeHistory(input: NativeRecoveryInput, signal?: AbortSignal, maxBytes?: number): Promise<NativeRecoveryResponse>;
+    private _getJobWatchController;
     private _createKernelHostHandlers;
     reload(): Promise<void>;
     private _rlmKernelEnv;