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

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

@@ -14647,12 +14647,21 @@ var harnessAccountSnapshotSchema = external_exports.object({
   plan: external_exports.string().trim().min(1).max(128).optional(),
   credits: accountCreditsSnapshotSchema
 }).strict();
-var harnessAccountListParamsSchema = external_exports.object({}).strict();
+var harnessAccountIdentityShape = {
+  harnessId: harnessIdSchema,
+  harnessName: external_exports.string().trim().min(1).max(128)
+};
+var harnessAccountSourceSchema = external_exports.object(harnessAccountIdentityShape).strict();
+var harnessAccountSourceListParamsSchema = external_exports.object({}).strict();
+var harnessAccountSourceListResultSchema = external_exports.object({ sources: external_exports.array(harnessAccountSourceSchema).max(128) }).strict();
+var harnessAccountInspectParamsSchema = external_exports.object({ harnessId: harnessIdSchema, refresh: external_exports.boolean().optional() }).strict();
+var harnessAccountInspectResultSchema = external_exports.object({
+  ...harnessAccountIdentityShape,
+  account: harnessAccountSnapshotSchema.nullable()
+}).strict();
+var harnessAccountListParamsSchema = external_exports.object({ refresh: external_exports.boolean().optional() }).strict();
 var harnessAccountListResultSchema = external_exports.object({
-  accounts: external_exports.array(harnessAccountSnapshotSchema.extend({
-    harnessId: harnessIdSchema,
-    harnessName: external_exports.string().min(1)
-  })).max(128)
+  accounts: external_exports.array(harnessAccountSnapshotSchema.extend(harnessAccountIdentityShape)).max(128)
 }).strict();
 
 // ../../shared-contracts/dist/json-value.js
