@codexhost/cli-darwin-x64 0.6.1 → 0.7.0

package/app/plugins/kiro-cli/plugin.mjs

@@ -20183,6 +20183,7 @@ var KiroAcpTransport = class {
   #replay = null;
   #sessionId = null;
   #stderrTail = "";
+  #configUpdates = /* @__PURE__ */ new Set();
   constructor(options) {
     this.#options = options;
     this.#commandTimeoutMs = options.commandTimeoutMs ?? 3e4;
@@ -20341,13 +20342,28 @@ var KiroAcpTransport = class {
     };
   }
   async #setConfigOptionOnSession(connection, sessionId, configId, value) {
+    const confirmation = Promise.withResolvers();
+    const listener = {
+      update: (params) => {
+        if (params.sessionId !== sessionId || params.update.sessionUpdate !== "config_option_update")
+          return;
+        try {
+          confirmation.resolve(confirmedKiroConfig(params.update, configId, value));
+        } catch {
+        }
+      },
+      cancel: () => confirmation.reject(new KiroTransportError("unavailable", "Kiro Session closed during configuration"))
+    };
+    void confirmation.promise.catch(() => void 0);
+    this.#configUpdates.add(listener);
     try {
-      const result = await withTimeout(connection.setSessionConfigOption({
-        sessionId,
-        configId,
-        value
-      }), this.#commandTimeoutMs, `Kiro set_config_option (${configId})`);
-      return confirmedKiroConfig(result, configId, value);
+      return await withTimeout((async () => {
+        const result = await connection.setSessionConfigOption({ sessionId, configId, value });
+        if (configId === "model" && Array.isArray(result.configOptions) && !result.configOptions.some((option) => option.id === "model")) {
+          return confirmation.promise;
+        }
+        return confirmedKiroConfig(result, configId, value);
+      })(), this.#commandTimeoutMs, `Kiro set_config_option (${configId})`);
     } catch (error51) {
       if (error51 instanceof KiroRequestTimeoutError) {
         this.#fault(error51);
@@ -20356,6 +20372,8 @@ var KiroAcpTransport = class {
       throw new KiroTransportError("unavailable", `Failed to set ${configId} config option`, {
         cause: error51
       });
+    } finally {
+      this.#configUpdates.delete(listener);
     }
   }
   async #forkSession(params) {
@@ -20506,6 +20524,8 @@ var KiroAcpTransport = class {
     return initialize;
   }
   #handleUpdate(params) {
+    for (const listener of this.#configUpdates)
+      listener.update(params);
     const update = params.update;
     const meta3 = isRecord4(update) && isRecord4(update._meta) ? update._meta : void 0;
     const kiroMeta = meta3 && isRecord4(meta3.kiro) ? meta3.kiro : void 0;
@@ -20608,6 +20628,9 @@ var KiroAcpTransport = class {
       return;
     this.#closed = true;
     this.#closing = true;
+    for (const listener of this.#configUpdates)
+      listener.cancel();
+    this.#configUpdates.clear();
     try {
       if (this.#child) {
         const child = this.#child;

package/app/plugins/pi/plugin.mjs

@@ -17437,7 +17437,6 @@ var PiRpcSession = class {
   #closePromise = null;
   #compactionActive = false;
   #compactionTurn = null;
-  #compactionTimeout = null;
   #failed = false;
   #pending = /* @__PURE__ */ new Map();
   #state = null;
@@ -17453,7 +17452,6 @@ var PiRpcSession = class {
     }
     this.#options = {
       commandTimeoutMs: 3e4,
-      compactionTimeoutMs: 3e5,
       cancelTimeoutMs: 2e3,
       closeTimeoutMs: 2e3,
       ...options
@@ -17795,10 +17793,6 @@ var PiRpcSession = class {
     if (value.type === "compaction_start") {
       this.#compactionActive = true;
       this.#compactionTurn = this.#activeTurn;
-      this.#compactionTimeout ??= setTimeout(() => {
-        this.#compactionTimeout = null;
-        this.#fail(new PiRpcFaultError("protocolError", `Pi RPC compaction timed out after ${this.#options.compactionTimeoutMs}ms`));
-      }, this.#options.compactionTimeoutMs);
       const onEvent = this.#activeTurn?.onEvent ?? this.#manualCompaction?.onEvent;
       onEvent?.({ type: "compaction.started" });
       for (const pending of this.#pending.values()) {
@@ -17811,9 +17805,6 @@ var PiRpcSession = class {
     }
     if (value.type === "compaction_end") {
       this.#compactionActive = false;
-      if (this.#compactionTimeout)
-        clearTimeout(this.#compactionTimeout);
-      this.#compactionTimeout = null;
       const compactionTurn = this.#compactionTurn;
       this.#compactionTurn = null;
       for (const [id, pending] of this.#pending) {
@@ -18303,9 +18294,6 @@ var PiRpcSession = class {
     }
   }
   #rejectAll(error51) {
-    if (this.#compactionTimeout)
-      clearTimeout(this.#compactionTimeout);
-    this.#compactionTimeout = null;
     for (const pending of this.#pending.values()) {
       if (pending.timeout)
         clearTimeout(pending.timeout);