@liberseek/boft-cli-win32-arm64 0.6.4 → 0.6.6

package/app/plugins/grok/plugin.mjs

@@ -19685,6 +19685,12 @@ function parseHostUsage(value) {
       throw new Error(`Harness Usage contains unknown field '${key}'`);
     }
   }
+  for (const field of ["totalCredits", "contextUsagePercent"]) {
+    const candidate = value[field];
+    if (candidate !== void 0 && (typeof candidate !== "number" || !Number.isFinite(candidate) || candidate < 0)) {
+      throw new Error(`Harness Usage '${field}' must be a finite non-negative number`);
+    }
+  }
   for (const field of tokenFields) {
     const candidate = value[field];
     if (candidate !== void 0 && (typeof candidate !== "number" || !Number.isSafeInteger(candidate) || candidate < 0)) {
@@ -19998,8 +20004,13 @@ function resolveGrokExecutable(input = {}) {
     throw new GrokExecutableError("Grok CLI is not installed");
   return targetPath(platform).isAbsolute(resolution.executable) ? resolution.executable : path3.resolve(resolution.executable);
 }
-function grokInvocation(command, platform = process.platform) {
-  return commandInvocation(command, ["agent", "--no-leader", "stdio"], process.env, platform);
+function grokInvocation(command, platform = process.platform, modelId) {
+  const arguments_ = ["agent", "--no-leader"];
+  const trimmed = modelId?.trim();
+  if (trimmed)
+    arguments_.push("--model", trimmed);
+  arguments_.push("stdio");
+  return commandInvocation(command, arguments_, process.env, platform);
 }
 
 // dist/grok-fork.js
@@ -21487,7 +21498,9 @@ function mapGrokReplay(replay, harnessId, sessionId, cwd, knownTurnRefs = [], to
         retryable: false
       }
     } : { status: "succeeded" };
-    settleWatchedSubagents(tool.type === "toolExecution" ? tool.toolName : tool.command, tool.type === "toolExecution" ? tool.arguments : void 0, content, rawOutput);
+    if (status === "completed") {
+      settleWatchedSubagents(tool.type === "toolExecution" ? tool.toolName : tool.command, tool.type === "toolExecution" ? tool.arguments : void 0, content, rawOutput);
+    }
     items.push({ item: tool, outcome });
     if (status !== "completed")
       return;
@@ -22698,6 +22711,7 @@ var GrokAcpTransport = class {
   #initialize = null;
   #replay = null;
   #sessionId = null;
+  #startupModelId;
   #stderrTail = "";
   constructor(options) {
     this.#options = {
@@ -22754,6 +22768,8 @@ var GrokAcpTransport = class {
     if (this.#sessionId || this.#closed)
       throw new Error("Grok ACP Transport cannot be opened twice");
     try {
+      if (input.kind === "create")
+        this.#startupModelId = input.modelId;
       const initialize = await this.#ensureInitialized();
       const connection = this.#connection;
       if (!connection)
@@ -22879,7 +22895,7 @@ var GrokAcpTransport = class {
       ...this.#options.command ? { command: this.#options.command } : {},
       environment: this.#options.environment ?? process.env
     });
-    const invocation = grokInvocation(executable);
+    const invocation = grokInvocation(executable, process.platform, this.#startupModelId);
     const child = spawn(invocation.command, invocation.arguments, {
       cwd: this.#options.cwd,
       env: { ...process.env, ...this.#options.environment },
@@ -23370,10 +23386,13 @@ function finitePercent(value) {
     return void 0;
   return Math.min(100, Math.max(0, value));
 }
-function nonNegativeNumber(value) {
-  if (typeof value !== "number" || !Number.isFinite(value) || value < 0)
+function nonNegativeCentValue(value) {
+  if (!isRecord14(value))
     return void 0;
-  return value;
+  const amount = value.val === void 0 ? 0 : value.val;
+  if (typeof amount !== "number" || !Number.isFinite(amount) || amount < 0)
+    return void 0;
+  return amount;
 }
 function grokHome(environment) {
   return environment.GROK_HOME ?? path9.join(environment.HOME ?? environment.USERPROFILE ?? os4.homedir(), ".grok");
@@ -23404,16 +23423,26 @@ function parseGrokCreditsResponse(value, fetchedAt = (/* @__PURE__ */ new Date()
     return null;
   const config2 = value.config;
   const period = isRecord14(config2.currentPeriod) ? config2.currentPeriod : void 0;
+  const periodType = periodTypeFrom(period?.type);
   const resetsAt = (typeof period?.end === "string" && period.end.length > 0 ? period.end : void 0) ?? (typeof config2.billingPeriodEnd === "string" && config2.billingPeriodEnd.length > 0 ? config2.billingPeriodEnd : void 0);
-  const onDemandCap = isRecord14(config2.onDemandCap) ? nonNegativeNumber(config2.onDemandCap.val) : void 0;
-  const onDemandUsed = isRecord14(config2.onDemandUsed) ? nonNegativeNumber(config2.onDemandUsed.val) : void 0;
-  const usedPercent = finitePercent(config2.creditUsagePercent) ?? (onDemandCap !== void 0 && onDemandCap > 0 && onDemandUsed !== void 0 ? Math.min(100, Math.max(0, onDemandUsed / onDemandCap * 100)) : void 0);
+  let usedPercent = finitePercent(config2.creditUsagePercent);
+  if (config2.creditUsagePercent === void 0) {
+    const monthlyLimit = nonNegativeCentValue(config2.monthlyLimit);
+    const used = nonNegativeCentValue(config2.used);
+    if (config2.monthlyLimit !== void 0 && monthlyLimit === void 0 || config2.used !== void 0 && used === void 0)
+      return null;
+    if (monthlyLimit !== void 0 && monthlyLimit > 0) {
+      usedPercent = Math.min(100, (used ?? 0) / monthlyLimit * 100);
+    } else if (periodType !== "unknown" && resetsAt !== void 0 && Number.isFinite(Date.parse(resetsAt))) {
+      usedPercent = 0;
+    }
+  }
   if (usedPercent === void 0)
     return null;
   const productUsage = productUsageFrom(config2.productUsage);
   return {
     usedPercent,
-    periodType: periodTypeFrom(period?.type),
+    periodType,
     fetchedAt,
     ...resetsAt ? { resetsAt } : {},
     ...productUsage ? { productUsage } : {}
@@ -24404,12 +24433,6 @@ var GrokHarnessSession = class {
       emit: (event) => this.#event(event)
     });
   }
-  #subagentModelLabel(modelId) {
-    const id = modelId ?? this.#state.effectiveModel?.id;
-    if (!id)
-      return void 0;
-    return this.#modelState.catalog.models.find((model) => model.ref.id === id)?.label ?? id;
-  }
   #startTool(active, event) {
     this.#completeReasoning(active, { status: "succeeded" });
     this.#completeAgent(active, { status: "succeeded" });
@@ -24418,8 +24441,7 @@ var GrokHarnessSession = class {
       const prompt = grokSubagentPrompt(event.rawInput);
       const role = grokSubagentRole(event.rawInput);
       const nativeSubagentId = grokNativeSubagentId(event.rawInput);
-      const model = this.#subagentModelLabel(grokSubagentModel(event.rawInput));
-      const reasoningEffort = this.#state.effectiveThinkingOptionId;
+      const model = grokSubagentModel(event.rawInput);
       active.subagents.start(active.command.turnId, {
         callId: event.callId,
         operation,
@@ -24427,7 +24449,6 @@ var GrokHarnessSession = class {
         ...prompt ? { prompt } : {},
         ...role ? { role } : {},
         ...model ? { model } : {},
-        ...reasoningEffort ? { reasoningEffort } : {},
         background: grokSubagentBackground(event.rawInput),
         ...nativeSubagentId ? { nativeSubagentId } : {}
       });
@@ -24535,9 +24556,9 @@ var GrokHarnessSession = class {
       }
     } : { status: "succeeded" };
     this.#completeItem(active, tool.item, outcome);
-    this.#completeWatchedSubagents(active, tool.item, content, rawOutput);
     if (status !== "completed")
       return;
+    this.#completeWatchedSubagents(active, tool.item, content, rawOutput);
     const changes = projectGrokFileChanges(content, this.#cwd);
     if (!changes)
       return;
@@ -24579,12 +24600,11 @@ var GrokHarnessSession = class {
     }
   }
   #bindSpawnedSubagent(active, event) {
-    const model = event.model ? this.#subagentModelLabel(event.model) : void 0;
     active.subagents.bindNativeId(active.command.turnId, {
       nativeSubagentId: event.nativeSubagentId,
       ...event.description ? { description: event.description } : {},
       ...event.role ? { role: event.role } : {},
-      ...model ? { model } : {}
+      ...event.model ? { model: event.model } : {}
     });
   }
   #finishNativeSubagent(active, event) {
@@ -24978,7 +24998,11 @@ var GrokAdapter = class {
           kind: "resume",
           sessionId: parsedRef.data.nativeSessionId,
           permissionModeId: requestedPermissionModeId
-        } : { kind: "create", permissionModeId: requestedPermissionModeId });
+        } : {
+          kind: "create",
+          permissionModeId: requestedPermissionModeId,
+          ...input.kind === "create" && input.model ? { modelId: input.model.id } : {}
+        });
       }
       if (!opened) {
         await transport.close().catch(() => void 0);

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

@@ -15524,6 +15524,12 @@ function parseHostUsage(value) {
       throw new Error(`Harness Usage contains unknown field '${key}'`);
     }
   }
+  for (const field of ["totalCredits", "contextUsagePercent"]) {
+    const candidate = value[field];
+    if (candidate !== void 0 && (typeof candidate !== "number" || !Number.isFinite(candidate) || candidate < 0)) {
+      throw new Error(`Harness Usage '${field}' must be a finite non-negative number`);
+    }
+  }
   for (const field of tokenFields) {
     const candidate = value[field];
     if (candidate !== void 0 && (typeof candidate !== "number" || !Number.isSafeInteger(candidate) || candidate < 0)) {
@@ -20155,12 +20161,14 @@ function classifyStartupError(error51) {
   }
   return new KiroTransportError("unavailable", "Kiro CLI could not start", { cause: error51 });
 }
+var KiroRequestTimeoutError = class extends KiroTransportError {
+};
 function withTimeout(promise2, milliseconds, operation) {
   let timeout;
   return Promise.race([
     promise2,
     new Promise((_resolve, reject) => {
-      timeout = setTimeout(() => reject(new KiroTransportError("unavailable", `${operation} timed out`)), milliseconds);
+      timeout = setTimeout(() => reject(new KiroRequestTimeoutError("unavailable", `${operation} timed out`)), milliseconds);
     })
   ]).finally(() => {
     if (timeout)
@@ -20205,6 +20213,7 @@ var KiroAcpTransport = class {
   #replay = null;
   #sessionId = null;
   #stderrTail = "";
+  #configUpdates = /* @__PURE__ */ new Set();
   constructor(options) {
     this.#options = options;
     this.#commandTimeoutMs = options.commandTimeoutMs ?? 3e4;
@@ -20363,17 +20372,38 @@ 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);
+        await this.close().catch(() => void 0);
+      }
       throw new KiroTransportError("unavailable", `Failed to set ${configId} config option`, {
         cause: error51
       });
+    } finally {
+      this.#configUpdates.delete(listener);
     }
   }
   async #forkSession(params) {
@@ -20524,6 +20554,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;
@@ -20626,6 +20658,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;
@@ -22579,7 +22614,7 @@ var KiroSession = class {
   #currentPermissionModeId;
   #thinking;
   #modelCatalog;
-  #pendingInteraction = null;
+  #pendingInteractions = /* @__PURE__ */ new Map();
   #closed = false;
   #activeTask = null;
   #stopTurn = null;
@@ -22825,48 +22860,42 @@ var KiroSession = class {
             const question = projectKiroRequirementQuestion(interactionId, turnId, request);
             if (question) {
               return new Promise((resolve) => {
-                this.#pendingInteraction = {
+                this.#pendingInteractions.set(question.interaction.interactionId, {
                   type: "question",
                   id: question.interaction.interactionId,
                   interaction: question.interaction,
                   resolve: (response) => resolve(question.resolve(response))
-                };
+                });
                 this.#channel.emit({ kind: "interaction", interaction: question.interaction });
               });
             }
             const projected = projectKiroPermission(interactionId, turnId, request);
-            this.#channel.emit({
-              kind: "interaction",
-              interaction: projected.interaction
-            });
             return new Promise((resolve) => {
-              this.#pendingInteraction = {
+              this.#pendingInteractions.set(projected.interaction.interactionId, {
                 type: "approval",
                 id: projected.interaction.interactionId,
                 interaction: projected.interaction,
                 resolve: (actionId, cancelled) => {
                   resolve(projected.resolve(actionId, cancelled));
                 }
-              };
+              });
+              this.#channel.emit({ kind: "interaction", interaction: projected.interaction });
             });
           }, async (params) => {
             if (this.#closed || this.#activeTurnId !== turnId)
               return { action: "dismissed" };
             const interactionId = this.#randomUUID();
             const projected = projectKiroUserInput(interactionId, turnId, params);
-            this.#channel.emit({
-              kind: "interaction",
-              interaction: projected.interaction
-            });
             return new Promise((resolve) => {
-              this.#pendingInteraction = {
+              this.#pendingInteractions.set(projected.interaction.interactionId, {
                 type: "question",
                 id: projected.interaction.interactionId,
                 interaction: projected.interaction,
                 resolve: (response) => {
                   resolve(projected.resolve(response));
                 }
-              };
+              });
+              this.#channel.emit({ kind: "interaction", interaction: projected.interaction });
             });
           })
         ]);