@@ -14948,7 +14957,6 @@ var threadInspectionParamsSchema = external_exports.object({
 }).strict();
 var codexThreadInspectionSchema = external_exports.object({
   owner: external_exports.literal("codex"),
-  accountId: nonBlankTextSchema2.optional(),
   locked: external_exports.literal(true)
 }).strict();
 var externalThreadInspectionSchema = external_exports.object({
@@ -15090,53 +15098,25 @@ var codexAccountSchema = external_exports.object({
   label: nonBlankTextSchema3.max(256),
   email: external_exports.string().email().max(320).optional(),
   planType: codexAccountPlanTypeSchema.optional(),
-  codexHome: nonBlankTextSchema3.max(16384),
-  active: external_exports.boolean(),
-  isDefault: external_exports.boolean(),
   authKind: codexAccountAuthKindSchema.optional(),
   authIdentity: nonBlankTextSchema3.max(256).optional()
 }).strict();
-var codexAccountListResultSchema = external_exports.object({ accounts: external_exports.array(codexAccountSchema).max(128) }).strict();
-var codexAccountCreateParamsSchema = external_exports.object({ label: nonBlankTextSchema3.max(256).optional() }).strict();
-var codexAccountActivateParamsSchema = external_exports.object({ accountId: accountIdSchema }).strict();
-var codexAccountDeleteParamsSchema = external_exports.object({ accountId: accountIdSchema }).strict();
-var codexAccountDeleteResultSchema = external_exports.object({ deletedAccountId: accountIdSchema }).strict();
-var codexAccountMutationResultSchema = external_exports.object({ account: codexAccountSchema }).strict();
-var codexAccountLoginStartParamsSchema = external_exports.object({ accountId: accountIdSchema }).strict();
-var codexAccountLoginStartResultSchema = external_exports.object({
-  accountId: accountIdSchema,
-  loginId: nonBlankTextSchema3.max(1024),
-  verificationUrl: external_exports.string().url().max(16384),
-  userCode: nonBlankTextSchema3.max(1024)
-}).strict();
-var codexAccountLoginCancelParamsSchema = external_exports.object({ accountId: accountIdSchema.optional(), loginId: nonBlankTextSchema3.max(1024) }).strict();
-var codexAccountLoginCancelResultSchema = external_exports.object({ cancelled: external_exports.boolean() }).strict();
-var codexAccountLoginCompletedSchema = external_exports.object({
-  accountId: accountIdSchema,
-  loginId: nonBlankTextSchema3.max(1024),
-  success: external_exports.boolean(),
-  error: external_exports.string().max(4096).nullable()
+var codexAccountPhaseSchema = external_exports.enum(["ready", "unavailable"]);
+var codexAccountListResultSchema = external_exports.object({
+  version: external_exports.literal(2),
+  currentAccountId: accountIdSchema.nullable(),
+  phase: codexAccountPhaseSchema,
+  revision: external_exports.number().int().nonnegative(),
+  instanceId: nonBlankTextSchema3.max(1024).optional(),
+  accounts: external_exports.array(codexAccountSchema).max(1)
 }).strict();
-var codexAccountUsageParamsSchema = external_exports.object({ accountId: accountIdSchema }).strict();
+var codexAccountUsageParamsSchema = external_exports.object({ accountId: accountIdSchema, refresh: external_exports.boolean().optional() }).strict();
 var codexAccountUsageResultSchema = external_exports.object({
   accountId: accountIdSchema,
   usage: threadUsageSnapshotSchema.nullable(),
-  accountCredits: accountCreditsSnapshotSchema.optional()
-}).strict();
-var codexAccountResetCreditConsumeParamsSchema = external_exports.object({
-  accountId: accountIdSchema,
-  idempotencyKey: external_exports.string().uuid().optional()
-}).strict();
-var codexAccountResetCreditConsumeOutcomeSchema = external_exports.enum([
-  "reset",
-  "nothingToReset",
-  "noCredit",
-  "alreadyRedeemed"
-]);
-var codexAccountResetCreditConsumeResultSchema = external_exports.object({
-  accountId: accountIdSchema,
-  outcome: codexAccountResetCreditConsumeOutcomeSchema,
-  accountCredits: accountCreditsSnapshotSchema.optional()
+  accountCredits: accountCreditsSnapshotSchema.optional(),
+  freshness: external_exports.enum(["live", "cached"]),
+  observedAt: external_exports.string().datetime().nullable()
 }).strict();
 
 // ../../shared-contracts/dist/harness-session-import.js
@@ -15645,7 +15625,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 +15680,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 +15716,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 +15984,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 +16033,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 +16069,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 +16120,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 +16149,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 +16165,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 +16177,10 @@ var BrokerConnection = class _BrokerConnection {
   }
 };
 var BrokeredHarnessSession = class {
-  harnessId = harnessIdSchema.parse("claude-code");
+  openInput;
+  reconnect;
+  onClose;
+  harnessId;
   outputs;
   #channel = new HarnessOutputChannel();
   #connection;
@@ -16170,9 +16188,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 +16243,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 +16265,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 +16283,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 +16302,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 +16375,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 +16474,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 +16492,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 +16502,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 +16538,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 +45211,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 +45242,7 @@ var ClaudeSdkTransport = class {
   #autonomous = null;
   #autonomousTurnHandler = null;
   #idleHandler = null;
+  #threadEventHandler = null;
   #idleLive = false;
   #idleAccumulator = null;
   #closePromise = null;
@@ -45140,6 +45275,9 @@ var ClaudeSdkTransport = class {
   setIdleTurnHandler(handler) {
     this.#idleHandler = handler;
   }
+  setThreadEventHandler(handler) {
+    this.#threadEventHandler = handler;
+  }
   setIdleLive(live) {
     this.#idleLive = live;
     if (!live)
@@ -45528,8 +45666,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 +46816,7 @@ var ClaudeHarnessSession = class {
       agentMessageStartedAtMs: null,
       reasoningStartedAtMs: /* @__PURE__ */ new Map(),
       held: false,
+      rootSegmentActive: true,
       completion,
       resolveCompletion
     };
@@ -46781,6 +46925,7 @@ var ClaudeHarnessSession = class {
       agentMessageStartedAtMs: null,
       reasoningStartedAtMs: /* @__PURE__ */ new Map(),
       held: false,
+      rootSegmentActive: true,
       completion,
       resolveCompletion
     };
@@ -47198,11 +47343,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 +47439,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 +47454,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 +47467,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 +47484,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 +47498,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 +47547,7 @@ var ClaudeHarnessSession = class {
         return;
       }
       case "interaction.requested":
+        this.#observeRootOutput(active);
         this.#startInteraction(active, event.request);
         return;
       case "interaction.closed":
@@ -47690,6 +47849,7 @@ var ClaudeHarnessSession = class {
       agentMessageStartedAtMs: null,
       reasoningStartedAtMs: /* @__PURE__ */ new Map(),
       held: false,
+      rootSegmentActive: true,
       completion,
       resolveCompletion
     };
@@ -47728,6 +47888,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 +47908,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 +48186,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 +48209,8 @@ var ClaudeHarnessSession = class {
     clearTimeout(this.#continuationQuiescence);
     this.#continuationQuiescence = null;
   }
-  #observeRootOutput() {
+  #observeRootOutput(active) {
+    active.rootSegmentActive = true;
     this.#clearContinuationQuiescence();
   }
   #finish(active, outcome) {