@codexhost/cli-darwin-x64 0.12.2 → 0.13.1

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

@@ -396,7 +396,7 @@ async function npmInstallation(command, packages, environment) {
       const npm = resolveHarnessExecutable({ id: "npm", command: "npm", installRoots: { posix: [], windows: [] } }, { environment: env });
       let globalInstall = modules === globalRoot;
       if (process.platform === "win32") {
-        const project = (await Promise.all(["package.json", "package-lock.json", "npm-shrinkwrap.json"].map((file2) => readFile(path4.join(prefix, file2), "utf8").then(() => true, (error51) => error51.code !== "ENOENT")))).some(Boolean);
+        const project2 = (await Promise.all(["package.json", "package-lock.json", "npm-shrinkwrap.json"].map((file2) => readFile(path4.join(prefix, file2), "utf8").then(() => true, (error51) => error51.code !== "ENOENT")))).some(Boolean);
         const bins = typeof metadata.bin === "string" ? { [name.split("/").at(-1) ?? name]: metadata.bin } : metadata.bin ?? {};
         const launchers = await Promise.all(Object.entries(bins).map(async ([bin, entry]) => {
           if (path4.basename(bin) !== bin || entry.includes(".."))
@@ -407,7 +407,7 @@ async function npmInstallation(command, packages, environment) {
           const shim = await readFile(path4.join(prefix, `${bin}.cmd`), "utf8").catch(() => "");
           return referencesNpmBin(shim, name, entry);
         }));
-        globalInstall = globalInstall && !project && launchers.some(Boolean);
+        globalInstall = globalInstall && !project2 && launchers.some(Boolean);
       }
       const canUpdate = globalInstall && !!npm;
       return {
@@ -5128,8 +5128,8 @@ function az_default() {
 }
 
 // ../../../node_modules/zod/v4/locales/be.js
-function getBelarusianPlural(count, one, few, many) {
-  const absCount = Math.abs(count);
+function getBelarusianPlural(count2, one, few, many) {
+  const absCount = Math.abs(count2);
   const lastDigit = absCount % 10;
   const lastTwoDigits = absCount % 100;
   if (lastTwoDigits >= 11 && lastTwoDigits <= 19) {
@@ -7207,8 +7207,8 @@ function hu_default() {
 }
 
 // ../../../node_modules/zod/v4/locales/hy.js
-function getArmenianPlural(count, one, many) {
-  return Math.abs(count) === 1 ? one : many;
+function getArmenianPlural(count2, one, many) {
+  return Math.abs(count2) === 1 ? one : many;
 }
 function withDefiniteArticle(word) {
   if (!word)
@@ -9336,8 +9336,8 @@ function ro_default() {
 }
 
 // ../../../node_modules/zod/v4/locales/ru.js
-function getRussianPlural(count, one, few, many) {
-  const absCount = Math.abs(count);
+function getRussianPlural(count2, one, few, many) {
+  const absCount = Math.abs(count2);
   const lastDigit = absCount % 10;
   const lastTwoDigits = absCount % 100;
   if (lastTwoDigits >= 11 && lastTwoDigits <= 19) {
@@ -15006,6 +15006,15 @@ function date4(params) {
 // ../../../node_modules/zod/v4/classic/external.js
 config(en_default());
 
+// ../../shared-contracts/dist/delegation-read.js
+var REMOTE_THREAD_REPLY_MAX_BYTES = 16 * 1024 * 1024;
+var delegationReadParamsSchema = external_exports.strictObject({
+  threadId: external_exports.string().min(1).max(1024),
+  view: external_exports.enum(["result", "messages"]),
+  cursor: external_exports.string().min(1).max(8192).optional(),
+  limit: external_exports.number().int().min(1).max(100).optional()
+});
+
 // ../../shared-contracts/dist/credential-imports.js
 var credentialSourceSchema = external_exports.object({
   id: external_exports.string().min(1).max(256),
@@ -15076,6 +15085,160 @@ var harnessDisplaySetSchema = external_exports.strictObject({
   initializeOnly: external_exports.boolean().optional()
 });
 
+// ../../shared-contracts/dist/model-price-overrides.js
+var usdPerMillionTokens = external_exports.number().finite().nonnegative();
+var modelPriceOverrideSchema = external_exports.strictObject({
+  input: usdPerMillionTokens,
+  output: usdPerMillionTokens,
+  cacheRead: usdPerMillionTokens.optional(),
+  cacheWrite: usdPerMillionTokens.optional(),
+  cacheWrite1h: usdPerMillionTokens.optional()
+});
+var modelPriceKeySchema = external_exports.string().max(512).refine((key) => key.trim() === key && key.length > 0, "Model ID is required");
+var modelPriceOverridesSchema = external_exports.strictObject({
+  /** Absolute path of the Host's `pricing.json`. */
+  path: external_exports.string(),
+  entries: external_exports.array(external_exports.strictObject({ key: external_exports.string(), price: modelPriceOverrideSchema })),
+  /** Why the existing file is unusable; the Host then ignores it and refuses to overwrite it. */
+  error: external_exports.string().nullable()
+});
+var modelPriceOverridesGetSchema = external_exports.strictObject({});
+var modelPriceOverridesSetSchema = external_exports.strictObject({
+  key: modelPriceKeySchema,
+  price: modelPriceOverrideSchema.nullable(),
+  previousKey: modelPriceKeySchema.optional()
+});
+var modelPriceDefaultParamsSchema = external_exports.strictObject({
+  model: modelPriceKeySchema
+});
+var modelPriceSuggestionSchema = external_exports.strictObject({
+  /** Verified from catalog canonical links, not inferred from names or equal prices. */
+  official: external_exports.boolean().optional(),
+  canonicalModelId: external_exports.string().min(1).optional(),
+  provider: external_exports.string().min(1).max(512),
+  model: external_exports.string().min(1).max(512),
+  price: modelPriceOverrideSchema
+});
+var modelPriceDefaultResultSchema = external_exports.strictObject({
+  price: modelPriceOverrideSchema.nullable(),
+  /** Local catalog suggestions only; never used automatically for pricing. */
+  suggestions: external_exports.array(modelPriceSuggestionSchema).max(6).optional()
+});
+
+// ../../shared-contracts/dist/usage-statistics.js
+var USAGE_STATISTICS_RANGES = ["today", "7d", "30d", "90d", "all"];
+var count = external_exports.number().int().min(0).max(Number.MAX_SAFE_INTEGER);
+var localDate = external_exports.string().regex(/^\d{4}-\d{2}-\d{2}$/u);
+var harness = external_exports.string().min(1).max(128);
+var model = external_exports.string().min(1).max(512);
+var project = external_exports.string().min(1).max(4096);
+var usageStatisticsParamsSchema = external_exports.strictObject({
+  range: external_exports.enum(USAGE_STATISTICS_RANGES),
+  harness: harness.optional(),
+  model: model.nullable().optional(),
+  project: project.nullable().optional(),
+  /** One local date inside the range. */
+  date: localDate.optional()
+});
+var usageStatisticsTotalsSchema = external_exports.strictObject({
+  requests: count,
+  inputTokens: count,
+  cachedInputTokens: count,
+  cacheWriteInputTokens: count,
+  cacheKnownInputTokens: count,
+  outputTokens: count,
+  reasoningOutputTokens: count,
+  /** USD at the public price, summed over the priced requests only. */
+  costUsd: external_exports.number().finite().min(0),
+  /** Requests without a price (or the cache data the price needs); not in `costUsd`. */
+  unpricedRequests: count,
+  /**
+   * Requests whose storage gave no token counts: counted as requests, with neither tokens nor
+   * cost, and not as unpriced.
+   */
+  unmeteredRequests: count
+});
+var totals = usageStatisticsTotalsSchema.shape;
+var usageStatisticsSessionSchema = external_exports.strictObject({
+  harness,
+  sessionId: external_exports.string().min(1).max(512),
+  project: project.nullable(),
+  /** Persisted Desktop title for a mapped Session, otherwise its native name; may be absent. */
+  title: external_exports.string().min(1).max(200).optional(),
+  /** Models the session used, most requests first. */
+  models: external_exports.array(model).max(16),
+  firstAtMs: count,
+  lastAtMs: count,
+  ...totals
+});
+var usageStatisticsResultSchema = external_exports.strictObject({
+  range: external_exports.enum(USAGE_STATISTICS_RANGES),
+  /** First local date of the range; null for all time. */
+  from: localDate.nullable(),
+  to: localDate,
+  /** The filters these figures apply, echoed so a late answer to older filters is recognised. */
+  filters: external_exports.strictObject({
+    harness: harness.nullable(),
+    model: model.nullable(),
+    unknownModel: external_exports.boolean(),
+    project: project.nullable(),
+    unknownProject: external_exports.boolean(),
+    date: localDate.nullable()
+  }),
+  /** Reading of native storage: incomplete while the first read, or a refresh, is under way. */
+  reading: external_exports.strictObject({ complete: external_exports.boolean(), sources: count, read: count }),
+  /** Harnesses whose storage could not be read; their part is missing, the rest is complete. */
+  failures: external_exports.array(external_exports.strictObject({ harness, message: external_exports.string().max(2048) })).max(256),
+  /** Every value seen in the range, ignoring the filters, to choose filters from. */
+  options: external_exports.strictObject({
+    harnesses: external_exports.array(harness).max(256),
+    models: external_exports.array(model.nullable()).max(4096),
+    projects: external_exports.array(project.nullable()).max(4096)
+  }),
+  /** Current display metadata, scoped by Harness. Never a pricing or filter identity.
+   * Optional for older Hosts; missing/conflicting labels fall back to the native model ID.
+   */
+  modelLabels: external_exports.array(external_exports.strictObject({ harness, model, label: model })).max(4096).optional(),
+  /** Native credits, all filters applied, never combined across Harnesses or treated as USD.
+   * Only groups with at least one reported value appear; reportedRequests exposes partial data.
+   */
+  credits: external_exports.array(external_exports.strictObject({
+    harness,
+    model: model.nullable(),
+    credits: external_exports.number().finite().min(0),
+    reportedRequests: count,
+    requests: count
+  })).max(4096).optional(),
+  /** All filters applied. */
+  totals: usageStatisticsTotalsSchema,
+  /** Each date and Harness of the range: every filter except the day. */
+  daily: external_exports.array(external_exports.strictObject({ date: localDate, harness, ...totals })).max(2e5),
+  /** Local weekday (0 = Sunday) and hour, all filters applied. */
+  hourly: external_exports.array(external_exports.strictObject({
+    weekday: external_exports.number().int().min(0).max(6),
+    hour: external_exports.number().int().min(0).max(23),
+    ...totals
+  })).max(168),
+  byHarness: external_exports.array(external_exports.strictObject({ harness, ...totals })).max(256),
+  byModel: external_exports.array(external_exports.strictObject({
+    model: model.nullable(),
+    ...totals,
+    /** Requests priced by what the Harness recorded they cost, not by a price list. */
+    harnessPricedRequests: count
+  })).max(4096),
+  byProject: external_exports.array(external_exports.strictObject({ project: project.nullable(), ...totals })).max(4096),
+  /**
+   * The sessions that spent the most, by cost and by tokens without cache, all filters applied;
+   * requests without a native session are not listed here but count everywhere else.
+   */
+  sessions: external_exports.array(usageStatisticsSessionSchema).max(100),
+  /**
+   * The sessions last active in the range, newest first, all filters applied. Optional for older
+   * Hosts; missing is treated as no list rather than no sessions.
+   */
+  recentSessions: external_exports.array(usageStatisticsSessionSchema).max(100).optional()
+});
+
 // ../../shared-contracts/dist/ids.js
 var opaqueIdSchema = external_exports.string().refine((value) => value.trim().length > 0, {
   message: "Identifier must not be empty or whitespace"
@@ -15123,6 +15286,10 @@ var CONSOLE_HOST_METHODS = Object.freeze([
   "codexhost/account/list",
   "codexhost/account/refresh",
   "codexhost/account/usage/inspect",
+  "codexhost/usage/model-prices/get",
+  "codexhost/usage/model-prices/set",
+  "codexhost/usage/model-prices/default",
+  "codexhost/usage/statistics/get",
   "codexhost/update/check",
   "codexhost/update/start",
   "codexhost/update/status"
@@ -15187,6 +15354,7 @@ var threadUsageSnapshotSchema = external_exports.object({
   cacheWriteInputTokens: nonNegativeSafeIntegerSchema.optional(),
   outputTokens: nonNegativeSafeIntegerSchema.optional(),
   outputTokensPerSecond: finiteNonNegativeNumberSchema.optional(),
+  apiOutputTokensPerSecond: finiteNonNegativeNumberSchema.optional(),
   reasoningOutputTokens: nonNegativeSafeIntegerSchema.optional(),
   totalTokens: nonNegativeSafeIntegerSchema.optional(),
   totalCostUsd: finiteNonNegativeNumberSchema.optional(),
@@ -15198,7 +15366,11 @@ var threadUsageSnapshotSchema = external_exports.object({
   planFiveHourUsedPercent: cacheHitRatePercentSchema.optional(),
   planFiveHourResetsAtUnix: nonNegativeSafeIntegerSchema.optional(),
   planSevenDayUsedPercent: cacheHitRatePercentSchema.optional(),
-  planSevenDayResetsAtUnix: nonNegativeSafeIntegerSchema.optional()
+  planSevenDayResetsAtUnix: nonNegativeSafeIntegerSchema.optional(),
+  sessionCacheHitRatePercent: cacheHitRatePercentSchema.optional(),
+  timeToFirstOutputMs: nonNegativeSafeIntegerSchema.optional(),
+  costSource: external_exports.enum(["publicPrice", "native"]).optional(),
+  unpricedModels: external_exports.array(external_exports.string().min(1)).min(1).optional()
 }).strict().superRefine((usage, context) => {
   if (Object.keys(usage).length === 0) {
     context.addIssue({ code: "custom", message: "Thread Usage must contain a reliable field" });
@@ -15219,6 +15391,20 @@ var threadUsageSnapshotSchema = external_exports.object({
       path: ["contextWindowTokens"]
     });
   }
+  if (usage.costSource !== void 0 && usage.totalCostUsd === void 0) {
+    context.addIssue({
+      code: "custom",
+      message: "Thread Usage costSource must be provided with totalCostUsd",
+      path: ["costSource"]
+    });
+  }
+  if (usage.unpricedModels !== void 0 && usage.costSource !== "publicPrice") {
+    context.addIssue({
+      code: "custom",
+      message: "Thread Usage unpricedModels must be provided with a publicPrice cost",
+      path: ["unpricedModels"]
+    });
+  }
   if (usage.planFiveHourResetsAtUnix !== void 0 && usage.planFiveHourUsedPercent === void 0) {
     context.addIssue({
       code: "custom",
@@ -15473,27 +15659,27 @@ var harnessModelCatalogSchema = external_exports.object({
 }).strict().superRefine((catalog, context) => {
   const refs = /* @__PURE__ */ new Set();
   const thinkingIds = new Set(catalog.thinkingOptions.map(({ id }) => id));
-  for (const [index, model] of catalog.models.entries()) {
-    if (refs.has(model.ref.id)) {
+  for (const [index, model2] of catalog.models.entries()) {
+    if (refs.has(model2.ref.id)) {
       context.addIssue({
         code: "custom",
         message: "Model Catalog refs must be unique",
         path: ["models", index, "ref", "id"]
       });
     }
-    refs.add(model.ref.id);
-    if (model.fastModel) {
-      if (refs.has(model.fastModel.id) || catalog.models.some((entry) => entry.ref.id === model.fastModel?.id)) {
+    refs.add(model2.ref.id);
+    if (model2.fastModel) {
+      if (refs.has(model2.fastModel.id) || catalog.models.some((entry) => entry.ref.id === model2.fastModel?.id)) {
         context.addIssue({
           code: "custom",
           message: "Fast Model refs must be distinct and unique",
           path: ["models", index, "fastModel"]
         });
       }
-      refs.add(model.fastModel.id);
+      refs.add(model2.fastModel.id);
     }
     const supportedThinkingIds = /* @__PURE__ */ new Set();
-    for (const [optionIndex, optionId] of (model.supportedThinkingOptionIds ?? []).entries()) {
+    for (const [optionIndex, optionId] of (model2.supportedThinkingOptionIds ?? []).entries()) {
       if (supportedThinkingIds.has(optionId)) {
         context.addIssue({
           code: "custom",
@@ -15687,13 +15873,40 @@ var HARNESS_PLUGIN_LIMIT = 128;
 var harnessPluginIdSchema = external_exports.string().min(1).max(128).regex(/^[a-z][a-z0-9]*(?:[._-][a-z0-9]+)*$/u).refine((id) => id !== "codex", "The official Codex identity is reserved").pipe(harnessIdSchema);
 var relativeResourceSchema = external_exports.string().min(1).max(512).refine((value) => !/[\\\u0000:#?]/u.test(value) && !value.startsWith("/") && !value.split("/").some((part) => part === ".." || part === ""), "Plugin resources must be relative paths inside the plugin");
 var documentationUrlSchema = external_exports.url().refine((value) => /^https:\/\/[^/?#@]+(?:[/?#]|$)/iu.test(value), "Plugin documentation links must be credential-free HTTPS URLs");
+var localizedTextSchema = external_exports.object({ en: external_exports.string().max(4096), "zh-CN": external_exports.string().max(4096).optional() }).strict();
+var harnessInstallationGuideSchema = external_exports.object({
+  commands: external_exports.array(external_exports.object({ terminal: external_exports.string().max(256), command: external_exports.string().max(4096) }).strict()).max(8),
+  before: localizedTextSchema.optional(),
+  after: localizedTextSchema.optional(),
+  downloads: external_exports.array(external_exports.object({ label: external_exports.string().max(128), url: documentationUrlSchema }).strict()).max(8).optional()
+}).strict();
 var pluginPresentationShape = {
   id: harnessPluginIdSchema,
   name: external_exports.string().trim().min(1).max(128),
   version: external_exports.string().min(1).max(128),
+  /** Capability-only plugin; omitted for existing session-capable plugins. */
+  kind: external_exports.literal("usage").optional(),
+  /** Original image styling or bounded vector paths; never arbitrary CSS/SVG markup. */
+  iconStyle: external_exports.object({
+    vector: external_exports.object({
+      viewBox: external_exports.string().max(128).regex(/^-?\d+(?:\.\d+)?(?: +-?\d+(?:\.\d+)?){3}$/u),
+      color: external_exports.string().regex(/^(?:currentColor|#[a-f0-9]{6})$/iu),
+      paths: external_exports.array(external_exports.object({
+        d: external_exports.string().min(1).max(32768).regex(/^[MmLlHhVvCcSsQqTtAaZz\d.,+eE\s-]+$/u),
+        fillRule: external_exports.enum(["evenodd", "nonzero"]).optional(),
+        fill: external_exports.string().regex(/^(?:currentColor|#[a-f0-9]{6})$/iu).optional()
+      }).strict()).min(1).max(32)
+    }).strict().optional(),
+    background: external_exports.string().regex(/^#[a-f0-9]{6}$/iu).optional(),
+    borderRadius: external_exports.number().min(0).max(50).optional(),
+    paddingRatio: external_exports.number().min(0).max(0.25).optional()
+  }).strict().optional(),
+  installation: harnessInstallationGuideSchema.optional(),
+  notice: localizedTextSchema.optional(),
   /** The factory accepts a persisted local entrypoint through its construction context. */
   launchCommand: external_exports.literal(true).optional(),
   links: external_exports.object({
+    website: documentationUrlSchema.optional(),
     documentation: documentationUrlSchema.optional(),
     installation: documentationUrlSchema.optional()
   }).strict().optional()
@@ -16112,6 +16325,11 @@ var codexSshDraftSchema = external_exports.strictObject({
 });
 var remoteConnectionsRequestSchema = external_exports.discriminatedUnion("action", [
   external_exports.strictObject({ action: external_exports.literal("list") }),
+  external_exports.strictObject({
+    action: external_exports.literal("read-thread"),
+    hostId: hostId.refine((id) => id !== "local"),
+    input: delegationReadParamsSchema
+  }),
   external_exports.strictObject({
     action: external_exports.literal("save"),
     draft: codexSshDraftSchema,
@@ -16254,10 +16472,12 @@ var tokenFields = [
 ];
 var safeIntegerFields = [
   "planFiveHourResetsAtUnix",
-  "planSevenDayResetsAtUnix"
+  "planSevenDayResetsAtUnix",
+  "timeToFirstOutputMs"
 ];
 var percentFields = [
   "cacheHitRatePercent",
+  "sessionCacheHitRatePercent",
   "planFiveHourUsedPercent",
   "planSevenDayUsedPercent"
 ];
@@ -16265,10 +16485,14 @@ var usageFields = /* @__PURE__ */ new Set([
   ...tokenFields,
   ...safeIntegerFields,
   ...percentFields,
+  "sessionCacheUsage",
   "totalCostUsd",
   "totalCredits",
   "contextUsagePercent",
-  "outputTokensPerSecond"
+  "outputTokensPerSecond",
+  "apiOutputTokensPerSecond",
+  "costSource",
+  "unpricedModels"
 ]);
 function isRecord(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
@@ -16284,7 +16508,11 @@ function parseHostUsage(value) {
       throw new Error(`Harness Usage contains unknown field '${key}'`);
     }
   }
-  for (const field of ["totalCredits", "contextUsagePercent"]) {
+  for (const field of [
+    "totalCredits",
+    "contextUsagePercent",
+    "apiOutputTokensPerSecond"
+  ]) {
     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`);
@@ -16314,6 +16542,12 @@ function parseHostUsage(value) {
       throw new Error(`Harness Usage '${field}' must be between 0 and 100`);
     }
   }
+  if (value.sessionCacheUsage !== void 0) {
+    const totals2 = value.sessionCacheUsage;
+    if (!isRecord(totals2) || Object.keys(totals2).some((key) => key !== "inputTokens" && key !== "cachedInputTokens") || typeof totals2.inputTokens !== "number" || !Number.isSafeInteger(totals2.inputTokens) || totals2.inputTokens < 0 || typeof totals2.cachedInputTokens !== "number" || !Number.isSafeInteger(totals2.cachedInputTokens) || totals2.cachedInputTokens < 0 || totals2.cachedInputTokens > totals2.inputTokens) {
+      throw new Error("Harness Usage 'sessionCacheUsage' must contain complete bounded token totals");
+    }
+  }
   const hasContextUsed = value.contextUsedTokens !== void 0;
   const hasContextWindow = value.contextWindowTokens !== void 0;
   if (hasContextUsed !== hasContextWindow) {
@@ -16328,8 +16562,43 @@ function parseHostUsage(value) {
   if (value.planSevenDayResetsAtUnix !== void 0 && value.planSevenDayUsedPercent === void 0) {
     throw new Error("Harness Usage 'planSevenDayResetsAtUnix' must be provided with 'planSevenDayUsedPercent'");
   }
+  if (value.costSource !== void 0) {
+    if (value.costSource !== "publicPrice" && value.costSource !== "native") {
+      throw new Error("Harness Usage 'costSource' must be 'publicPrice' or 'native'");
+    }
+    if (value.totalCostUsd === void 0) {
+      throw new Error("Harness Usage 'costSource' must be provided with 'totalCostUsd'");
+    }
+  }
+  if (value.unpricedModels !== void 0) {
+    const models = value.unpricedModels;
+    if (!Array.isArray(models) || models.length === 0 || !models.every((model2) => typeof model2 === "string" && model2.length > 0)) {
+      throw new Error("Harness Usage 'unpricedModels' must be a non-empty list of Model IDs");
+    }
+    if (value.costSource !== "publicPrice") {
+      throw new Error("Harness Usage 'unpricedModels' must be provided with a 'publicPrice' cost");
+    }
+    return { ...value, unpricedModels: [...models] };
+  }
   return { ...value };
 }
+var requestTokenFields = [
+  "inputTokens",
+  "cachedInputTokens",
+  "cacheWriteInputTokens",
+  "cacheWrite1hInputTokens",
+  "outputTokens",
+  "reasoningOutputTokens",
+  "startedAtMs",
+  "completedAtMs"
+];
+var requestFields = /* @__PURE__ */ new Set([
+  ...requestTokenFields,
+  "requestId",
+  "historical",
+  "model",
+  "provider"
+]);
 
 // ../../../node_modules/@agentclientprotocol/sdk/dist/schema/index.js
 var AGENT_METHODS = {
@@ -18614,9 +18883,9 @@ var Connection = class {
       return;
     }
     const responseBatch = isResponseBatch(batch);
-    const responseCount = responseBatch ? 0 : batch.reduce((count, message) => count + (isNotificationMessage(message) ? 0 : 1), 0);
+    const responseCount = responseBatch ? 0 : batch.reduce((count2, message) => count2 + (isNotificationMessage(message) ? 0 : 1), 0);
     let remaining = responseCount;
-    let remainingNotifications = batch.reduce((count, message) => count + (isNotificationMessage(message) ? 1 : 0), 0);
+    let remainingNotifications = batch.reduce((count2, message) => count2 + (isNotificationMessage(message) ? 1 : 0), 0);
     let responseSent = false;
     const responses = [];
     const sendResponsesIfReady = async () => {
@@ -21600,6 +21869,33 @@ function splitLines(text) {
 }
 
 // ../../../node_modules/smol-toml/dist/date.js
+/*!
+ * Copyright (c) Squirrel Chat et al., All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holder nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software without
+ *    specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 var DATE_TIME_RE = /^(\d{4}-\d{2}-\d{2})?[T ]?(?:(\d{2}):\d{2}(?::\d{2}(?:\.\d+)?)?)?(Z|[-+]\d{2}:\d{2})?$/i;
 var TomlDate = class _TomlDate extends Date {
   #hasDate = false;
@@ -21692,6 +21988,33 @@ var TomlDate = class _TomlDate extends Date {
 };
 
 // ../../../node_modules/smol-toml/dist/error.js
+/*!
+ * Copyright (c) Squirrel Chat et al., All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holder nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software without
+ *    specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 function getLineColFromPtr(string4, ptr) {
   let lines = string4.slice(0, ptr).split(/\r\n|\n|\r/g);
   return [lines.length, lines.pop().length + 1];
@@ -21732,6 +22055,33 @@ ${codeblock}`, options);
 };
 
 // ../../../node_modules/smol-toml/dist/util.js
+/*!
+ * Copyright (c) Squirrel Chat et al., All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holder nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software without
+ *    specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 function indexOfNewline(str, start = 0) {
   let idx = str.indexOf("\n", start);
   if (str.charCodeAt(idx - 1) === 13)
@@ -21787,6 +22137,33 @@ function skipUntil(ctx, sep, end) {
 }
 
 // ../../../node_modules/smol-toml/dist/primitive.js
+/*!
+ * Copyright (c) Squirrel Chat et al., All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holder nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software without
+ *    specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 var INT_REGEX = /^((0x[0-9a-fA-F](_?[0-9a-fA-F])*)|(([+-]|0[ob])?\d(_?\d)*))$/;
 var FLOAT_REGEX = /^[+-]?\d(_?\d)*(\.\d(_?\d)*)?([eE][+-]?\d(_?\d)*)?$/;
 var LEADING_ZERO = /^[+-]?0[0-9_]/;
@@ -21943,6 +22320,33 @@ function parseValue(ctx, integersAsBigInt, end) {
 }
 
 // ../../../node_modules/smol-toml/dist/extract.js
+/*!
+ * Copyright (c) Squirrel Chat et al., All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holder nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software without
+ *    specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 function extractValue(ctx, end, integersAsBigInt) {
   let ptr = ctx.p;
   let c = ctx.s.charCodeAt(ptr);
@@ -21976,6 +22380,33 @@ function extractValue(ctx, end, integersAsBigInt) {
 }
 
 // ../../../node_modules/smol-toml/dist/struct.js
+/*!
+ * Copyright (c) Squirrel Chat et al., All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holder nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software without
+ *    specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 var KEY_PART_RE = /^[a-zA-Z0-9-_]+[ \t]*$/;
 function parseKey(ctx, end = "=") {
   let start = ctx.p;
@@ -22118,6 +22549,33 @@ function parseArray(ctx, integersAsBigInt) {
 }
 
 // ../../../node_modules/smol-toml/dist/parse.js
+/*!
+ * Copyright (c) Squirrel Chat et al., All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holder nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software without
+ *    specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 function peekTable(key, table, meta3, type) {
   let t = table;
   let m = meta3;
@@ -22244,6 +22702,64 @@ function parse3(toml, { maxDepth = 1e3, integersAsBigInt } = {}) {
   return res;
 }
 
+// ../../../node_modules/smol-toml/dist/stringify.js
+/*!
+ * Copyright (c) Squirrel Chat et al., All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holder nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software without
+ *    specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+// ../../../node_modules/smol-toml/dist/index.js
+/*!
+ * Copyright (c) Squirrel Chat et al., All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holder nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software without
+ *    specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
 // dist/models.js
 var KIMI_MODEL_PREFIX = "kimi.";
 function encodeKimiModelRef(alias) {
@@ -24087,7 +24603,7 @@ var KimiSession = class {
         }
       });
     };
-    const completeAgentMessage = (phase) => {
+    const completeAgentMessage = (phase, outcome = { status: "succeeded" }) => {
       if (currentAgentMessage) {
         const resolvedPhase = phase ?? currentAgentMessage.phase;
         const item = {
@@ -24096,10 +24612,23 @@ var KimiSession = class {
           text: currentAgentMessage.text,
           ...resolvedPhase ? { phase: resolvedPhase } : {}
         };
-        completeItem({ item, outcome: { status: "succeeded" } });
+        completeItem({ item, outcome });
         currentAgentMessage = null;
       }
     };
+    const completeFinalMessage = (outcome) => {
+      completeAgentMessage(outcome.status !== "succeeded" ? "commentary" : hasHadToolCallsInTurn ? "final_answer" : void 0, outcome);
+    };
+    const getActiveTool = (event) => {
+      const existing = accumulator.get(event.toolCallId);
+      if (existing) {
+        return existing.status === "completed" || existing.status === "failed" ? void 0 : existing;
+      }
+      hasHadToolCallsInTurn = true;
+      completeReasoning();
+      completeAgentMessage("commentary");
+      return accumulator.getOrCreate(event.toolCallId, turnId, event.name, event.kind);
+    };
     const handler = {
       onEvent: (event) => {
         if (this.#closed || this.#faulted || this.#activeTurn?.turnId !== turnId)
@@ -24121,12 +24650,9 @@ var KimiSession = class {
             break;
           }
           case "tool.call": {
-            hasHadToolCallsInTurn = true;
-            completeReasoning();
-            if (currentAgentMessage) {
-              completeAgentMessage("commentary");
-            }
-            const state = accumulator.getOrCreate(event.toolCallId, turnId, event.name, event.kind);
+            const state = getActiveTool(event);
+            if (!state)
+              break;
             state.name = canonicalizeKimiToolName(event.name, event.kind, event.args);
             if (event.kind)
               state.kind = event.kind;
@@ -24143,11 +24669,9 @@ var KimiSession = class {
             break;
           }
           case "tool.update": {
-            completeReasoning();
-            if (currentAgentMessage) {
-              completeAgentMessage("commentary");
-            }
-            const state = accumulator.getOrCreate(event.toolCallId, turnId, event.name, event.kind);
+            const state = getActiveTool(event);
+            if (!state)
+              break;
             if (state.name === "Tool" && event.name) {
               state.name = canonicalizeKimiToolName(event.name, event.kind ?? state.kind, event.rawInput ?? state.rawInput);
             }
@@ -24303,13 +24827,13 @@ var KimiSession = class {
     completeReasoning();
     if (isCommandTurn)
       appendAgentText(formatKimiCommandOutput(commandOutput));
-    completeAgentMessage(hasHadToolCallsInTurn ? "final_answer" : void 0);
     let currentNativeTurn = null;
     if (isCommandTurn) {
       const outcome = promptError ? {
         status: "failed",
         error: { code: "nativeFailure", message: promptError.message, retryable: false }
       } : promptResponse?.stopReason === "cancelled" ? { status: "cancelled", reason: "Native command cancelled" } : { status: "succeeded" };
+      completeFinalMessage(outcome);
       const commandTurn = {
         nativeTurnRef: createKimiNativeTurnRef(this.#sessionId, `command:${turnId}`),
         input: command.input,
@@ -24400,6 +24924,8 @@ var KimiSession = class {
         status: "succeeded"
       };
     }
+    if (!isCommandTurn)
+      completeFinalMessage(turnOutcome);
     const completedOutcome = currentNativeTurn?.checkpoint ? { ...turnOutcome, checkpoint: currentNativeTurn.checkpoint } : turnOutcome;
     return {
       kind: "event",