@@ -22885,23 +22914,7 @@ var KiroSession = class {
           }
         };
       } finally {
-        if (this.#pendingInteraction) {
-          const pending = this.#pendingInteraction;
-          this.#pendingInteraction = null;
-          if (pending.type === "approval")
-            pending.resolve("", true);
-          else
-            pending.resolve({ type: "question", cancelled: true, answers: {} });
-          this.#channel.emit({
-            kind: "event",
-            event: {
-              type: "interaction.closed",
-              interactionId: pending.id,
-              turnId,
-              reason: "cancelled"
-            }
-          });
-        }
+        this.#cancelInteractions(turnId);
         output.finish(turnOutcome);
         const nativeTurnRef = assignedUserMessageId ? nativeTurnRefSchema.parse({
           harnessId: this.harnessId,
@@ -22929,29 +22942,33 @@ var KiroSession = class {
   async #cancelTurn(command) {
     if (this.#activeTurnId !== null && this.#activeTurnId === command.turnId) {
       await this.#transport.cancel();
-      if (this.#pendingInteraction) {
-        const pending = this.#pendingInteraction;
-        this.#pendingInteraction = null;
-        if (pending.type === "approval") {
-          pending.resolve("", true);
-        } else {
-          pending.resolve({ type: "question", cancelled: true, answers: {} });
-        }
-        this.#channel.emit({
-          kind: "event",
-          event: {
-            type: "interaction.closed",
-            interactionId: pending.id,
-            turnId: command.turnId,
-            reason: "cancelled"
-          }
-        });
-      }
+      if (this.#activeTurnId === command.turnId)
+        this.#cancelInteractions(command.turnId);
     }
     return { ok: true, value: { cancellationRequested: true } };
   }
+  #cancelInteractions(turnId) {
+    const interactions = [...this.#pendingInteractions.values()];
+    this.#pendingInteractions.clear();
+    for (const pending of interactions) {
+      if (pending.type === "approval")
+        pending.resolve("", true);
+      else
+        pending.resolve({ type: "question", cancelled: true, answers: {} });
+      this.#channel.emit({
+        kind: "event",
+        event: {
+          type: "interaction.closed",
+          interactionId: pending.id,
+          turnId,
+          reason: "cancelled"
+        }
+      });
+    }
+  }
   async #respondInteraction(command) {
