@liberseek/boft-cli-win32-arm64 0.6.7 → 0.6.8

package/app/plugins/claude-code/plugin.mjs

@@ -15645,7 +15645,7 @@ var harnessBrokerServerFrameSchema = external_exports.union([
 var harnessBrokerDescriptorSchema = external_exports.object({
   schemaVersion: external_exports.literal(1),
   protocolVersion: external_exports.literal(HARNESS_BROKER_PROTOCOL_VERSION),
-  harnessId: external_exports.literal("claude-code"),
+  harnessId: harnessPluginIdSchema,
   generation: external_exports.string().uuid(),
   ownerPid: external_exports.number().int().positive(),
   socketPath: external_exports.string().min(1).max(512),
@@ -15700,22 +15700,34 @@ function defaultHarnessBrokerDirectory(environment = process.env) {
   const home = environment.HOME || os.homedir();
   return path.join(home, ".codexhost", "harness-broker");
 }
-function defaultHarnessBrokerDescriptorPath(environment = process.env) {
+function defaultHarnessBrokerDescriptorPath(environment = process.env, harnessId = "claude-code") {
+  harnessPluginIdSchema.parse(harnessId);
+  if (harnessId !== "claude-code")
+    return path.join(defaultHarnessBrokerDirectory(environment), `${harnessId}-broker-v1.json`);
   return environment[HARNESS_BROKER_DESCRIPTOR_ENV] ?? path.join(defaultHarnessBrokerDirectory(environment), HARNESS_BROKER_DESCRIPTOR_FILE);
 }
 
 // ../../harness-broker/dist/validation.js
 var cwdSchema = external_exports.string().min(1).max(16384);
+var brokerEnvironmentSchema = external_exports.object({
+  CODEXHOST_CLI_PATH: external_exports.string().max(16384).optional(),
+  CODEXHOST_RUNTIME_ENDPOINT: external_exports.string().max(16384).optional(),
+  CODEXHOST_RUNTIME_TOKEN: external_exports.string().max(16384).optional(),
+  CODEXHOST_THREAD_ID: external_exports.string().max(256).optional()
+}).strict();
 var createSchema = external_exports.object({
   kind: external_exports.literal("create"),
   cwd: cwdSchema,
   executionPolicy: external_exports.enum(["default", "unattended-full-access"]).optional(),
+  environment: brokerEnvironmentSchema.optional(),
   model: harnessModelRefSchema.optional(),
   thinkingOptionId: harnessThinkingOptionIdSchema.optional(),
   permissionModeId: harnessPermissionModeIdSchema.optional()
 }).strict();
 var resumeSchema = external_exports.object({
   kind: external_exports.literal("resume"),
+  environment: brokerEnvironmentSchema.optional(),
+  permissionModeId: harnessPermissionModeIdSchema.optional(),
   model: harnessModelRefSchema.optional(),
   thinkingOptionId: harnessThinkingOptionIdSchema.optional(),
   nativeRef: nativeSessionRefSchema,
@@ -15724,12 +15736,14 @@ var resumeSchema = external_exports.object({
 }).strict();
 var forkSchema = external_exports.object({
   kind: external_exports.literal("fork"),
+  environment: brokerEnvironmentSchema.optional(),
   sourceRef: nativeSessionRefSchema,
   checkpoint: nativeCheckpointRefSchema,
   cwd: cwdSchema
 }).strict();
 var rollbackSchema = external_exports.object({
   kind: external_exports.literal("rollbackLastTurn"),
+  environment: brokerEnvironmentSchema.optional(),
   model: harnessModelRefSchema.optional(),
   thinkingOptionId: harnessThinkingOptionIdSchema.optional(),
   permissionModeId: harnessPermissionModeIdSchema.optional(),
@@ -15990,37 +16004,43 @@ function parseSessionMetadata(value) {
 async function readDescriptor(descriptorPath) {
   const metadata = await lstat(descriptorPath);
   if (metadata.isSymbolicLink())
-    throw new Error("Claude Aqua broker descriptor must not be a symlink");
+    throw new Error("Aqua Harness broker descriptor must not be a symlink");
   if (!metadata.isFile())
-    throw new Error("Claude Aqua broker descriptor is not a file");
+    throw new Error("Aqua Harness broker descriptor is not a file");
   if (process.platform !== "win32") {
     if ((metadata.mode & 63) !== 0)
-      throw new Error("Claude Aqua broker descriptor is not owner-only");
+      throw new Error("Aqua Harness broker descriptor is not owner-only");
     if (process.getuid && metadata.uid !== process.getuid()) {
-      throw new Error("Claude Aqua broker descriptor belongs to another user");
+      throw new Error("Aqua Harness broker descriptor belongs to another user");
     }
   }
   const descriptor = harnessBrokerDescriptorSchema.parse(JSON.parse(await readFile(descriptorPath, "utf8")));
   if (process.platform === "darwin" && Buffer.byteLength(descriptor.socketPath) > 103) {
-    throw new Error("Claude Aqua broker socket path is too long for macOS");
+    throw new Error("Aqua Harness broker socket path is too long for macOS");
   }
   if (process.platform !== "win32") {
     const socket = await lstat(descriptor.socketPath);
     if (socket.isSymbolicLink() || !socket.isSocket()) {
-      throw new Error("Claude Aqua broker endpoint is not a Unix socket");
+      throw new Error("Aqua Harness broker endpoint is not a Unix socket");
     }
     if ((socket.mode & 63) !== 0 || process.getuid && socket.uid !== process.getuid()) {
-      throw new Error("Claude Aqua broker endpoint is not owner-only");
+      throw new Error("Aqua Harness broker endpoint is not owner-only");
     }
   }
   try {
     process.kill(descriptor.ownerPid, 0);
   } catch {
-    throw new Error("Claude Aqua broker owner process is unavailable");
+    throw new Error("Aqua Harness broker owner process is unavailable");
   }
   return descriptor;
 }
 var BrokerConnection = class _BrokerConnection {
+  #onClose;
+  onClose(callback) {
+    this.#onClose = callback;
+    if (this.#closed)
+      callback();
+  }
   #descriptor;
   #socket;
   #pending = /* @__PURE__ */ new Map();
@@ -16033,14 +16053,16 @@ var BrokerConnection = class _BrokerConnection {
     this.#descriptor = descriptor;
     this.#socket = socket;
     consumeBrokerFrames(socket, (raw) => this.#frame(raw), (error52) => this.#fail(error52));
-    socket.once("close", () => this.#fail(new Error("Claude Aqua broker connection closed")));
+    socket.once("close", () => this.#fail(new Error("Aqua Harness broker connection closed")));
     socket.once("error", (error52) => this.#fail(error52));
   }
-  static async connect(descriptorPath) {
+  static async connect(descriptorPath, harnessId) {
     const descriptor = await readDescriptor(descriptorPath);
+    if (descriptor.harnessId !== harnessId)
+      throw new Error("Aqua broker belongs to another Harness");
     const socket = net.createConnection(descriptor.socketPath);
     await new Promise((resolve2, reject) => {
-      const timeout = setTimeout(() => reject(new Error("Timed out connecting to Claude Aqua broker")), HARNESS_BROKER_REQUEST_TIMEOUT_MS);
+      const timeout = setTimeout(() => reject(new Error("Timed out connecting to Aqua Harness broker")), HARNESS_BROKER_REQUEST_TIMEOUT_MS);
       socket.once("connect", () => {
         clearTimeout(timeout);
         resolve2();
@@ -16067,29 +16089,38 @@ var BrokerConnection = class _BrokerConnection {
       const id = "__hello__";
       const timeout = setTimeout(() => {
         this.#pending.delete(id);
-        reject(new Error("Claude Aqua broker authentication timed out"));
+        reject(new Error("Aqua Harness broker authentication timed out"));
       }, HARNESS_BROKER_REQUEST_TIMEOUT_MS);
       this.#pending.set(id, { resolve: () => resolve2(), reject, timeout });
     });
   }
   register(session) {
+    if (this.#closed)
+      throw new Error("Aqua Harness broker connection closed while opening Session");
     this.#sessions.set(session.sessionId, session);
   }
+  get closed() {
+    return this.#closed;
+  }
   unregister(sessionId) {
     this.#sessions.delete(sessionId);
   }
+  async dispose() {
+    await Promise.allSettled([...this.#sessions.values()].map((session) => session.close()));
+    this.close();
+  }
   async request(method, params) {
     if (this.#closed)
-      throw new Error("Claude Aqua broker connection is closed");
+      throw new Error("Aqua Harness broker connection is closed");
     if (this.#pending.size >= HARNESS_BROKER_MAX_PENDING_REQUESTS) {
-      throw new Error("Claude Aqua broker request limit exceeded");
+      throw new Error("Aqua Harness broker request limit exceeded");
     }
     this.#inputSequence += 1;
     const id = randomUUID();
     const response = new Promise((resolve2, reject) => {
       const timeout = setTimeout(() => {
         this.#pending.delete(id);
-        reject(new Error(`Claude Aqua broker ${method} timed out`));
+        reject(new Error(`Aqua Harness broker ${method} timed out`));
       }, HARNESS_BROKER_REQUEST_TIMEOUT_MS);
       this.#pending.set(id, { resolve: resolve2, reject, timeout });
     });
@@ -16109,12 +16140,14 @@ var BrokerConnection = class _BrokerConnection {
       return;
     this.#closed = true;
     this.#socket.destroy();
-    this.#fail(new Error("Claude Aqua broker connection closed"));
+    this.#fail(new Error("Aqua Harness broker connection closed"));
   }
   #frame(raw) {
+    if (this.#closed)
+      return;
     const frame = harnessBrokerServerFrameSchema.parse(raw);
     if (frame.generation !== this.#descriptor.generation || frame.sequence !== this.#outputSequence + 1) {
-      this.#fail(new Error("Claude Aqua broker response generation or sequence is invalid"));
+      this.#fail(new Error("Aqua Harness broker response generation or sequence is invalid"));
       return;
     }
     this.#outputSequence = frame.sequence;
@@ -16136,7 +16169,7 @@ var BrokerConnection = class _BrokerConnection {
     }
     const pending = this.#pending.get(frame.id);
     if (!pending) {
-      this.#fail(new Error("Claude Aqua broker returned an unknown response ID"));
+      this.#fail(new Error("Aqua Harness broker returned an unknown response ID"));
       return;
     }
     clearTimeout(pending.timeout);
@@ -16152,6 +16185,8 @@ var BrokerConnection = class _BrokerConnection {
     this.#failed = true;
     if (!this.#closed)
       this.#closed = true;
+    this.#socket.destroy();
+    this.#onClose?.();
     for (const pending of this.#pending.values()) {
       clearTimeout(pending.timeout);
       pending.reject(error52);
@@ -16162,7 +16197,10 @@ var BrokerConnection = class _BrokerConnection {
   }
 };
 var BrokeredHarnessSession = class {
-  harnessId = harnessIdSchema.parse("claude-code");
+  openInput;
+  reconnect;
+  onClose;
+  harnessId;
   outputs;
   #channel = new HarnessOutputChannel();
   #connection;
@@ -16170,9 +16208,18 @@ var BrokeredHarnessSession = class {
   #metadata;
   #faulted = false;
   #closed = false;
-  constructor(connection, metadata) {
+  #state;
+  #recovery;
+  constructor(connection, metadata, harnessId, openInput, reconnect, onClose) {
+    this.openInput = openInput;
+    this.reconnect = reconnect;
+    this.onClose = onClose;
+    this.harnessId = harnessId;
+    if (metadata.initialState.nativeRef && metadata.initialState.nativeRef.harnessId !== harnessId)
+      throw new Error("Broker Session identity belongs to another Harness");
     this.#connection = connection;
     this.#metadata = metadata;
+    this.#state = structuredClone(metadata.initialState);
     this.outputs = this.#channel.outputs;
     if (metadata.commands) {
       this.commands = {
@@ -16216,6 +16263,10 @@ var BrokeredHarnessSession = class {
     if (this.#closed || generation !== this.#metadata.sessionGeneration)
       return;
     const value = harnessOutputSchema.parse(output);
+    if (value.kind === "event" && value.event.type === "session.state.changed") {
+      const nativeRef = value.event.state.nativeRef ?? this.#state.nativeRef;
+      this.#state = { ...structuredClone(value.event.state), ...nativeRef ? { nativeRef } : {} };
+    }
     if (value.kind === "event" && value.event.type === "session.faulted" || isAuthenticationTerminal(value)) {
       this.#faulted = true;
     }
@@ -16234,6 +16285,13 @@ var BrokeredHarnessSession = class {
     await this.#request("session.refreshUsage", {});
   }
   async readSnapshot() {
+    if (this.#closed)
+      return { ok: false, error: unavailable("Aqua Harness broker Session is closed", false) };
+    if (this.#connection.closed) {
+      const recovered = await this.#ensureRecovery();
+      if (!recovered.ok)
+        return recovered;
+    }
     try {
       return parseHarnessResult(await this.#request("session.readSnapshot", {}));
     } catch (error52) {
@@ -16245,20 +16303,11 @@ var BrokeredHarnessSession = class {
   }
   async execute(command) {
     if (this.#closed)
-      return { ok: false, error: unavailable("Claude Aqua broker Session is closed", false) };
+      return { ok: false, error: unavailable("Aqua Harness broker Session is closed", false) };
     if (this.#faulted && command.type === "turn.start") {
-      try {
-        const reopened = parseHarnessResult(await this.#request("session.reopen", {}));
-        if (!reopened.ok)
-          return reopened;
-        this.#metadata = parseSessionMetadata(reopened.value);
-        this.#faulted = false;
-      } catch (error52) {
-        return {
-          ok: false,
-          error: unavailable(error52 instanceof Error ? error52.message : String(error52))
-        };
-      }
+      const recovered = await this.#ensureRecovery();
+      if (!recovered.ok)
+        return recovered;
     }
     try {
       return parseHarnessResult(await this.#request("session.execute", { command }));
@@ -16273,9 +16322,69 @@ var BrokeredHarnessSession = class {
     if (this.#closed)
       return;
     this.#closed = true;
+    await this.#recovery?.catch(() => {
+    });
     this.#connection.unregister(this.sessionId);
     await this.#request("session.close", {}).catch(() => void 0);
     this.#channel.end();
+    this.onClose();
+  }
+  async #ensureRecovery() {
+    try {
+      this.#recovery ??= this.#recover().finally(() => {
+        this.#recovery = void 0;
+      });
+      return await this.#recovery;
+    } catch (error52) {
+      return {
+        ok: false,
+        error: unavailable(error52 instanceof Error ? error52.message : String(error52))
+      };
+    }
+  }
+  async #recover() {
+    const previous = this.#connection;
+    const connection = previous.closed ? await this.reconnect() : previous;
+    const nativeRef = this.#state.nativeRef;
+    if (!nativeRef)
+      return {
+        ok: false,
+        error: unavailable("Cannot recover a Session without confirmed native identity", false)
+      };
+    const result = parseHarnessResult(await (connection === previous ? this.#request("session.reopen", {}) : connection.request("adapter.open", {
+      kind: "resume",
+      cwd: this.openInput.cwd,
+      nativeRef,
+      ...this.openInput.environment ? { environment: this.openInput.environment } : {},
+      ...this.#state.effectiveModel ? { model: this.#state.effectiveModel } : {},
+      ...this.#state.effectiveThinkingOptionId ? { thinkingOptionId: this.#state.effectiveThinkingOptionId } : {},
+      ...this.#state.effectivePermissionModeId ? { permissionModeId: this.#state.effectivePermissionModeId } : {}
+    })));
+    if (!result.ok)
+      return result;
+    const metadata = parseSessionMetadata(result.value), observed = metadata.initialState.nativeRef;
+    if (this.#closed || connection.closed || !observed || observed.harnessId !== nativeRef.harnessId || observed.nativeSessionId !== nativeRef.nativeSessionId || observed.formatVersion !== nativeRef.formatVersion) {
+      await connection.request("session.close", {
+        sessionId: metadata.sessionId,
+        sessionGeneration: metadata.sessionGeneration
+      }).catch(() => {
+      });
+      return {
+        ok: false,
+        error: unavailable("Broker recovery did not preserve the live native Session identity", false)
+      };
+    }
+    previous.unregister(this.sessionId);
+    this.#connection = connection;
+    this.#metadata = metadata;
+    this.#state = structuredClone(metadata.initialState);
+    connection.register(this);
+    this.#faulted = false;
+    this.#channel.emit({
+      kind: "event",
+      event: { type: "session.state.changed", state: structuredClone(this.#state) }
+    });
+    return { ok: true, value: void 0 };
   }
   #request(method, extra) {
     return this.#connection.request(method, {
@@ -16286,9 +16395,11 @@ var BrokeredHarnessSession = class {
   }
 };
 var BrokeredHarnessAdapter = class {
+  #sessions = /* @__PURE__ */ new Set();
   commandCatalog;
-  harnessId = harnessIdSchema.parse("claude-code");
+  harnessId;
   #descriptorPath;
+  #forwardEnvironment;
   #connection = null;
   #closed = false;
   #sessionImportListing = null;
@@ -16383,9 +16494,11 @@ var BrokeredHarnessAdapter = class {
     }
   }
   constructor(input = {}) {
+    this.harnessId = harnessPluginIdSchema.parse(input.harnessId ?? "claude-code");
+    this.#forwardEnvironment = input.forwardDelegationEnvironment === true;
     if (input.commandCatalog)
       this.commandCatalog = input.commandCatalog;
-    this.#descriptorPath = input.descriptorPath ?? defaultHarnessBrokerDescriptorPath(input.environment);
+    this.#descriptorPath = input.descriptorPath ?? defaultHarnessBrokerDescriptorPath(input.environment, this.harnessId);
   }
   async inspectAccount() {
     if (this.#closed)
@@ -16399,7 +16512,7 @@ var BrokeredHarnessAdapter = class {
   }
   async inspect(input = {}) {
     if (this.#closed)
-      return failedInspection("Claude Aqua broker adapter is closed");
+      return failedInspection("Aqua Harness broker adapter is closed");
     try {
       return harnessInspectionSchema.parse(await (await this.#connect()).request("adapter.inspect", input));
     } catch (error52) {
@@ -16409,18 +16522,33 @@ var BrokeredHarnessAdapter = class {
   }
   async open(input) {
     if (this.#closed)
-      return { ok: false, error: unavailable("Claude Aqua broker adapter is closed", false) };
+      return { ok: false, error: unavailable("Aqua Harness broker adapter is closed", false) };
+    let connection;
     try {
       const safeInput = { ...input };
       delete safeInput.environment;
-      const result = parseHarnessResult(await (await this.#connect()).request("adapter.open", safeInput));
+      if (this.#forwardEnvironment && input.environment) {
+        const allowed2 = [
+          "CODEXHOST_CLI_PATH",
+          "CODEXHOST_RUNTIME_ENDPOINT",
+          "CODEXHOST_RUNTIME_TOKEN",
+          "CODEXHOST_THREAD_ID"
+        ];
+        const environment = Object.fromEntries(Object.entries(input.environment).filter(([key, value]) => allowed2.includes(key) && value !== void 0));
+        if (Object.keys(environment).length)
+          safeInput.environment = environment;
+      }
+      connection = await this.#connect();
+      const result = parseHarnessResult(await connection.request("adapter.open", safeInput));
       if (!result.ok)
         return result;
-      return {
-        ok: true,
-        value: new BrokeredHarnessSession(await this.#connect(), parseSessionMetadata(result.value))
-      };
+      const session = new BrokeredHarnessSession(connection, parseSessionMetadata(result.value), this.harnessId, safeInput, () => this.#connect(), () => {
+        this.#sessions.delete(session);
+      });
+      this.#sessions.add(session);
+      return { ok: true, value: session };
     } catch (error52) {
+      connection?.close();
       this.#connection = null;
       return {
         ok: false,
@@ -16430,13 +16558,29 @@ var BrokeredHarnessAdapter = class {
   }
   async close() {
     this.#closed = true;
+    await Promise.allSettled([...this.#sessions].map((session) => session.close()));
+    this.#sessions.clear();
     const connection = await this.#connection?.catch(() => null);
-    connection?.close();
+    await connection?.dispose();
     this.#connection = null;
   }
   #connect() {
-    if (!this.#connection)
-      this.#connection = BrokerConnection.connect(this.#descriptorPath);
+    if (this.#closed)
+      return Promise.reject(new Error("Aqua Harness broker adapter is closed"));
+    if (!this.#connection) {
+      const pending = BrokerConnection.connect(this.#descriptorPath, this.harnessId).then((connection) => {
+        connection.onClose(() => {
+          if (this.#connection === pending)
+            this.#connection = null;
+        });
+        return connection;
+      }).catch((error52) => {
+        if (this.#connection === pending)
+          this.#connection = null;
+        throw error52;
+      });
+      this.#connection = pending;
+    }
     return this.#connection;
   }
 };
@@ -45087,6 +45231,16 @@ function allowed(toolUseId, input, suggestions) {
     ...suggestions ? { updatedPermissions: suggestions } : {}
   };
 }
+function canDeliverSettlementImmediately(event, pendingEvents) {
+  if (event.type !== "subagent.settled")
+    return false;
+  return !pendingEvents.some((pending) => {
+    if (pending.type !== "subagent.started" && pending.type !== "subagent.updated" && pending.type !== "subagent.completed") {
+      return false;
+    }
+    return event.callId !== void 0 && pending.callId === event.callId || pending.nativeSubagentId === event.nativeSubagentId;
+  });
+}
 var ClaudeSdkTransport = class {
   sessionId;
   #children = [];
@@ -45108,6 +45262,7 @@ var ClaudeSdkTransport = class {
   #autonomous = null;
   #autonomousTurnHandler = null;
   #idleHandler = null;
+  #threadEventHandler = null;
   #idleLive = false;
   #idleAccumulator = null;
   #closePromise = null;
@@ -45140,6 +45295,9 @@ var ClaudeSdkTransport = class {
   setIdleTurnHandler(handler) {
     this.#idleHandler = handler;
   }
+  setThreadEventHandler(handler) {
+    this.#threadEventHandler = handler;
+  }
   setIdleLive(live) {
     this.#idleLive = live;
     if (!live)
@@ -45528,8 +45686,13 @@ var ClaudeSdkTransport = class {
           autonomous.nativeTurnKey = message.uuid;
         }
         const interpreted = autonomous.accumulator.consume(message);
-        for (const event of interpreted.events)
+        for (const event of interpreted.events) {
+          if (this.#threadEventHandler && canDeliverSettlementImmediately(event, autonomous.events)) {
+            this.#threadEventHandler(event);
+            continue;
+          }
           autonomous.events.push({ ...event, observedAtMs });
+        }
         if (interpreted.terminal) {
           this.#autonomous = null;
           const nativeTurnKey = autonomous.nativeTurnKey ?? `autonomous-${Date.now()}`;
@@ -46673,6 +46836,7 @@ var ClaudeHarnessSession = class {
       agentMessageStartedAtMs: null,
       reasoningStartedAtMs: /* @__PURE__ */ new Map(),
       held: false,
+      rootSegmentActive: true,
       completion,
       resolveCompletion
     };
@@ -46781,6 +46945,7 @@ var ClaudeHarnessSession = class {
       agentMessageStartedAtMs: null,
       reasoningStartedAtMs: /* @__PURE__ */ new Map(),
       held: false,
+      rootSegmentActive: true,
       completion,
       resolveCompletion
     };
@@ -47198,11 +47363,21 @@ var ClaudeHarnessSession = class {
       });
       this.#transport = transport;
       transport.setAutonomousTurnHandler((turn) => this.#handleAutonomousTurn(turn));
+      transport.setThreadEventHandler((event) => {
+        if (event.type === "subagent.settled") {
+          this.#settleBackgroundSubagent(event.status, event.nativeSubagentId, event.callId, event.resultSummary);
+        }
+      });
       transport.setIdleTurnHandler({
         onEvent: (event) => {
           const active = this.#active;
-          if (active)
+          if (active) {
             this.#handleTurnEvent(active, event);
+            return;
+          }
+          if (event.type === "subagent.settled") {
+            this.#settleBackgroundSubagent(event.status, event.nativeSubagentId, event.callId, event.resultSummary);
+          }
         },
         onTerminal: (result) => {
           const active = this.#active;
@@ -47284,12 +47459,14 @@ var ClaudeHarnessSession = class {
       return;
     switch (event.type) {
       case "segment.started":
-        this.#observeRootOutput();
+        this.#observeRootOutput(active);
         return;
       case "subagents.live":
         this.#occupancy.observeLive(event.nativeSubagentIds);
+        this.#armContinuationQuiescence(active);
         return;
       case "compaction.started":
+        this.#observeRootOutput(active);
         this.#startCompaction(active);
         return;
       case "compaction.completed":
@@ -47297,12 +47474,12 @@ var ClaudeHarnessSession = class {
         return;
       case "text.delta":
         if (event.delta.length > 0)
-          this.#observeRootOutput();
+          this.#observeRootOutput(active);
         this.#appendText(active, event.messageId, event.delta);
         return;
       case "reasoning.delta":
         if (event.delta.length > 0)
-          this.#observeRootOutput();
+          this.#observeRootOutput(active);
         this.#activateAssistantMessage(active, event.messageId);
         this.#appendReasoning(active, event.messageId, event.delta);
         return;
@@ -47310,6 +47487,7 @@ var ClaudeHarnessSession = class {
         this.#completeReasoning(active, event.messageId, { status: "succeeded" });
         return;
       case "message.completed": {
+        this.#observeRootOutput(active);
         if (event.lastRequestUsage) {
           this.#requestUsageBoundary += 1;
           this.#applyLatestRequestUsage(active, event.lastRequestUsage);
@@ -47326,7 +47504,7 @@ var ClaudeHarnessSession = class {
         return;
       }
       case "tool.started":
-        this.#observeRootOutput();
+        this.#observeRootOutput(active);
         for (const messageId of [...active.reasoningItems.keys()]) {
           this.#completeReasoning(active, messageId, { status: "succeeded" });
         }
@@ -47340,7 +47518,7 @@ var ClaudeHarnessSession = class {
         active.tools.complete(active.command.turnId, event, active.cancellationRequested);
         return;
       case "subagent.started":
-        this.#observeRootOutput();
+        this.#observeRootOutput(active);
         for (const messageId of [...active.reasoningItems.keys()]) {
           this.#completeReasoning(active, messageId, { status: "succeeded" });
         }
@@ -47389,6 +47567,7 @@ var ClaudeHarnessSession = class {
         return;
       }
       case "interaction.requested":
+        this.#observeRootOutput(active);
         this.#startInteraction(active, event.request);
         return;
       case "interaction.closed":
@@ -47690,6 +47869,7 @@ var ClaudeHarnessSession = class {
       agentMessageStartedAtMs: null,
       reasoningStartedAtMs: /* @__PURE__ */ new Map(),
       held: false,
+      rootSegmentActive: true,
       completion,
       resolveCompletion
     };
@@ -47728,6 +47908,9 @@ var ClaudeHarnessSession = class {
   }
   #settleBackgroundSubagent(status, nativeSubagentId2, callId, resultSummary) {
     this.#occupancy.notify(callId, nativeSubagentId2);
+    const active = this.#active;
+    if (active?.held)
+      this.#armContinuationQuiescence(active);
     if (!nativeSubagentId2)
       return;
     this.#event({
@@ -47745,6 +47928,7 @@ var ClaudeHarnessSession = class {
   #finishResult(active, result) {
     if (this.#active !== active || this.#hardCancelTask)
       return;
+    active.rootSegmentActive = false;
     if (result.status === "succeeded" && (active.tools.size > 0 || active.subagents.size > 0)) {
       this.#finishFailed(active, transportFailure("protocol"));
     } else if (result.status === "succeeded") {
@@ -48022,13 +48206,15 @@ var ClaudeHarnessSession = class {
   }
   /** Completes held work after a quiet period with no further Root output. */
   #armContinuationQuiescence(active) {
-    this.#clearContinuationQuiescence();
-    if (!this.#occupancy.awaitingContinuation)
+    if (this.#active !== active || !active.held || active.rootSegmentActive || this.#phase !== "open" || !this.#occupancy.awaitingContinuation) {
       return;
+    }
+    this.#clearContinuationQuiescence();
     const quiescence = setTimeout(() => {
       this.#continuationQuiescence = null;
-      if (this.#active !== active || !active.held || this.#phase !== "open")
+      if (this.#active !== active || !active.held || active.rootSegmentActive || this.#phase !== "open") {
         return;
+      }
       this.#occupancy.releaseContinuations();
       if (this.#occupancy.unsettled)
         return;
@@ -48043,7 +48229,8 @@ var ClaudeHarnessSession = class {
     clearTimeout(this.#continuationQuiescence);
     this.#continuationQuiescence = null;
   }
-  #observeRootOutput() {
+  #observeRootOutput(active) {
+    active.rootSegmentActive = true;
     this.#clearContinuationQuiescence();
   }
   #finish(active, outcome) {

package/app/plugins/codebuddy/assets/icon.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 40 40" fill="none"><g clip-path="url(#clip0_4958_10776)"><rect x="-0.00146484" width="40" height="40" rx="8.63158" fill="#6C4DFF"></rect><path d="M30.5918 3.12856C30.984 2.77679 31.0078 2.7632 31.2955 2.74593C31.7615 2.71193 32.1882 2.93586 32.9147 3.59728C34.6119 5.13959 36.9755 8.30995 38.4449 11.0177L39.0125 12.0691L39.8143 12.4677C40.5885 12.8589 41.8587 13.6611 42.389 14.0913C42.6286 14.2894 42.6626 14.2934 42.912 14.1964C44.0375 13.7583 45.6494 14.3393 47.0714 15.7033C48.3516 16.9303 49.5781 19.0269 50.0478 20.7767C50.1164 21.0582 50.2074 21.6636 50.2405 22.1144C50.3477 23.6973 49.84 24.9617 48.8624 25.5341C48.6628 25.6493 48.6492 25.6807 48.6548 26.1783C48.6998 28.5492 48.0606 30.9165 46.7768 33.2244C45.3276 35.8156 42.7467 38.496 39.2544 41.0214C37.3789 42.3862 32.9421 44.9717 30.9361 45.8792C26.1304 48.0428 22.278 48.8718 18.9316 48.4618C16.9356 48.22 14.6761 47.4417 13.3392 46.5373C12.9873 46.294 12.9318 46.2791 12.6629 46.3561C11.2318 46.7671 9.35752 45.9219 7.76528 44.1544C7.13027 43.448 6.10508 41.7136 5.77273 40.7853C5.00409 38.6128 5.15721 36.6516 6.18105 35.4808C6.44522 35.1797 6.4538 35.1667 6.39603 34.6598C6.30065 33.8298 6.25703 32.6017 6.30061 31.809L6.33535 31.0683L5.22371 29.1019C3.50212 26.0386 2.40857 23.4663 1.98661 21.501C1.76389 20.4233 1.77734 19.9446 2.05091 19.5908C2.21741 19.3773 2.76347 19.1568 3.42155 19.0352C5.07869 18.7442 8.69327 19.0065 12.7142 19.7165L13.1316 19.789L14.0497 18.977C15.5733 17.6274 16.5858 16.8705 18.4518 15.707C20.3967 14.4901 22.5922 13.4895 25.064 12.6968L25.8564 12.4423L26.2926 11.2974C27.8535 7.17701 29.452 4.13917 30.5918 3.12856ZM17.5169 24.2439C15.7528 25.2625 14.8705 25.7716 14.2223 26.3423C11.5975 28.6536 10.6172 32.3151 11.7346 35.6292C12.0106 36.4475 12.5193 37.3301 13.5378 39.0941C14.5563 40.8582 15.0662 41.7401 15.637 42.3882C17.9483 45.0128 21.6091 45.9938 24.923 44.8764C25.7414 44.6004 26.6233 44.0909 28.3875 43.0724L38.5362 37.213C40.3004 36.1945 41.1826 35.6854 41.8308 35.1147C44.4555 32.8034 45.4363 29.1426 44.319 25.8286C44.043 25.0103 43.5343 24.1277 42.5158 22.3637C41.4974 20.5997 40.9873 19.7177 40.4166 19.0696C38.1053 16.4448 34.4441 15.4631 31.1301 16.5806C30.3118 16.8565 29.4297 17.3661 27.6656 18.3846L17.5169 24.2439Z" fill="white"></path><rect x="18.4944" y="31.334" width="4.00904" height="8.32646" rx="2.00452" transform="rotate(-30 18.4944 31.334)" fill="white"></rect><rect x="29.311" y="25.0898" width="4.00904" height="8.32646" rx="2.00452" transform="rotate(-30 29.311 25.0898)" fill="white"></rect></g><defs><clipPath id="clip0_4958_10776"><rect x="-0.00146484" width="40" height="40" rx="8.63158" fill="white"></rect></clipPath></defs></svg>