0sec-cli 0.25.0 → 0.26.0

package/chunks/{chunk-EIONVEFN.js → chunk-HS2NQ7K6.js}

@@ -3,7 +3,7 @@ import { createRequire as __0CreateRequire } from "node:module";
 const require = __0CreateRequire(import.meta.url);
 import {
   isAdmittedSmolvmWorkbench
-} from "./chunk-3T5R7P4T.js";
+} from "./chunk-XOVYV7TT.js";
 import {
   MESSAGE_CACHE_BREAKPOINTS,
   planMessageBreakpoints,
@@ -13,7 +13,45 @@ import {
 } from "./chunk-RS4MAN3Q.js";
 import {
   VERSION
-} from "./chunk-S3B6HFSM.js";
+} from "./chunk-GYEYTNHK.js";
+
+// packages/core/dist/runtime/siwc-connection.js
+function captureSiwcConnection(connection) {
+  if (!connection.accountId || !connection.clientId || connection.clientId === "dynamic_agent_client" || !connection.hostId || typeof connection.resolveCredentials !== "function") {
+    throw new Error("ChatGPT plan requires a verified account, issued client ID and stable host ID");
+  }
+  return Object.freeze({ accountId: connection.accountId, clientId: connection.clientId, hostId: connection.hostId, resolveCredentials: connection.resolveCredentials });
+}
+async function abortable(pending, signal) {
+  if (!signal)
+    return pending;
+  signal.throwIfAborted();
+  return new Promise((resolve, reject) => {
+    const abort = () => reject(signal.reason ?? new Error("ChatGPT plan request cancelled"));
+    signal.addEventListener("abort", abort, { once: true });
+    pending.then(resolve, reject).finally(() => signal.removeEventListener("abort", abort));
+    if (signal.aborted)
+      abort();
+  });
+}
+async function siwcHeaders(connection, signal) {
+  signal?.throwIfAborted();
+  const credentials = await abortable(connection.resolveCredentials(signal), signal);
+  signal?.throwIfAborted();
+  if (typeof credentials.accessToken !== "string" || !credentials.accessToken || credentials.accessToken.length > 65536 || /[\s\x00-\x1f\x7f]/.test(credentials.accessToken) || !Array.isArray(credentials.scopes) || !["resource.invoke", "chatgpt.tokens.use.direct"].every((scope) => credentials.scopes.includes(scope))) {
+    throw new Error("ChatGPT plan permission is not enabled; authorize plan usage for this account");
+  }
+  return { Authorization: `Bearer ${credentials.accessToken}`, "Content-Type": "application/json" };
+}
+async function listSiwcModels(connection, fetchImpl = fetch, signal) {
+  const response = await fetchImpl("https://api.openai.com/v1/models", { headers: await siwcHeaders(captureSiwcConnection(connection), signal), signal, redirect: "error" });
+  if (!response.ok)
+    throw new Error(`ChatGPT plan model discovery failed (HTTP ${response.status})`);
+  const data = await response.json();
+  if (!data || typeof data !== "object" || !("models" in data) || !Array.isArray(data.models))
+    throw new Error("Invalid ChatGPT plan model catalog");
+  return data.models.filter((model) => !!model && typeof model === "object" && model.visibility === "list" && typeof model.slug === "string" && !!model.slug && typeof model.display_name === "string").map(({ slug, display_name }) => ({ slug, display_name }));
+}
 
 // packages/core/dist/runtime/request-admission.js
 var LOCAL_ADMISSION_LIMIT = "LOCAL_REQUEST_ADMISSION_LIMIT:";