-    if (!this.#pendingInteraction || this.#pendingInteraction.id !== command.interactionId) {
+    const pending = this.#pendingInteractions.get(command.interactionId);
+    if (!pending) {
       return {
         ok: false,
         error: {
@@ -22961,7 +22978,6 @@ var KiroSession = class {
         }
       };
     }
-    const pending = this.#pendingInteraction;
     if (pending.type === "approval") {
       if (command.response.type !== "approval") {
         return {
@@ -22976,7 +22992,7 @@ var KiroSession = class {
       const error51 = validateHostApprovalResponse(pending.interaction, command.response);
       if (error51)
         return { ok: false, error: error51 };
-      this.#pendingInteraction = null;
+      this.#pendingInteractions.delete(command.interactionId);
       pending.resolve(command.response.actionId);
     } else {
       if (command.response.type !== "question") {
@@ -22992,7 +23008,7 @@ var KiroSession = class {
       const error51 = validateHostQuestionResponse(pending.interaction, command.response);
       if (error51)
         return { ok: false, error: error51 };
-      this.#pendingInteraction = null;
+      this.#pendingInteractions.delete(command.interactionId);
       pending.resolve(command.response);
     }
     if (this.#activeTurnId) {

package/app/plugins/omp/plugin.mjs

@@ -16044,6 +16044,12 @@ function parseHostUsage(value) {
       throw new Error(`Harness Usage contains unknown field '${key}'`);
     }
   }
+  for (const field of ["totalCredits", "contextUsagePercent"]) {
+    const candidate = value[field];
+    if (candidate !== void 0 && (typeof candidate !== "number" || !Number.isFinite(candidate) || candidate < 0)) {
+      throw new Error(`Harness Usage '${field}' must be a finite non-negative number`);
+    }
+  }
   for (const field of tokenFields) {
     const candidate = value[field];
     if (candidate !== void 0 && (typeof candidate !== "number" || !Number.isSafeInteger(candidate) || candidate < 0)) {