ns-omp-provider 0.5.0 → 0.6.1

package/dist/index.js

@@ -1,4 +1,4 @@
-// ns-omp-provider 0.5.0 — bundles @ngosangns/ns-pi-provider@0.4.0 (MIT). See NOTICE.
+// ns-omp-provider 0.6.1 — bundles @ngosangns/ns-pi-provider@0.5.1 (MIT). See NOTICE.
 import { createRequire as __nsOmpCreateRequire } from 'node:module';
 const require = __nsOmpCreateRequire(import.meta.url);
 var __create = Object.create;
@@ -298,439 +298,6 @@ var init_endpoints = __esm({
   }
 });
 
-// ../bridge-core/dist/sidecar/binary.js
-import { createRequire } from "node:module";
-function findPackagedSidecarBinary() {
-  let bin;
-  try {
-    bin = localRequire(SIDECAR_BIN_PACKAGE);
-  } catch {
-    return { error: `${SIDECAR_BIN_PACKAGE} is not installed` };
-  }
-  try {
-    return { path: bin.binaryPath() };
-  } catch (error2) {
-    return { error: error2 instanceof Error ? error2.message : String(error2) };
-  }
-}
-function resolveSidecarBinary(explicit, env = process.env, options = {}) {
-  const fromEnv = env[NS_BRIDGE_BIN_ENV]?.trim();
-  if (fromEnv)
-    return fromEnv;
-  if (explicit?.trim())
-    return explicit.trim();
-  const packaged = (options.packaged ?? findPackagedSidecarBinary)();
-  if ("path" in packaged)
-    return packaged.path;
-  return DEFAULT_SIDECAR_COMMAND;
-}
-var NS_BRIDGE_BIN_ENV, DEFAULT_SIDECAR_COMMAND, SIDECAR_BIN_PACKAGE, localRequire;
-var init_binary = __esm({
-  "../bridge-core/dist/sidecar/binary.js"() {
-    "use strict";
-    NS_BRIDGE_BIN_ENV = "NS_BRIDGE_BIN";
-    DEFAULT_SIDECAR_COMMAND = "ns-bridge";
-    SIDECAR_BIN_PACKAGE = "ns-bridge-bin";
-    localRequire = createRequire(import.meta.url);
-  }
-});
-
-// ../bridge-core/dist/sidecar/errors.js
-var SidecarError;
-var init_errors = __esm({
-  "../bridge-core/dist/sidecar/errors.js"() {
-    "use strict";
-    SidecarError = class _SidecarError extends Error {
-      name = "SidecarError";
-      kind;
-      vendor;
-      status;
-      retryAfterMs;
-      reasonCode;
-      vendorError;
-      providerAttempts;
-      exitCode;
-      exitSignal;
-      stderr;
-      constructor(kind, message, details = {}) {
-        super(message, details.cause === void 0 ? void 0 : { cause: details.cause });
-        this.kind = kind;
-        this.vendor = details.vendor;
-        this.status = details.status;
-        this.retryAfterMs = details.retryAfterMs;
-        this.reasonCode = details.reasonCode;
-        this.vendorError = details.vendorError;
-        this.providerAttempts = details.providerAttempts;
-        this.exitCode = details.exitCode;
-        this.exitSignal = details.exitSignal;
-        this.stderr = details.stderr;
-      }
-      /** Rebuild the error a binary reported on its terminal line. */
-      static fromPayload(payload, details = {}) {
-        const kind = typeof payload.kind === "string" ? payload.kind : "internal";
-        const message = typeof payload.message === "string" && payload.message ? payload.message : `sidecar ${kind} error`;
-        return new _SidecarError(kind, message, {
-          ...details,
-          vendor: payload.vendor ?? details.vendor,
-          status: payload.status,
-          retryAfterMs: payload.retryAfterMs,
-          reasonCode: payload.reasonCode,
-          vendorError: payload.vendorError,
-          providerAttempts: payload.providerAttempts
-        });
-      }
-    };
-  }
-});
-
-// ../bridge-core/dist/sidecar/stream.js
-import { spawn } from "node:child_process";
-async function* sidecarStream(vendor, request, options = {}) {
-  let sawDone = false;
-  for await (const message of sidecarLines(vendor, ["stream", "--vendor", vendor], request, options, "done")) {
-    if (!EVENT_TYPES.has(message.type))
-      continue;
-    if (sawDone)
-      continue;
-    if (message.type === "done")
-      sawDone = true;
-    yield message;
-  }
-}
-async function sidecarCall(vendor, op, request, options = {}) {
-  let result;
-  for await (const message of sidecarLines(vendor, ["call", "--vendor", vendor, "--op", op], request, options, "result")) {
-    if (message.type === "result")
-      result = message.result;
-  }
-  return result;
-}
-async function* sidecarLines(vendor, args, request, options, terminal) {
-  const { signal } = options;
-  signal?.throwIfAborted();
-  const env = options.env ?? process.env;
-  const binary = resolveSidecarBinary(options.binary, env);
-  const graceMs = options.killGraceMs ?? DEFAULT_KILL_GRACE_MS;
-  let child;
-  try {
-    child = spawn(binary, args, { env, stdio: "pipe", windowsHide: true });
-  } catch (cause) {
-    throw unavailable(binary, vendor, cause);
-  }
-  const lines = [];
-  let partial = "";
-  let stderr = "";
-  let spawnError;
-  let exited = false;
-  let closed = false;
-  let exitCode = null;
-  let exitSignal = null;
-  let aborted = false;
-  let wake;
-  const notify = () => {
-    const resolve = wake;
-    wake = void 0;
-    resolve?.();
-  };
-  child.stdout.setEncoding("utf8");
-  child.stdout.on("data", (chunk) => {
-    const parts = (partial + chunk).split("\n");
-    partial = parts.pop() ?? "";
-    for (const part of parts)
-      if (part.trim())
-        lines.push(part);
-    notify();
-  });
-  child.stderr.setEncoding("utf8");
-  const stderrSink = options.stderr === void 0 ? process.stderr : options.stderr;
-  child.stderr.on("data", (chunk) => {
-    if (stderrSink)
-      stderrSink.write(chunk);
-    stderr = (stderr + chunk).slice(-STDERR_TAIL_BYTES);
-  });
-  child.stdin.on("error", () => {
-  });
-  child.on("error", (error2) => {
-    spawnError = error2;
-    notify();
-  });
-  child.on("exit", (code, sig) => {
-    exited = true;
-    exitCode = code;
-    exitSignal = sig;
-  });
-  child.on("close", (code, sig) => {
-    exited = true;
-    closed = true;
-    exitCode ??= code;
-    exitSignal ??= sig;
-    if (partial.trim())
-      lines.push(partial);
-    partial = "";
-    notify();
-  });
-  const timers = [];
-  const cancel = () => {
-    if (!child.stdin.destroyed)
-      child.stdin.end();
-    if (exited)
-      return;
-    const escalate = (delay, sig) => {
-      const timer = setTimeout(() => {
-        if (!exited)
-          child.kill(sig);
-      }, delay);
-      timer.unref();
-      timers.push(timer);
-    };
-    escalate(graceMs, "SIGTERM");
-    escalate(graceMs * 2, "SIGKILL");
-  };
-  const onAbort = () => {
-    aborted = true;
-    cancel();
-    notify();
-  };
-  signal?.addEventListener("abort", onAbort, { once: true });
-  child.stdin.write(`${JSON.stringify({ protocol: SIDECAR_PROTOCOL_VERSION, request })}
-`);
-  const details = () => ({ vendor, exitCode, exitSignal, stderr: stderr.trim() || void 0 });
-  let sawTerminal = false;
-  let finished = false;
-  try {
-    while (true) {
-      if (aborted)
-        throw abortReason(signal);
-      if (spawnError !== void 0)
-        throw unavailable(binary, vendor, spawnError);
-      const line = lines.shift();
-      if (line !== void 0) {
-        const message = parseLine(line, details);
-        if (message.type === "error") {
-          throw SidecarError.fromPayload(message.error ?? { kind: "protocol", message: "ns-bridge wrote an error line without a payload" }, details());
-        }
-        if (message.type === terminal)
-          sawTerminal = true;
-        yield message;
-        continue;
-      }
-      if (closed)
-        break;
-      await new Promise((resolve) => {
-        wake = resolve;
-      });
-    }
-    if (exitCode !== 0) {
-      const how = exitSignal ? `was killed by ${exitSignal}` : `exited with code ${exitCode}`;
-      throw new SidecarError("crashed", `ns-bridge (${vendor}) ${how} without reporting an error`, details());
-    }
-    if (!sawTerminal) {
-      throw new SidecarError("protocol", `ns-bridge (${vendor}) exited without a ${terminal} ${terminal === "done" ? "event" : "line"}`, details());
-    }
-    finished = true;
-  } finally {
-    signal?.removeEventListener("abort", onAbort);
-    if (finished) {
-      for (const timer of timers)
-        clearTimeout(timer);
-    } else {
-      cancel();
-    }
-  }
-}
-function parseLine(line, details) {
-  let value;
-  try {
-    value = JSON.parse(line);
-  } catch (cause) {
-    throw new SidecarError("protocol", `ns-bridge wrote a line that is not JSON: ${line.slice(0, 200)}`, {
-      ...details(),
-      cause
-    });
-  }
-  if (!value || typeof value !== "object" || typeof value.type !== "string") {
-    throw new SidecarError("protocol", `ns-bridge wrote a line without a type: ${line.slice(0, 200)}`, details());
-  }
-  return value;
-}
-function unavailable(binary, vendor, cause) {
-  const code = cause?.code;
-  const reason = code === "ENOENT" ? "not found" : code === "EACCES" ? "not executable" : String(cause);
-  const packaged = binary === DEFAULT_SIDECAR_COMMAND ? findPackagedSidecarBinary() : void 0;
-  const why = packaged && "error" in packaged ? ` ${packaged.error}.` : "";
-  return new SidecarError("unavailable", `Cannot start the ns-bridge binary "${binary}" (${reason}).${why} Install ns-bridge-bin or point NS_BRIDGE_BIN at a binary.`, { vendor, cause });
-}
-function abortReason(signal) {
-  const reason = signal?.reason;
-  if (reason instanceof Error)
-    return reason;
-  return new DOMException(typeof reason === "string" ? reason : "This operation was aborted", "AbortError");
-}
-var SIDECAR_PROTOCOL_VERSION, DEFAULT_KILL_GRACE_MS, STDERR_TAIL_BYTES, EVENT_TYPES;
-var init_stream = __esm({
-  "../bridge-core/dist/sidecar/stream.js"() {
-    "use strict";
-    init_binary();
-    init_errors();
-    SIDECAR_PROTOCOL_VERSION = 1;
-    DEFAULT_KILL_GRACE_MS = 2e3;
-    STDERR_TAIL_BYTES = 8 * 1024;
-    EVENT_TYPES = /* @__PURE__ */ new Set([
-      "start",
-      "text_start",
-      "text_delta",
-      "text_end",
-      "thinking_start",
-      "thinking_delta",
-      "thinking_end",
-      "tool_call_start",
-      "tool_call_delta",
-      "tool_call_end",
-      "reset",
-      "usage",
-      "done"
-    ]);
-  }
-});
-
-// ../bridge-core/dist/sidecar/engine.js
-import { existsSync, statSync } from "node:fs";
-import { delimiter, isAbsolute, join as join2 } from "node:path";
-function parseSetting(value) {
-  switch (value?.trim().toLowerCase()) {
-    case "go":
-    case "sidecar":
-    case "native":
-      return "go";
-    case "ts":
-    case "typescript":
-    case "js":
-    case "node":
-    case "in-process":
-      return "ts";
-    case "auto":
-      return "auto";
-    default:
-      return void 0;
-  }
-}
-function bridgeEngineSetting(vendor, env = process.env) {
-  const perVendor = vendor ? parseSetting(env[`${NS_BRIDGE_ENGINE_ENV}_${vendor.toUpperCase()}`]) : void 0;
-  return perVendor ?? parseSetting(env[NS_BRIDGE_ENGINE_ENV]) ?? DEFAULT_BRIDGE_ENGINE;
-}
-function isFile(path) {
-  try {
-    return statSync(path).isFile();
-  } catch {
-    return false;
-  }
-}
-function onPath(command, env) {
-  if (isAbsolute(command))
-    return isFile(command);
-  const extensions = process.platform === "win32" ? (env.PATHEXT ?? ".EXE;.CMD;.BAT").split(";") : [""];
-  for (const dir of (env.PATH ?? "").split(delimiter)) {
-    if (!dir)
-      continue;
-    for (const ext of extensions)
-      if (isFile(join2(dir, command + ext.toLowerCase())) || isFile(join2(dir, command + ext)))
-        return true;
-  }
-  return false;
-}
-function sidecarBinaryAvailable(env = process.env) {
-  const fromEnv = env[NS_BRIDGE_BIN_ENV]?.trim();
-  if (fromEnv)
-    return existsSync(fromEnv) || onPath(fromEnv, env);
-  if ("path" in findPackagedSidecarBinary())
-    return true;
-  return onPath(DEFAULT_SIDECAR_COMMAND, env);
-}
-function selectBridgeEngine(vendor, env = process.env) {
-  const setting = bridgeEngineSetting(vendor, env);
-  if (setting !== "auto")
-    return setting;
-  return sidecarBinaryAvailable(env) ? "go" : "ts";
-}
-function isAutoFallback(error2) {
-  return error2.kind === "unavailable" || error2.kind === "unsupported" || error2.kind === "crashed" && error2.exitCode === 2;
-}
-async function* engineStream(options) {
-  const env = options.env ?? process.env;
-  const engine = options.engine ?? selectBridgeEngine(options.vendor, env);
-  if (engine === "ts") {
-    yield* options.inProcess();
-    return;
-  }
-  let delivered = false;
-  try {
-    const raw = sidecarStream(options.vendor, options.request(), {
-      ...options.sidecar,
-      ...options.signal ? { signal: options.signal } : {},
-      env
-    });
-    for await (const event of options.transform ? options.transform(raw) : raw) {
-      delivered = true;
-      yield event;
-    }
-  } catch (error2) {
-    if (error2 instanceof SidecarError && isAutoFallback(error2) && !delivered && options.engine === void 0 && bridgeEngineSetting(options.vendor, env) === "auto") {
-      if (!warnedFallback) {
-        warnedFallback = true;
-        console.warn(`[ns-bridge] ${error2.message} Falling back to the in-process TypeScript core.`);
-      }
-      yield* options.inProcess();
-      return;
-    }
-    throw error2 instanceof SidecarError && options.mapError ? options.mapError(error2) : error2;
-  }
-}
-async function engineCall(options) {
-  const env = options.env ?? process.env;
-  const engine = options.engine ?? selectBridgeEngine(options.vendor, env);
-  if (engine === "ts")
-    return options.inProcess();
-  try {
-    return await sidecarCall(options.vendor, options.op, options.request(), {
-      ...options.sidecar,
-      ...options.signal ? { signal: options.signal } : {},
-      env
-    });
-  } catch (error2) {
-    if (error2 instanceof SidecarError && isAutoFallback(error2) && options.engine === void 0 && bridgeEngineSetting(options.vendor, env) === "auto") {
-      if (!warnedFallback) {
-        warnedFallback = true;
-        console.warn(`[ns-bridge] ${error2.message} Falling back to the in-process TypeScript core.`);
-      }
-      return options.inProcess();
-    }
-    throw error2 instanceof SidecarError && options.mapError ? options.mapError(error2) : error2;
-  }
-}
-var NS_BRIDGE_ENGINE_ENV, DEFAULT_BRIDGE_ENGINE, warnedFallback;
-var init_engine = __esm({
-  "../bridge-core/dist/sidecar/engine.js"() {
-    "use strict";
-    init_binary();
-    init_errors();
-    init_stream();
-    NS_BRIDGE_ENGINE_ENV = "NS_BRIDGE_ENGINE";
-    DEFAULT_BRIDGE_ENGINE = "auto";
-    warnedFallback = false;
-  }
-});
-
-// ../bridge-core/dist/sidecar/index.js
-var init_sidecar = __esm({
-  "../bridge-core/dist/sidecar/index.js"() {
-    "use strict";
-    init_binary();
-    init_engine();
-    init_errors();
-    init_stream();
-  }
-});
-
 // ../kiro-core/dist/kiro-cli.js
 var kiro_cli_exports = {};
 __export(kiro_cli_exports, {
@@ -746,16 +313,16 @@ __export(kiro_cli_exports, {
   tryKiroCliToken: () => tryKiroCliToken
 });
 import { execFileSync, execSync } from "node:child_process";
-import { existsSync as existsSync2 } from "node:fs";
-import { createRequire as createRequire2 } from "node:module";
+import { existsSync } from "node:fs";
+import { createRequire } from "node:module";
 import { homedir as homedir2, platform } from "node:os";
-import { join as join3 } from "node:path";
+import { join as join2 } from "node:path";
 function getKiroCliDbPath() {
   const p = platform();
-  const localAppData = process.env.LOCALAPPDATA || join3(homedir2(), "AppData", "Local");
-  const roamingAppData = process.env.APPDATA || join3(homedir2(), "AppData", "Roaming");
-  const candidates = p === "win32" ? [join3(localAppData, "Kiro-Cli", "data.sqlite3"), join3(roamingAppData, "kiro-cli", "data.sqlite3")] : p === "darwin" ? [join3(homedir2(), "Library", "Application Support", "kiro-cli", "data.sqlite3")] : [join3(homedir2(), ".local", "share", "kiro-cli", "data.sqlite3")];
-  return candidates.find((candidate) => existsSync2(candidate));
+  const localAppData = process.env.LOCALAPPDATA || join2(homedir2(), "AppData", "Local");
+  const roamingAppData = process.env.APPDATA || join2(homedir2(), "AppData", "Roaming");
+  const candidates = p === "win32" ? [join2(localAppData, "Kiro-Cli", "data.sqlite3"), join2(roamingAppData, "kiro-cli", "data.sqlite3")] : p === "darwin" ? [join2(homedir2(), "Library", "Application Support", "kiro-cli", "data.sqlite3")] : [join2(homedir2(), ".local", "share", "kiro-cli", "data.sqlite3")];
+  return candidates.find((candidate) => existsSync(candidate));
 }
 function getKiroCliExternalIdpCredentials() {
   const dbPath = getKiroCliDbPath();
@@ -1035,7 +602,7 @@ var init_kiro_cli = __esm({
   "../kiro-core/dist/kiro-cli.js"() {
     "use strict";
     init_debug();
-    require2 = createRequire2(import.meta.url);
+    require2 = createRequire(import.meta.url);
     EXTERNAL_IDP_TOKEN_KEY = "kirocli:external-idp:token";
     TOKEN_KEY_BY_AUTH_METHOD = {
       idc: ["kirocli:odic:token", "codewhisperer:odic:token"],
@@ -1047,12 +614,12 @@ var init_kiro_cli = __esm({
 });
 
 // ../kiro-core/dist/kiro-ide.js
-import { existsSync as existsSync3, readFileSync } from "node:fs";
+import { existsSync as existsSync2, readFileSync } from "node:fs";
 import { homedir as homedir3 } from "node:os";
-import { join as join4 } from "node:path";
+import { join as join3 } from "node:path";
 function readKiroIdeToken(allowExpired) {
   try {
-    if (!existsSync3(KIRO_IDE_TOKEN_PATH))
+    if (!existsSync2(KIRO_IDE_TOKEN_PATH))
       return void 0;
     const tokenData = JSON.parse(readFileSync(KIRO_IDE_TOKEN_PATH, "utf-8"));
     if (!tokenData.accessToken || !tokenData.refreshToken)
@@ -1064,8 +631,8 @@ function readKiroIdeToken(allowExpired) {
     let clientId = "";
     let clientSecret = "";
     if (tokenData.clientIdHash) {
-      const regPath = join4(SSO_CACHE_DIR, `${tokenData.clientIdHash}.json`);
-      if (existsSync3(regPath)) {
+      const regPath = join3(SSO_CACHE_DIR, `${tokenData.clientIdHash}.json`);
+      if (existsSync2(regPath)) {
         try {
           const reg = JSON.parse(readFileSync(regPath, "utf-8"));
           clientId = reg.clientId ?? "";
@@ -1099,8 +666,8 @@ var SSO_CACHE_DIR, KIRO_IDE_TOKEN_PATH;
 var init_kiro_ide = __esm({
   "../kiro-core/dist/kiro-ide.js"() {
     "use strict";
-    SSO_CACHE_DIR = join4(homedir3(), ".aws", "sso", "cache");
-    KIRO_IDE_TOKEN_PATH = join4(SSO_CACHE_DIR, "kiro-auth-token.json");
+    SSO_CACHE_DIR = join3(homedir3(), ".aws", "sso", "cache");
+    KIRO_IDE_TOKEN_PATH = join3(SSO_CACHE_DIR, "kiro-auth-token.json");
   }
 });
 
@@ -1130,23 +697,28 @@ function kiroAuthHeaders(token) {
 function isApiKey(token) {
   return token.startsWith("ksk_");
 }
+async function fetchApiKeyGetProfile(accessToken) {
+  try {
+    return await fetch(getKiroEndpoints(API_KEY_REGION).management, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/x-amz-json-1.0",
+        "X-Amz-Target": "AmazonCodeWhispererService.GetProfile",
+        ...kiroAuthHeaders(accessToken),
+        ...kiroUserAgent("codewhispererruntime", "F,C")
+      },
+      body: "{}"
+    });
+  } catch (error2) {
+    throw new Error(`Kiro management GetProfile request failed in ${API_KEY_REGION}`, { cause: error2 });
+  }
+}
 async function loginKiroWithApiKey(apiKey, onProgress) {
   if (!apiKey.startsWith("ksk_")) {
     throw new Error("Invalid API key format. Kiro API keys start with 'ksk_'.");
   }
   onProgress?.("Validating API key...");
-  const region = "us-east-1";
-  const managementUrl = `https://management.${resolveApiRegion(region)}.kiro.dev/`;
-  const response = await fetch(managementUrl, {
-    method: "POST",
-    headers: {
-      "Content-Type": "application/x-amz-json-1.0",
-      "X-Amz-Target": "AmazonCodeWhispererService.GetProfile",
-      ...kiroAuthHeaders(apiKey),
-      ...kiroUserAgent("codewhispererruntime", "F,C")
-    },
-    body: "{}"
-  });
+  const response = await fetchApiKeyGetProfile(apiKey);
   if (!response.ok) {
     let detail = "";
     try {
@@ -1167,7 +739,7 @@ async function loginKiroWithApiKey(apiKey, onProgress) {
     expires: Date.now() + 365 * 24 * 60 * 60 * 1e3,
     clientId: "",
     clientSecret: "",
-    region,
+    region: API_KEY_REGION,
     authMethod: "apikey",
     ...profileArn ? { profileArn } : {}
   };
@@ -1238,8 +810,7 @@ async function refreshKiroTokenInternal(credentials) {
   }
 }
 async function refreshKiroTokenDirect(credentials) {
-  const { runKiroOp: runKiroOp2 } = await Promise.resolve().then(() => (init_engine_ops(), engine_ops_exports));
-  return runKiroOp2("refreshToken", () => ({ credentials }), () => refreshKiroTokenDirectInProcess(credentials));
+  return refreshKiroTokenDirectInProcess(credentials);
 }
 function endpointFromEnv(name, fallback, region) {
   return (process.env[name]?.trim() || fallback).replaceAll("{region}", region);
@@ -1360,7 +931,7 @@ async function resolveKiroCredentials() {
     throw lastFailure;
   return void 0;
 }
-var KIRO_DESKTOP_REFRESH_URL, EXPIRES_BUFFER_MS, KIRO_DESKTOP_USER_AGENT, AUTH_SOURCE_ENV, KIRO_DESKTOP_REFRESH_ENDPOINT_ENV, KIRO_OIDC_ENDPOINT_ENV;
+var KIRO_DESKTOP_REFRESH_URL, EXPIRES_BUFFER_MS, KIRO_DESKTOP_USER_AGENT, AUTH_SOURCE_ENV, API_KEY_REGION, KIRO_DESKTOP_REFRESH_ENDPOINT_ENV, KIRO_OIDC_ENDPOINT_ENV;
 var init_oauth = __esm({
   "../kiro-core/dist/oauth.js"() {
     "use strict";
@@ -1371,6 +942,7 @@ var init_oauth = __esm({
     EXPIRES_BUFFER_MS = 5 * 60 * 1e3;
     KIRO_DESKTOP_USER_AGENT = "Kiro-Desktop/0.2.13 (darwin; arm64)";
     AUTH_SOURCE_ENV = "KIRO_AUTH_SOURCE";
+    API_KEY_REGION = "us-east-1";
     KIRO_DESKTOP_REFRESH_ENDPOINT_ENV = "KIRO_DESKTOP_REFRESH_ENDPOINT";
     KIRO_OIDC_ENDPOINT_ENV = "KIRO_OIDC_ENDPOINT";
   }
@@ -1455,25 +1027,11 @@ function profileCacheKey(auth) {
 }
 async function getApiKeyProfileArn(accessToken) {
   const operation = "GetProfile";
-  let response;
-  try {
-    response = await fetch(getKiroEndpoints(API_KEY_REGION).management, {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/x-amz-json-1.0",
-        "X-Amz-Target": GET_PROFILE_TARGET,
-        ...kiroAuthHeaders(accessToken),
-        ...kiroUserAgent("codewhispererruntime", "F,C")
-      },
-      body: "{}"
-    });
-  } catch (error2) {
-    throw new Error(`Kiro management ${operation} request failed in ${API_KEY_REGION}`, { cause: error2 });
-  }
-  const parsed = await parseManagementResponse(response, operation, API_KEY_REGION);
+  const response = await fetchApiKeyGetProfile(accessToken);
+  const parsed = await parseManagementResponse(response, operation, API_KEY_REGION2);
   const arn = parsed.profile?.arn;
   if (!arn) {
-    throw new Error(`Kiro management ${operation} returned no profile in ${API_KEY_REGION}`);
+    throw new Error(`Kiro management ${operation} returned no profile in ${API_KEY_REGION2}`);
   }
   return arn;
 }
@@ -1488,32 +1046,6 @@ async function parseManagementResponse(response, operation, region) {
     throw new Error(`Kiro management ${operation} returned invalid JSON in ${region}`, { cause: error2 });
   }
 }
-function snapshotKiroProfileArnCache() {
-  return Object.fromEntries(profileArnCache);
-}
-function snapshotKiroProfileRegionCache() {
-  return Object.fromEntries(profileRegionCache);
-}
-function applyKiroProfileRegionChanges(regions) {
-  if (!regions)
-    return;
-  for (const [key, region] of Object.entries(regions))
-    if (typeof region === "string" && region)
-      profileRegionCache.set(key, region);
-}
-function applyKiroProfileArnCacheChanges(changes) {
-  if (!changes)
-    return;
-  for (const [key, arn] of Object.entries(changes)) {
-    if (typeof arn === "string" && arn) {
-      profileArnCache.set(key, arn);
-    } else {
-      profileArnCache.delete(key);
-      profileRegionCache.delete(key);
-      pendingProfileRequests.delete(key);
-    }
-  }
-}
 function invalidateKiroProfileArn(auth) {
   const key = profileCacheKey(auth);
   profileArnCache.delete(key);
@@ -1541,8 +1073,8 @@ async function resolveKiroProfileArn(auth, providedArn) {
     if (isApiKey(auth.accessToken)) {
       const arn = await getApiKeyProfileArn(auth.accessToken);
       profileArnCache.set(key, arn);
-      profileRegionCache.set(key, API_KEY_REGION);
-      debugLog("profile.resolve", { source: "api-key", region: API_KEY_REGION, arn });
+      profileRegionCache.set(key, API_KEY_REGION2);
+      debugLog("profile.resolve", { source: "api-key", region: API_KEY_REGION2, arn });
       return arn;
     }
     let lastResponse;
@@ -1595,13 +1127,13 @@ async function listAvailableModels(auth, profileArn) {
 }
 async function fetchKiroModelCatalog(auth, providedProfileArn) {
   const profileArn = await resolveKiroProfileArn(auth, providedProfileArn);
-  const region = isApiKey(auth.accessToken) ? API_KEY_REGION : profileRegionCache.get(profileCacheKey(auth)) ?? auth.region;
+  const region = isApiKey(auth.accessToken) ? API_KEY_REGION2 : profileRegionCache.get(profileCacheKey(auth)) ?? auth.region;
   if (region !== auth.region) {
     return listAvailableModels({ ...auth, region }, profileArn);
   }
   return listAvailableModels(auth, profileArn);
 }
-var LIST_PROFILES_PATH, LIST_MODELS_PATH, GET_PROFILE_TARGET, API_KEY_REGION, profileArnCache, pendingProfileRequests, profileRegionCache, CANONICAL_MANAGEMENT_REGIONS, ENV_PROFILE_ARN, KiroManagementHttpError;
+var LIST_PROFILES_PATH, LIST_MODELS_PATH, API_KEY_REGION2, profileArnCache, pendingProfileRequests, profileRegionCache, CANONICAL_MANAGEMENT_REGIONS, ENV_PROFILE_ARN, KiroManagementHttpError;
 var init_management = __esm({
   "../kiro-core/dist/management.js"() {
     "use strict";
@@ -1611,8 +1143,7 @@ var init_management = __esm({
     init_token_type();
     LIST_PROFILES_PATH = "List-Available-Profiles";
     LIST_MODELS_PATH = "List-Available-Models";
-    GET_PROFILE_TARGET = "AmazonCodeWhispererService.GetProfile";
-    API_KEY_REGION = "us-east-1";
+    API_KEY_REGION2 = "us-east-1";
     profileArnCache = /* @__PURE__ */ new Map();
     pendingProfileRequests = /* @__PURE__ */ new Map();
     profileRegionCache = /* @__PURE__ */ new Map();
@@ -1648,9 +1179,9 @@ __export(models_exports, {
   updateKiroModelsCacheInProcess: () => updateKiroModelsCacheInProcess
 });
 import { randomUUID } from "node:crypto";
-import { existsSync as existsSync4, readFileSync as readFileSync2, renameSync, rmSync, writeFileSync } from "node:fs";
+import { existsSync as existsSync3, readFileSync as readFileSync2, renameSync, rmSync, writeFileSync } from "node:fs";
 import { homedir as homedir4 } from "node:os";
-import { join as join5 } from "node:path";
+import { join as join4 } from "node:path";
 function isRecord2(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -1702,7 +1233,7 @@ function parseManagementCache(raw) {
   };
 }
 function readManagementCache() {
-  if (!existsSync4(KIRO_MANAGEMENT_CACHE_PATH))
+  if (!existsSync3(KIRO_MANAGEMENT_CACHE_PATH))
     return void 0;
   try {
     return parseManagementCache(readFileSync2(KIRO_MANAGEMENT_CACHE_PATH, "utf-8"));
@@ -1837,22 +1368,7 @@ function isCacheStale(region) {
   return !entry || Date.now() - entry.fetchedAt > CACHE_MAX_AGE_MS;
 }
 async function updateKiroModelsCache(accessToken, region, profileArn) {
-  const { runKiroOp: runKiroOp2 } = await Promise.resolve().then(() => (init_engine_ops(), engine_ops_exports));
-  await runKiroOp2("refreshModels", () => ({
-    accessToken,
-    region,
-    ...profileArn ? { profileArn } : {},
-    known: kiroModels.map((model) => ({
-      id: model.id,
-      name: model.name,
-      input: model.input,
-      ...model.firstTokenTimeout ? { firstTokenTimeout: model.firstTokenTimeout } : {}
-    })),
-    cachePath: KIRO_MANAGEMENT_CACHE_PATH
-  }), async () => {
-    await updateKiroModelsCacheInProcess(accessToken, region, profileArn);
-    return {};
-  });
+  await updateKiroModelsCacheInProcess(accessToken, region, profileArn);
   refreshKnownModelIds(readManagementCache());
 }
 async function updateKiroModelsCacheInProcess(accessToken, region, profileArn) {
@@ -1896,7 +1412,7 @@ var init_models = __esm({
     init_endpoints();
     KIRO_MANAGEMENT_CACHE_VERSION = 1;
     KIRO_MANAGEMENT_CACHE_SOURCE = "ns-kiro-provider-management";
-    KIRO_MANAGEMENT_CACHE_PATH = join5(homedir4(), ".ns-kiro-provider-models-cache.json");
+    KIRO_MANAGEMENT_CACHE_PATH = join4(homedir4(), ".ns-kiro-provider-models-cache.json");
     CACHE_MAX_AGE_MS = 36e5;
     DEFAULT_CONTEXT_WINDOW = 2e5;
     DEFAULT_MAX_TOKENS = 8192;
@@ -2118,254 +1634,34 @@ var init_models = __esm({
   }
 });
 
-// ../kiro-core/dist/retry.js
-function firstTokenTimeoutForModel(modelId) {
-  if (retryConfig.firstTokenTimeoutMs !== FIRST_TOKEN_TIMEOUT) {
-    return retryConfig.firstTokenTimeoutMs;
-  }
-  const model = kiroModels.find((m) => m.id === modelId);
-  return model?.firstTokenTimeout ?? FIRST_TOKEN_TIMEOUT;
-}
-function exponentialBackoff(attempt, baseMs, maxMs) {
-  return Math.min(baseMs * 2 ** attempt, maxMs);
-}
-function extractKiroReason(errorText) {
-  if (!errorText)
-    return void 0;
-  try {
-    const parsed = JSON.parse(errorText);
-    if (!parsed || typeof parsed !== "object" || Array.isArray(parsed))
-      return void 0;
-    const reason = parsed.reason;
-    return typeof reason === "string" && reason.length > 0 ? reason : void 0;
-  } catch {
-    return void 0;
-  }
-}
-function parseRetryAfterMs(headers, nowMs = Date.now()) {
-  const get = headers?.get?.bind(headers);
-  if (!get)
-    return void 0;
-  const milliseconds = nonNegativeNumber(get("retry-after-ms"));
-  if (milliseconds !== void 0)
-    return Math.round(milliseconds);
-  const retryAfter = get("retry-after");
-  if (retryAfter !== null && retryAfter.trim() !== "") {
-    const seconds = Number(retryAfter);
-    if (Number.isFinite(seconds)) {
-      if (seconds >= 0) {
-        const delayMs = seconds * 1e3;
-        if (Number.isFinite(delayMs))
-          return Math.round(delayMs);
+// ../../node_modules/.pnpm/base64-js@1.5.1/node_modules/base64-js/index.js
+var require_base64_js = __commonJS({
+  "../../node_modules/.pnpm/base64-js@1.5.1/node_modules/base64-js/index.js"(exports) {
+    "use strict";
+    exports.byteLength = byteLength;
+    exports.toByteArray = toByteArray;
+    exports.fromByteArray = fromByteArray;
+    var lookup = [];
+    var revLookup = [];
+    var Arr = typeof Uint8Array !== "undefined" ? Uint8Array : Array;
+    var code = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+    for (i = 0, len = code.length; i < len; ++i) {
+      lookup[i] = code[i];
+      revLookup[code.charCodeAt(i)] = i;
+    }
+    var i;
+    var len;
+    revLookup["-".charCodeAt(0)] = 62;
+    revLookup["_".charCodeAt(0)] = 63;
+    function getLens(b64) {
+      var len2 = b64.length;
+      if (len2 % 4 > 0) {
+        throw new Error("Invalid string. Length must be a multiple of 4");
       }
-    } else {
-      const dateMs = Date.parse(retryAfter);
-      if (!Number.isNaN(dateMs))
-        return Math.max(0, dateMs - nowMs);
-    }
-  }
-  const resetAfterSeconds = nonNegativeNumber(get("x-ratelimit-reset-after"));
-  if (resetAfterSeconds !== void 0) {
-    const delayMs = resetAfterSeconds * 1e3;
-    if (Number.isFinite(delayMs))
-      return Math.round(delayMs);
-  }
-  return void 0;
-}
-function resolveRequestRateRetryDelay(headers, nowMs = Date.now()) {
-  const advertisedDelayMs = parseRetryAfterMs(headers, nowMs);
-  const requestedDelayMs = advertisedDelayMs ?? REQUEST_RATE_FALLBACK_DELAY_MS;
-  return {
-    delayMs: Math.min(requestedDelayMs, MAX_RETRY_DELAY),
-    ...advertisedDelayMs !== void 0 ? { advertisedDelayMs } : {},
-    capped: requestedDelayMs > MAX_RETRY_DELAY
-  };
-}
-function nonNegativeNumber(value) {
-  if (value === null || value.trim() === "")
-    return void 0;
-  const parsed = Number(value);
-  return Number.isFinite(parsed) && parsed >= 0 ? parsed : void 0;
-}
-function isTooBigError(status, errorText) {
-  return status === 413 || status === 400 && TOO_BIG_PATTERNS.some((p) => errorText.includes(p));
-}
-function isNonRetryableBodyError(errorText) {
-  return NON_RETRYABLE_BODY_PATTERNS.some((p) => errorText.includes(p));
-}
-function isCapacityError(errorText) {
-  return errorText.includes(CAPACITY_PATTERN);
-}
-var FIRST_TOKEN_TIMEOUT, REQUEST_HEADER_TIMEOUT, retryConfig, MAX_RETRY_DELAY, REQUEST_RATE_FALLBACK_DELAY_MS, KIRO_REASON_CODES, TOO_BIG_PATTERNS, NON_RETRYABLE_BODY_PATTERNS, CAPACITY_PATTERN, CAPACITY_MAX_RETRIES, CAPACITY_BASE_DELAY_MS, capacityRetryConfig;
-var init_retry = __esm({
-  "../kiro-core/dist/retry.js"() {
-    "use strict";
-    init_models();
-    FIRST_TOKEN_TIMEOUT = 9e4;
-    REQUEST_HEADER_TIMEOUT = 9e4;
-    retryConfig = {
-      firstTokenTimeoutMs: FIRST_TOKEN_TIMEOUT,
-      requestHeaderTimeoutMs: REQUEST_HEADER_TIMEOUT
-    };
-    MAX_RETRY_DELAY = 1e4;
-    REQUEST_RATE_FALLBACK_DELAY_MS = 1e4;
-    KIRO_REASON_CODES = Object.freeze({
-      /** Request body exceeded the service's size threshold. */
-      CONTENT_LENGTH_EXCEEDS_THRESHOLD: "CONTENT_LENGTH_EXCEEDS_THRESHOLD",
-      /** Prose-only size rejection; the service sends no reason code for this one. */
-      INPUT_TOO_LONG: "Input is too long",
-      /** Monthly request quota exhausted — hard limit, not transient. */
-      MONTHLY_REQUEST_COUNT: "MONTHLY_REQUEST_COUNT",
-      /** Model capacity temporarily unavailable — transient, worth retrying. */
-      INSUFFICIENT_MODEL_CAPACITY: "INSUFFICIENT_MODEL_CAPACITY",
-      /** Short-window request throttle — retry only within the provider budget. */
-      USER_REQUEST_RATE_EXCEEDED: "USER_REQUEST_RATE_EXCEEDED",
-      /**
-       * Generic request-validation rejection, returned for a malformed body of any
-       * size (empty `content`, history referencing tools absent from the catalog).
-       * Not a size signal: classifying it as "too big" makes the caller compact a
-       * history that was never the problem, a loop it can never satisfy.
-       */
-      REQUEST_BODY_INVALID: "REQUEST_BODY_INVALID"
-    });
-    TOO_BIG_PATTERNS = Object.freeze([
-      KIRO_REASON_CODES.CONTENT_LENGTH_EXCEEDS_THRESHOLD,
-      KIRO_REASON_CODES.INPUT_TOO_LONG
-    ]);
-    NON_RETRYABLE_BODY_PATTERNS = Object.freeze([KIRO_REASON_CODES.MONTHLY_REQUEST_COUNT]);
-    CAPACITY_PATTERN = KIRO_REASON_CODES.INSUFFICIENT_MODEL_CAPACITY;
-    CAPACITY_MAX_RETRIES = 3;
-    CAPACITY_BASE_DELAY_MS = 5e3;
-    capacityRetryConfig = {
-      maxRetries: CAPACITY_MAX_RETRIES,
-      baseDelayMs: CAPACITY_BASE_DELAY_MS
-    };
-  }
-});
-
-// ../kiro-core/dist/errors.js
-function extractKiroReasonCode(errorText) {
-  if (!errorText)
-    return void 0;
-  const trimmed = errorText.trim();
-  if (trimmed.startsWith("{")) {
-    try {
-      const parsed = JSON.parse(trimmed);
-      const reason = parsed.reason ?? parsed.reasonCode;
-      if (typeof reason === "string" && reason.length > 0)
-        return reason;
-    } catch {
-    }
-  }
-  return REASON_CODE_MARKERS.find((code) => errorText.includes(code));
-}
-var REASON_CODE_MARKERS, KiroApiError;
-var init_errors2 = __esm({
-  "../kiro-core/dist/errors.js"() {
-    "use strict";
-    init_retry();
-    init_retry();
-    REASON_CODE_MARKERS = [
-      KIRO_REASON_CODES.CONTENT_LENGTH_EXCEEDS_THRESHOLD,
-      KIRO_REASON_CODES.MONTHLY_REQUEST_COUNT,
-      KIRO_REASON_CODES.INSUFFICIENT_MODEL_CAPACITY,
-      KIRO_REASON_CODES.REQUEST_BODY_INVALID
-    ];
-    KiroApiError = class extends Error {
-      status;
-      reasonCode;
-      retryAfterMs;
-      providerAttempts;
-      constructor(message, status, reasonCode, retryAfterMs, providerAttempts) {
-        super(message);
-        this.status = status;
-        this.reasonCode = reasonCode;
-        this.retryAfterMs = retryAfterMs;
-        this.providerAttempts = providerAttempts;
-        this.name = "KiroApiError";
-      }
-    };
-  }
-});
-
-// ../kiro-core/dist/engine-ops.js
-var engine_ops_exports = {};
-__export(engine_ops_exports, {
-  kiroErrorFromSidecar: () => kiroErrorFromSidecar,
-  runKiroOp: () => runKiroOp
-});
-function kiroErrorFromSidecar(error2) {
-  switch (error2.vendorError) {
-    case "KiroApiError":
-      return new KiroApiError(error2.message, error2.status ?? 0, error2.reasonCode, error2.retryAfterMs, error2.providerAttempts);
-    case "KiroManagementHttpError":
-      return new KiroManagementHttpError(error2.message, error2.status ?? 0);
-    case "Error":
-      return new Error(error2.message);
-    default:
-      return error2;
-  }
-}
-async function runKiroOp(op, request, inProcess) {
-  let ranInProcess = false;
-  const result = await engineCall({
-    vendor: "kiro",
-    op,
-    request: () => ({
-      ...request(),
-      profileArnCache: snapshotKiroProfileArnCache(),
-      profileRegions: snapshotKiroProfileRegionCache()
-    }),
-    inProcess: async () => {
-      ranInProcess = true;
-      return await inProcess();
-    },
-    mapError: kiroErrorFromSidecar
-  });
-  if (ranInProcess || !result || typeof result !== "object")
-    return result;
-  const { kiroProfileArns, kiroProfileRegions, ...rest } = result;
-  applyKiroProfileArnCacheChanges(kiroProfileArns);
-  applyKiroProfileRegionChanges(kiroProfileRegions);
-  return rest;
-}
-var init_engine_ops = __esm({
-  "../kiro-core/dist/engine-ops.js"() {
-    "use strict";
-    init_sidecar();
-    init_errors2();
-    init_management();
-  }
-});
-
-// ../../node_modules/.pnpm/base64-js@1.5.1/node_modules/base64-js/index.js
-var require_base64_js = __commonJS({
-  "../../node_modules/.pnpm/base64-js@1.5.1/node_modules/base64-js/index.js"(exports) {
-    "use strict";
-    exports.byteLength = byteLength;
-    exports.toByteArray = toByteArray;
-    exports.fromByteArray = fromByteArray;
-    var lookup = [];
-    var revLookup = [];
-    var Arr = typeof Uint8Array !== "undefined" ? Uint8Array : Array;
-    var code = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-    for (i = 0, len = code.length; i < len; ++i) {
-      lookup[i] = code[i];
-      revLookup[code.charCodeAt(i)] = i;
-    }
-    var i;
-    var len;
-    revLookup["-".charCodeAt(0)] = 62;
-    revLookup["_".charCodeAt(0)] = 63;
-    function getLens(b64) {
-      var len2 = b64.length;
-      if (len2 % 4 > 0) {
-        throw new Error("Invalid string. Length must be a multiple of 4");
-      }
-      var validLen = b64.indexOf("=");
-      if (validLen === -1) validLen = len2;
-      var placeHoldersLen = validLen === len2 ? 0 : 4 - validLen % 4;
-      return [validLen, placeHoldersLen];
+      var validLen = b64.indexOf("=");
+      if (validLen === -1) validLen = len2;
+      var placeHoldersLen = validLen === len2 ? 0 : 4 - validLen % 4;
+      return [validLen, placeHoldersLen];
     }
     function byteLength(b64) {
       var lens = getLens(b64);
@@ -2439,393 +1735,83 @@ var require_base64_js = __commonJS({
   }
 });
 
-// ../devin-core/dist/util.js
-import { createHash as createHash4 } from "node:crypto";
-function isRecord3(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-function sanitizeText(text) {
-  const wellFormed = text.toWellFormed();
-  const clean = wellFormed === text ? text : wellFormed.replaceAll(REPLACEMENT_CHAR, "");
-  return clean.replace(ANSI_PATTERN, "").replace(CONTROL_PATTERN, "");
-}
-function deterministicUuid(seed) {
-  const hex = createHash4("sha256").update(seed).digest("hex");
-  return `${hex.slice(0, 8)}-${hex.slice(8, 12)}-${hex.slice(12, 16)}-${hex.slice(16, 20)}-${hex.slice(20, 32)}`;
-}
-function devinDebugEnabled() {
-  const value = process.env.NS_DEVIN_DEBUG ?? process.env.DEVIN_DEBUG;
-  return value !== void 0 && value !== "" && value !== "0" && value !== "false";
-}
-function emit(method, message, data) {
-  const line = data === void 0 ? `[devin] ${message}` : `[devin] ${message} ${safeJson(data)}`;
-  console[method === "debug" ? "error" : method](line);
+// src/compat/pi-ai.ts
+import { createAssistantMessageEventStream } from "@oh-my-pi/pi-ai";
+
+// ../bridge-core/dist/pi/transcript.js
+function isSystemMessage(message) {
+  return message?.role === "system";
 }
-function safeJson(data) {
-  try {
-    return JSON.stringify(data, (_key, value) => typeof value === "bigint" ? Number(value) : value);
-  } catch {
+function contentText(content) {
+  if (typeof content === "string")
+    return content;
+  if (!Array.isArray(content))
     return "";
-  }
+  return content.map((part) => part && typeof part === "object" && part.type === "text" ? String(part.text ?? "") : "").filter((text) => text.length > 0).join("\n");
 }
-function redactSensitiveCredentials(text) {
-  let out = text;
-  for (const pattern of SENSITIVE_PATTERNS) {
-    out = out.replace(pattern, (match) => {
-      const separator = match.match(/[:=\s]/)?.index ?? 0;
-      return `${match.slice(0, separator + 1)}[REDACTED]`;
-    });
+function getCurrentTools(messages) {
+  const tools = /* @__PURE__ */ new Map();
+  for (const message of messages) {
+    if (!isSystemMessage(message))
+      continue;
+    for (const tool of message.toolsRemoved ?? [])
+      tools.delete(tool.name);
+    for (const tool of message.toolsAdded ?? [])
+      tools.set(tool.name, tool);
   }
-  return out;
-}
-function normalizeSystemPrompts(systemPrompt) {
-  const prompts = systemPrompt === void 0 || systemPrompt === null ? [] : Array.isArray(systemPrompt) ? systemPrompt : typeof systemPrompt === "string" ? [systemPrompt] : [];
-  return prompts.map((prompt) => redactSensitiveCredentials(prompt.toWellFormed())).filter((prompt) => prompt.trim().length > 0);
+  return [...tools.values()];
 }
-var ANSI_PATTERN, CONTROL_PATTERN, REPLACEMENT_CHAR, logger, SENSITIVE_PATTERNS;
-var init_util = __esm({
-  "../devin-core/dist/util.js"() {
-    "use strict";
-    ANSI_PATTERN = /\x1b(?:\[[0-9;?]*[ -/]*[@-~]|\][^\x07\x1b]*(?:\x07|\x1b\\)|[@-Z\\-_])/g;
-    CONTROL_PATTERN = /[\x00-\x08\x0B-\x1F\x7F-\x9F]/g;
-    REPLACEMENT_CHAR = "\uFFFD";
-    logger = {
-      debug(message, data) {
-        if (devinDebugEnabled())
-          emit("debug", message, data);
-      },
-      warn(message, data) {
-        emit("warn", message, data);
-      },
-      error(message, data) {
-        emit("error", message, data);
-      }
-    };
-    SENSITIVE_PATTERNS = [
-      /\b(sk|pk|key|token|secret|password|bearer|api[_-]?key|credential|authorization)\s*[:=]\s*["']?[\w.$~+-]{6,}["']?/gi,
-      /\b(cog_|devin-session-token\$)[\w.$~+-]+/g,
-      /\bBearer\s+[\w.$~+-]{6,}/gi
-    ];
+function getCurrentSystemPrompt(messages) {
+  const content = [];
+  const sections = /* @__PURE__ */ new Map();
+  for (const message of messages) {
+    if (!isSystemMessage(message))
+      continue;
+    const text = contentText(message.content);
+    if (text.length > 0)
+      content.push(text);
+    for (const [name, value] of Object.entries(message.sections ?? {})) {
+      if (value === null)
+        sections.delete(name);
+      else
+        sections.set(name, value);
+    }
   }
-});
+  return [content.join("\n\n"), ...sections.values()].filter((part) => part.length > 0).join("\n\n");
+}
 
-// ../devin-core/dist/errors.js
-function devinErrorDetail(response, payload) {
-  let text;
-  try {
-    text = new TextDecoder("utf-8", { fatal: true }).decode(payload).trim();
-  } catch {
-    return void 0;
-  }
-  if (response.headers.get("content-type")?.toLowerCase().includes("text/html"))
-    return void 0;
-  try {
-    const decoded = JSON.parse(text);
-    if (isRecord3(decoded)) {
-      const error2 = decoded.error;
-      if (isRecord3(error2) && typeof error2.message === "string")
-        text = error2.message.trim();
-      else if (typeof error2 === "string")
-        text = error2.trim();
-      else if (typeof decoded.message === "string")
-        text = decoded.message.trim();
+// ../bridge-core/dist/pi/context.js
+function userContent(content) {
+  if (typeof content === "string")
+    return content ? [{ type: "text", text: content }] : [];
+  if (!Array.isArray(content))
+    return [];
+  const out = [];
+  for (const block of content) {
+    if (block?.type === "text" && typeof block.text === "string")
+      out.push({ type: "text", text: block.text });
+    else if (block?.type === "image" && typeof block.data === "string") {
+      out.push({ type: "image", data: block.data, mimeType: String(block.mimeType ?? "image/png") });
     }
-  } catch {
-  }
-  const normalized = text.replace(/\s+/g, " ").trim();
-  if (normalized.length === 0 || HTML_ERROR_BODY_PATTERN.test(normalized) || sanitizeText(normalized) !== normalized) {
-    return void 0;
   }
-  if (normalized.length <= MAX_DEVIN_ERROR_DETAIL_CHARS)
-    return normalized;
-  const boundaryUnit = normalized.charCodeAt(MAX_DEVIN_ERROR_DETAIL_CHARS - 1);
-  const cut = boundaryUnit >= 55296 && boundaryUnit <= 56319 ? MAX_DEVIN_ERROR_DETAIL_CHARS - 1 : MAX_DEVIN_ERROR_DETAIL_CHARS;
-  return normalized.slice(0, cut);
-}
-function createDevinHttpError(operation, response, payload) {
-  const status = `${response.status}${response.statusText ? ` ${response.statusText}` : ""}`;
-  const detail = devinErrorDetail(response, payload);
-  const headers = {};
-  response.headers.forEach((value, key) => {
-    headers[key] = value;
-  });
-  return new DevinApiError(`Devin ${operation} error ${status}${detail ? `: ${detail}` : ""}`, operation, response.status, headers);
+  return out;
 }
-function truncateTrailerEvidence(text) {
-  return text.length > MAX_TRAILER_EVIDENCE_CHARS ? `${text.slice(0, MAX_TRAILER_EVIDENCE_CHARS)}\u2026` : text;
+var STOP_REASONS = /* @__PURE__ */ new Set(["stop", "length", "toolUse", "error", "aborted"]);
+function parseArguments(value) {
+  if (typeof value === "string") {
+    try {
+      const parsed = JSON.parse(value || "{}");
+      return parsed && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : {};
+    } catch {
+      return {};
+    }
+  }
+  return value && typeof value === "object" ? value : {};
 }
-function summarizeTrailerDetails(details) {
-  if (!Array.isArray(details) || details.length === 0)
-    return void 0;
-  let summary = "";
-  for (const entry of details) {
-    if (!isRecord3(entry))
-      continue;
-    const type = typeof entry.type === "string" && entry.type ? entry.type : void 0;
-    const value = typeof entry.value === "string" && entry.value ? entry.value : void 0;
-    let debug;
-    if (entry.debug !== void 0) {
-      try {
-        debug = typeof entry.debug === "string" ? entry.debug : JSON.stringify(entry.debug);
-      } catch {
-        debug = void 0;
-      }
-    }
-    const boundedType = type ? truncateTrailerEvidence(type) : void 0;
-    const evidence = debug ?? value;
-    const boundedEvidence = evidence ? truncateTrailerEvidence(evidence) : void 0;
-    let part;
-    if (boundedType && boundedEvidence)
-      part = `${boundedType}: ${boundedEvidence}`;
-    else
-      part = boundedType ?? boundedEvidence;
-    if (!part)
-      continue;
-    const next = summary ? `${summary}; ${part}` : part;
-    if (next.length > MAX_TRAILER_EVIDENCE_CHARS)
-      return truncateTrailerEvidence(next);
-    summary = next;
-  }
-  return summary || void 0;
-}
-function readConnectTrailerError(text) {
-  if (text.length === 0)
-    return null;
-  let parsed;
-  try {
-    parsed = JSON.parse(text);
-  } catch {
-    return null;
-  }
-  if (!isRecord3(parsed) || !("error" in parsed))
-    return null;
-  const err = parsed.error;
-  if (!isRecord3(err))
-    return null;
-  const code = typeof err.code === "string" ? err.code : "";
-  const message = typeof err.message === "string" ? err.message : "";
-  if (!code && !message)
-    return null;
-  const trailer = {
-    code,
-    message,
-    formatted: `Devin stream error${code ? ` ${code}` : ""}: ${message}`,
-    raw: truncateTrailerEvidence(text)
-  };
-  const detail = summarizeTrailerDetails(err.details);
-  if (detail) {
-    trailer.detail = detail;
-    trailer.formatted += ` [details: ${detail}]`;
-  }
-  return trailer;
-}
-function isDevinCapacityError(error2) {
-  if (error2 instanceof DevinApiError)
-    return error2.status === 502 || error2.status === 503 || error2.status === 529;
-  if (error2 instanceof DevinStreamError) {
-    return error2.code === "unavailable" || error2.code === "deadline_exceeded" || /capacity|overload/i.test(error2.message);
-  }
-  return false;
-}
-var DevinApiError, DevinProtocolError, DevinStreamError, MAX_DEVIN_ERROR_DETAIL_CHARS, HTML_ERROR_BODY_PATTERN, MAX_TRAILER_EVIDENCE_CHARS;
-var init_errors3 = __esm({
-  "../devin-core/dist/errors.js"() {
-    "use strict";
-    init_util();
-    DevinApiError = class extends Error {
-      status;
-      operation;
-      headers;
-      constructor(message, operation, status, headers) {
-        super(message);
-        this.name = "DevinApiError";
-        this.operation = operation;
-        this.status = status;
-        this.headers = headers ?? {};
-      }
-    };
-    DevinProtocolError = class extends Error {
-      kind;
-      constructor(message, kind = "runtime") {
-        super(message);
-        this.name = "DevinProtocolError";
-        this.kind = kind;
-      }
-    };
-    DevinStreamError = class extends Error {
-      code;
-      contextOverflow;
-      constructor(message, code = "", contextOverflow = false) {
-        super(message);
-        this.name = "DevinStreamError";
-        this.code = code;
-        this.contextOverflow = contextOverflow;
-      }
-    };
-    MAX_DEVIN_ERROR_DETAIL_CHARS = 4096;
-    HTML_ERROR_BODY_PATTERN = /^\s*(?:<!doctype\s+html\b|<html\b)/i;
-    MAX_TRAILER_EVIDENCE_CHARS = 2e3;
-  }
-});
-
-// ../devin-core/dist/engine.js
-function selectDevinEngine(request) {
-  return request.fetch ? "ts" : selectBridgeEngine(DEVIN_SIDECAR_VENDOR);
-}
-function toDevinSidecarRequest(request, capacityRetry) {
-  const { signal: _signal, fetch: _fetch, ...wire } = request;
-  return capacityRetry ? { ...wire, capacityRetry } : wire;
-}
-function devinErrorFromSidecar(error2) {
-  if (error2.status !== void 0) {
-    const headers = error2.retryAfterMs !== void 0 ? { "retry-after": String(error2.retryAfterMs / 1e3) } : {};
-    return new DevinApiError(error2.message, "API", error2.status, headers);
-  }
-  if (error2.kind === "protocol" && error2.reasonCode && PROTOCOL_KINDS.has(error2.reasonCode)) {
-    return new DevinProtocolError(error2.message, error2.reasonCode);
-  }
-  if (error2.kind === "context_overflow" || error2.kind === "capacity" || error2.kind === "rate_limit" || error2.kind === "auth" || error2.kind === "vendor") {
-    return new DevinStreamError(error2.message, error2.reasonCode ?? "", error2.kind === "context_overflow");
-  }
-  return error2;
-}
-function streamDevinOnEngine(request, capacityRetry, inProcess) {
-  if (request.fetch)
-    return inProcess(request);
-  return engineStream({
-    vendor: DEVIN_SIDECAR_VENDOR,
-    request: () => toDevinSidecarRequest(request, capacityRetry),
-    inProcess: () => inProcess(request),
-    mapError: devinErrorFromSidecar,
-    ...request.signal ? { signal: request.signal } : {}
-  });
-}
-var DEVIN_SIDECAR_VENDOR, PROTOCOL_KINDS;
-var init_engine2 = __esm({
-  "../devin-core/dist/engine.js"() {
-    "use strict";
-    init_sidecar();
-    init_errors3();
-    DEVIN_SIDECAR_VENDOR = "devin";
-    PROTOCOL_KINDS = /* @__PURE__ */ new Set(["empty-body", "envelope", "runtime"]);
-  }
-});
-
-// ../devin-core/dist/engine-ops.js
-var engine_ops_exports2 = {};
-__export(engine_ops_exports2, {
-  runDevinOp: () => runDevinOp
-});
-async function runDevinOp(options) {
-  let ranInProcess = false;
-  try {
-    const result = await engineCall({
-      vendor: DEVIN_SIDECAR_VENDOR,
-      op: options.op,
-      request: options.request,
-      inProcess: async () => {
-        ranInProcess = true;
-        return options.inProcess();
-      },
-      mapError: devinErrorFromSidecar,
-      ...options.signal ? { signal: options.signal } : {}
-    });
-    return ranInProcess ? result : options.fromWire(result);
-  } catch (error2) {
-    if (ranInProcess)
-      throw error2;
-    logger.warn(`Devin ${options.op} sidecar call failed`, {
-      error: error2 instanceof Error ? error2.name : "unknown"
-    });
-    return options.fallback;
-  }
-}
-var init_engine_ops2 = __esm({
-  "../devin-core/dist/engine-ops.js"() {
-    "use strict";
-    init_sidecar();
-    init_engine2();
-    init_util();
-  }
-});
-
-// src/compat/pi-ai.ts
-import { createAssistantMessageEventStream } from "@oh-my-pi/pi-ai";
-
-// ../bridge-core/dist/pi/transcript.js
-function isSystemMessage(message) {
-  return message?.role === "system";
-}
-function contentText(content) {
-  if (typeof content === "string")
-    return content;
-  if (!Array.isArray(content))
-    return "";
-  return content.map((part) => part && typeof part === "object" && part.type === "text" ? String(part.text ?? "") : "").filter((text) => text.length > 0).join("\n");
-}
-function getCurrentTools(messages) {
-  const tools = /* @__PURE__ */ new Map();
-  for (const message of messages) {
-    if (!isSystemMessage(message))
-      continue;
-    for (const tool of message.toolsRemoved ?? [])
-      tools.delete(tool.name);
-    for (const tool of message.toolsAdded ?? [])
-      tools.set(tool.name, tool);
-  }
-  return [...tools.values()];
-}
-function getCurrentSystemPrompt(messages) {
-  const content = [];
-  const sections = /* @__PURE__ */ new Map();
-  for (const message of messages) {
-    if (!isSystemMessage(message))
-      continue;
-    const text = contentText(message.content);
-    if (text.length > 0)
-      content.push(text);
-    for (const [name, value] of Object.entries(message.sections ?? {})) {
-      if (value === null)
-        sections.delete(name);
-      else
-        sections.set(name, value);
-    }
-  }
-  return [content.join("\n\n"), ...sections.values()].filter((part) => part.length > 0).join("\n\n");
-}
-
-// ../bridge-core/dist/pi/context.js
-function userContent(content) {
-  if (typeof content === "string")
-    return content ? [{ type: "text", text: content }] : [];
-  if (!Array.isArray(content))
-    return [];
-  const out = [];
-  for (const block of content) {
-    if (block?.type === "text" && typeof block.text === "string")
-      out.push({ type: "text", text: block.text });
-    else if (block?.type === "image" && typeof block.data === "string") {
-      out.push({ type: "image", data: block.data, mimeType: String(block.mimeType ?? "image/png") });
-    }
-  }
-  return out;
-}
-var STOP_REASONS = /* @__PURE__ */ new Set(["stop", "length", "toolUse", "error", "aborted"]);
-function parseArguments(value) {
-  if (typeof value === "string") {
-    try {
-      const parsed = JSON.parse(value || "{}");
-      return parsed && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : {};
-    } catch {
-      return {};
-    }
-  }
-  return value && typeof value === "object" ? value : {};
-}
-function toBridgeMessages(messages) {
-  const out = [];
-  for (const message of messages) {
-    if (message.role === "system")
+function toBridgeMessages(messages) {
+  const out = [];
+  for (const message of messages) {
+    if (message.role === "system")
       continue;
     if (message.role === "user" || message.role === "developer") {
       out.push({ role: "user", content: userContent(message.content) });
@@ -3327,245 +2313,471 @@ init_debug();
 init_effort();
 init_endpoints();
 
-// ../kiro-core/dist/engine.js
-init_sidecar();
-init_debug();
-init_endpoints();
-init_engine_ops();
-init_management();
-init_models();
-init_retry();
-
-// ../kiro-core/dist/stream.js
-import { createHash as createHash3 } from "node:crypto";
-init_debug();
-init_effort();
-init_endpoints();
-init_errors2();
-init_kiro_cli();
-init_management();
+// ../kiro-core/dist/retry.js
 init_models();
-init_oauth();
-
-// ../kiro-core/dist/request-builder.js
-init_debug();
-
-// ../kiro-core/dist/history.js
-var HISTORY_LIMIT = 85e4;
-var HISTORY_LIMIT_CONTEXT_WINDOW = 2e5;
-var HISTORY_IMAGE_BASE64_LIMIT = 512 * 1024;
-function stripHistoryImages(history, keepNewestBounded = true) {
-  let newestImageIndex = -1;
-  for (let index = history.length - 1; index >= 0; index--) {
-    if ((history[index]?.userInputMessage?.images?.length ?? 0) > 0) {
-      newestImageIndex = index;
-      break;
-    }
+var FIRST_TOKEN_TIMEOUT = 9e4;
+var REQUEST_HEADER_TIMEOUT = 9e4;
+function firstTokenTimeoutForModel(modelId) {
+  if (retryConfig.firstTokenTimeoutMs !== FIRST_TOKEN_TIMEOUT) {
+    return retryConfig.firstTokenTimeoutMs;
   }
-  const newestImages = newestImageIndex >= 0 ? history[newestImageIndex]?.userInputMessage?.images : void 0;
-  const keepNewest = keepNewestBounded && newestImages !== void 0 && newestImages.reduce((size, image) => size + image.source.bytes.length, 0) <= HISTORY_IMAGE_BASE64_LIMIT;
-  return history.map((entry, index) => {
-    if (!entry.userInputMessage?.images || index === newestImageIndex && keepNewest)
-      return entry;
-    const { images: _images, ...rest } = entry.userInputMessage;
-    return { ...entry, userInputMessage: { ...rest } };
-  });
+  const model = kiroModels.find((m) => m.id === modelId);
+  return model?.firstTokenTimeout ?? FIRST_TOKEN_TIMEOUT;
 }
-function sanitizeHistory(history) {
-  while (history.length > 0 && (!history[0]?.userInputMessage || history[0].userInputMessage.userInputMessageContext?.toolResults))
-    history = history.slice(1);
-  const result = [];
-  for (let i = 0; i < history.length; i++) {
-    const m = history[i];
-    if (!m)
-      continue;
-    if (m.assistantResponseMessage && !m.assistantResponseMessage.toolUses && !m.assistantResponseMessage.content)
-      continue;
-    if (m.assistantResponseMessage?.toolUses) {
-      const next = history[i + 1];
-      if (next?.userInputMessage?.userInputMessageContext?.toolResults)
-        result.push(m);
-    } else if (m.userInputMessage?.userInputMessageContext?.toolResults) {
-      const prev = result[result.length - 1];
-      if (prev?.assistantResponseMessage?.toolUses)
-        result.push(m);
-    } else {
-      result.push(m);
-    }
+var retryConfig = {
+  firstTokenTimeoutMs: FIRST_TOKEN_TIMEOUT,
+  requestHeaderTimeoutMs: REQUEST_HEADER_TIMEOUT
+};
+function exponentialBackoff(attempt, baseMs, maxMs) {
+  return Math.min(baseMs * 2 ** attempt, maxMs);
+}
+var MAX_RETRY_DELAY = 1e4;
+var REQUEST_RATE_FALLBACK_DELAY_MS = 1e4;
+function extractKiroReason(errorText) {
+  if (!errorText)
+    return void 0;
+  try {
+    const parsed = JSON.parse(errorText);
+    if (!parsed || typeof parsed !== "object" || Array.isArray(parsed))
+      return void 0;
+    const reason = parsed.reason;
+    return typeof reason === "string" && reason.length > 0 ? reason : void 0;
+  } catch {
+    return void 0;
   }
-  return result;
 }
-function injectSyntheticToolCalls(history) {
-  const validIds = /* @__PURE__ */ new Set();
-  for (const entry of history) {
-    for (const tu of entry.assistantResponseMessage?.toolUses ?? []) {
-      if (tu.toolUseId)
-        validIds.add(tu.toolUseId);
-    }
-  }
-  const result = [];
-  for (const entry of history) {
-    const toolResults = entry.userInputMessage?.userInputMessageContext?.toolResults;
-    if (toolResults) {
-      const orphaned = toolResults.filter((tr) => !validIds.has(tr.toolUseId));
-      if (orphaned.length > 0) {
-        result.push({
-          assistantResponseMessage: {
-            content: "Tool calls were made.",
-            toolUses: orphaned.map((tr) => ({ name: "unknown_tool", toolUseId: tr.toolUseId, input: {} }))
-          }
-        });
-        for (const tr of orphaned)
-          validIds.add(tr.toolUseId);
+function parseRetryAfterMs(headers, nowMs = Date.now()) {
+  const get = headers?.get?.bind(headers);
+  if (!get)
+    return void 0;
+  const milliseconds = nonNegativeNumber(get("retry-after-ms"));
+  if (milliseconds !== void 0)
+    return Math.round(milliseconds);
+  const retryAfter = get("retry-after");
+  if (retryAfter !== null && retryAfter.trim() !== "") {
+    const seconds = Number(retryAfter);
+    if (Number.isFinite(seconds)) {
+      if (seconds >= 0) {
+        const delayMs = seconds * 1e3;
+        if (Number.isFinite(delayMs))
+          return Math.round(delayMs);
       }
+    } else {
+      const dateMs = Date.parse(retryAfter);
+      if (!Number.isNaN(dateMs))
+        return Math.max(0, dateMs - nowMs);
     }
-    result.push(entry);
-  }
-  return result;
-}
-function prepareHistory(history, keepNewestBoundedImage = true) {
-  return injectSyntheticToolCalls(sanitizeHistory(stripHistoryImages(history, keepNewestBoundedImage)));
-}
-function assertHistoryWithinLimit(history, limit) {
-  const size = JSON.stringify(history).length;
-  if (size > limit) {
-    throw new Error(`Kiro API error: context_length_exceeded (local history ${size} chars / ${history.length} entries exceeds ${limit}-char limit)`);
   }
-}
-function extractToolNamesFromHistory(history) {
-  const names = /* @__PURE__ */ new Set();
-  for (const entry of history) {
-    for (const tu of entry.assistantResponseMessage?.toolUses ?? []) {
-      if (tu.name)
-        names.add(tu.name);
-    }
+  const resetAfterSeconds = nonNegativeNumber(get("x-ratelimit-reset-after"));
+  if (resetAfterSeconds !== void 0) {
+    const delayMs = resetAfterSeconds * 1e3;
+    if (Number.isFinite(delayMs))
+      return Math.round(delayMs);
   }
-  return names;
+  return void 0;
 }
-function addPlaceholderTools(tools, history) {
-  const historyNames = extractToolNamesFromHistory(history);
-  if (historyNames.size === 0)
-    return tools;
-  const existing = new Set(tools.map((t) => t.toolSpecification?.name).filter(Boolean));
-  const missing = Array.from(historyNames).filter((n) => !existing.has(n));
-  if (missing.length === 0)
-    return tools;
-  return [
-    ...tools,
-    ...missing.map((name) => ({
-      toolSpecification: {
-        name,
-        description: "Tool",
-        inputSchema: { json: { type: "object", properties: {} } }
-      }
-    }))
-  ];
+function resolveRequestRateRetryDelay(headers, nowMs = Date.now()) {
+  const advertisedDelayMs = parseRetryAfterMs(headers, nowMs);
+  const requestedDelayMs = advertisedDelayMs ?? REQUEST_RATE_FALLBACK_DELAY_MS;
+  return {
+    delayMs: Math.min(requestedDelayMs, MAX_RETRY_DELAY),
+    ...advertisedDelayMs !== void 0 ? { advertisedDelayMs } : {},
+    capped: requestedDelayMs > MAX_RETRY_DELAY
+  };
 }
-
-// ../kiro-core/dist/transform.js
-import { createHash as createHash2 } from "node:crypto";
-var TOOL_RESULT_LIMIT = 25e4;
-var EMPTY_CONTENT_PLACEHOLDER = "Please proceed with the task.";
-function sanitizeSurrogates(text) {
-  return text.replace(/[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?<![\uD800-\uDBFF])[\uDC00-\uDFFF]/g, "");
+function nonNegativeNumber(value) {
+  if (value === null || value.trim() === "")
+    return void 0;
+  const parsed = Number(value);
+  return Number.isFinite(parsed) && parsed >= 0 ? parsed : void 0;
 }
-function truncate(text, limit) {
-  if (text.length <= limit)
-    return text;
-  const half = Math.floor(limit / 2);
-  return `${text.substring(0, half)}
-... [TRUNCATED] ...
-${text.substring(text.length - half)}`;
+var KIRO_REASON_CODES = Object.freeze({
+  /** Request body exceeded the service's size threshold. */
+  CONTENT_LENGTH_EXCEEDS_THRESHOLD: "CONTENT_LENGTH_EXCEEDS_THRESHOLD",
+  /** Prose-only size rejection; the service sends no reason code for this one. */
+  INPUT_TOO_LONG: "Input is too long",
+  /** Monthly request quota exhausted — hard limit, not transient. */
+  MONTHLY_REQUEST_COUNT: "MONTHLY_REQUEST_COUNT",
+  /** Model capacity temporarily unavailable — transient, worth retrying. */
+  INSUFFICIENT_MODEL_CAPACITY: "INSUFFICIENT_MODEL_CAPACITY",
+  /** Short-window request throttle — retry only within the provider budget. */
+  USER_REQUEST_RATE_EXCEEDED: "USER_REQUEST_RATE_EXCEEDED",
+  /**
+   * Generic request-validation rejection, returned for a malformed body of any
+   * size (empty `content`, history referencing tools absent from the catalog).
+   * Not a size signal: classifying it as "too big" makes the caller compact a
+   * history that was never the problem, a loop it can never satisfy.
+   */
+  REQUEST_BODY_INVALID: "REQUEST_BODY_INVALID"
+});
+var TOO_BIG_PATTERNS = Object.freeze([
+  KIRO_REASON_CODES.CONTENT_LENGTH_EXCEEDS_THRESHOLD,
+  KIRO_REASON_CODES.INPUT_TOO_LONG
+]);
+var NON_RETRYABLE_BODY_PATTERNS = Object.freeze([KIRO_REASON_CODES.MONTHLY_REQUEST_COUNT]);
+var CAPACITY_PATTERN = KIRO_REASON_CODES.INSUFFICIENT_MODEL_CAPACITY;
+var CAPACITY_MAX_RETRIES = 3;
+var CAPACITY_BASE_DELAY_MS = 5e3;
+var capacityRetryConfig = {
+  maxRetries: CAPACITY_MAX_RETRIES,
+  baseDelayMs: CAPACITY_BASE_DELAY_MS
+};
+function isTooBigError(status, errorText) {
+  return status === 413 || status === 400 && TOO_BIG_PATTERNS.some((p) => errorText.includes(p));
 }
-var KIRO_TOOL_USE_ID_PATTERN = /^[a-zA-Z0-9_.:-]{1,64}$/;
-function toKiroToolUseId(toolUseId) {
-  const id = typeof toolUseId === "string" ? toolUseId : String(toolUseId);
-  if (KIRO_TOOL_USE_ID_PATTERN.test(id))
-    return id;
-  const digest = createHash2("sha256").update(id).digest("base64url").slice(0, 32);
-  return `pi_${digest}`;
+function isNonRetryableBodyError(errorText) {
+  return NON_RETRYABLE_BODY_PATTERNS.some((p) => errorText.includes(p));
 }
-var KIRO_TOOL_NAME_PATTERN = /^[a-zA-Z0-9_-]{1,64}$/;
-function toKiroToolName(name) {
-  const str2 = typeof name === "string" ? name : String(name);
-  if (KIRO_TOOL_NAME_PATTERN.test(str2))
-    return str2;
-  const clean = str2.replace(/[^a-zA-Z0-9_-]/g, "_").slice(0, 55);
-  const digest = createHash2("sha256").update(str2).digest("base64url").slice(0, 8);
-  return `${clean || "tool"}_${digest}`;
+function isCapacityError(errorText) {
+  return errorText.includes(CAPACITY_PATTERN);
 }
-function kiroToolNameAliases(tools) {
-  const aliases = /* @__PURE__ */ new Map();
-  for (const tool of tools ?? []) {
-    const wire = toKiroToolName(tool.name);
-    if (wire !== tool.name)
-      aliases.set(wire, tool.name);
+
+// ../kiro-core/dist/errors.js
+var REASON_CODE_MARKERS = [
+  KIRO_REASON_CODES.CONTENT_LENGTH_EXCEEDS_THRESHOLD,
+  KIRO_REASON_CODES.MONTHLY_REQUEST_COUNT,
+  KIRO_REASON_CODES.INSUFFICIENT_MODEL_CAPACITY,
+  KIRO_REASON_CODES.REQUEST_BODY_INVALID
+];
+var KiroApiError = class extends Error {
+  status;
+  reasonCode;
+  retryAfterMs;
+  providerAttempts;
+  constructor(message, status, reasonCode, retryAfterMs, providerAttempts) {
+    super(message);
+    this.status = status;
+    this.reasonCode = reasonCode;
+    this.retryAfterMs = retryAfterMs;
+    this.providerAttempts = providerAttempts;
+    this.name = "KiroApiError";
   }
-  return aliases;
-}
-function normalizeMessages(messages) {
-  return messages.filter((msg) => {
-    if (msg.role !== "assistant")
-      return true;
-    return msg.stopReason !== "error" && msg.stopReason !== "aborted";
-  });
-}
-function relocateDisplacedToolResults(messages) {
-  const out = [];
-  const pending = [...messages];
-  while (pending.length > 0) {
-    const msg = pending.shift();
-    if (!msg)
-      break;
-    out.push(msg);
-    if (msg.role !== "assistant")
-      continue;
-    for (const block of msg.content) {
-      if (block.type !== "toolCall")
-        continue;
-      const id = block.id;
-      const at = pending.findIndex((p) => p.role === "toolResult" && p.toolCallId === id);
-      if (at >= 0)
-        out.push(...pending.splice(at, 1));
+};
+function extractKiroReasonCode(errorText) {
+  if (!errorText)
+    return void 0;
+  const trimmed = errorText.trim();
+  if (trimmed.startsWith("{")) {
+    try {
+      const parsed = JSON.parse(trimmed);
+      const reason = parsed.reason ?? parsed.reasonCode;
+      if (typeof reason === "string" && reason.length > 0)
+        return reason;
+    } catch {
     }
   }
-  return out;
+  return REASON_CODE_MARKERS.find((code) => errorText.includes(code));
 }
-function extractImages(msg) {
-  return msg.content.filter((c) => c.type === "image");
+
+// ../kiro-core/dist/event-parser.js
+var KIRO_EVENT_KEYS = [
+  "assistantResponseEvent",
+  "codeReferenceEvent",
+  "contextUsageEvent",
+  "documentCitationEvent",
+  "error",
+  "metadataEvent",
+  "meteringEvent",
+  "reasoningContentEvent",
+  "serviceUnavailableError",
+  "throttlingError",
+  "toolResultEvent",
+  "toolUseEvent",
+  "validationError"
+];
+var KIRO_EVENT_KEY_SET = new Set(KIRO_EVENT_KEYS);
+var KIRO_ERROR_MEMBERS = {
+  error: { kind: "internalServer", exception: "InternalServerException" },
+  throttlingError: { kind: "throttling", exception: "ThrottlingException" },
+  validationError: { kind: "validation", exception: "ValidationException" },
+  serviceUnavailableError: { kind: "serviceUnavailable", exception: "ServiceUnavailableException" }
+};
+var KIRO_ERROR_TOKENS = {
+  ...KIRO_ERROR_MEMBERS,
+  InternalServerException: KIRO_ERROR_MEMBERS.error,
+  ThrottlingException: KIRO_ERROR_MEMBERS.throttlingError,
+  ValidationException: KIRO_ERROR_MEMBERS.validationError,
+  ServiceUnavailableException: KIRO_ERROR_MEMBERS.serviceUnavailableError
+};
+function lookupKiroErrorMember(key) {
+  return Object.hasOwn(KIRO_ERROR_TOKENS, key) ? KIRO_ERROR_TOKENS[key] : void 0;
 }
-function getContentText(msg) {
-  return msg.content.map((c) => {
-    if (c.type === "text")
-      return c.text;
-    if (c.type === "thinking")
-      return c.thinking;
-    return "";
-  }).join("");
+var num = (v) => typeof v === "number" ? v : void 0;
+var str = (v) => typeof v === "string" ? v : void 0;
+function tokenCount(value) {
+  return typeof value === "number" && Number.isFinite(value) && value >= 0 ? value : void 0;
 }
-function toKiroInputSchema(parameters) {
-  if (parameters && typeof parameters === "object" && !Array.isArray(parameters)) {
-    return parameters.type === void 0 ? { type: "object", ...parameters } : parameters;
+function firstTokenCount(source, keys) {
+  for (const key of keys) {
+    const count = tokenCount(source[key]);
+    if (count !== void 0)
+      return count;
   }
-  return { type: "object", properties: {} };
-}
-function toKiroToolDescription(description) {
-  if (typeof description === "string")
-    return description === "" ? {} : { description };
-  return description == null ? {} : { description: String(description) };
-}
-function convertToolsToKiro(tools) {
-  return tools.map((tool) => ({
-    toolSpecification: {
-      name: toKiroToolName(tool.name),
-      ...toKiroToolDescription(tool.description),
-      inputSchema: { json: toKiroInputSchema(tool.parameters) }
-    }
-  }));
+  return void 0;
 }
-var KIRO_IMAGE_FORMAT_ALIASES = {
-  png: "png",
-  "x-png": "png",
+var CACHE_READ_KEYS = ["cacheReadInputTokens", "cache_read_input_tokens", "cacheReadTokens"];
+var CACHE_WRITE_KEYS = [
+  "cacheWriteInputTokens",
+  "cache_creation_input_tokens",
+  "cacheCreationInputTokens",
+  "cacheWriteTokens"
+];
+function toolInput(raw) {
+  if (typeof raw === "string")
+    return raw;
+  if (raw && typeof raw === "object" && Object.keys(raw).length > 0) {
+    return JSON.stringify(raw);
+  }
+  return "";
+}
+function parseToolUse(parsed) {
+  if (parsed.name && parsed.toolUseId) {
+    return {
+      type: "toolUse",
+      data: {
+        name: parsed.name,
+        toolUseId: parsed.toolUseId,
+        input: toolInput(parsed.input),
+        stop: parsed.stop
+      }
+    };
+  }
+  if (parsed.input !== void 0) {
+    return { type: "toolUseInput", data: { input: toolInput(parsed.input) } };
+  }
+  if (parsed.stop !== void 0)
+    return { type: "toolUseStop", data: { stop: parsed.stop } };
+  return null;
+}
+function parseMetadata(parsed) {
+  const tu = parsed.tokenUsage ?? {};
+  const data = {
+    inputTokens: tokenCount(tu.uncachedInputTokens) ?? tokenCount(tu.inputTokens),
+    outputTokens: tokenCount(tu.outputTokens),
+    totalTokens: tokenCount(tu.totalTokens),
+    cacheReadInputTokens: firstTokenCount(tu, CACHE_READ_KEYS),
+    cacheWriteInputTokens: firstTokenCount(tu, CACHE_WRITE_KEYS),
+    contextUsagePercentage: num(tu.contextUsagePercentage),
+    normalizedTokenUsage: num(tu.normalizedTokenUsage),
+    rawStopReason: str(parsed.stopReason),
+    stopDetails: parsed.stopDetails && typeof parsed.stopDetails === "object" ? parsed.stopDetails : void 0
+  };
+  for (const k of Object.keys(data)) {
+    if (data[k] === void 0)
+      delete data[k];
+  }
+  return Object.keys(data).length > 0 ? { type: "usage", data } : null;
+}
+function parseError(parsed, kind, fallbackName) {
+  const rawError = parsed.error ?? parsed.Error;
+  const error2 = typeof rawError === "string" ? rawError : rawError !== void 0 ? JSON.stringify(rawError) : str(parsed.name) ?? fallbackName;
+  const message = parsed.message ?? parsed.Message ?? parsed.reason;
+  const data = { error: error2, kind };
+  if (typeof message === "string")
+    data.message = message;
+  const reason = str(parsed.reason);
+  if (reason !== void 0)
+    data.reason = reason;
+  const retryAfterMilliseconds = num(parsed.retryAfterMilliseconds);
+  if (retryAfterMilliseconds !== void 0)
+    data.retryAfterMilliseconds = retryAfterMilliseconds;
+  return { type: "error", data };
+}
+function parseKiroEvent(key, parsed) {
+  switch (key) {
+    case "assistantResponseEvent": {
+      const content = str(parsed.content);
+      return content !== void 0 ? { type: "content", data: content } : null;
+    }
+    case "reasoningContentEvent": {
+      const text = str(parsed.text);
+      if (text !== void 0)
+        return { type: "thinkingText", data: text };
+      const signature = str(parsed.signature);
+      if (signature !== void 0)
+        return { type: "thinkingSignature", data: signature };
+      return { type: "ignored", data: { key } };
+    }
+    case "toolUseEvent":
+      return parseToolUse(parsed);
+    case "contextUsageEvent": {
+      const pct = num(parsed.contextUsagePercentage);
+      return pct !== void 0 ? { type: "contextUsage", data: { contextUsagePercentage: pct } } : null;
+    }
+    case "metadataEvent":
+      return parseMetadata(parsed);
+    case "meteringEvent":
+      return {
+        type: "metering",
+        data: { credits: tokenCount(parsed.usage), unit: str(parsed.unit), unitPlural: str(parsed.unitPlural) }
+      };
+    // Reachable when a member that models an exception is delivered as an
+    // ordinary event frame. The real wire uses exception framing, handled by
+    // parseKiroExceptionFrame, but both routes must agree.
+    case "error":
+    case "throttlingError":
+    case "validationError":
+    case "serviceUnavailableError": {
+      const member = lookupKiroErrorMember(key);
+      return parseError(parsed, member.kind, member.exception);
+    }
+    // Known members with no consumer yet: explicitly ignored, not unparseable.
+    case "codeReferenceEvent":
+    case "documentCitationEvent":
+    case "toolResultEvent":
+      return { type: "ignored", data: { key } };
+    default: {
+      const member = lookupKiroErrorMember(key);
+      if (member)
+        return parseError(parsed, member.kind, member.exception);
+      return parseKiroEventByShape(parsed);
+    }
+  }
+}
+function parseKiroExceptionFrame(key, parsed) {
+  const member = lookupKiroErrorMember(key);
+  if (!member)
+    return null;
+  const event = parseError(parsed, member.kind, member.exception);
+  return event.data;
+}
+function parseKiroEventByShape(parsed) {
+  if (parsed.content !== void 0)
+    return { type: "content", data: parsed.content };
+  if (typeof parsed.text === "string")
+    return { type: "thinkingText", data: parsed.text };
+  if (typeof parsed.signature === "string")
+    return { type: "thinkingSignature", data: parsed.signature };
+  if (parsed.name && parsed.toolUseId)
+    return parseToolUse(parsed);
+  if (parsed.input !== void 0 && !parsed.name) {
+    return { type: "toolUseInput", data: { input: toolInput(parsed.input) } };
+  }
+  if (parsed.stop !== void 0 && parsed.contextUsagePercentage === void 0)
+    return { type: "toolUseStop", data: { stop: parsed.stop } };
+  if (parsed.contextUsagePercentage !== void 0)
+    return { type: "contextUsage", data: { contextUsagePercentage: parsed.contextUsagePercentage } };
+  if (parsed.followupPrompt !== void 0)
+    return { type: "followupPrompt", data: parsed.followupPrompt };
+  if (parsed.tokenUsage !== void 0 || parsed.stopReason !== void 0 || parsed.stopDetails !== void 0) {
+    return parseMetadata(parsed);
+  }
+  if (parsed.error !== void 0 || parsed.Error !== void 0) {
+    return parseError(parsed, "unknown", "unknown");
+  }
+  if (typeof parsed.usage === "number") {
+    return {
+      type: "metering",
+      data: { credits: tokenCount(parsed.usage), unit: str(parsed.unit), unitPlural: str(parsed.unitPlural) }
+    };
+  }
+  return null;
+}
+
+// ../kiro-core/dist/transform.js
+import { createHash as createHash2 } from "node:crypto";
+var TOOL_RESULT_LIMIT = 25e4;
+var EMPTY_CONTENT_PLACEHOLDER = "Please proceed with the task.";
+function sanitizeSurrogates(text) {
+  return text.replace(/[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?<![\uD800-\uDBFF])[\uDC00-\uDFFF]/g, "");
+}
+function truncate(text, limit) {
+  if (text.length <= limit)
+    return text;
+  const half = Math.floor(limit / 2);
+  return `${text.substring(0, half)}
+... [TRUNCATED] ...
+${text.substring(text.length - half)}`;
+}
+var KIRO_TOOL_USE_ID_PATTERN = /^[a-zA-Z0-9_.:-]{1,64}$/;
+function toKiroToolUseId(toolUseId) {
+  const id = typeof toolUseId === "string" ? toolUseId : String(toolUseId);
+  if (KIRO_TOOL_USE_ID_PATTERN.test(id))
+    return id;
+  const digest = createHash2("sha256").update(id).digest("base64url").slice(0, 32);
+  return `pi_${digest}`;
+}
+var KIRO_TOOL_NAME_PATTERN = /^[a-zA-Z0-9_-]{1,64}$/;
+function toKiroToolName(name) {
+  const str2 = typeof name === "string" ? name : String(name);
+  if (KIRO_TOOL_NAME_PATTERN.test(str2))
+    return str2;
+  const clean = str2.replace(/[^a-zA-Z0-9_-]/g, "_").slice(0, 55);
+  const digest = createHash2("sha256").update(str2).digest("base64url").slice(0, 8);
+  return `${clean || "tool"}_${digest}`;
+}
+function kiroToolNameAliases(tools) {
+  const aliases = /* @__PURE__ */ new Map();
+  for (const tool of tools ?? []) {
+    const wire = toKiroToolName(tool.name);
+    if (wire !== tool.name)
+      aliases.set(wire, tool.name);
+  }
+  return aliases;
+}
+function normalizeMessages(messages) {
+  return messages.filter((msg) => {
+    if (msg.role !== "assistant")
+      return true;
+    return msg.stopReason !== "error" && msg.stopReason !== "aborted";
+  });
+}
+function relocateDisplacedToolResults(messages) {
+  const out = [];
+  const pending = [...messages];
+  while (pending.length > 0) {
+    const msg = pending.shift();
+    if (!msg)
+      break;
+    out.push(msg);
+    if (msg.role !== "assistant")
+      continue;
+    for (const block of msg.content) {
+      if (block.type !== "toolCall")
+        continue;
+      const id = block.id;
+      const at = pending.findIndex((p) => p.role === "toolResult" && p.toolCallId === id);
+      if (at >= 0)
+        out.push(...pending.splice(at, 1));
+    }
+  }
+  return out;
+}
+function extractImages(msg) {
+  return msg.content.filter((c) => c.type === "image");
+}
+function getContentText(msg) {
+  return msg.content.map((c) => {
+    if (c.type === "text")
+      return c.text;
+    if (c.type === "thinking")
+      return c.thinking;
+    return "";
+  }).join("");
+}
+function toKiroInputSchema(parameters) {
+  if (parameters && typeof parameters === "object" && !Array.isArray(parameters)) {
+    return parameters.type === void 0 ? { type: "object", ...parameters } : parameters;
+  }
+  return { type: "object", properties: {} };
+}
+function toKiroToolDescription(description) {
+  if (typeof description === "string")
+    return description === "" ? {} : { description };
+  return description == null ? {} : { description: String(description) };
+}
+function convertToolsToKiro(tools) {
+  return tools.map((tool) => ({
+    toolSpecification: {
+      name: toKiroToolName(tool.name),
+      ...toKiroToolDescription(tool.description),
+      inputSchema: { json: toKiroInputSchema(tool.parameters) }
+    }
+  }));
+}
+var KIRO_IMAGE_FORMAT_ALIASES = {
+  png: "png",
+  "x-png": "png",
   jpeg: "jpeg",
   jpg: "jpeg",
   pjpeg: "jpeg",
@@ -3676,333 +2888,621 @@ ${uim.content}` : prevUim.content || uim.content;
           armHadBlocks = true;
         }
       }
-      if (!armContent && armToolUses.length === 0 && !armHadBlocks)
-        continue;
-      history.push({
-        assistantResponseMessage: { content: armContent, ...armToolUses.length > 0 ? { toolUses: armToolUses } : {} }
-      });
+      if (!armContent && armToolUses.length === 0 && !armHadBlocks)
+        continue;
+      history.push({
+        assistantResponseMessage: { content: armContent, ...armToolUses.length > 0 ? { toolUses: armToolUses } : {} }
+      });
+    } else {
+      const toolResults = [toolResultOf(msg)];
+      const trImages = [...extractImages(msg)];
+      let j = i + 1;
+      while (j < historyMessages.length) {
+        const next = historyMessages[j];
+        if (next?.role !== "toolResult")
+          break;
+        toolResults.push(toolResultOf(next));
+        trImages.push(...extractImages(next));
+        j++;
+      }
+      i = j - 1;
+      const prevTr = history[history.length - 1]?.userInputMessage;
+      if (prevTr) {
+        const images = convertImagesToKiro(trImages);
+        if (images.length > 0)
+          prevTr.images = [...prevTr.images || [], ...images];
+        if (!prevTr.userInputMessageContext)
+          prevTr.userInputMessageContext = {};
+        prevTr.userInputMessageContext.toolResults = [
+          ...prevTr.userInputMessageContext.toolResults || [],
+          ...toolResults
+        ];
+      } else {
+        const images = convertImagesToKiro(trImages);
+        history.push({
+          userInputMessage: {
+            // Empty by design: `toolResults` is this turn's payload. See
+            // EMPTY_CONTENT_PLACEHOLDER for the content-or-toolResults rule.
+            content: "",
+            modelId,
+            origin: "KIRO_CLI",
+            ...images.length > 0 ? { images } : {},
+            userInputMessageContext: { toolResults }
+          }
+        });
+      }
+    }
+  }
+  return { history, systemPrepended, currentMsgStartIdx };
+}
+
+// ../kiro-core/dist/history-validator.js
+var KiroValidationRule;
+(function(KiroValidationRule2) {
+  KiroValidationRule2["STARTS_WITH_USER_MESSAGE"] = "STARTS_WITH_USER_MESSAGE";
+  KiroValidationRule2["ENDS_WITH_USER_MESSAGE"] = "ENDS_WITH_USER_MESSAGE";
+  KiroValidationRule2["ALTERNATING_MESSAGES"] = "ALTERNATING_MESSAGES";
+  KiroValidationRule2["TOOL_USES_AND_RESULTS"] = "TOOL_USES_AND_RESULTS";
+  KiroValidationRule2["TOOL_RESULTS_AND_NO_USES"] = "TOOL_RESULTS_AND_NO_USES";
+  KiroValidationRule2["TOOL_RESULTS_ORPHAN_IDS"] = "TOOL_RESULTS_ORPHAN_IDS";
+  KiroValidationRule2["NON_EMPTY_USER_MESSAGE"] = "NON_EMPTY_USER_MESSAGE";
+})(KiroValidationRule || (KiroValidationRule = {}));
+var KIRO_VALIDATION_MESSAGES = {
+  [KiroValidationRule.STARTS_WITH_USER_MESSAGE]: "Conversation must start with a user message",
+  [KiroValidationRule.ENDS_WITH_USER_MESSAGE]: "Conversation must end with a user message",
+  [KiroValidationRule.ALTERNATING_MESSAGES]: "Between every two user messages there must be an assistant message",
+  [KiroValidationRule.TOOL_USES_AND_RESULTS]: "If an assistant message has tool uses, the next message must be a user message with corresponding tool results",
+  [KiroValidationRule.TOOL_RESULTS_AND_NO_USES]: "If there is a message with tool result, there has to be a corresponding message with tool use.",
+  [KiroValidationRule.NON_EMPTY_USER_MESSAGE]: "User messages must have either content or tool results",
+  [KiroValidationRule.TOOL_RESULTS_ORPHAN_IDS]: "User message has toolResults whose toolUseIds do not match any toolUse in the preceding assistant message."
+};
+var KIRO_TOOL_STRUCTURE_RULES = [
+  KiroValidationRule.TOOL_USES_AND_RESULTS,
+  KiroValidationRule.TOOL_RESULTS_AND_NO_USES,
+  KiroValidationRule.TOOL_RESULTS_ORPHAN_IDS
+];
+function isKiroToolStructureRule(rule) {
+  return KIRO_TOOL_STRUCTURE_RULES.includes(rule);
+}
+var SYNTHETIC_FAILED_TOOL_RESULT_TEXT = "Tool use was interrupted and did not produce a result.";
+function error(rule, index, message) {
+  return { rule, message: message ?? KIRO_VALIDATION_MESSAGES[rule], index };
+}
+function isUserEntry(entry) {
+  return !!entry?.userInputMessage;
+}
+function isAssistantEntry(entry) {
+  return !!entry?.assistantResponseMessage;
+}
+function toolResultsOf(entry) {
+  return entry?.userInputMessage?.userInputMessageContext?.toolResults ?? [];
+}
+function hasToolResults(entry) {
+  return toolResultsOf(entry).length > 0;
+}
+function toolUseIdsOf(entry) {
+  return (entry?.assistantResponseMessage?.toolUses ?? []).map((tu) => tu.toolUseId).filter(Boolean);
+}
+function hasToolUses(entry) {
+  return toolUseIdsOf(entry).length > 0;
+}
+function hasText(entry) {
+  return (entry?.userInputMessage?.content ?? "").trim() !== "";
+}
+function toolResultsMatch(toolUseIds, toolResults) {
+  if (toolUseIds.length === 0)
+    return true;
+  if (toolResults.length === 0)
+    return false;
+  const resultIds = new Set(toolResults.map((tr) => tr.toolUseId));
+  const useIds = new Set(toolUseIds);
+  return toolUseIds.every((id) => resultIds.has(id)) && toolResults.every((tr) => useIds.has(tr.toolUseId));
+}
+function validateStartsWithUserMessage(entries) {
+  if (entries.length === 0 || !isUserEntry(entries[0])) {
+    return error(KiroValidationRule.STARTS_WITH_USER_MESSAGE, 0);
+  }
+  return null;
+}
+function validateEndsWithUserMessage(entries) {
+  if (entries.length === 0 || !isUserEntry(entries[entries.length - 1])) {
+    return error(KiroValidationRule.ENDS_WITH_USER_MESSAGE, entries.length - 1);
+  }
+  return null;
+}
+function validateAlternatingMessages(entries) {
+  for (let i = 1; i < entries.length; i++) {
+    if (isUserEntry(entries[i - 1]) && isUserEntry(entries[i])) {
+      return error(KiroValidationRule.ALTERNATING_MESSAGES, i, "Between every two user messages there must be an assistant message");
+    }
+    if (isAssistantEntry(entries[i - 1]) && isAssistantEntry(entries[i])) {
+      return error(KiroValidationRule.ALTERNATING_MESSAGES, i, "Between every two assistant messages there must be a user message");
+    }
+  }
+  return null;
+}
+function validateToolUsesAndResults(entries) {
+  for (let i = 0; i < entries.length - 1; i++) {
+    const current = entries[i];
+    const next = entries[i + 1];
+    if (isAssistantEntry(current) && hasToolUses(current) && (!isUserEntry(next) || !toolResultsMatch(toolUseIdsOf(current), toolResultsOf(next)))) {
+      return error(KiroValidationRule.TOOL_USES_AND_RESULTS, i + 1);
+    }
+    if (isAssistantEntry(current) && !hasToolUses(current) && isUserEntry(next) && hasToolResults(next)) {
+      return error(KiroValidationRule.TOOL_RESULTS_AND_NO_USES, i);
+    }
+  }
+  for (let i = 0; i < entries.length; i++) {
+    const entry = entries[i];
+    if (!isUserEntry(entry) || !hasToolResults(entry))
+      continue;
+    const prev = i > 0 ? entries[i - 1] : void 0;
+    if (!isAssistantEntry(prev))
+      return error(KiroValidationRule.TOOL_RESULTS_AND_NO_USES, i);
+  }
+  return null;
+}
+function validateToolResultOrphanIds(entries) {
+  for (let i = 1; i < entries.length; i++) {
+    const prev = entries[i - 1];
+    const current = entries[i];
+    if (!isAssistantEntry(prev) || !hasToolUses(prev) || !isUserEntry(current) || !hasToolResults(current))
+      continue;
+    const validIds = new Set(toolUseIdsOf(prev));
+    const toolResults = toolResultsOf(current);
+    const hasOrphan = toolResults.some((tr) => !tr.toolUseId || !validIds.has(tr.toolUseId));
+    const seen = /* @__PURE__ */ new Set();
+    const hasDuplicate = toolResults.some((tr) => {
+      if (!tr.toolUseId)
+        return false;
+      if (seen.has(tr.toolUseId))
+        return true;
+      seen.add(tr.toolUseId);
+      return false;
+    });
+    if (hasOrphan || hasDuplicate)
+      return error(KiroValidationRule.TOOL_RESULTS_ORPHAN_IDS, i);
+  }
+  return null;
+}
+function validateNonEmptyUserMessages(entries) {
+  for (let i = 0; i < entries.length; i++) {
+    const entry = entries[i];
+    if (!isUserEntry(entry))
+      continue;
+    if (!hasText(entry) && !hasToolResults(entry)) {
+      return error(KiroValidationRule.NON_EMPTY_USER_MESSAGE, i);
+    }
+  }
+  return null;
+}
+function validateKiroToolStructure(entries) {
+  const errors = [validateToolUsesAndResults(entries), validateToolResultOrphanIds(entries)].filter((e) => e !== null);
+  return { valid: errors.length === 0, errors };
+}
+function validateKiroConversation(entries) {
+  const errors = [
+    validateStartsWithUserMessage(entries),
+    validateEndsWithUserMessage(entries),
+    validateAlternatingMessages(entries),
+    ...validateKiroToolStructure(entries).errors,
+    validateNonEmptyUserMessages(entries)
+  ].filter((e) => e !== null);
+  return { valid: errors.length === 0, errors };
+}
+function kiroConversationEntries(history, currentUserMessage) {
+  return currentUserMessage ? [...history, { userInputMessage: currentUserMessage }] : [...history];
+}
+function repairKiroConversation(entries) {
+  const diagnostics = validateKiroConversation(entries).errors;
+  if (diagnostics.length === 0)
+    return { entries, diagnostics, remaining: [] };
+  const modelId = entries.find((e) => e.userInputMessage?.modelId)?.userInputMessage?.modelId ?? "";
+  let working = [...entries];
+  while (working.length > 0 && (!isUserEntry(working[0]) || hasToolResults(working[0])))
+    working = working.slice(1);
+  const consolidated = [];
+  for (let i = 0; i < working.length; i++) {
+    const entry = working[i];
+    const isToolOnly = isUserEntry(entry) && hasToolResults(entry) && !hasText(entry);
+    if (!isToolOnly) {
+      consolidated.push(entry);
+      continue;
+    }
+    let j = i;
+    const merged = [];
+    const seen = /* @__PURE__ */ new Set();
+    while (j < working.length) {
+      const candidate = working[j];
+      if (!(isUserEntry(candidate) && hasToolResults(candidate) && !hasText(candidate)))
+        break;
+      for (const tr of toolResultsOf(candidate)) {
+        if (tr.toolUseId && seen.has(tr.toolUseId))
+          continue;
+        if (tr.toolUseId)
+          seen.add(tr.toolUseId);
+        merged.push(tr);
+      }
+      j++;
+    }
+    if (j - i === 1) {
+      consolidated.push(entry);
     } else {
-      const toolResults = [toolResultOf(msg)];
-      const trImages = [...extractImages(msg)];
-      let j = i + 1;
-      while (j < historyMessages.length) {
-        const next = historyMessages[j];
-        if (next?.role !== "toolResult")
-          break;
-        toolResults.push(toolResultOf(next));
-        trImages.push(...extractImages(next));
-        j++;
-      }
-      i = j - 1;
-      const prevTr = history[history.length - 1]?.userInputMessage;
-      if (prevTr) {
-        const images = convertImagesToKiro(trImages);
-        if (images.length > 0)
-          prevTr.images = [...prevTr.images || [], ...images];
-        if (!prevTr.userInputMessageContext)
-          prevTr.userInputMessageContext = {};
-        prevTr.userInputMessageContext.toolResults = [
-          ...prevTr.userInputMessageContext.toolResults || [],
-          ...toolResults
-        ];
+      const uim = entry.userInputMessage;
+      consolidated.push({
+        userInputMessage: {
+          ...uim,
+          userInputMessageContext: { ...uim.userInputMessageContext, toolResults: merged }
+        }
+      });
+    }
+    i = j - 1;
+  }
+  working = consolidated;
+  const repaired = [];
+  for (let i = 0; i < working.length; i++) {
+    const entry = working[i];
+    if (isUserEntry(entry) && hasToolResults(entry)) {
+      const prev = repaired[repaired.length - 1];
+      const validIds = new Set(toolUseIdsOf(prev));
+      const seen = /* @__PURE__ */ new Set();
+      const kept = toolResultsOf(entry).filter((tr) => {
+        if (!tr.toolUseId || !validIds.has(tr.toolUseId) || seen.has(tr.toolUseId))
+          return false;
+        seen.add(tr.toolUseId);
+        return true;
+      });
+      const uim = { ...entry.userInputMessage };
+      if (kept.length === 0) {
+        const { userInputMessageContext, ...rest } = uim;
+        const tools = userInputMessageContext?.tools;
+        repaired.push({
+          userInputMessage: { ...rest, ...tools ? { userInputMessageContext: { tools } } : {} }
+        });
       } else {
-        const images = convertImagesToKiro(trImages);
-        history.push({
+        repaired.push({
           userInputMessage: {
-            // Empty by design: `toolResults` is this turn's payload. See
-            // EMPTY_CONTENT_PLACEHOLDER for the content-or-toolResults rule.
-            content: "",
-            modelId,
-            origin: "KIRO_CLI",
-            ...images.length > 0 ? { images } : {},
-            userInputMessageContext: { toolResults }
+            ...uim,
+            userInputMessageContext: { ...uim.userInputMessageContext, toolResults: kept }
           }
         });
       }
+      continue;
+    }
+    repaired.push(entry);
+    if (isAssistantEntry(entry) && hasToolUses(entry)) {
+      const next = working[i + 1];
+      const answered = new Set(isUserEntry(next) ? toolResultsOf(next).map((tr) => tr.toolUseId) : (
+        /* c8 ignore next */
+        []
+      ));
+      const unanswered = toolUseIdsOf(entry).filter((id) => !answered.has(id));
+      if (unanswered.length > 0 && !isUserEntry(next)) {
+        repaired.push(syntheticToolResultEntry(unanswered, modelId));
+      } else if (unanswered.length > 0 && isUserEntry(next)) {
+        const uim = { ...next.userInputMessage };
+        working[i + 1] = {
+          userInputMessage: {
+            ...uim,
+            userInputMessageContext: {
+              ...uim.userInputMessageContext,
+              toolResults: [...toolResultsOf(next), ...unanswered.map(syntheticFailedToolResult)]
+            }
+          }
+        };
+      }
     }
   }
-  return { history, systemPrepended, currentMsgStartIdx };
-}
-
-// ../kiro-core/dist/history-validator.js
-var KiroValidationRule;
-(function(KiroValidationRule2) {
-  KiroValidationRule2["STARTS_WITH_USER_MESSAGE"] = "STARTS_WITH_USER_MESSAGE";
-  KiroValidationRule2["ENDS_WITH_USER_MESSAGE"] = "ENDS_WITH_USER_MESSAGE";
-  KiroValidationRule2["ALTERNATING_MESSAGES"] = "ALTERNATING_MESSAGES";
-  KiroValidationRule2["TOOL_USES_AND_RESULTS"] = "TOOL_USES_AND_RESULTS";
-  KiroValidationRule2["TOOL_RESULTS_AND_NO_USES"] = "TOOL_RESULTS_AND_NO_USES";
-  KiroValidationRule2["TOOL_RESULTS_ORPHAN_IDS"] = "TOOL_RESULTS_ORPHAN_IDS";
-  KiroValidationRule2["NON_EMPTY_USER_MESSAGE"] = "NON_EMPTY_USER_MESSAGE";
-})(KiroValidationRule || (KiroValidationRule = {}));
-var KIRO_VALIDATION_MESSAGES = {
-  [KiroValidationRule.STARTS_WITH_USER_MESSAGE]: "Conversation must start with a user message",
-  [KiroValidationRule.ENDS_WITH_USER_MESSAGE]: "Conversation must end with a user message",
-  [KiroValidationRule.ALTERNATING_MESSAGES]: "Between every two user messages there must be an assistant message",
-  [KiroValidationRule.TOOL_USES_AND_RESULTS]: "If an assistant message has tool uses, the next message must be a user message with corresponding tool results",
-  [KiroValidationRule.TOOL_RESULTS_AND_NO_USES]: "If there is a message with tool result, there has to be a corresponding message with tool use.",
-  [KiroValidationRule.NON_EMPTY_USER_MESSAGE]: "User messages must have either content or tool results",
-  [KiroValidationRule.TOOL_RESULTS_ORPHAN_IDS]: "User message has toolResults whose toolUseIds do not match any toolUse in the preceding assistant message."
-};
-var KIRO_TOOL_STRUCTURE_RULES = [
-  KiroValidationRule.TOOL_USES_AND_RESULTS,
-  KiroValidationRule.TOOL_RESULTS_AND_NO_USES,
-  KiroValidationRule.TOOL_RESULTS_ORPHAN_IDS
-];
-function isKiroToolStructureRule(rule) {
-  return KIRO_TOOL_STRUCTURE_RULES.includes(rule);
-}
-var SYNTHETIC_FAILED_TOOL_RESULT_TEXT = "Tool use was interrupted and did not produce a result.";
-function error(rule, index, message) {
-  return { rule, message: message ?? KIRO_VALIDATION_MESSAGES[rule], index };
-}
-function isUserEntry(entry) {
-  return !!entry?.userInputMessage;
-}
-function isAssistantEntry(entry) {
-  return !!entry?.assistantResponseMessage;
-}
-function toolResultsOf(entry) {
-  return entry?.userInputMessage?.userInputMessageContext?.toolResults ?? [];
-}
-function hasToolResults(entry) {
-  return toolResultsOf(entry).length > 0;
-}
-function toolUseIdsOf(entry) {
-  return (entry?.assistantResponseMessage?.toolUses ?? []).map((tu) => tu.toolUseId).filter(Boolean);
+  const final = repaired.map((entry) => {
+    if (!isUserEntry(entry) || hasText(entry) || hasToolResults(entry))
+      return entry;
+    const uim = entry.userInputMessage;
+    return { userInputMessage: { ...uim, content: EMPTY_CONTENT_PLACEHOLDER } };
+  });
+  return { entries: final, diagnostics, remaining: validateKiroConversation(final).errors };
 }
-function hasToolUses(entry) {
-  return toolUseIdsOf(entry).length > 0;
+function syntheticFailedToolResult(toolUseId) {
+  return { toolUseId, content: [{ text: SYNTHETIC_FAILED_TOOL_RESULT_TEXT }], status: "error" };
 }
-function hasText(entry) {
-  return (entry?.userInputMessage?.content ?? "").trim() !== "";
+function syntheticToolResultEntry(toolUseIds, modelId) {
+  return {
+    userInputMessage: {
+      // Empty by design: `toolResults` is the payload. Matches kiro-agent's
+      // `FAILED_TOOL_USE_MESSAGE`, which also ships `content: ''`.
+      content: "",
+      modelId,
+      origin: "KIRO_CLI",
+      userInputMessageContext: { toolResults: toolUseIds.map(syntheticFailedToolResult) }
+    }
+  };
 }
-function toolResultsMatch(toolUseIds, toolResults) {
-  if (toolUseIds.length === 0)
-    return true;
-  if (toolResults.length === 0)
-    return false;
-  const resultIds = new Set(toolResults.map((tr) => tr.toolUseId));
-  const useIds = new Set(toolUseIds);
-  return toolUseIds.every((id) => resultIds.has(id)) && toolResults.every((tr) => useIds.has(tr.toolUseId));
+
+// ../kiro-core/dist/host-auth.js
+init_endpoints();
+init_oauth();
+var KIRO_NO_SESSION_MESSAGE = "No Kiro session found. Sign in with `kiro-cli login` (Builder ID, IAM Identity Center, Google, or GitHub), then run /login kiro again \u2014 or paste a Kiro API key below.";
+async function loginKiroFromSession(callbacks) {
+  callbacks.onProgress?.("Looking for an existing Kiro session\u2026");
+  const existing = await resolveKiroCredentials();
+  if (existing) {
+    callbacks.onProgress?.(`Using the ${existing.authMethod} session from kiro-cli.`);
+    return existing;
+  }
+  if (!callbacks.onPrompt)
+    throw new Error(KIRO_NO_SESSION_MESSAGE);
+  const apiKey = (await callbacks.onPrompt({
+    message: KIRO_NO_SESSION_MESSAGE,
+    placeholder: "ksk_\u2026",
+    allowEmpty: true,
+    secret: true
+  })).trim();
+  if (!apiKey)
+    throw new Error(KIRO_NO_SESSION_MESSAGE);
+  return loginKiroWithApiKey(apiKey, callbacks.onProgress);
 }
-function validateStartsWithUserMessage(entries) {
-  if (entries.length === 0 || !isUserEntry(entries[0])) {
-    return error(KiroValidationRule.STARTS_WITH_USER_MESSAGE, 0);
+async function resolveKiroRequestCredentials(hostKey) {
+  const stored = await resolveKiroCredentials();
+  const region = resolveApiRegion(stored?.region);
+  if (hostKey && (isApiKey(hostKey) || hostKey === stored?.access)) {
+    return { accessToken: hostKey, region, ...stored?.profileArn ? { profileArn: stored.profileArn } : {} };
   }
-  return null;
+  if (stored) {
+    return {
+      accessToken: stored.access,
+      region,
+      ...stored.profileArn ? { profileArn: stored.profileArn } : {}
+    };
+  }
+  if (hostKey)
+    return { accessToken: hostKey, region };
+  throw new Error("Kiro credentials not set. Run `kiro-cli login`, or set KIRO_API_KEY to a `ksk_` API key.");
+}
+
+// ../kiro-core/dist/host-model.js
+init_models();
+function toKiroModelForHost(model, region) {
+  const known = getCachedModels(region).find((candidate) => candidate.id === model.id);
+  return {
+    ...known ?? {
+      id: model.id,
+      // No fallback to `model.id`: that dash-spelled local id is not a valid
+      // Kiro wire id. `""` is falsy, so `resolveKiroModel` runs its own
+      // cache/bootstrap/dot-normalize resolution instead of being
+      // short-circuited by a value that is really just `model.id` again.
+      kiroModelId: model.kiroModelId ?? "",
+      name: model.name,
+      reasoning: model.reasoning,
+      input: [...model.input],
+      cost: { ...model.cost },
+      contextWindow: model.contextWindow ?? 2e5,
+      maxTokens: model.maxTokens ?? 8192
+    },
+    region,
+    ...model.kiroProfileArn ? { profileArn: model.kiroProfileArn } : {},
+    ...model.additionalModelRequestFieldsSchema ? { additionalModelRequestFieldsSchema: model.additionalModelRequestFieldsSchema } : {}
+  };
 }
-function validateEndsWithUserMessage(entries) {
-  if (entries.length === 0 || !isUserEntry(entries[entries.length - 1])) {
-    return error(KiroValidationRule.ENDS_WITH_USER_MESSAGE, entries.length - 1);
+
+// ../kiro-core/dist/invoke-tool-parser.js
+var INVOKE_OPEN_ANCHORED = /^<invoke name="([\w-]+)">/;
+var INVOKE_OPEN_SEARCH = "<invoke name=";
+var INVOKE_OPEN_ANYWHERE = /<invoke name="[\w-]+">/;
+var PARAM_OPEN_ANCHORED = /^<parameter name="([^"]*)">/;
+var INVOKE_CLOSE = "</invoke>";
+var PARAM_CLOSE = "</parameter>";
+var FENCE = "```";
+function fencedRanges(text) {
+  const ranges = [];
+  let searchFrom = 0;
+  while (true) {
+    const open = text.indexOf(FENCE, searchFrom);
+    if (open < 0)
+      break;
+    const close = text.indexOf(FENCE, open + FENCE.length);
+    if (close < 0) {
+      ranges.push({ start: open, end: text.length });
+      break;
+    }
+    ranges.push({ start: open, end: close + FENCE.length });
+    searchFrom = close + FENCE.length;
   }
-  return null;
+  return ranges;
 }
-function validateAlternatingMessages(entries) {
-  for (let i = 1; i < entries.length; i++) {
-    if (isUserEntry(entries[i - 1]) && isUserEntry(entries[i])) {
-      return error(KiroValidationRule.ALTERNATING_MESSAGES, i, "Between every two user messages there must be an assistant message");
-    }
-    if (isAssistantEntry(entries[i - 1]) && isAssistantEntry(entries[i])) {
-      return error(KiroValidationRule.ALTERNATING_MESSAGES, i, "Between every two assistant messages there must be a user message");
+var AmbiguousDialectError = class extends Error {
+};
+function parseBlockAt(text, start) {
+  const openMatch = INVOKE_OPEN_ANCHORED.exec(text.substring(start));
+  if (!openMatch)
+    return null;
+  const args = {};
+  let cursor = start + openMatch[0].length;
+  while (true) {
+    const remainder = text.substring(cursor);
+    const leadingWhitespace = remainder.length - remainder.trimStart().length;
+    if (leadingWhitespace > 0)
+      cursor += leadingWhitespace;
+    if (text.startsWith(INVOKE_CLOSE, cursor)) {
+      const end = cursor + INVOKE_CLOSE.length;
+      if (end < text.length && !/\s/.test(text[end]))
+        return null;
+      return { name: openMatch[1], arguments: args, end };
     }
+    const paramMatch = PARAM_OPEN_ANCHORED.exec(text.substring(cursor));
+    if (!paramMatch)
+      return null;
+    const valueStart = cursor + paramMatch[0].length;
+    const valueEnd = text.indexOf(PARAM_CLOSE, valueStart);
+    if (valueEnd < 0)
+      return null;
+    const value = text.substring(valueStart, valueEnd);
+    if (INVOKE_OPEN_ANYWHERE.test(value))
+      throw new AmbiguousDialectError();
+    args[paramMatch[1]] = value;
+    cursor = valueEnd + PARAM_CLOSE.length;
   }
-  return null;
 }
-function validateToolUsesAndResults(entries) {
-  for (let i = 0; i < entries.length - 1; i++) {
-    const current = entries[i];
-    const next = entries[i + 1];
-    if (isAssistantEntry(current) && hasToolUses(current) && (!isUserEntry(next) || !toolResultsMatch(toolUseIdsOf(current), toolResultsOf(next)))) {
-      return error(KiroValidationRule.TOOL_USES_AND_RESULTS, i + 1);
+function parseInvokeToolCalls(text) {
+  const toolCalls = [];
+  const removals = [];
+  const fences = fencedRanges(text);
+  const untouched = { toolCalls: [], cleanedText: text };
+  let cursor = 0;
+  while (cursor < text.length) {
+    const openStart = text.indexOf(INVOKE_OPEN_SEARCH, cursor);
+    if (openStart < 0)
+      break;
+    const containingFence = fences.find((range) => openStart >= range.start && openStart < range.end);
+    if (containingFence) {
+      cursor = containingFence.end;
+      continue;
     }
-    if (isAssistantEntry(current) && !hasToolUses(current) && isUserEntry(next) && hasToolResults(next)) {
-      return error(KiroValidationRule.TOOL_RESULTS_AND_NO_USES, i);
+    let block;
+    try {
+      block = parseBlockAt(text, openStart);
+    } catch (e) {
+      if (e instanceof AmbiguousDialectError)
+        return untouched;
+      throw e;
     }
+    if (block === null)
+      return untouched;
+    const nextOpen = text.indexOf(INVOKE_OPEN_SEARCH, block.end);
+    const interstitialEnd = nextOpen < 0 ? text.length : nextOpen;
+    const interstitial = text.substring(block.end, interstitialEnd);
+    if (interstitial.includes(PARAM_CLOSE) || interstitial.includes(INVOKE_CLOSE))
+      return untouched;
+    toolCalls.push({ toolUseId: crypto.randomUUID(), name: block.name, arguments: block.arguments });
+    removals.push({ start: openStart, end: block.end });
+    cursor = block.end;
   }
-  for (let i = 0; i < entries.length; i++) {
-    const entry = entries[i];
-    if (!isUserEntry(entry) || !hasToolResults(entry))
-      continue;
-    const prev = i > 0 ? entries[i - 1] : void 0;
-    if (!isAssistantEntry(prev))
-      return error(KiroValidationRule.TOOL_RESULTS_AND_NO_USES, i);
-  }
-  return null;
-}
-function validateToolResultOrphanIds(entries) {
-  for (let i = 1; i < entries.length; i++) {
-    const prev = entries[i - 1];
-    const current = entries[i];
-    if (!isAssistantEntry(prev) || !hasToolUses(prev) || !isUserEntry(current) || !hasToolResults(current))
-      continue;
-    const validIds = new Set(toolUseIdsOf(prev));
-    const toolResults = toolResultsOf(current);
-    const hasOrphan = toolResults.some((tr) => !tr.toolUseId || !validIds.has(tr.toolUseId));
-    const seen = /* @__PURE__ */ new Set();
-    const hasDuplicate = toolResults.some((tr) => {
-      if (!tr.toolUseId)
-        return false;
-      if (seen.has(tr.toolUseId))
-        return true;
-      seen.add(tr.toolUseId);
-      return false;
-    });
-    if (hasOrphan || hasDuplicate)
-      return error(KiroValidationRule.TOOL_RESULTS_ORPHAN_IDS, i);
+  let cleanedText = text;
+  for (let i = removals.length - 1; i >= 0; i--) {
+    const { start, end } = removals[i];
+    cleanedText = cleanedText.substring(0, start) + cleanedText.substring(end);
   }
-  return null;
+  return { toolCalls, cleanedText };
 }
-function validateNonEmptyUserMessages(entries) {
-  for (let i = 0; i < entries.length; i++) {
-    const entry = entries[i];
-    if (!isUserEntry(entry))
-      continue;
-    if (!hasText(entry) && !hasToolResults(entry)) {
-      return error(KiroValidationRule.NON_EMPTY_USER_MESSAGE, i);
+
+// ../kiro-core/dist/index.js
+init_kiro_cli();
+init_kiro_ide();
+init_management();
+init_models();
+init_oauth();
+
+// ../kiro-core/dist/request-builder.js
+init_debug();
+
+// ../kiro-core/dist/history.js
+var HISTORY_LIMIT = 85e4;
+var HISTORY_LIMIT_CONTEXT_WINDOW = 2e5;
+var HISTORY_IMAGE_BASE64_LIMIT = 512 * 1024;
+function stripHistoryImages(history, keepNewestBounded = true) {
+  let newestImageIndex = -1;
+  for (let index = history.length - 1; index >= 0; index--) {
+    if ((history[index]?.userInputMessage?.images?.length ?? 0) > 0) {
+      newestImageIndex = index;
+      break;
     }
   }
-  return null;
-}
-function validateKiroToolStructure(entries) {
-  const errors = [validateToolUsesAndResults(entries), validateToolResultOrphanIds(entries)].filter((e) => e !== null);
-  return { valid: errors.length === 0, errors };
-}
-function validateKiroConversation(entries) {
-  const errors = [
-    validateStartsWithUserMessage(entries),
-    validateEndsWithUserMessage(entries),
-    validateAlternatingMessages(entries),
-    ...validateKiroToolStructure(entries).errors,
-    validateNonEmptyUserMessages(entries)
-  ].filter((e) => e !== null);
-  return { valid: errors.length === 0, errors };
-}
-function kiroConversationEntries(history, currentUserMessage) {
-  return currentUserMessage ? [...history, { userInputMessage: currentUserMessage }] : [...history];
+  const newestImages = newestImageIndex >= 0 ? history[newestImageIndex]?.userInputMessage?.images : void 0;
+  const keepNewest = keepNewestBounded && newestImages !== void 0 && newestImages.reduce((size, image) => size + image.source.bytes.length, 0) <= HISTORY_IMAGE_BASE64_LIMIT;
+  return history.map((entry, index) => {
+    if (!entry.userInputMessage?.images || index === newestImageIndex && keepNewest)
+      return entry;
+    const { images: _images, ...rest } = entry.userInputMessage;
+    return { ...entry, userInputMessage: { ...rest } };
+  });
 }
-function repairKiroConversation(entries) {
-  const diagnostics = validateKiroConversation(entries).errors;
-  if (diagnostics.length === 0)
-    return { entries, diagnostics, remaining: [] };
-  const modelId = entries.find((e) => e.userInputMessage?.modelId)?.userInputMessage?.modelId ?? "";
-  let working = [...entries];
-  while (working.length > 0 && (!isUserEntry(working[0]) || hasToolResults(working[0])))
-    working = working.slice(1);
-  const consolidated = [];
-  for (let i = 0; i < working.length; i++) {
-    const entry = working[i];
-    const isToolOnly = isUserEntry(entry) && hasToolResults(entry) && !hasText(entry);
-    if (!isToolOnly) {
-      consolidated.push(entry);
+function sanitizeHistory(history) {
+  while (history.length > 0 && (!history[0]?.userInputMessage || history[0].userInputMessage.userInputMessageContext?.toolResults))
+    history = history.slice(1);
+  const result = [];
+  for (let i = 0; i < history.length; i++) {
+    const m = history[i];
+    if (!m)
       continue;
-    }
-    let j = i;
-    const merged = [];
-    const seen = /* @__PURE__ */ new Set();
-    while (j < working.length) {
-      const candidate = working[j];
-      if (!(isUserEntry(candidate) && hasToolResults(candidate) && !hasText(candidate)))
-        break;
-      for (const tr of toolResultsOf(candidate)) {
-        if (tr.toolUseId && seen.has(tr.toolUseId))
-          continue;
-        if (tr.toolUseId)
-          seen.add(tr.toolUseId);
-        merged.push(tr);
-      }
-      j++;
-    }
-    if (j - i === 1) {
-      consolidated.push(entry);
+    if (m.assistantResponseMessage && !m.assistantResponseMessage.toolUses && !m.assistantResponseMessage.content)
+      continue;
+    if (m.assistantResponseMessage?.toolUses) {
+      const next = history[i + 1];
+      if (next?.userInputMessage?.userInputMessageContext?.toolResults)
+        result.push(m);
+    } else if (m.userInputMessage?.userInputMessageContext?.toolResults) {
+      const prev = result[result.length - 1];
+      if (prev?.assistantResponseMessage?.toolUses)
+        result.push(m);
     } else {
-      const uim = entry.userInputMessage;
-      consolidated.push({
-        userInputMessage: {
-          ...uim,
-          userInputMessageContext: { ...uim.userInputMessageContext, toolResults: merged }
-        }
-      });
+      result.push(m);
+    }
+  }
+  return result;
+}
+function injectSyntheticToolCalls(history) {
+  const validIds = /* @__PURE__ */ new Set();
+  for (const entry of history) {
+    for (const tu of entry.assistantResponseMessage?.toolUses ?? []) {
+      if (tu.toolUseId)
+        validIds.add(tu.toolUseId);
     }
-    i = j - 1;
   }
-  working = consolidated;
-  const repaired = [];
-  for (let i = 0; i < working.length; i++) {
-    const entry = working[i];
-    if (isUserEntry(entry) && hasToolResults(entry)) {
-      const prev = repaired[repaired.length - 1];
-      const validIds = new Set(toolUseIdsOf(prev));
-      const seen = /* @__PURE__ */ new Set();
-      const kept = toolResultsOf(entry).filter((tr) => {
-        if (!tr.toolUseId || !validIds.has(tr.toolUseId) || seen.has(tr.toolUseId))
-          return false;
-        seen.add(tr.toolUseId);
-        return true;
-      });
-      const uim = { ...entry.userInputMessage };
-      if (kept.length === 0) {
-        const { userInputMessageContext, ...rest } = uim;
-        const tools = userInputMessageContext?.tools;
-        repaired.push({
-          userInputMessage: { ...rest, ...tools ? { userInputMessageContext: { tools } } : {} }
-        });
-      } else {
-        repaired.push({
-          userInputMessage: {
-            ...uim,
-            userInputMessageContext: { ...uim.userInputMessageContext, toolResults: kept }
+  const result = [];
+  for (const entry of history) {
+    const toolResults = entry.userInputMessage?.userInputMessageContext?.toolResults;
+    if (toolResults) {
+      const orphaned = toolResults.filter((tr) => !validIds.has(tr.toolUseId));
+      if (orphaned.length > 0) {
+        result.push({
+          assistantResponseMessage: {
+            content: "Tool calls were made.",
+            toolUses: orphaned.map((tr) => ({ name: "unknown_tool", toolUseId: tr.toolUseId, input: {} }))
           }
         });
-      }
-      continue;
-    }
-    repaired.push(entry);
-    if (isAssistantEntry(entry) && hasToolUses(entry)) {
-      const next = working[i + 1];
-      const answered = new Set(isUserEntry(next) ? toolResultsOf(next).map((tr) => tr.toolUseId) : (
-        /* c8 ignore next */
-        []
-      ));
-      const unanswered = toolUseIdsOf(entry).filter((id) => !answered.has(id));
-      if (unanswered.length > 0 && !isUserEntry(next)) {
-        repaired.push(syntheticToolResultEntry(unanswered, modelId));
-      } else if (unanswered.length > 0 && isUserEntry(next)) {
-        const uim = { ...next.userInputMessage };
-        working[i + 1] = {
-          userInputMessage: {
-            ...uim,
-            userInputMessageContext: {
-              ...uim.userInputMessageContext,
-              toolResults: [...toolResultsOf(next), ...unanswered.map(syntheticFailedToolResult)]
-            }
-          }
-        };
+        for (const tr of orphaned)
+          validIds.add(tr.toolUseId);
       }
     }
+    result.push(entry);
   }
-  const final = repaired.map((entry) => {
-    if (!isUserEntry(entry) || hasText(entry) || hasToolResults(entry))
-      return entry;
-    const uim = entry.userInputMessage;
-    return { userInputMessage: { ...uim, content: EMPTY_CONTENT_PLACEHOLDER } };
-  });
-  return { entries: final, diagnostics, remaining: validateKiroConversation(final).errors };
+  return result;
 }
-function syntheticFailedToolResult(toolUseId) {
-  return { toolUseId, content: [{ text: SYNTHETIC_FAILED_TOOL_RESULT_TEXT }], status: "error" };
+function prepareHistory(history, keepNewestBoundedImage = true) {
+  return injectSyntheticToolCalls(sanitizeHistory(stripHistoryImages(history, keepNewestBoundedImage)));
 }
-function syntheticToolResultEntry(toolUseIds, modelId) {
-  return {
-    userInputMessage: {
-      // Empty by design: `toolResults` is the payload. Matches kiro-agent's
-      // `FAILED_TOOL_USE_MESSAGE`, which also ships `content: ''`.
-      content: "",
-      modelId,
-      origin: "KIRO_CLI",
-      userInputMessageContext: { toolResults: toolUseIds.map(syntheticFailedToolResult) }
+function assertHistoryWithinLimit(history, limit) {
+  const size = JSON.stringify(history).length;
+  if (size > limit) {
+    throw new Error(`Kiro API error: context_length_exceeded (local history ${size} chars / ${history.length} entries exceeds ${limit}-char limit)`);
+  }
+}
+function extractToolNamesFromHistory(history) {
+  const names = /* @__PURE__ */ new Set();
+  for (const entry of history) {
+    for (const tu of entry.assistantResponseMessage?.toolUses ?? []) {
+      if (tu.name)
+        names.add(tu.name);
     }
-  };
+  }
+  return names;
+}
+function addPlaceholderTools(tools, history) {
+  const historyNames = extractToolNamesFromHistory(history);
+  if (historyNames.size === 0)
+    return tools;
+  const existing = new Set(tools.map((t) => t.toolSpecification?.name).filter(Boolean));
+  const missing = Array.from(historyNames).filter((n) => !existing.has(n));
+  if (missing.length === 0)
+    return tools;
+  return [
+    ...tools,
+    ...missing.map((name) => ({
+      toolSpecification: {
+        name,
+        description: "Tool",
+        inputSchema: { json: { type: "object", properties: {} } }
+      }
+    }))
+  ];
 }
 
 // ../kiro-core/dist/truncation.js
@@ -4141,145 +3641,45 @@ ${currentContent}`;
   } else {
     wireHistory = [];
     wireContent = currentContent || EMPTY_CONTENT_PLACEHOLDER;
-    wireUimc = uimc?.tools?.length ? { tools: uimc.tools } : void 0;
-  }
-  if (repair.remaining.length > 0) {
-    const structural = repair.remaining.filter((e) => isKiroToolStructureRule(e.rule));
-    if (structural.length > 0) {
-      console.warn(`[kiro-core] outbound history still violates ${structural.map((e) => `${e.rule}@${e.index}`).join(", ")} after repair \u2014 Kiro may reject this request`);
-    }
-  }
-  return {
-    request: {
-      conversationState: {
-        chatTriggerType: "MANUAL",
-        agentTaskType: "vibe",
-        conversationId,
-        currentMessage: {
-          userInputMessage: {
-            content: sanitizeSurrogates(wireContent),
-            modelId: kiroModelId,
-            origin: "KIRO_CLI",
-            ...currentImages ? { images: currentImages } : {},
-            ...wireUimc ? { userInputMessageContext: wireUimc } : {}
-          }
-        },
-        ...wireHistory.length > 0 ? { history: wireHistory } : {}
-      },
-      ...params.additionalModelRequestFields ? { additionalModelRequestFields: params.additionalModelRequestFields } : {},
-      profileArn,
-      agentMode: "vibe"
-    },
-    wireHistoryLength: wireHistory.length,
-    wireContentLength: wireContent.length,
-    hasImages: !!currentImages,
-    toolResultCount: wireUimc?.toolResults?.length ?? 0
-  };
-}
-
-// ../kiro-core/dist/response-assembler.js
-init_debug();
-
-// ../kiro-core/dist/invoke-tool-parser.js
-var INVOKE_OPEN_ANCHORED = /^<invoke name="([\w-]+)">/;
-var INVOKE_OPEN_SEARCH = "<invoke name=";
-var INVOKE_OPEN_ANYWHERE = /<invoke name="[\w-]+">/;
-var PARAM_OPEN_ANCHORED = /^<parameter name="([^"]*)">/;
-var INVOKE_CLOSE = "</invoke>";
-var PARAM_CLOSE = "</parameter>";
-var FENCE = "```";
-function fencedRanges(text) {
-  const ranges = [];
-  let searchFrom = 0;
-  while (true) {
-    const open = text.indexOf(FENCE, searchFrom);
-    if (open < 0)
-      break;
-    const close = text.indexOf(FENCE, open + FENCE.length);
-    if (close < 0) {
-      ranges.push({ start: open, end: text.length });
-      break;
-    }
-    ranges.push({ start: open, end: close + FENCE.length });
-    searchFrom = close + FENCE.length;
-  }
-  return ranges;
-}
-var AmbiguousDialectError = class extends Error {
-};
-function parseBlockAt(text, start) {
-  const openMatch = INVOKE_OPEN_ANCHORED.exec(text.substring(start));
-  if (!openMatch)
-    return null;
-  const args = {};
-  let cursor = start + openMatch[0].length;
-  while (true) {
-    const remainder = text.substring(cursor);
-    const leadingWhitespace = remainder.length - remainder.trimStart().length;
-    if (leadingWhitespace > 0)
-      cursor += leadingWhitespace;
-    if (text.startsWith(INVOKE_CLOSE, cursor)) {
-      const end = cursor + INVOKE_CLOSE.length;
-      if (end < text.length && !/\s/.test(text[end]))
-        return null;
-      return { name: openMatch[1], arguments: args, end };
-    }
-    const paramMatch = PARAM_OPEN_ANCHORED.exec(text.substring(cursor));
-    if (!paramMatch)
-      return null;
-    const valueStart = cursor + paramMatch[0].length;
-    const valueEnd = text.indexOf(PARAM_CLOSE, valueStart);
-    if (valueEnd < 0)
-      return null;
-    const value = text.substring(valueStart, valueEnd);
-    if (INVOKE_OPEN_ANYWHERE.test(value))
-      throw new AmbiguousDialectError();
-    args[paramMatch[1]] = value;
-    cursor = valueEnd + PARAM_CLOSE.length;
-  }
-}
-function parseInvokeToolCalls(text) {
-  const toolCalls = [];
-  const removals = [];
-  const fences = fencedRanges(text);
-  const untouched = { toolCalls: [], cleanedText: text };
-  let cursor = 0;
-  while (cursor < text.length) {
-    const openStart = text.indexOf(INVOKE_OPEN_SEARCH, cursor);
-    if (openStart < 0)
-      break;
-    const containingFence = fences.find((range) => openStart >= range.start && openStart < range.end);
-    if (containingFence) {
-      cursor = containingFence.end;
-      continue;
-    }
-    let block;
-    try {
-      block = parseBlockAt(text, openStart);
-    } catch (e) {
-      if (e instanceof AmbiguousDialectError)
-        return untouched;
-      throw e;
-    }
-    if (block === null)
-      return untouched;
-    const nextOpen = text.indexOf(INVOKE_OPEN_SEARCH, block.end);
-    const interstitialEnd = nextOpen < 0 ? text.length : nextOpen;
-    const interstitial = text.substring(block.end, interstitialEnd);
-    if (interstitial.includes(PARAM_CLOSE) || interstitial.includes(INVOKE_CLOSE))
-      return untouched;
-    toolCalls.push({ toolUseId: crypto.randomUUID(), name: block.name, arguments: block.arguments });
-    removals.push({ start: openStart, end: block.end });
-    cursor = block.end;
+    wireUimc = uimc?.tools?.length ? { tools: uimc.tools } : void 0;
   }
-  let cleanedText = text;
-  for (let i = removals.length - 1; i >= 0; i--) {
-    const { start, end } = removals[i];
-    cleanedText = cleanedText.substring(0, start) + cleanedText.substring(end);
+  if (repair.remaining.length > 0) {
+    const structural = repair.remaining.filter((e) => isKiroToolStructureRule(e.rule));
+    if (structural.length > 0) {
+      console.warn(`[kiro-core] outbound history still violates ${structural.map((e) => `${e.rule}@${e.index}`).join(", ")} after repair \u2014 Kiro may reject this request`);
+    }
   }
-  return { toolCalls, cleanedText };
+  return {
+    request: {
+      conversationState: {
+        chatTriggerType: "MANUAL",
+        agentTaskType: "vibe",
+        conversationId,
+        currentMessage: {
+          userInputMessage: {
+            content: sanitizeSurrogates(wireContent),
+            modelId: kiroModelId,
+            origin: "KIRO_CLI",
+            ...currentImages ? { images: currentImages } : {},
+            ...wireUimc ? { userInputMessageContext: wireUimc } : {}
+          }
+        },
+        ...wireHistory.length > 0 ? { history: wireHistory } : {}
+      },
+      ...params.additionalModelRequestFields ? { additionalModelRequestFields: params.additionalModelRequestFields } : {},
+      profileArn,
+      agentMode: "vibe"
+    },
+    wireHistoryLength: wireHistory.length,
+    wireContentLength: wireContent.length,
+    hasImages: !!currentImages,
+    toolResultCount: wireUimc?.toolResults?.length ?? 0
+  };
 }
 
+// ../kiro-core/dist/response-assembler.js
+init_debug();
+
 // ../kiro-core/dist/thinking-parser.js
 var THINKING_END_TAG = "</thinking>";
 var THINKING_TAG_VARIANTS = [
@@ -5756,294 +5156,87 @@ function getChunkedStream(source) {
           currentMessagePendingLength += numBytesForTotal;
           currentOffset += numBytesForTotal;
           if (currentMessagePendingLength < 4) {
-            break;
-          }
-          allocateMessage(new DataView(messageLengthBuffer.buffer).getUint32(0, false));
-          messageLengthBuffer = null;
-        }
-        const numBytesToWrite = Math.min(currentMessageTotalLength - currentMessagePendingLength, chunkLength - currentOffset);
-        currentMessage.set(value.slice(currentOffset, currentOffset + numBytesToWrite), currentMessagePendingLength);
-        currentMessagePendingLength += numBytesToWrite;
-        currentOffset += numBytesToWrite;
-        if (currentMessageTotalLength && currentMessageTotalLength === currentMessagePendingLength) {
-          yield currentMessage;
-          currentMessage = null;
-          currentMessageTotalLength = 0;
-          currentMessagePendingLength = 0;
-        }
-      }
-    }
-  };
-  return {
-    [Symbol.asyncIterator]: iterator
-  };
-}
-
-// ../../node_modules/.pnpm/@smithy+core@3.34.1/node_modules/@smithy/core/dist-es/submodules/event-streams/eventstream-serde-universal/getUnmarshalledStream.js
-function getMessageUnmarshaller(deserializer, toUtf82) {
-  return async function(message) {
-    const { value: messageType } = message.headers[":message-type"];
-    if (messageType === "error") {
-      const unmodeledError = new Error(message.headers[":error-message"].value || "UnknownError");
-      unmodeledError.name = message.headers[":error-code"].value;
-      throw unmodeledError;
-    } else if (messageType === "exception") {
-      const code = message.headers[":exception-type"].value;
-      const exception = { [code]: message };
-      const deserializedException = await deserializer(exception);
-      if (deserializedException.$unknown) {
-        const error2 = new Error(toUtf82(message.body));
-        error2.name = code;
-        throw error2;
-      }
-      throw deserializedException[code];
-    } else if (messageType === "event") {
-      const event = {
-        [message.headers[":event-type"].value]: message
-      };
-      const deserialized = await deserializer(event);
-      if (deserialized.$unknown)
-        return;
-      return deserialized;
-    } else {
-      throw Error(`Unrecognizable event type: ${message.headers[":event-type"].value}`);
-    }
-  };
-}
-
-// ../../node_modules/.pnpm/@smithy+core@3.34.1/node_modules/@smithy/core/dist-es/submodules/event-streams/eventstream-serde-universal/EventStreamMarshaller.js
-var EventStreamMarshaller = class {
-  eventStreamCodec;
-  utfEncoder;
-  constructor({ utf8Encoder, utf8Decoder }) {
-    this.eventStreamCodec = new EventStreamCodec(utf8Encoder, utf8Decoder);
-    this.utfEncoder = utf8Encoder;
-  }
-  deserialize(body, deserializer) {
-    const inputStream = getChunkedStream(body);
-    return new SmithyMessageDecoderStream({
-      messageStream: new MessageDecoderStream({ inputStream, decoder: this.eventStreamCodec }),
-      deserializer: getMessageUnmarshaller(deserializer, this.utfEncoder)
-    });
-  }
-  serialize(inputStream, serializer) {
-    return new MessageEncoderStream({
-      messageStream: new SmithyMessageEncoderStream({ inputStream, serializer }),
-      encoder: this.eventStreamCodec,
-      includeEndFrame: true
-    });
-  }
-};
-
-// ../kiro-core/dist/response-stream.js
-init_debug();
-
-// ../kiro-core/dist/event-parser.js
-var KIRO_EVENT_KEYS = [
-  "assistantResponseEvent",
-  "codeReferenceEvent",
-  "contextUsageEvent",
-  "documentCitationEvent",
-  "error",
-  "metadataEvent",
-  "meteringEvent",
-  "reasoningContentEvent",
-  "serviceUnavailableError",
-  "throttlingError",
-  "toolResultEvent",
-  "toolUseEvent",
-  "validationError"
-];
-var KIRO_EVENT_KEY_SET = new Set(KIRO_EVENT_KEYS);
-var KIRO_ERROR_MEMBERS = {
-  error: { kind: "internalServer", exception: "InternalServerException" },
-  throttlingError: { kind: "throttling", exception: "ThrottlingException" },
-  validationError: { kind: "validation", exception: "ValidationException" },
-  serviceUnavailableError: { kind: "serviceUnavailable", exception: "ServiceUnavailableException" }
-};
-var KIRO_ERROR_TOKENS = {
-  ...KIRO_ERROR_MEMBERS,
-  InternalServerException: KIRO_ERROR_MEMBERS.error,
-  ThrottlingException: KIRO_ERROR_MEMBERS.throttlingError,
-  ValidationException: KIRO_ERROR_MEMBERS.validationError,
-  ServiceUnavailableException: KIRO_ERROR_MEMBERS.serviceUnavailableError
-};
-function lookupKiroErrorMember(key) {
-  return Object.hasOwn(KIRO_ERROR_TOKENS, key) ? KIRO_ERROR_TOKENS[key] : void 0;
-}
-var num = (v) => typeof v === "number" ? v : void 0;
-var str = (v) => typeof v === "string" ? v : void 0;
-function tokenCount(value) {
-  return typeof value === "number" && Number.isFinite(value) && value >= 0 ? value : void 0;
-}
-function firstTokenCount(source, keys) {
-  for (const key of keys) {
-    const count = tokenCount(source[key]);
-    if (count !== void 0)
-      return count;
-  }
-  return void 0;
-}
-var CACHE_READ_KEYS = ["cacheReadInputTokens", "cache_read_input_tokens", "cacheReadTokens"];
-var CACHE_WRITE_KEYS = [
-  "cacheWriteInputTokens",
-  "cache_creation_input_tokens",
-  "cacheCreationInputTokens",
-  "cacheWriteTokens"
-];
-function toolInput(raw) {
-  if (typeof raw === "string")
-    return raw;
-  if (raw && typeof raw === "object" && Object.keys(raw).length > 0) {
-    return JSON.stringify(raw);
-  }
-  return "";
-}
-function parseToolUse(parsed) {
-  if (parsed.name && parsed.toolUseId) {
-    return {
-      type: "toolUse",
-      data: {
-        name: parsed.name,
-        toolUseId: parsed.toolUseId,
-        input: toolInput(parsed.input),
-        stop: parsed.stop
-      }
-    };
-  }
-  if (parsed.input !== void 0) {
-    return { type: "toolUseInput", data: { input: toolInput(parsed.input) } };
-  }
-  if (parsed.stop !== void 0)
-    return { type: "toolUseStop", data: { stop: parsed.stop } };
-  return null;
-}
-function parseMetadata(parsed) {
-  const tu = parsed.tokenUsage ?? {};
-  const data = {
-    inputTokens: tokenCount(tu.uncachedInputTokens) ?? tokenCount(tu.inputTokens),
-    outputTokens: tokenCount(tu.outputTokens),
-    totalTokens: tokenCount(tu.totalTokens),
-    cacheReadInputTokens: firstTokenCount(tu, CACHE_READ_KEYS),
-    cacheWriteInputTokens: firstTokenCount(tu, CACHE_WRITE_KEYS),
-    contextUsagePercentage: num(tu.contextUsagePercentage),
-    normalizedTokenUsage: num(tu.normalizedTokenUsage),
-    rawStopReason: str(parsed.stopReason),
-    stopDetails: parsed.stopDetails && typeof parsed.stopDetails === "object" ? parsed.stopDetails : void 0
-  };
-  for (const k of Object.keys(data)) {
-    if (data[k] === void 0)
-      delete data[k];
-  }
-  return Object.keys(data).length > 0 ? { type: "usage", data } : null;
-}
-function parseError(parsed, kind, fallbackName) {
-  const rawError = parsed.error ?? parsed.Error;
-  const error2 = typeof rawError === "string" ? rawError : rawError !== void 0 ? JSON.stringify(rawError) : str(parsed.name) ?? fallbackName;
-  const message = parsed.message ?? parsed.Message ?? parsed.reason;
-  const data = { error: error2, kind };
-  if (typeof message === "string")
-    data.message = message;
-  const reason = str(parsed.reason);
-  if (reason !== void 0)
-    data.reason = reason;
-  const retryAfterMilliseconds = num(parsed.retryAfterMilliseconds);
-  if (retryAfterMilliseconds !== void 0)
-    data.retryAfterMilliseconds = retryAfterMilliseconds;
-  return { type: "error", data };
-}
-function parseKiroEvent(key, parsed) {
-  switch (key) {
-    case "assistantResponseEvent": {
-      const content = str(parsed.content);
-      return content !== void 0 ? { type: "content", data: content } : null;
-    }
-    case "reasoningContentEvent": {
-      const text = str(parsed.text);
-      if (text !== void 0)
-        return { type: "thinkingText", data: text };
-      const signature = str(parsed.signature);
-      if (signature !== void 0)
-        return { type: "thinkingSignature", data: signature };
-      return { type: "ignored", data: { key } };
-    }
-    case "toolUseEvent":
-      return parseToolUse(parsed);
-    case "contextUsageEvent": {
-      const pct = num(parsed.contextUsagePercentage);
-      return pct !== void 0 ? { type: "contextUsage", data: { contextUsagePercentage: pct } } : null;
+            break;
+          }
+          allocateMessage(new DataView(messageLengthBuffer.buffer).getUint32(0, false));
+          messageLengthBuffer = null;
+        }
+        const numBytesToWrite = Math.min(currentMessageTotalLength - currentMessagePendingLength, chunkLength - currentOffset);
+        currentMessage.set(value.slice(currentOffset, currentOffset + numBytesToWrite), currentMessagePendingLength);
+        currentMessagePendingLength += numBytesToWrite;
+        currentOffset += numBytesToWrite;
+        if (currentMessageTotalLength && currentMessageTotalLength === currentMessagePendingLength) {
+          yield currentMessage;
+          currentMessage = null;
+          currentMessageTotalLength = 0;
+          currentMessagePendingLength = 0;
+        }
+      }
     }
-    case "metadataEvent":
-      return parseMetadata(parsed);
-    case "meteringEvent":
-      return {
-        type: "metering",
-        data: { credits: tokenCount(parsed.usage), unit: str(parsed.unit), unitPlural: str(parsed.unitPlural) }
+  };
+  return {
+    [Symbol.asyncIterator]: iterator
+  };
+}
+
+// ../../node_modules/.pnpm/@smithy+core@3.34.1/node_modules/@smithy/core/dist-es/submodules/event-streams/eventstream-serde-universal/getUnmarshalledStream.js
+function getMessageUnmarshaller(deserializer, toUtf82) {
+  return async function(message) {
+    const { value: messageType } = message.headers[":message-type"];
+    if (messageType === "error") {
+      const unmodeledError = new Error(message.headers[":error-message"].value || "UnknownError");
+      unmodeledError.name = message.headers[":error-code"].value;
+      throw unmodeledError;
+    } else if (messageType === "exception") {
+      const code = message.headers[":exception-type"].value;
+      const exception = { [code]: message };
+      const deserializedException = await deserializer(exception);
+      if (deserializedException.$unknown) {
+        const error2 = new Error(toUtf82(message.body));
+        error2.name = code;
+        throw error2;
+      }
+      throw deserializedException[code];
+    } else if (messageType === "event") {
+      const event = {
+        [message.headers[":event-type"].value]: message
       };
-    // Reachable when a member that models an exception is delivered as an
-    // ordinary event frame. The real wire uses exception framing, handled by
-    // parseKiroExceptionFrame, but both routes must agree.
-    case "error":
-    case "throttlingError":
-    case "validationError":
-    case "serviceUnavailableError": {
-      const member = lookupKiroErrorMember(key);
-      return parseError(parsed, member.kind, member.exception);
-    }
-    // Known members with no consumer yet: explicitly ignored, not unparseable.
-    case "codeReferenceEvent":
-    case "documentCitationEvent":
-    case "toolResultEvent":
-      return { type: "ignored", data: { key } };
-    default: {
-      const member = lookupKiroErrorMember(key);
-      if (member)
-        return parseError(parsed, member.kind, member.exception);
-      return parseKiroEventByShape(parsed);
+      const deserialized = await deserializer(event);
+      if (deserialized.$unknown)
+        return;
+      return deserialized;
+    } else {
+      throw Error(`Unrecognizable event type: ${message.headers[":event-type"].value}`);
     }
-  }
-}
-function parseKiroExceptionFrame(key, parsed) {
-  const member = lookupKiroErrorMember(key);
-  if (!member)
-    return null;
-  const event = parseError(parsed, member.kind, member.exception);
-  return event.data;
+  };
 }
-function parseKiroEventByShape(parsed) {
-  if (parsed.content !== void 0)
-    return { type: "content", data: parsed.content };
-  if (typeof parsed.text === "string")
-    return { type: "thinkingText", data: parsed.text };
-  if (typeof parsed.signature === "string")
-    return { type: "thinkingSignature", data: parsed.signature };
-  if (parsed.name && parsed.toolUseId)
-    return parseToolUse(parsed);
-  if (parsed.input !== void 0 && !parsed.name) {
-    return { type: "toolUseInput", data: { input: toolInput(parsed.input) } };
-  }
-  if (parsed.stop !== void 0 && parsed.contextUsagePercentage === void 0)
-    return { type: "toolUseStop", data: { stop: parsed.stop } };
-  if (parsed.contextUsagePercentage !== void 0)
-    return { type: "contextUsage", data: { contextUsagePercentage: parsed.contextUsagePercentage } };
-  if (parsed.followupPrompt !== void 0)
-    return { type: "followupPrompt", data: parsed.followupPrompt };
-  if (parsed.tokenUsage !== void 0 || parsed.stopReason !== void 0 || parsed.stopDetails !== void 0) {
-    return parseMetadata(parsed);
+
+// ../../node_modules/.pnpm/@smithy+core@3.34.1/node_modules/@smithy/core/dist-es/submodules/event-streams/eventstream-serde-universal/EventStreamMarshaller.js
+var EventStreamMarshaller = class {
+  eventStreamCodec;
+  utfEncoder;
+  constructor({ utf8Encoder, utf8Decoder }) {
+    this.eventStreamCodec = new EventStreamCodec(utf8Encoder, utf8Decoder);
+    this.utfEncoder = utf8Encoder;
   }
-  if (parsed.error !== void 0 || parsed.Error !== void 0) {
-    return parseError(parsed, "unknown", "unknown");
+  deserialize(body, deserializer) {
+    const inputStream = getChunkedStream(body);
+    return new SmithyMessageDecoderStream({
+      messageStream: new MessageDecoderStream({ inputStream, decoder: this.eventStreamCodec }),
+      deserializer: getMessageUnmarshaller(deserializer, this.utfEncoder)
+    });
   }
-  if (typeof parsed.usage === "number") {
-    return {
-      type: "metering",
-      data: { credits: tokenCount(parsed.usage), unit: str(parsed.unit), unitPlural: str(parsed.unitPlural) }
-    };
+  serialize(inputStream, serializer) {
+    return new MessageEncoderStream({
+      messageStream: new SmithyMessageEncoderStream({ inputStream, serializer }),
+      encoder: this.eventStreamCodec,
+      includeEndFrame: true
+    });
   }
-  return null;
-}
+};
 
 // ../kiro-core/dist/response-stream.js
+init_debug();
 var IDLE_TIMEOUT = 3e5;
 var eventStreamMarshaller = new EventStreamMarshaller({
   utf8Encoder: (input) => new TextDecoder().decode(input),
@@ -6155,12 +5348,17 @@ function readKiroEventStream(body, options) {
             iterResult = await iterator.next();
           }
         } catch (e) {
+          if (callerSignal?.aborted)
+            throw callerSignal.reason ?? e;
           const kiroError = e?.kiroError;
           if (kiroError)
             outcome.errorData = kiroError;
           outcome.error = e instanceof Error ? e.message : (typeof e === "object" && e !== null ? JSON.stringify(e) : String(e)) || "Unknown stream error";
           return;
         }
+        if (callerSignal?.aborted) {
+          throw callerSignal.reason ?? new Error("Request aborted");
+        }
         const { done, value } = iterResult;
         if (done)
           return;
@@ -6198,15 +5396,22 @@ function readKiroEventStream(body, options) {
 }
 
 // ../kiro-core/dist/stream.js
-init_retry();
+import { createHash as createHash3 } from "node:crypto";
+init_debug();
+init_effort();
+init_endpoints();
+init_kiro_cli();
+init_management();
+init_models();
+init_oauth();
 init_token_type();
 
 // ../kiro-core/dist/transport.js
 import { appendFile, mkdir } from "node:fs/promises";
 import { homedir as homedir5 } from "node:os";
-import { join as join6 } from "node:path";
-var CAPACITY_LOG_DIR = join6(homedir5(), ".ns-kiro-provider", "logs");
-var CAPACITY_LOG_FILE = join6(CAPACITY_LOG_DIR, "capacity-retries.log");
+import { join as join5 } from "node:path";
+var CAPACITY_LOG_DIR = join5(homedir5(), ".ns-kiro-provider", "logs");
+var CAPACITY_LOG_FILE = join5(CAPACITY_LOG_DIR, "capacity-retries.log");
 var capacityLogDirCreated = false;
 function logCapacityEvent(message) {
   (async () => {
@@ -6324,9 +5529,6 @@ function describeReturnedContent(kinds) {
 }
 var skipProfileResolutionForTests = false;
 var TEST_PROFILE_ARN = "arn:aws:codewhisperer:us-east-1:000000000000:profile/test";
-function testProfileArnOverride() {
-  return skipProfileResolutionForTests ? TEST_PROFILE_ARN : void 0;
-}
 function throwOnTerminalWireStop(wireStopReason, stopDetails) {
   switch (wireStopReason) {
     case "MODEL_CONTEXT_WINDOW_EXCEEDED":
@@ -6338,7 +5540,7 @@ function throwOnTerminalWireStop(wireStopReason, stopDetails) {
   }
 }
 async function* streamKiro(request) {
-  yield* streamKiroOnEngine(request, streamKiroInProcess);
+  yield* streamKiroInProcess(request);
 }
 async function* streamKiroInProcess(request) {
   const { model, signal } = request;
@@ -6621,185 +5823,25 @@ ${systemPrompt}` : ""}`;
     yield* assembler.takeEvents();
     if (!errorMessage) {
       const estimatedRead = applyCacheEstimate(conversationId, usage, wireUsage, usageTracking);
-      if (estimatedRead > 0) {
-        debugLog("usage.estimate", {
-          conversationId,
-          estimatedRead,
-          input: usage.input,
-          cacheRead: usage.cacheRead
-        });
-      }
-      const estimatedCost = estimateKiroCreditCost(usageTracking, metering);
-      if (estimatedCost !== void 0)
-        usage.cost.total = estimatedCost;
-    }
-    yield { type: "usage", usage };
-    yield { type: "done", stopReason, ...errorMessage ? { errorMessage } : {} };
-    return;
-  }
-}
-
-// ../kiro-core/dist/engine.js
-var KIRO_SIDECAR_VENDOR = "kiro";
-function selectKiroEngine() {
-  return selectBridgeEngine(KIRO_SIDECAR_VENDOR);
-}
-function toKiroSidecarRequest(request, conversationId) {
-  const { signal: _signal, ...wire } = request;
-  const kiroModelId = resolveKiroModel(request.model.id, request.model.kiroModelId);
-  const testProfileArn = testProfileArnOverride();
-  return {
-    ...wire,
-    model: { ...request.model, kiroModelId },
-    conversationId,
-    profileArnCache: snapshotKiroProfileArnCache(),
-    timeouts: {
-      firstTokenMs: request.model.firstTokenTimeout ?? firstTokenTimeoutForModel(request.model.id),
-      requestHeaderMs: retryConfig.requestHeaderTimeoutMs
-    },
-    capacityRetry: { ...capacityRetryConfig },
-    ...testProfileArn ? { testProfileArn } : {}
-  };
-}
-async function* postProcess(events, request, conversationId) {
-  let pendingUsage;
-  for await (const event of events) {
-    if (event.type === "usage") {
-      pendingUsage = event;
-      continue;
-    }
-    if (event.type !== "done") {
-      yield event;
-      continue;
-    }
-    const { kiroProfileArns, kiroRuntimeRegion, kiroProfileArn, ...done } = event;
-    applyKiroProfileArnCacheChanges(kiroProfileArns);
-    const region = kiroRuntimeRegion ?? getKiroRegionFromProfileArn(kiroProfileArn) ?? request.model.region;
-    if (!process.env.VITEST && region && kiroProfileArn && isCacheStale(region)) {
-      updateKiroModelsCache(request.accessToken, region, kiroProfileArn).catch((error2) => {
-        console.warn(`[kiro-core] Failed to refresh Kiro model catalog in ${region}: ${formatSafeError(error2)}`);
-      });
-    }
-    if (pendingUsage) {
-      const { kiroWireCache, ...usageEvent } = pendingUsage;
-      if (!done.errorMessage) {
-        const estimatedRead = applyCacheEstimate(conversationId, usageEvent.usage, kiroWireCache ? { cacheReadInputTokens: 0 } : null, request.usageTracking ?? KIRO_USAGE_TRACKING_DISABLED);
-        if (estimatedRead > 0) {
-          debugLog("usage.estimate", {
-            conversationId,
-            estimatedRead,
-            input: usageEvent.usage.input,
-            cacheRead: usageEvent.usage.cacheRead
-          });
-        }
-      }
-      pendingUsage = void 0;
-      yield usageEvent;
-    }
-    yield done;
-  }
-  if (pendingUsage) {
-    const { kiroWireCache: _wire, ...usageEvent } = pendingUsage;
-    yield usageEvent;
-  }
-}
-function streamKiroOnEngine(request, inProcess) {
-  if (selectKiroEngine() === "ts" || !request.accessToken)
-    return inProcess(request);
-  const conversationId = request.sessionId ?? crypto.randomUUID();
-  let sidecarRequest;
-  try {
-    sidecarRequest = toKiroSidecarRequest(request, conversationId);
-  } catch {
-    return inProcess(request);
-  }
-  return engineStream({
-    vendor: KIRO_SIDECAR_VENDOR,
-    request: () => sidecarRequest,
-    inProcess: () => inProcess(request),
-    mapError: kiroErrorFromSidecar,
-    transform: (events) => postProcess(events, request, conversationId),
-    ...request.signal ? { signal: request.signal } : {}
-  });
-}
-
-// ../kiro-core/dist/index.js
-init_engine_ops();
-init_errors2();
-
-// ../kiro-core/dist/host-auth.js
-init_endpoints();
-init_oauth();
-var KIRO_NO_SESSION_MESSAGE = "No Kiro session found. Sign in with `kiro-cli login` (Builder ID, IAM Identity Center, Google, or GitHub), then run /login kiro again \u2014 or paste a Kiro API key below.";
-async function loginKiroFromSession(callbacks) {
-  callbacks.onProgress?.("Looking for an existing Kiro session\u2026");
-  const existing = await resolveKiroCredentials();
-  if (existing) {
-    callbacks.onProgress?.(`Using the ${existing.authMethod} session from kiro-cli.`);
-    return existing;
-  }
-  if (!callbacks.onPrompt)
-    throw new Error(KIRO_NO_SESSION_MESSAGE);
-  const apiKey = (await callbacks.onPrompt({
-    message: KIRO_NO_SESSION_MESSAGE,
-    placeholder: "ksk_\u2026",
-    allowEmpty: true,
-    secret: true
-  })).trim();
-  if (!apiKey)
-    throw new Error(KIRO_NO_SESSION_MESSAGE);
-  return loginKiroWithApiKey(apiKey, callbacks.onProgress);
-}
-async function resolveKiroRequestCredentials(hostKey) {
-  const stored = await resolveKiroCredentials();
-  const region = resolveApiRegion(stored?.region);
-  if (hostKey && (isApiKey(hostKey) || hostKey === stored?.access)) {
-    return { accessToken: hostKey, region, ...stored?.profileArn ? { profileArn: stored.profileArn } : {} };
-  }
-  if (stored) {
-    return {
-      accessToken: stored.access,
-      region,
-      ...stored.profileArn ? { profileArn: stored.profileArn } : {}
-    };
-  }
-  if (hostKey)
-    return { accessToken: hostKey, region };
-  throw new Error("Kiro credentials not set. Run `kiro-cli login`, or set KIRO_API_KEY to a `ksk_` API key.");
-}
-
-// ../kiro-core/dist/host-model.js
-init_models();
-function toKiroModelForHost(model, region) {
-  const known = getCachedModels(region).find((candidate) => candidate.id === model.id);
-  return {
-    ...known ?? {
-      id: model.id,
-      // No fallback to `model.id`: that dash-spelled local id is not a valid
-      // Kiro wire id. `""` is falsy, so `resolveKiroModel` runs its own
-      // cache/bootstrap/dot-normalize resolution instead of being
-      // short-circuited by a value that is really just `model.id` again.
-      kiroModelId: model.kiroModelId ?? "",
-      name: model.name,
-      reasoning: model.reasoning,
-      input: [...model.input],
-      cost: { ...model.cost },
-      contextWindow: model.contextWindow ?? 2e5,
-      maxTokens: model.maxTokens ?? 8192
-    },
-    region,
-    ...model.kiroProfileArn ? { profileArn: model.kiroProfileArn } : {},
-    ...model.additionalModelRequestFieldsSchema ? { additionalModelRequestFieldsSchema: model.additionalModelRequestFieldsSchema } : {}
-  };
+      if (estimatedRead > 0) {
+        debugLog("usage.estimate", {
+          conversationId,
+          estimatedRead,
+          input: usage.input,
+          cacheRead: usage.cacheRead
+        });
+      }
+      const estimatedCost = estimateKiroCreditCost(usageTracking, metering);
+      if (estimatedCost !== void 0)
+        usage.cost.total = estimatedCost;
+    }
+    yield { type: "usage", usage };
+    yield { type: "done", stopReason, ...errorMessage ? { errorMessage } : {} };
+    return;
+  }
 }
 
 // ../kiro-core/dist/index.js
-init_kiro_cli();
-init_kiro_ide();
-init_management();
-init_models();
-init_oauth();
-init_retry();
 init_types();
 
 // ../kiro-core/dist/usage.js
@@ -6935,17 +5977,225 @@ async function registerKiroProvider(pi) {
 }
 
 // ../pi-provider/src/devin/register.ts
-import { existsSync as existsSync5, readFileSync as readFileSync5 } from "node:fs";
+import { existsSync as existsSync4, readFileSync as readFileSync5 } from "node:fs";
 
-// ../devin-core/dist/capacity-retry.js
-init_engine2();
-init_errors3();
+// ../devin-core/dist/util.js
+import { createHash as createHash4 } from "node:crypto";
+function isRecord3(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+var ANSI_PATTERN = /\x1b(?:\[[0-9;?]*[ -/]*[@-~]|\][^\x07\x1b]*(?:\x07|\x1b\\)|[@-Z\\-_])/g;
+var CONTROL_PATTERN = /[\x00-\x08\x0B-\x1F\x7F-\x9F]/g;
+var REPLACEMENT_CHAR = "\uFFFD";
+function sanitizeText(text) {
+  const wellFormed = text.toWellFormed();
+  const clean = wellFormed === text ? text : wellFormed.replaceAll(REPLACEMENT_CHAR, "");
+  return clean.replace(ANSI_PATTERN, "").replace(CONTROL_PATTERN, "");
+}
+function deterministicUuid(seed) {
+  const hex = createHash4("sha256").update(seed).digest("hex");
+  return `${hex.slice(0, 8)}-${hex.slice(8, 12)}-${hex.slice(12, 16)}-${hex.slice(16, 20)}-${hex.slice(20, 32)}`;
+}
+function devinDebugEnabled() {
+  const value = process.env.NS_DEVIN_DEBUG ?? process.env.DEVIN_DEBUG;
+  return value !== void 0 && value !== "" && value !== "0" && value !== "false";
+}
+function emit(method, message, data) {
+  const line = data === void 0 ? `[devin] ${message}` : `[devin] ${message} ${safeJson(data)}`;
+  console[method === "debug" ? "error" : method](line);
+}
+function safeJson(data) {
+  try {
+    return JSON.stringify(data, (_key, value) => typeof value === "bigint" ? Number(value) : value);
+  } catch {
+    return "";
+  }
+}
+var logger = {
+  debug(message, data) {
+    if (devinDebugEnabled())
+      emit("debug", message, data);
+  },
+  warn(message, data) {
+    emit("warn", message, data);
+  },
+  error(message, data) {
+    emit("error", message, data);
+  }
+};
+var SENSITIVE_PATTERNS = [
+  /\b(sk|pk|key|token|secret|password|bearer|api[_-]?key|credential|authorization)\s*[:=]\s*["']?[\w.$~+-]{6,}["']?/gi,
+  /\b(cog_|devin-session-token\$)[\w.$~+-]+/g,
+  /\bBearer\s+[\w.$~+-]{6,}/gi
+];
+function redactSensitiveCredentials(text) {
+  let out = text;
+  for (const pattern of SENSITIVE_PATTERNS) {
+    out = out.replace(pattern, (match) => {
+      const separator = match.match(/[:=\s]/)?.index ?? 0;
+      return `${match.slice(0, separator + 1)}[REDACTED]`;
+    });
+  }
+  return out;
+}
+function normalizeSystemPrompts(systemPrompt) {
+  const prompts = systemPrompt === void 0 || systemPrompt === null ? [] : Array.isArray(systemPrompt) ? systemPrompt : typeof systemPrompt === "string" ? [systemPrompt] : [];
+  return prompts.map((prompt) => redactSensitiveCredentials(prompt.toWellFormed())).filter((prompt) => prompt.trim().length > 0);
+}
 
-// ../devin-core/dist/client.js
-init_errors3();
+// ../devin-core/dist/errors.js
+var DevinApiError = class extends Error {
+  status;
+  operation;
+  headers;
+  constructor(message, operation, status, headers) {
+    super(message);
+    this.name = "DevinApiError";
+    this.operation = operation;
+    this.status = status;
+    this.headers = headers ?? {};
+  }
+};
+var DevinProtocolError = class extends Error {
+  kind;
+  constructor(message, kind = "runtime") {
+    super(message);
+    this.name = "DevinProtocolError";
+    this.kind = kind;
+  }
+};
+var DevinStreamError = class extends Error {
+  code;
+  contextOverflow;
+  constructor(message, code = "", contextOverflow = false) {
+    super(message);
+    this.name = "DevinStreamError";
+    this.code = code;
+    this.contextOverflow = contextOverflow;
+  }
+};
+var MAX_DEVIN_ERROR_DETAIL_CHARS = 4096;
+var HTML_ERROR_BODY_PATTERN = /^\s*(?:<!doctype\s+html\b|<html\b)/i;
+function devinErrorDetail(response, payload) {
+  let text;
+  try {
+    text = new TextDecoder("utf-8", { fatal: true }).decode(payload).trim();
+  } catch {
+    return void 0;
+  }
+  if (response.headers.get("content-type")?.toLowerCase().includes("text/html"))
+    return void 0;
+  try {
+    const decoded = JSON.parse(text);
+    if (isRecord3(decoded)) {
+      const error2 = decoded.error;
+      if (isRecord3(error2) && typeof error2.message === "string")
+        text = error2.message.trim();
+      else if (typeof error2 === "string")
+        text = error2.trim();
+      else if (typeof decoded.message === "string")
+        text = decoded.message.trim();
+    }
+  } catch {
+  }
+  const normalized = text.replace(/\s+/g, " ").trim();
+  if (normalized.length === 0 || HTML_ERROR_BODY_PATTERN.test(normalized) || sanitizeText(normalized) !== normalized) {
+    return void 0;
+  }
+  if (normalized.length <= MAX_DEVIN_ERROR_DETAIL_CHARS)
+    return normalized;
+  const boundaryUnit = normalized.charCodeAt(MAX_DEVIN_ERROR_DETAIL_CHARS - 1);
+  const cut = boundaryUnit >= 55296 && boundaryUnit <= 56319 ? MAX_DEVIN_ERROR_DETAIL_CHARS - 1 : MAX_DEVIN_ERROR_DETAIL_CHARS;
+  return normalized.slice(0, cut);
+}
+function createDevinHttpError(operation, response, payload) {
+  const status = `${response.status}${response.statusText ? ` ${response.statusText}` : ""}`;
+  const detail = devinErrorDetail(response, payload);
+  const headers = {};
+  response.headers.forEach((value, key) => {
+    headers[key] = value;
+  });
+  return new DevinApiError(`Devin ${operation} error ${status}${detail ? `: ${detail}` : ""}`, operation, response.status, headers);
+}
+var MAX_TRAILER_EVIDENCE_CHARS = 2e3;
+function truncateTrailerEvidence(text) {
+  return text.length > MAX_TRAILER_EVIDENCE_CHARS ? `${text.slice(0, MAX_TRAILER_EVIDENCE_CHARS)}\u2026` : text;
+}
+function summarizeTrailerDetails(details) {
+  if (!Array.isArray(details) || details.length === 0)
+    return void 0;
+  let summary = "";
+  for (const entry of details) {
+    if (!isRecord3(entry))
+      continue;
+    const type = typeof entry.type === "string" && entry.type ? entry.type : void 0;
+    const value = typeof entry.value === "string" && entry.value ? entry.value : void 0;
+    let debug;
+    if (entry.debug !== void 0) {
+      try {
+        debug = typeof entry.debug === "string" ? entry.debug : JSON.stringify(entry.debug);
+      } catch {
+        debug = void 0;
+      }
+    }
+    const boundedType = type ? truncateTrailerEvidence(type) : void 0;
+    const evidence = debug ?? value;
+    const boundedEvidence = evidence ? truncateTrailerEvidence(evidence) : void 0;
+    let part;
+    if (boundedType && boundedEvidence)
+      part = `${boundedType}: ${boundedEvidence}`;
+    else
+      part = boundedType ?? boundedEvidence;
+    if (!part)
+      continue;
+    const next = summary ? `${summary}; ${part}` : part;
+    if (next.length > MAX_TRAILER_EVIDENCE_CHARS)
+      return truncateTrailerEvidence(next);
+    summary = next;
+  }
+  return summary || void 0;
+}
+function readConnectTrailerError(text) {
+  if (text.length === 0)
+    return null;
+  let parsed;
+  try {
+    parsed = JSON.parse(text);
+  } catch {
+    return null;
+  }
+  if (!isRecord3(parsed) || !("error" in parsed))
+    return null;
+  const err = parsed.error;
+  if (!isRecord3(err))
+    return null;
+  const code = typeof err.code === "string" ? err.code : "";
+  const message = typeof err.message === "string" ? err.message : "";
+  if (!code && !message)
+    return null;
+  const trailer = {
+    code,
+    message,
+    formatted: `Devin stream error${code ? ` ${code}` : ""}: ${message}`,
+    raw: truncateTrailerEvidence(text)
+  };
+  const detail = summarizeTrailerDetails(err.details);
+  if (detail) {
+    trailer.detail = detail;
+    trailer.formatted += ` [details: ${detail}]`;
+  }
+  return trailer;
+}
+function isDevinCapacityError(error2) {
+  if (error2 instanceof DevinApiError)
+    return error2.status === 502 || error2.status === 503 || error2.status === 529;
+  if (error2 instanceof DevinStreamError) {
+    return error2.code === "unavailable" || error2.code === "deadline_exceeded" || /capacity|overload/i.test(error2.message);
+  }
+  return false;
+}
 
 // ../devin-core/dist/proto/protobuf.js
-init_util();
 var textEncoder = new TextEncoder();
 var textDecoder = new TextDecoder("utf-8", { fatal: true });
 function pb(typeName, fields = []) {
@@ -9478,7 +8728,6 @@ async function assignDevinModel(model, turn, routerPrompt, baseUrl, fetchImpl, s
 }
 
 // ../devin-core/dist/connect.js
-init_errors3();
 import { gunzipSync as gunzipSync2, gzipSync } from "node:zlib";
 var CONNECT_COMPRESSED_FLAG = 1;
 var CONNECT_END_STREAM_FLAG = 2;
@@ -9524,10 +8773,6 @@ var ConnectFrameReader = class {
   }
 };
 
-// ../devin-core/dist/stream.js
-init_engine2();
-init_errors3();
-
 // ../devin-core/dist/json.js
 function parseStreamingJson(partialJson) {
   const trimmed = partialJson?.trimStart();
@@ -9620,7 +8865,6 @@ function parseToolCallArguments(json) {
 }
 
 // ../devin-core/dist/schema.js
-init_util();
 var GOOGLE_UNSUPPORTED_FIELDS = /* @__PURE__ */ new Set([
   "$schema",
   "$id",
@@ -9715,7 +8959,6 @@ function isGeminiRoutedModel(...candidates) {
 }
 
 // ../devin-core/dist/request-builder.js
-init_util();
 var DEVIN_DEFAULT_STOP_PATTERNS = [
   "<|user|>",
   "<|bot|>",
@@ -9855,7 +9098,6 @@ function buildDevinChatRequest(params) {
 }
 
 // ../devin-core/dist/stream.js
-init_util();
 var LARGE_HISTORY_RECOVERY_BYTES = 512 * 1024;
 function calculateDevinCost(cost, usage) {
   const per = (tokens, rate) => tokens / 1e6 * rate;
@@ -9866,9 +9108,11 @@ function calculateDevinCost(cost, usage) {
   return { input, output, cacheRead, cacheWrite, total: input + output + cacheRead + cacheWrite };
 }
 function streamDevin(request) {
-  return streamDevinOnEngine(request, void 0, streamDevinInProcess);
+  return streamDevinInProcess(request);
 }
 async function* streamDevinInProcess(request) {
+  if (request.signal?.aborted)
+    throw request.signal.reason ?? new Error("Request aborted");
   const model = request.model;
   const fetchImpl = request.fetch ?? fetch;
   const baseUrl = (model.baseUrl || DEVIN_DEFAULT_BASE_URL).replace(/\/+$/, "");
@@ -9947,143 +9191,169 @@ async function* streamDevinInProcess(request) {
   };
   const reader = new ConnectFrameReader();
   const body = response.body.getReader();
-  for (; ; ) {
-    const { done, value } = await body.read();
-    if (value && value.length > 0)
-      reader.push(value);
+  const signal = request.signal;
+  const onAbort = () => {
+    void body.cancel(signal?.reason).catch(() => {
+    });
+  };
+  if (signal?.aborted)
+    onAbort();
+  else
+    signal?.addEventListener("abort", onAbort, { once: true });
+  const abortReason = () => signal?.reason ?? new Error("Request aborted");
+  try {
     for (; ; ) {
-      const envelope = reader.next();
-      if (envelope === null)
-        break;
-      if (envelope.endStream) {
-        const trailerError = readConnectTrailerError(new TextDecoder().decode(envelope.payload).trim());
-        if (trailerError === null)
-          continue;
-        logger.warn("stream rejected via Connect trailer", {
-          model: model.id,
-          code: trailerError.code,
-          message: trailerError.message,
-          ...trailerError.detail ? { detail: trailerError.detail } : {},
-          rawTrailer: trailerError.raw,
-          requestBytes: requestBytes.byteLength,
-          messages: request.messages.length,
-          hadOutput: sawAnyToken
-        });
-        let contextOverflow = false;
-        if (!sawAnyToken && trailerError.code.toLowerCase() === "invalid_argument" && /\binternal error\b/i.test(trailerError.message)) {
-          const historyBytes = toBinary(GetChatMessageRequestSchema, create(GetChatMessageRequestSchema, {
-            chatMessagePrompts: buildChatMessagePrompts(request.messages, turn.cascadeId)
-          })).byteLength;
-          contextOverflow = historyBytes >= LARGE_HISTORY_RECOVERY_BYTES;
-          if (contextOverflow) {
-            logger.warn("treating large-history invalid_argument as context overflow", {
-              model: model.id,
-              historyBytes
-            });
+      if (signal?.aborted)
+        throw abortReason();
+      let read;
+      try {
+        read = await body.read();
+      } catch (error2) {
+        if (signal?.aborted)
+          throw abortReason();
+        throw error2;
+      }
+      if (signal?.aborted)
+        throw abortReason();
+      const { done, value } = read;
+      if (value && value.length > 0)
+        reader.push(value);
+      for (; ; ) {
+        const envelope = reader.next();
+        if (envelope === null)
+          break;
+        if (envelope.endStream) {
+          const trailerError = readConnectTrailerError(new TextDecoder().decode(envelope.payload).trim());
+          if (trailerError === null)
+            continue;
+          logger.warn("stream rejected via Connect trailer", {
+            model: model.id,
+            code: trailerError.code,
+            message: trailerError.message,
+            ...trailerError.detail ? { detail: trailerError.detail } : {},
+            rawTrailer: trailerError.raw,
+            requestBytes: requestBytes.byteLength,
+            messages: request.messages.length,
+            hadOutput: sawAnyToken
+          });
+          let contextOverflow = false;
+          if (!sawAnyToken && trailerError.code.toLowerCase() === "invalid_argument" && /\binternal error\b/i.test(trailerError.message)) {
+            const historyBytes = toBinary(GetChatMessageRequestSchema, create(GetChatMessageRequestSchema, {
+              chatMessagePrompts: buildChatMessagePrompts(request.messages, turn.cascadeId)
+            })).byteLength;
+            contextOverflow = historyBytes >= LARGE_HISTORY_RECOVERY_BYTES;
+            if (contextOverflow) {
+              logger.warn("treating large-history invalid_argument as context overflow", {
+                model: model.id,
+                historyBytes
+              });
+            }
           }
+          throw new DevinStreamError(trailerError.formatted, trailerError.code, contextOverflow);
         }
-        throw new DevinStreamError(trailerError.formatted, trailerError.code, contextOverflow);
-      }
-      const msg = fromBinary(GetChatMessageResponseSchema, envelope.payload);
-      if (msg.messageId && !responseId)
-        responseId = msg.messageId;
-      if (msg.actualModelUid)
-        upstreamModel = msg.actualModelUid;
-      if (msg.deltaThinking) {
-        markToken();
-        if (openThinking === void 0) {
-          openThinking = { index: nextIndex++, text: "" };
-          yield { type: "thinking_start", index: openThinking.index };
-        }
-        openThinking.text += msg.deltaThinking;
-        yield { type: "thinking_delta", index: openThinking.index, delta: msg.deltaThinking };
-      }
-      if (msg.deltaSignature && openThinking !== void 0)
-        openThinking.signature = msg.deltaSignature;
-      if (msg.deltaText) {
-        markToken();
-        if (openThinking !== void 0) {
-          yield {
-            type: "thinking_end",
-            index: openThinking.index,
-            thinking: openThinking.text,
-            ...openThinking.signature ? { signature: openThinking.signature } : {}
-          };
-          openThinking = void 0;
+        const msg = fromBinary(GetChatMessageResponseSchema, envelope.payload);
+        if (msg.messageId && !responseId)
+          responseId = msg.messageId;
+        if (msg.actualModelUid)
+          upstreamModel = msg.actualModelUid;
+        if (msg.deltaThinking) {
+          markToken();
+          if (openThinking === void 0) {
+            openThinking = { index: nextIndex++, text: "" };
+            yield { type: "thinking_start", index: openThinking.index };
+          }
+          openThinking.text += msg.deltaThinking;
+          yield { type: "thinking_delta", index: openThinking.index, delta: msg.deltaThinking };
         }
-        if (openText === void 0) {
-          openText = { index: nextIndex++, text: "" };
-          yield { type: "text_start", index: openText.index };
+        if (msg.deltaSignature && openThinking !== void 0)
+          openThinking.signature = msg.deltaSignature;
+        if (msg.deltaText) {
+          markToken();
+          if (openThinking !== void 0) {
+            yield {
+              type: "thinking_end",
+              index: openThinking.index,
+              thinking: openThinking.text,
+              ...openThinking.signature ? { signature: openThinking.signature } : {}
+            };
+            openThinking = void 0;
+          }
+          if (openText === void 0) {
+            openText = { index: nextIndex++, text: "" };
+            yield { type: "text_start", index: openText.index };
+          }
+          openText.text += msg.deltaText;
+          yield { type: "text_delta", index: openText.index, delta: msg.deltaText };
         }
-        openText.text += msg.deltaText;
-        yield { type: "text_delta", index: openText.index, delta: msg.deltaText };
-      }
-      if (msg.deltaToolCalls.length > 0) {
-        markToken();
-        if (openText !== void 0) {
-          yield { type: "text_end", index: openText.index, text: openText.text };
-          openText = void 0;
+        if (msg.deltaToolCalls.length > 0) {
+          markToken();
+          if (openText !== void 0) {
+            yield { type: "text_end", index: openText.index, text: openText.text };
+            openText = void 0;
+          }
+          if (openThinking !== void 0) {
+            yield {
+              type: "thinking_end",
+              index: openThinking.index,
+              thinking: openThinking.text,
+              ...openThinking.signature ? { signature: openThinking.signature } : {}
+            };
+            openThinking = void 0;
+          }
+          for (const call of msg.deltaToolCalls) {
+            const toolCallId = call.id || activeToolCallId;
+            if (!toolCallId)
+              continue;
+            let block = toolBlocks.get(toolCallId);
+            if (block === void 0) {
+              block = { index: nextIndex++, name: call.name };
+              toolBlocks.set(toolCallId, block);
+              toolPartialJson.set(toolCallId, "");
+              yield { type: "tool_call_start", index: block.index, id: toolCallId, name: call.name };
+            }
+            if (call.name)
+              block.name = call.name;
+            activeToolCallId = toolCallId;
+            if (!call.argumentsJson)
+              continue;
+            const previousJson = toolPartialJson.get(toolCallId) ?? "";
+            const accumulated = call.argumentsJson.startsWith(previousJson) ? call.argumentsJson : previousJson + call.argumentsJson;
+            const delta = accumulated.slice(previousJson.length);
+            toolPartialJson.set(toolCallId, accumulated);
+            const throttled = parseStreamingJsonThrottled(accumulated, toolLastParseLen.get(toolCallId) ?? 0);
+            if (throttled)
+              toolLastParseLen.set(toolCallId, throttled.parsedLen);
+            yield { type: "tool_call_delta", index: block.index, id: toolCallId, argumentsDelta: delta };
+          }
         }
-        if (openThinking !== void 0) {
-          yield {
-            type: "thinking_end",
-            index: openThinking.index,
-            thinking: openThinking.text,
-            ...openThinking.signature ? { signature: openThinking.signature } : {}
+        if (msg.stopReason !== StopReason.UNSPECIFIED)
+          latestStopReason = msg.stopReason;
+        if (msg.usage || msg.creditCost || msg.committedCreditCost || msg.committedAcuCost) {
+          const usage = {
+            input: Number(msg.usage?.inputTokens ?? 0n),
+            output: Number(msg.usage?.outputTokens ?? 0n),
+            cacheRead: Number(msg.usage?.cacheReadTokens ?? 0n),
+            cacheWrite: Number(msg.usage?.cacheWriteTokens ?? 0n)
           };
-          openThinking = void 0;
-        }
-        for (const call of msg.deltaToolCalls) {
-          const toolCallId = call.id || activeToolCallId;
-          if (!toolCallId)
-            continue;
-          let block = toolBlocks.get(toolCallId);
-          if (block === void 0) {
-            block = { index: nextIndex++, name: call.name };
-            toolBlocks.set(toolCallId, block);
-            toolPartialJson.set(toolCallId, "");
-            yield { type: "tool_call_start", index: block.index, id: toolCallId, name: call.name };
-          }
-          if (call.name)
-            block.name = call.name;
-          activeToolCallId = toolCallId;
-          if (!call.argumentsJson)
+          const totalTokens = usage.input + usage.output + usage.cacheRead + usage.cacheWrite;
+          const credits = msg.creditCost || msg.committedCreditCost || msg.committedAcuCost;
+          const moved = responseUsage === void 0 ? totalTokens > 0 || credits !== 0 : totalTokens !== responseUsage.totalTokens || credits !== (responseUsage.credits ?? 0);
+          if (!moved)
             continue;
-          const previousJson = toolPartialJson.get(toolCallId) ?? "";
-          const accumulated = call.argumentsJson.startsWith(previousJson) ? call.argumentsJson : previousJson + call.argumentsJson;
-          const delta = accumulated.slice(previousJson.length);
-          toolPartialJson.set(toolCallId, accumulated);
-          const throttled = parseStreamingJsonThrottled(accumulated, toolLastParseLen.get(toolCallId) ?? 0);
-          if (throttled)
-            toolLastParseLen.set(toolCallId, throttled.parsedLen);
-          yield { type: "tool_call_delta", index: block.index, id: toolCallId, argumentsDelta: delta };
+          responseUsage = {
+            ...usage,
+            totalTokens,
+            ...credits ? { credits } : {},
+            cost: calculateDevinCost(model.cost, usage)
+          };
+          yield { type: "usage", usage: responseUsage };
         }
       }
-      if (msg.stopReason !== StopReason.UNSPECIFIED)
-        latestStopReason = msg.stopReason;
-      if (msg.usage || msg.creditCost || msg.committedCreditCost || msg.committedAcuCost) {
-        const usage = {
-          input: Number(msg.usage?.inputTokens ?? 0n),
-          output: Number(msg.usage?.outputTokens ?? 0n),
-          cacheRead: Number(msg.usage?.cacheReadTokens ?? 0n),
-          cacheWrite: Number(msg.usage?.cacheWriteTokens ?? 0n)
-        };
-        const totalTokens = usage.input + usage.output + usage.cacheRead + usage.cacheWrite;
-        const credits = msg.creditCost || msg.committedCreditCost || msg.committedAcuCost;
-        const moved = responseUsage === void 0 ? totalTokens > 0 || credits !== 0 : totalTokens !== responseUsage.totalTokens || credits !== (responseUsage.credits ?? 0);
-        if (!moved)
-          continue;
-        responseUsage = {
-          ...usage,
-          totalTokens,
-          ...credits ? { credits } : {},
-          cost: calculateDevinCost(model.cost, usage)
-        };
-        yield { type: "usage", usage: responseUsage };
-      }
+      if (done)
+        break;
     }
-    if (done)
-      break;
+  } finally {
+    signal?.removeEventListener("abort", onAbort);
   }
   if (openText !== void 0) {
     yield { type: "text_end", index: openText.index, text: openText.text };
@@ -10134,10 +9404,6 @@ function abortableDelay2(ms, signal) {
   });
 }
 async function* streamDevinWithCapacityRetry(request, policy = DEFAULT_DEVIN_CAPACITY_RETRY, stream = streamDevin) {
-  if (stream === streamDevin && selectDevinEngine(request) === "go") {
-    yield* streamDevinOnEngine(request, policy, streamDevin);
-    return;
-  }
   for (let attempt = 0; ; attempt++) {
     let heldStart;
     let committed = false;
@@ -10168,7 +9434,7 @@ async function* streamDevinWithCapacityRetry(request, policy = DEFAULT_DEVIN_CAP
 // ../devin-core/dist/credentials.js
 import { mkdirSync as mkdirSync2, readFileSync as readFileSync3, writeFileSync as writeFileSync2 } from "node:fs";
 import { homedir as homedir6 } from "node:os";
-import { dirname as dirname2, join as join7 } from "node:path";
+import { dirname as dirname2, join as join6 } from "node:path";
 
 // ../devin-core/dist/oauth.js
 import { createHash as createHash5, randomBytes } from "node:crypto";
@@ -10290,8 +9556,8 @@ function devinCredentialsPath() {
   const override = process.env.DEVIN_CREDENTIALS_PATH;
   if (override)
     return override;
-  const dataHome = process.env.XDG_DATA_HOME ?? join7(homedir6(), ".local", "share");
-  return join7(dataHome, "devin", "credentials.toml");
+  const dataHome = process.env.XDG_DATA_HOME ?? join6(homedir6(), ".local", "share");
+  return join6(dataHome, "devin", "credentials.toml");
 }
 function parseCredentialsToml(text) {
   const out = {};
@@ -10333,7 +9599,6 @@ function resolveDevinCredentials() {
 var DEVIN_EFFORT_ORDER = ["minimal", "low", "medium", "high", "xhigh", "max"];
 
 // ../devin-core/dist/discovery.js
-init_util();
 var DEFAULT_CONTEXT_WINDOW2 = 2e5;
 var DEFAULT_MAX_TOKENS2 = 64e3;
 var DEVIN_DISPLAY_OPTION_INTERNAL_DEFAULT = 6;
@@ -10480,21 +9745,7 @@ function collectDevinFamilyLane(lanes, config, uid) {
   }
 }
 async function fetchDevinModels(options) {
-  if (options.fetch)
-    return fetchDevinModelsInProcess(options);
-  const { runDevinOp: runDevinOp2 } = await Promise.resolve().then(() => (init_engine_ops2(), engine_ops_exports2));
-  return runDevinOp2({
-    op: "models",
-    request: () => ({
-      ...options.apiKey !== void 0 ? { apiKey: options.apiKey } : {},
-      ...options.baseUrl !== void 0 ? { baseUrl: options.baseUrl } : {},
-      ...options.timeoutMs !== void 0 ? { timeoutMs: options.timeoutMs } : {}
-    }),
-    inProcess: () => fetchDevinModelsInProcess(options),
-    fromWire: (models) => Array.isArray(models) && models.length > 0 ? models : null,
-    fallback: null,
-    ...options.signal ? { signal: options.signal } : {}
-  });
+  return fetchDevinModelsInProcess(options);
 }
 async function fetchDevinModelsInProcess(options) {
   const timeoutMs = options.timeoutMs ?? 5e3;
@@ -10685,14 +9936,10 @@ function normalizeDevinModels(configs, baseUrlOverride) {
   return collapseDevinLanes(specs, lanes.values()).sort((a, b) => a.id.localeCompare(b.id));
 }
 
-// ../devin-core/dist/index.js
-init_engine2();
-init_errors3();
-
 // ../devin-core/dist/models.js
-import { mkdirSync as mkdirSync3, readFileSync as readFileSync4, statSync as statSync2, writeFileSync as writeFileSync3 } from "node:fs";
+import { mkdirSync as mkdirSync3, readFileSync as readFileSync4, statSync, writeFileSync as writeFileSync3 } from "node:fs";
 import { homedir as homedir7 } from "node:os";
-import { dirname as dirname3, join as join8 } from "node:path";
+import { dirname as dirname3, join as join7 } from "node:path";
 var devinModels = [
   {
     id: "swe-1-6",
@@ -10724,15 +9971,15 @@ function devinModelCachePath() {
   const override = process.env.NS_DEVIN_MODEL_CACHE;
   if (override)
     return override;
-  const dataHome = process.env.XDG_DATA_HOME ?? join8(homedir7(), ".local", "share");
-  return join8(dataHome, "ns-devin-provider", "models.json");
+  const dataHome = process.env.XDG_DATA_HOME ?? join7(homedir7(), ".local", "share");
+  return join7(dataHome, "ns-devin-provider", "models.json");
 }
 var CACHE_TTL_MS = 24 * 60 * 60 * 1e3;
 var cacheFile;
 var cacheMtimeMs = -1;
 function loadCacheFile() {
   try {
-    const mtimeMs = statSync2(devinModelCachePath()).mtimeMs;
+    const mtimeMs = statSync(devinModelCachePath()).mtimeMs;
     if (mtimeMs !== cacheMtimeMs) {
       cacheMtimeMs = mtimeMs;
       const parsed = JSON.parse(readFileSync4(devinModelCachePath(), "utf8"));
@@ -10756,15 +10003,13 @@ function updateDevinModelsCache(models, now = Date.now()) {
   try {
     mkdirSync3(dirname3(devinModelCachePath()), { recursive: true });
     writeFileSync3(devinModelCachePath(), JSON.stringify(cacheFile), "utf8");
-    cacheMtimeMs = statSync2(devinModelCachePath()).mtimeMs;
+    cacheMtimeMs = statSync(devinModelCachePath()).mtimeMs;
   } catch {
   }
   return models;
 }
 
 // ../devin-core/dist/usage.js
-init_errors3();
-init_util();
 var MICROS_PER_USD = 1e6;
 function timestampMs(timestamp) {
   return Number(timestamp.seconds) * 1e3 + timestamp.nanos / 1e6;
@@ -10895,30 +10140,7 @@ function buildDevinUsageReport(response) {
   };
 }
 async function fetchDevinUsage(options) {
-  if (options.fetch)
-    return fetchDevinUsageInProcess(options);
-  if (!options.apiKey?.trim())
-    return null;
-  const { runDevinOp: runDevinOp2 } = await Promise.resolve().then(() => (init_engine_ops2(), engine_ops_exports2));
-  return runDevinOp2({
-    op: "usage",
-    request: () => ({
-      ...options.apiKey !== void 0 ? { apiKey: options.apiKey } : {},
-      ...options.baseUrl !== void 0 ? { baseUrl: options.baseUrl } : {}
-    }),
-    inProcess: () => fetchDevinUsageInProcess(options),
-    fromWire: devinUsageFromWire,
-    fallback: null,
-    ...options.signal ? { signal: options.signal } : {}
-  });
-}
-function devinUsageFromWire(wire) {
-  if (!wire || typeof wire.raw !== "string")
-    return null;
-  const raw = decodeDevinUnaryMessage(GetUserStatusResponseSchema, Buffer.from(wire.raw, "base64"));
-  if (!raw)
-    return null;
-  return { ...wire.report, raw };
+  return fetchDevinUsageInProcess(options);
 }
 async function fetchDevinUsageInProcess(options) {
   const token = options.apiKey?.trim();
@@ -10948,9 +10170,6 @@ async function fetchDevinUsageInProcess(options) {
   }
 }
 
-// ../devin-core/dist/index.js
-init_util();
-
 // ../pi-provider/src/devin/register.ts
 var DEVIN_PROVIDER_ID = "devin";
 var DEVIN_API = "devin-cloud";
@@ -10981,7 +10200,7 @@ function resolveDevinToken(env = process.env, options = {}) {
   if (options.readFiles === false) return void 0;
   if (!options.paths) return resolveDevinCredentials()?.apiKey;
   for (const path of options.paths) {
-    if (!existsSync5(path)) continue;
+    if (!existsSync4(path)) continue;
     try {
       const token = parseDevinCredentialsToml(readFileSync5(path, "utf8"));
       if (token) return token;
@@ -11149,9 +10368,9 @@ async function registerDevinProvider(pi) {
 }
 
 // ../pi-provider/src/grok/register.ts
-import { existsSync as existsSync7 } from "node:fs";
+import { existsSync as existsSync6 } from "node:fs";
 import { homedir as homedir10 } from "node:os";
-import { join as join11 } from "node:path";
+import { join as join10 } from "node:path";
 
 // ../pi-provider/src/shared/types.ts
 function ensureCacheCost(cost) {
@@ -11164,12 +10383,12 @@ function ensureCacheCost(cost) {
 }
 
 // ../pi-provider/src/shared/catalog-cache.ts
-import { mkdirSync as mkdirSync4, readFileSync as readFileSync6, renameSync as renameSync2, writeFileSync as writeFileSync4, existsSync as existsSync6 } from "node:fs";
-import { join as join9 } from "node:path";
+import { mkdirSync as mkdirSync4, readFileSync as readFileSync6, renameSync as renameSync2, writeFileSync as writeFileSync4, existsSync as existsSync5 } from "node:fs";
+import { join as join8 } from "node:path";
 import { homedir as homedir8 } from "node:os";
 var DEFAULT_TTL_MS = 15 * 60 * 1e3;
 function defaultCacheDir() {
-  return join9(homedir8(), ".pi", "agent", "cache", "ns-pi-provider");
+  return join8(homedir8(), ".pi", "agent", "cache", "ns-pi-provider");
 }
 var CatalogCache = class {
   cacheDir;
@@ -11189,11 +10408,11 @@ var CatalogCache = class {
         mkdirSync4(path, opts);
       }),
       renameSync: options.fs?.renameSync ?? renameSync2,
-      existsSync: options.fs?.existsSync ?? existsSync6
+      existsSync: options.fs?.existsSync ?? existsSync5
     };
   }
   pathFor(providerId) {
-    return join9(this.cacheDir, `${providerId}.models.json`);
+    return join8(this.cacheDir, `${providerId}.models.json`);
   }
   lookup(providerId, expectedVersion) {
     const mem = this.memory.get(providerId);
@@ -11308,7 +10527,7 @@ function getDefaultCatalogCache(options) {
 import { accessSync, constants } from "node:fs";
 import { execFileSync as execFileSync2 } from "node:child_process";
 import { homedir as homedir9 } from "node:os";
-import { join as join10 } from "node:path";
+import { join as join9 } from "node:path";
 var CANDIDATE_NAMES = ["agent", "grok"];
 function isExecutable(path) {
   try {
@@ -11345,9 +10564,9 @@ function resolveGrokBinary(env = process.env) {
     const found = which(name);
     if (found) return found;
   }
-  const homeBin = join10(homedir9(), ".grok", "bin");
+  const homeBin = join9(homedir9(), ".grok", "bin");
   for (const name of CANDIDATE_NAMES) {
-    const candidate = join10(homeBin, name);
+    const candidate = join9(homeBin, name);
     if (isExecutable(candidate)) return candidate;
   }
   throw new Error(
@@ -11967,7 +11186,7 @@ function registerSessionScope(pi) {
 }
 
 // ../pi-provider/src/grok/acp-client.ts
-import { spawn as spawn2 } from "node:child_process";
+import { spawn } from "node:child_process";
 import { createInterface } from "node:readline";
 function buildAcpArgs(options) {
   const args = ["agent", "--no-leader"];
@@ -12149,7 +11368,7 @@ async function createLiveAcpSession(options) {
     reasoningEffort: options.reasoningEffort,
     alwaysApprove: options.alwaysApprove
   });
-  const proc = spawn2(options.binary, args, {
+  const proc = spawn(options.binary, args, {
     stdio: ["pipe", "pipe", "pipe"],
     cwd: options.cwd ?? process.cwd(),
     env: options.env ?? process.env
@@ -12539,7 +11758,7 @@ function streamViaAcp(model, context, options) {
 }
 
 // ../pi-provider/src/grok/jsonl-mode.ts
-import { spawn as spawn3 } from "node:child_process";
+import { spawn as spawn2 } from "node:child_process";
 import { createInterface as createInterface2 } from "node:readline";
 function buildJsonlArgs(prompt, options) {
   const args = [
@@ -12606,7 +11825,7 @@ function streamViaJsonl(model, context, options) {
         reasoningEffort: reasoning,
         cwd
       });
-      proc = spawn3(binary, args, {
+      proc = spawn2(binary, args, {
         stdio: ["ignore", "pipe", "pipe"],
         cwd,
         env: process.env
@@ -12745,10 +11964,10 @@ function catalogToProviderModels(models) {
 function grokAuthPresent() {
   if (process.env.XAI_API_KEY?.trim() || process.env.GROK_API_KEY?.trim()) return true;
   const paths = [
-    join11(homedir10(), ".grok", "auth.json"),
-    join11("/workspace/.provider-creds/grok", "auth.json")
+    join10(homedir10(), ".grok", "auth.json"),
+    join10("/workspace/.provider-creds/grok", "auth.json")
   ];
-  return paths.some((p) => existsSync7(p));
+  return paths.some((p) => existsSync6(p));
 }
 function refreshGrokModels(options = {}) {
   const cache = options.cache ?? getDefaultCatalogCache();