@@ -150,7 +188,7 @@ var features = {
   },
   /** Allow the agent to search the web for CVE details, docs, and technique references */
   get webSearch() {
-    return env("ZERO_FEATURE_WEB_SEARCH", false);
+    return env("ZERO_FEATURE_WEB_SEARCH", true);
   },
   /** Interactive PTY sessions for exploits requiring interactivity (reverse shells, DB clients, SSH) */
   get ptySession() {
@@ -1273,6 +1311,31 @@ function shouldRetryNativeStream(result) {
     return false;
   return true;
 }
+var RESPONSES_TERMINAL_FAILURE_MARKER = "Responses terminal failure ";
+function isPolicyRefusalResult(result) {
+  if (result.stopReason !== "error" || result.cancelled)
+    return false;
+  const error = result.error ?? "";
+  const at = error.indexOf(RESPONSES_TERMINAL_FAILURE_MARKER);
+  if (at < 0)
+    return false;
+  try {
+    const failure = JSON.parse(error.slice(at + RESPONSES_TERMINAL_FAILURE_MARKER.length));
+    return typeof failure.code === "string" && failure.code.length > 0 && /_policy$/.test(failure.code);
+  } catch {
+    return false;
+  }
+}
+function mergeRuntimeUsage(a, b) {
+  const cached = (a?.cachedInputTokens ?? 0) + (b?.cachedInputTokens ?? 0);
+  const cacheWrites = (a?.cacheWriteTokens ?? 0) + (b?.cacheWriteTokens ?? 0);
+  return {
+    inputTokens: (a?.inputTokens ?? 0) + (b?.inputTokens ?? 0),
+    outputTokens: (a?.outputTokens ?? 0) + (b?.outputTokens ?? 0),
+    ...cached > 0 ? { cachedInputTokens: cached } : {},
+    ...cacheWrites > 0 ? { cacheWriteTokens: cacheWrites } : {}
+  };
+}
 function isRetryableTransportCode(code) {
   return [
     "EAI_AGAIN",
@@ -1509,6 +1572,9 @@ async function logProviderStartup(provider, providerLabel, baseUrl, model, wireA
 var DEFAULT_ANTHROPIC_MODEL = "claude-sonnet-4-6";
 var DEFAULT_OPENROUTER_MODEL = "anthropic/claude-sonnet-4.6";
 var FREE_OPENROUTER_MODEL = "nvidia/nemotron-3-super-120b-a12b:free";
+function openrouterModelId(model) {
+  return model.replace(/^openrouter\//i, "");
+}
 var DEFAULT_OPENAI_MODEL = "gpt-4o";
 var DEEPSEEK_DEFAULT_BASE_URL = "https://api.deepseek.com";
 var DEEPSEEK_DEFAULT_MODEL = "deepseek-flash";
@@ -1959,15 +2025,20 @@ async function refreshChatGptCodexAuthState(state) {
   return { accessToken: state.accessToken, accountId: state.accountId };
 }
 var geminiCodeAssistAuthStates = /* @__PURE__ */ new Map();
-function geminiAuthStateKey(refreshToken, accessToken) {
-  return JSON.stringify([refreshToken, refreshToken ? void 0 : accessToken]);
+function geminiAuthStateKey(refreshToken, accessToken, oauthClient) {
+  return JSON.stringify([refreshToken, refreshToken ? void 0 : accessToken, oauthClient]);
 }
 function readGeminiCodeAssistEnv(env2 = process.env) {
   const access = env2["ZERO_GEMINI_ACCESS_TOKEN"];
   const refresh = env2["ZERO_GEMINI_OAUTH_REFRESH_TOKEN"];
   if ((!access || access.length === 0) && (!refresh || refresh.length === 0))
     return void 0;
+  const clientId = env2["ZERO_GEMINI_OAUTH_CLIENT_ID"]?.trim();
+  const clientSecret = env2["ZERO_GEMINI_OAUTH_CLIENT_SECRET"]?.trim();
+  if (!clientId && clientSecret)
+    throw new Error("Google OAuth client secret requires its matching client ID");
   return {
+    ...clientId ? { oauthClient: { clientId, ...clientSecret ? { clientSecret } : {} } } : {},
     accessToken: access && access.length > 0 ? access : void 0,
     refreshToken: refresh && refresh.length > 0 ? refresh : void 0
   };
@@ -1977,11 +2048,12 @@ function resolveGeminiCodeAssistAuthState(env2) {
   if (!tokens) {
     throw new Error("Google Gemini Code Assist auth: neither ZERO_GEMINI_ACCESS_TOKEN nor ZERO_GEMINI_OAUTH_REFRESH_TOKEN is set. Sign in with your Google account (0 connect) or forward a fresh access token.");
   }
-  const key = geminiAuthStateKey(tokens.refreshToken ?? "", tokens.accessToken);
+  const key = geminiAuthStateKey(tokens.refreshToken ?? "", tokens.accessToken, tokens.oauthClient);
   const existing = geminiCodeAssistAuthStates.get(key);
   if (existing)
     return existing;
   const state = {
+    oauthClient: tokens.oauthClient,
     refreshToken: tokens.refreshToken ?? "",
     accessToken: tokens.accessToken,
     // A forwarded access token with no `exp` we can read: treat as immediately
@@ -1991,15 +2063,15 @@ function resolveGeminiCodeAssistAuthState(env2) {
   geminiCodeAssistAuthStates.set(key, state);
   return state;
 }
-async function refreshGoogleAccessToken(refreshToken) {
+async function refreshGoogleAccessToken(refreshToken, oauthClient) {
   const res = await fetch(GEMINI_OAUTH_TOKEN_URL, {
     method: "POST",
     headers: { "Content-Type": "application/x-www-form-urlencoded" },
     body: new URLSearchParams({
       grant_type: "refresh_token",
       refresh_token: refreshToken,
-      client_id: GEMINI_OAUTH_CLIENT_ID,
-      client_secret: GEMINI_OAUTH_CLIENT_SECRET
+      client_id: oauthClient?.clientId ?? GEMINI_OAUTH_CLIENT_ID,
+      ...(oauthClient ? oauthClient.clientSecret : GEMINI_OAUTH_CLIENT_SECRET) ? { client_secret: oauthClient ? oauthClient.clientSecret : GEMINI_OAUTH_CLIENT_SECRET } : {}
     }).toString()
   });
   const bodyText = await res.text().catch(() => "");
@@ -2010,7 +2082,7 @@ async function refreshGoogleAccessToken(refreshToken) {
     parsed = {};
   }
   if (!res.ok) {
-    const err = new Error(`Google token refresh failed: ${res.status} ${bodyText.slice(0, 200)}`);
+    const err = new Error(`Google token refresh failed (HTTP ${res.status}${parsed.error === "invalid_grant" ? ": invalid_grant; reconnect this account" : ""})`);
     err.invalidGrant = parsed.error === "invalid_grant";
     throw err;
   }
@@ -2029,7 +2101,7 @@ async function refreshGeminiCodeAssistAuthState(state) {
       const usedRefresh = state.refreshToken;
       state.inflightRefresh = (async () => {
         try {
-          const tokens = await refreshGoogleAccessToken(usedRefresh);
+          const tokens = await refreshGoogleAccessToken(usedRefresh, state.oauthClient);
           if (!tokens.access_token)
             throw new Error("Google token refresh returned no access_token.");
           state.accessToken = tokens.access_token;
@@ -2040,7 +2112,7 @@ async function refreshGeminiCodeAssistAuthState(state) {
           if (err.invalidGrant) {
             state.accessToken = void 0;
             state.accessTokenExpiresAt = 0;
-            geminiCodeAssistAuthStates.delete(geminiAuthStateKey(state.refreshToken, state.accessToken));
+            geminiCodeAssistAuthStates.delete(geminiAuthStateKey(state.refreshToken, state.accessToken, state.oauthClient));
           }
           throw err;
         } finally {
@@ -2241,6 +2313,7 @@ var DEFAULT_PROVIDER_MODELS = {
   openai: DEFAULT_OPENAI_MODEL,
   azure: void 0,
   deepseek: DEEPSEEK_DEFAULT_MODEL,
+  "chatgpt-plan": void 0,
   "chatgpt-codex": CODEX_DEFAULT_MODEL,
   "z-ai": ZAI_DEFAULT_MODEL,
   kimi: KIMI_DEFAULT_MODEL,
@@ -2628,6 +2701,8 @@ var LlmApiRuntime = class _LlmApiRuntime {
   grantedProviderTransport;
   workbenchProviderProxy;
   geminiAuthState;
+  siwcConnection;
+  siwcModels;
   provider;
   apiKey;
   baseUrl;
@@ -2654,6 +2729,7 @@ var LlmApiRuntime = class _LlmApiRuntime {
       this.config = {
         type: "api",
         model,
+        siwcConnection: inherited.siwcConnection,
         agentModels: inherited.config.agentModels,
         singleModel: inherited.config.singleModel,
         timeout: Math.min(timeout, inherited.config.timeout || 12e4)
@@ -2661,6 +2737,8 @@ var LlmApiRuntime = class _LlmApiRuntime {
       this.env = inherited.env;
       this.workbenchProviderProxy = inherited.workbenchProviderProxy;
       this.grantedProviderTransport = inherited.grantedProviderTransport;
+      this.siwcConnection = inherited.siwcConnection;
+      this.siwcModels = inherited.siwcModels;
       this.provider = inherited.provider;
       this.apiKey = inherited.apiKey;
       this.baseUrl = inherited.baseUrl;
@@ -2699,6 +2777,32 @@ var LlmApiRuntime = class _LlmApiRuntime {
       ...config,
       ...config.agentModels ? { agentModels: Object.freeze({ ...config.agentModels }) } : {}
     };
+    this.siwcConnection = void 0;
+    this.siwcModels = void 0;
+    if (config.provider === "chatgpt-plan") {
+      if (!config.siwcConnection || !config.model)
+        throw new Error("ChatGPT plan requires a verified connection and a model selected from its catalog");
+      if (config.providerTransport || config.apiKey)
+        throw new Error("ChatGPT plan cannot use API keys or Codex transport");
+      this.siwcConnection = captureSiwcConnection(config.siwcConnection);
+      this.config = { ...this.config, siwcConnection: this.siwcConnection };
+      this.env = Object.freeze({ ZERO_SKIP_PROVIDER_BANNER: "1" });
+      this.grantedProviderTransport = void 0;
+      this.workbenchProviderProxy = void 0;
+      this.azureConfig = parseCodexAzureConfig({});
+      this.fallbackChain = [];
+      this.fallbackIndex = 0;
+      this.provider = "chatgpt-plan";
+      this.apiKey = "";
+      this.baseUrl = "https://api.openai.com/v1";
+      this.wireApi = "responses";
+      this.model = config.model;
+      this.codexAuthState = void 0;
+      this.geminiAuthState = void 0;
+      this.reasoningEffort = config.env?.["ZERO_REASONING_EFFORT"];
+      this.serverCompactionTokens = void 0;
+      return;
+    }
     this.grantedProviderTransport = config.providerTransport;
     if (config.providerTransport) {
       const grant = config.providerTransport;
@@ -2766,6 +2870,8 @@ var LlmApiRuntime = class _LlmApiRuntime {
     }
     if (this.provider === "cline")
       this.model = clineModelId(this.model);
+    if (this.provider === "openrouter")
+      this.model = openrouterModelId(this.model);
     this.applyModelWireApi();
     if (this.apiKey && !this.env["ZERO_SKIP_PROVIDER_BANNER"]) {
       void logProviderStartup(this.provider, this.providerLabel, this.baseUrl, this.model, this.wireApi, this.apiKey).catch(() => {
@@ -2774,6 +2880,8 @@ var LlmApiRuntime = class _LlmApiRuntime {
   }
   /** Non-secret identity for preferences scoped to the captured connection. */
   connectionIdentity() {
+    if (this.siwcConnection)
+      return createHash("sha256").update(JSON.stringify(["chatgpt-plan", this.siwcConnection.accountId, this.siwcConnection.clientId, this.siwcConnection.hostId])).digest("hex");
     if (this.grantedProviderTransport)
       return this.grantedProviderTransport.identity;
     let identity;
@@ -2793,7 +2901,7 @@ var LlmApiRuntime = class _LlmApiRuntime {
       const credential = this.geminiAuthState?.refreshToken || this.geminiAuthState?.accessToken;
       if (!credential)
         return void 0;
-      identity = [this.provider, this.baseUrl, credential, firstNonEmptyEnv(this.env, "GOOGLE_CLOUD_PROJECT", "ZERO_GEMINI_PROJECT") ?? ""];
+      identity = [this.provider, this.baseUrl, credential, firstNonEmptyEnv(this.env, "GOOGLE_CLOUD_PROJECT", "ZERO_GEMINI_PROJECT") ?? "", this.geminiAuthState?.oauthClient?.clientId ?? "legacy"];
     } else {
       if (!this.apiKey)
         return void 0;
@@ -2803,7 +2911,7 @@ var LlmApiRuntime = class _LlmApiRuntime {
   }
   /** Documented effort controls only on routes which send Responses reasoning. */
   reasoningConfiguration() {
-    if (this.wireApi !== "responses" || !["openai", "azure", "chatgpt-codex"].includes(this.provider))
+    if (this.wireApi !== "responses" || !["openai", "azure", "chatgpt-codex", "chatgpt-plan"].includes(this.provider))
       return null;
     const model = this.model.replace(/^openai\//, "");
     let options;
@@ -2832,14 +2940,19 @@ var LlmApiRuntime = class _LlmApiRuntime {
     const state = this.codexAuthState;
     if (this.provider !== "chatgpt-codex" || !state)
       throw new Error("No active Codex subscription");
-    const { loadCodexModelCatalog } = await import("./codex-models-KCUIVS3R.js");
+    const { loadCodexModelCatalog } = await import("./codex-models-CI22KIHY.js");
     return loadCodexModelCatalog({ signal, resolveCredentials: () => refreshChatGptCodexAuthState(state) });
   }
   /** Discover endpoint inventory; Cline explicitly marks its public catalog provenance. */
   async availableModelCatalog(signal) {
+    if (this.provider === "chatgpt-plan") {
+      if (!this.siwcConnection)
+        throw new Error("ChatGPT plan connection is unavailable");
+      return (await listSiwcModels(this.siwcConnection, fetch, signal)).map((model) => ({ id: model.slug, source: "catalog" }));
+    }
     if (this.provider === "chatgpt-codex")
       return this.codexModelCatalog(signal);
-    const { discoverProviderModels } = await import("./provider-model-discovery-QGUGL3XW.js");
+    const { discoverProviderModels } = await import("./provider-model-discovery-3X6DON3Y.js");
     return discoverProviderModels({
       provider: this.provider,
       baseUrl: this.baseUrl,
@@ -2869,11 +2982,15 @@ var LlmApiRuntime = class _LlmApiRuntime {
   reconfigure(sel) {
     if (this.grantedProviderTransport && (sel.provider && sel.provider !== this.grantedProviderTransport.provider || sel.model && !this.grantedProviderTransport.models.includes(sel.model) || Object.values(sel.agentModels ?? {}).some((model) => model !== "auto" && !this.grantedProviderTransport.models.includes(model))))
       throw new Error("Selection is outside the explicit provider transport grant");
+    if (this.siwcConnection && sel.siwcConnection && (sel.siwcConnection.accountId !== this.siwcConnection.accountId || sel.siwcConnection.clientId !== this.siwcConnection.clientId || sel.siwcConnection.hostId !== this.siwcConnection.hostId)) {
+      throw new Error("Changing the ChatGPT plan account requires a new chat runtime");
+    }
     const providerChanged = sel.provider !== void 0 && sel.provider !== this.provider;
     if (providerChanged) {
       const merged = {
         ...this.config,
         apiKey: void 0,
+        siwcConnection: sel.provider === "chatgpt-plan" ? sel.siwcConnection : void 0,
         provider: sel.provider ?? this.provider,
         model: sel.model,
         ...sel.agentModels !== void 0 ? { agentModels: sel.agentModels } : {},
@@ -2894,7 +3011,7 @@ var LlmApiRuntime = class _LlmApiRuntime {
       this.config = { ...this.config, autoRoute: sel.autoRoute };
     }
     if (sel.model !== void 0) {
-      const model = this.provider === "opencode" ? opencodeModelId(sel.model) : this.provider === "copilot" ? copilotModelId(sel.model) : this.provider === "cline" ? clineModelId(sel.model) : sel.model;
+      const model = this.provider === "opencode" ? opencodeModelId(sel.model) : this.provider === "copilot" ? copilotModelId(sel.model) : this.provider === "openrouter" ? openrouterModelId(sel.model) : this.provider === "cline" ? clineModelId(sel.model) : sel.model;
       if (model !== this.model) {
         this.model = model;
         this.config = { ...this.config, model };
@@ -2936,6 +3053,8 @@ var LlmApiRuntime = class _LlmApiRuntime {
    * failover chain uses — including auth-only providers (chatgpt-codex OAuth).
    */
   accessibleProviders() {
+    if (this.siwcConnection)
+      return ["chatgpt-plan"];
     if (this.grantedProviderTransport)
       return [this.grantedProviderTransport.provider];
     if (this.workbenchProviderProxy)
@@ -2996,7 +3115,7 @@ var LlmApiRuntime = class _LlmApiRuntime {
     if (typeof selectedModel !== "string" || !selectedModel.trim()) {
       throw new Error("Subagent model must be a non-empty model ID");
     }
-    const stripProviderPrefix = (id) => this.provider === "opencode" ? opencodeModelId(id) : this.provider === "copilot" ? copilotModelId(id) : this.provider === "cline" ? clineModelId(id) : id;
+    const stripProviderPrefix = (id) => this.provider === "opencode" ? opencodeModelId(id) : this.provider === "copilot" ? copilotModelId(id) : this.provider === "openrouter" ? openrouterModelId(id) : this.provider === "cline" ? clineModelId(id) : id;
     const model = stripProviderPrefix(selectedModel);
     const approvedByAllowlist = model === this.model || Object.values(this.config.agentModels ?? {}).some((id) => id !== AUTO_MODEL_SENTINEL && stripProviderPrefix(id) === model);
     const approved = approvedByAllowlist || autoInEffect && this.isModelAccessible(selectedModel);
@@ -3012,7 +3131,7 @@ var LlmApiRuntime = class _LlmApiRuntime {
    * contract; callers must fail closed before making a metered comparison call.
    */
   get outputTokenLimit() {
-    return this.provider === "chatgpt-codex" ? void 0 : NATIVE_COMPLETION_TOKEN_LIMIT;
+    return this.provider === "chatgpt-codex" || this.provider === "chatgpt-plan" ? void 0 : NATIVE_COMPLETION_TOKEN_LIMIT;
   }
   /**
    * Whether this provider uses OpenAI-compatible chat/completions format.
@@ -3024,7 +3143,7 @@ var LlmApiRuntime = class _LlmApiRuntime {
    * inert default — it is intentionally unused for these two providers.
    */
   get isOpenAICompat() {
-    return this.provider === "openrouter" || this.provider === "openai" || this.provider === "azure" || this.provider === "deepseek" || this.provider === "qwen" || this.provider === "xai" || this.provider === "copilot" || this.provider === "cline" || this.provider === "opencode" && (this.wireApi === "chat_completions" || this.wireApi === "responses") || // chatgpt-codex always speaks Responses API; treat it as
+    return this.provider === "openrouter" || this.provider === "openai" || this.provider === "chatgpt-plan" || this.provider === "azure" || this.provider === "deepseek" || this.provider === "qwen" || this.provider === "xai" || this.provider === "copilot" || this.provider === "cline" || this.provider === "opencode" && (this.wireApi === "chat_completions" || this.wireApi === "responses") || // chatgpt-codex always speaks Responses API; treat it as
     // OpenAI-compat for body-shape branching purposes (the Responses
     // wire-API code paths below already key on `wireApi === "responses"`
     // and produce a body codex's backend accepts as-is).
@@ -3105,7 +3224,7 @@ var LlmApiRuntime = class _LlmApiRuntime {
     if (this.isGeminiCodeAssist) {
       return {
         "Content-Type": "application/json",
-        "User-Agent": geminiUserAgent(this.model)
+        "User-Agent": this.geminiAuthState?.oauthClient ? `0/${VERSION} (${process.platform}; ${process.arch}) ${this.model}` : geminiUserAgent(this.model)
       };
     }
     if (this.isGoogleWire) {
@@ -3162,8 +3281,13 @@ var LlmApiRuntime = class _LlmApiRuntime {
    * controller process, add a setter on the runtime; for now this
    * matches how the CLI is actually invoked.
    */
-  async ensureFreshHeaders() {
+  async ensureFreshHeaders(signal) {
     const base = this.buildHeaders();
+    if (this.provider === "chatgpt-plan") {
+      if (!this.siwcConnection)
+        throw new Error("ChatGPT plan connection is unavailable");
+      return siwcHeaders(this.siwcConnection, signal);
+    }
     if (this.provider === "google") {
       if (!this.geminiAuthState)
         throw new Error("Google Gemini Code Assist auth: no credential captured for this runtime");
@@ -3347,6 +3471,8 @@ var LlmApiRuntime = class _LlmApiRuntime {
         return "Azure OpenAI";
       case "deepseek":
         return "DeepSeek";
+      case "chatgpt-plan":
+        return "ChatGPT plan";
       case "chatgpt-codex":
         return "ChatGPT (Codex backend)";
       case "z-ai":
@@ -3371,7 +3497,7 @@ var LlmApiRuntime = class _LlmApiRuntime {
     return "No provider credential found. Set one of:\n  env ZERO_CHATGPT_OAUTH_REFRESH_TOKEN=... 0 <command> (ChatGPT Codex subscription auth)\n  export OPENROUTER_API_KEY=sk-or-...   (OpenRouter \u2014 many models, one key)\n  export DEEPSEEK_API_KEY=...           (DeepSeek \u2014 direct Flash 0731 inference)\n  export ANTHROPIC_API_KEY=sk-ant-...    (Anthropic \u2014 direct Claude access)\n  export AZURE_OPENAI_API_KEY=...        (Azure OpenAI \u2014 reuse your Codex Azure provider)\n  export OPENAI_API_KEY=sk-...           (OpenAI \u2014 direct GPT access)\n  export Z_AI_API_KEY=...                (Z.ai GLM \u2014 flat-rate Coding Plan, Anthropic-compatible)\n  export KIMI_API_KEY=...                (Moonshot Kimi K3 \u2014 flat-rate coding, Anthropic-compatible)\n  export QWEN_API_KEY=...                (Alibaba Qwen \u2014 Token Plan sub, OpenAI-compatible)\n  export XAI_API_KEY=...                 (xAI Grok \u2014 OpenAI-compatible)\n  export CLINE_API_KEY=...               (Cline \u2014 API key; cline-pass/* needs ClinePass)\n  export OPENCODE_API_KEY=...            (OpenCode Zen \u2014 multi-wire gateway)\n  export ZERO_COPILOT_GITHUB_TOKEN=...   (GitHub Copilot \u2014 device-code OAuth token)";
   }
   getConfigurationDiagnostics() {
-    if (!this.apiKey && this.provider !== "chatgpt-codex") {
+    if (!this.apiKey && this.provider !== "chatgpt-codex" && this.provider !== "chatgpt-plan") {
       return {
         valid: false,
         provider: this.provider,
@@ -3492,7 +3618,7 @@ Missing: ${missing.join("; ")}
       const pending = (async () => {
         try {
           const response = await fetch(`${baseUrl.replace(/\/+$/, "")}/models`, {
-            headers: await this.ensureFreshHeaders(),
+            headers: await this.ensureFreshHeaders(signal),
             signal,
             redirect: "error"
           });
@@ -3520,6 +3646,16 @@ Missing: ${missing.join("; ")}
     let waitedOtherMs = 0;
     for (let attempt = 0; ; attempt++) {
       abort?.throwIfCancelled();
+      if (this.siwcConnection) {
+        this.siwcModels ??= listSiwcModels(this.siwcConnection, fetch, signal).then((models) => new Set(models.map((model) => model.slug)));
+        try {
+          if (!(await this.siwcModels).has(this.model))
+            throw new Error("Selected model is not in this ChatGPT account's available catalog");
+        } catch (error) {
+          this.siwcModels = void 0;
+          throw error;
+        }
+      }
       const body = bodyFactory();
       if (this.env["ZERO_REQUIRE_REQUEST_ADMISSION"] === "1") {
         assertRequestAdmission(body, await this.gatewayRequestAdmission(signal));
@@ -3534,7 +3670,8 @@ Missing: ${missing.join("; ")}
           signal
         }) : await fetch(this.buildUrl(), {
           method: "POST",
-          headers: await this.ensureFreshHeaders(),
+          redirect: "error",
+          headers: await this.ensureFreshHeaders(signal),
           body,
           signal
         });
@@ -3667,7 +3804,7 @@ Missing: ${missing.join("; ")}
     if (context?.signal?.aborted) {
       return { output: "", exitCode: null, timedOut: false, durationMs: 0, error: "API execution cancelled." };
     }
-    if (this.grantedProviderTransport || this.workbenchProviderProxy) {
+    if (this.siwcConnection || this.grantedProviderTransport || this.workbenchProviderProxy) {
       const result = await this.executeNative(context?.systemPrompt ?? "", [
         { role: "user", content: [{ type: "text", text: prompt }] }
       ], [], void 0, context?.signal);
@@ -3680,7 +3817,7 @@ Missing: ${missing.join("; ")}
         error: result.error
       };
     }
-    if (!this.apiKey && this.provider !== "chatgpt-codex" && this.provider !== "google") {
+    if (!this.apiKey && this.provider !== "chatgpt-codex" && this.provider !== "chatgpt-plan" && this.provider !== "google") {
       return {
         output: "",
         exitCode: 1,
@@ -3727,7 +3864,8 @@ Missing: ${missing.join("; ")}
           res = await this.postWithRetry(() => JSON.stringify({
             model: this.model,
             input,
-            ...isCodex ? { store: false } : { max_output_tokens: NATIVE_COMPLETION_TOKEN_LIMIT }
+            ...isCodex ? { store: false } : { max_output_tokens: NATIVE_COMPLETION_TOKEN_LIMIT },
+            ...this.provider === "chatgpt-plan" ? { store: false, stream: true } : {}
           }), abort.signal, abort);
         } else if (this.isGeminiCodeAssist) {
           const request = {
@@ -3843,13 +3981,23 @@ Missing: ${missing.join("; ")}
     const maxAttempts = llmStreamMaxAttempts();
     let result;
     let attempt = 0;
-    for (attempt = 1; attempt <= maxAttempts; attempt++) {
+    let refusedUsage;
+    const withRefusedUsage = (outcome) => refusedUsage ? { ...outcome, usage: mergeRuntimeUsage(outcome.usage, refusedUsage) } : outcome;
+    for (; ; ) {
       result = await this.executeNativeAttempt(system, messages, tools, callbacks, signal);
       if (isLocalAdmissionFailure(result.error))
-        return result;
+        return withRefusedUsage(result);
       if (this.env["ZERO_REQUIRE_RETRY_SAFE_RECEIPT"] === "1" && (result.stopReason === "error" || result.error)) {
-        return { ...result, error: `${result.error ?? "Incomplete gateway response"}. Request outcome may be unknown. Automatic replay is disabled` };
+        return withRefusedUsage({ ...result, error: `${result.error ?? "Incomplete gateway response"}. Request outcome may be unknown. Automatic replay is disabled` });
+      }
+      if (isPolicyRefusalResult(result) && !signal?.aborted) {
+        if (result.usage)
+          refusedUsage = mergeRuntimeUsage(refusedUsage, result.usage);
+        if (this._tryFailover("provider policy refusal"))
+          continue;
+        return refusedUsage ? { ...result, usage: refusedUsage } : result;
       }
+      attempt++;
       if (attempt >= maxAttempts || !shouldRetryNativeStream(result) || signal?.aborted)
         break;
       const backoff = streamRetryBackoffMs(attempt);
@@ -3859,13 +4007,13 @@ Missing: ${missing.join("; ")}
         break;
     }
     if (attempt >= maxAttempts && maxAttempts > 1 && shouldRetryNativeStream(result)) {
-      return { ...result, error: `${result.error} (retried ${maxAttempts} times)` };
+      return withRefusedUsage({ ...result, error: `${result.error} (retried ${maxAttempts} times)` });
     }
-    return result;
+    return withRefusedUsage(result);
   }
   async executeNativeAttempt(system, messages, tools, callbacks, signal) {
     const start = Date.now();
-    if (!this.apiKey && this.provider !== "chatgpt-codex" && this.provider !== "google") {
+    if (!this.apiKey && this.provider !== "chatgpt-codex" && this.provider !== "chatgpt-plan" && this.provider !== "google") {
       return {
         content: [{ type: "text", text: "" }],
         stopReason: "error",
@@ -3955,7 +4103,7 @@ Missing: ${missing.join("; ")}
           }
           res = await this.postWithRetry(() => JSON.stringify({ ...body, model: this.model }), call.signal, call);
         } else if (this.isOpenAICompat && this.wireApi === "responses") {
-          const isCodexProvider = this.provider === "chatgpt-codex";
+          const isCodexProvider = this.provider === "chatgpt-codex" || this.provider === "chatgpt-plan";
           const input = isCodexProvider ? [] : [
             {
               role: "system",
@@ -3983,6 +4131,7 @@ Missing: ${missing.join("; ")}
                 input.push({
                   type: "function_call",
                   call_id: block.id,
+                  ...this.provider === "chatgpt-plan" ? { namespace: "zero" } : {},
                   name: block.name,
                   arguments: JSON.stringify(block.input)
                 });
@@ -4006,8 +4155,9 @@ Missing: ${missing.join("; ")}
           const isCodex = this.provider === "chatgpt-codex";
           const body = {
             model: this.model,
+            ...this.provider === "chatgpt-plan" ? { store: false, stream: true } : {},
             input,
-            ...isCodex ? { store: false, instructions: system } : { max_output_tokens: NATIVE_COMPLETION_TOKEN_LIMIT },
+            ...isCodex || this.provider === "chatgpt-plan" ? { store: false, instructions: system } : { max_output_tokens: NATIVE_COMPLETION_TOKEN_LIMIT },
             ...reasoningEffort ? {
               reasoning: {
                 effort: reasoningEffort,
@@ -4060,6 +4210,8 @@ Missing: ${missing.join("; ")}
               strict: false,
               parameters: t.input_schema
             }));
+            if (this.provider === "chatgpt-plan")
+              body.tools = [{ type: "namespace", name: "zero", description: "0 local investigation tools", tools: body.tools }];
             if (isCodex) {
               body.tool_choice = "auto";
               body.parallel_tool_calls = true;
@@ -4755,6 +4907,8 @@ Missing: ${missing.join("; ")}
     };
   }
   async isAvailable() {
+    if (this.provider === "chatgpt-plan")
+      return this.siwcConnection !== void 0;
     if (this.grantedProviderTransport || this.workbenchProviderProxy)
       return true;
     if (this.provider === "chatgpt-codex") {
@@ -4765,6 +4919,8 @@ Missing: ${missing.join("; ")}
 };
 
 export {
+  captureSiwcConnection,
+  listSiwcModels,
   isLocalAdmissionLimit,
   isLocalAdmissionFailure,
   FEATURE_PRESETS,

package/chunks/{chunk-HJKJ4NQP.js → chunk-HUZ2EC2R.js}

@@ -6,7 +6,7 @@ import {
   isExistingLocalTargetPath,
   isExplicitLocalTargetPath,
   resolveLocalTargetPath
-} from "./chunk-2J3STRJT.js";
+} from "./chunk-R7VWEY45.js";
 
 // packages/core/dist/prepare.js
 import { execFileSync } from "node:child_process";

package/chunks/{chunk-5H2PXZ7Q.js → chunk-IUUNIJPM.js}

@@ -3,7 +3,7 @@ import { createRequire as __0CreateRequire } from "node:module";
 const require = __0CreateRequire(import.meta.url);
 import {
   homeStateDir
-} from "./chunk-S3B6HFSM.js";
+} from "./chunk-GYEYTNHK.js";
 
 // packages/core/dist/cve/artifact-scraper.js
 import { createHash } from "node:crypto";

package/chunks/{chunk-3DF55BWV.js → chunk-JGDA6EIJ.js}

@@ -6,10 +6,10 @@ import {
   parseRoutingQualificationPlan,
   qualifyTaskRouting,
   taskRoutingFixtureRuntime
-} from "./chunk-EEP6GBUO.js";
+} from "./chunk-3MWQNNJU.js";
 import {
   LlmApiRuntime
-} from "./chunk-EIONVEFN.js";
+} from "./chunk-HS2NQ7K6.js";
 
 // packages/cli/src/commands/routing.ts
 import { readFileSync, writeFileSync, statSync } from "node:fs";

package/chunks/{chunk-GOUGG7IQ.js → chunk-K3PTYN43.js}

@@ -4,7 +4,7 @@ const require = __0CreateRequire(import.meta.url);
 import {
   BackendIdSchema,
   requireBackendCapability
-} from "./chunk-S3B6HFSM.js";
+} from "./chunk-GYEYTNHK.js";
 import {
   external_exports
 } from "./chunk-5XOYTAOK.js";
@@ -47,7 +47,7 @@ async function createRemoteWorkflowRuntime(options, suppliedRegistry) {
   if (options.engineUrl && (options.backendId || options.configPath)) throw new Error("--engine-url cannot be combined with a registered backend.");
   if (Boolean(options.engineUrl) !== Boolean(options.engineTokenEnv)) throw new Error("Direct engine attachment requires both --engine-url and --engine-token-env.");
   const backendId = BackendIdSchema.parse(options.backendId ?? (options.engineUrl ? "attached-engine" : void 0));
-  const registry = suppliedRegistry ?? new (await import("./backend-connections-MYH4QRQG.js")).BackendConnectionRegistry(options.engineUrl ? { connections: [{ id: backendId, name: "Attached engine", url: options.engineUrl, bearerTokenEnv: options.engineTokenEnv }] } : { configPath: options.configPath });
+  const registry = suppliedRegistry ?? new (await import("./backend-connections-64PKYKL7.js")).BackendConnectionRegistry(options.engineUrl ? { connections: [{ id: backendId, name: "Attached engine", url: options.engineUrl, bearerTokenEnv: options.engineTokenEnv }] } : { configPath: options.configPath });
   try {
     const connection = await registry.handshake(backendId);
     if (connection.backend.transport !== "http") throw new Error("Select a registered remote HTTP backend; local execution cannot use this transport.");