@khalilgharbaoui/opencode-claude-code-plugin 0.42.3 → 0.44.0

package/dist/index.js

@@ -1327,7 +1327,7 @@ function formatUsageLimitNote(input) {
   const what = [
     `the Claude account "${account}" is out of usage`,
     window ? ` in ${window}` : "",
-    resets ? `, which resets at ${resets}` : "",
+    resets ? `, which resets at ${resets}` : input.resetsText ? `, which resets ${input.resetsText}` : "",
     "."
   ].join("");
   const advice = others ? `Pick a model from ${others} and resend your message, or wait for the window to reset.` : "Wait for the window to reset, or enable extra usage on the account.";
@@ -1341,6 +1341,13 @@ function isAccountLimitError(input) {
   if (typeof text !== "string" || text.length === 0) return false;
   return ACCOUNT_LIMIT_PATTERNS.some((pattern) => pattern.test(text));
 }
+function limitFactsFromText(text) {
+  const facts = {};
+  if (/\bsession limit\b/i.test(text)) facts.window = "five_hour";
+  const reset = /\bresets\s+([^·\n]{1,60}?)\s*$/im.exec(text);
+  if (reset) facts.resetsText = reset[1].trim();
+  return facts;
+}
 var lastAccountLimits = /* @__PURE__ */ new Map();
 function rememberAccountLimit(account, facts) {
   const name = normalizeAccountName(account || DEFAULT_ACCOUNT);
@@ -1423,7 +1430,6 @@ async function resolveFailoverSpawn(input) {
 }
 function isAccountFailoverQuestionActive(input) {
   if (input.compactionMode) return false;
-  if (input.interactive) return false;
   if (input.childSession) return false;
   if (input.configured !== "ask") return false;
   if (input.candidates.length === 0) return false;
@@ -1723,6 +1729,10 @@ function cliSupportsDontAsk(v) {
   if (!v) return false;
   return gte(v, { major: 2, minor: 1, patch: 263 });
 }
+function cliSupportsInteractiveBypass(v) {
+  if (!v) return false;
+  return gte(v, { major: 2, minor: 1, patch: 263 });
+}
 var INTERACTIVE_MEASURED_CLI = "2.1.288";
 var INTERACTIVE_MEASURED = { major: 2, minor: 1, patch: 288 };
 function isUnmeasuredInteractiveCli(v) {
@@ -4559,18 +4569,36 @@ function summarizePermissionPreset(provider, options, defaultProxyTools = DEFAUL
   };
 }
 function interactivePermissionPosture(input) {
-  if (!isReadOnlyPermissionMode(input.permissionMode)) {
-    return { permissionMode: input.permissionMode, restricted: false, allow: input.allow };
+  if (isReadOnlyPermissionMode(input.permissionMode)) {
+    if (!input.supportsReadOnly) return null;
+    const refused = new Set(READ_ONLY_DISALLOWED_CLI_TOOLS);
+    return {
+      permissionMode: "dontAsk",
+      restricted: true,
+      allow: input.allow.filter(
+        (rule) => !rule.startsWith("mcp__") && !refused.has(rule.split("(")[0].trim())
+      ),
+      bypass: false,
+      disallowed: []
+    };
   }
-  if (!input.supportsReadOnly) return null;
-  const refused = new Set(READ_ONLY_DISALLOWED_CLI_TOOLS);
-  return {
-    permissionMode: "dontAsk",
-    restricted: true,
-    allow: input.allow.filter(
-      (rule) => !rule.startsWith("mcp__") && !refused.has(rule.split("(")[0].trim())
-    )
+  const unchanged = {
+    permissionMode: input.permissionMode === "bypassPermissions" ? void 0 : input.permissionMode,
+    restricted: false,
+    allow: input.allow,
+    bypass: false,
+    disallowed: []
   };
+  if (input.permissionMode === "plan" || !input.supportsBypass) return unchanged;
+  const perTool = Object.entries(input.controlRequestToolBehaviors ?? {});
+  const named = (behavior) => perTool.filter(([, value]) => value === behavior).map(([tool]) => tool);
+  if (input.skipPermissions !== false || input.permissionMode === "bypassPermissions") {
+    return { ...unchanged, bypass: true };
+  }
+  if ((input.controlRequestBehavior ?? "allow") === "allow") {
+    return { ...unchanged, bypass: true, disallowed: named("deny") };
+  }
+  return { ...unchanged, permissionMode: "dontAsk", allow: named("allow") };
 }
 function isReadOnlyPermissionMode(mode) {
   return mode === READ_ONLY_PERMISSION_MODE;
@@ -5825,7 +5853,7 @@ var PLUGIN_LOG_MESSAGES = /* @__PURE__ */ new Set([
   "interactive transport denied a permission prompt",
   "interactive transport dropped non-text content blocks",
   "interactive turn failed",
-  "interactiveBypass ignored: Claude Code prompts for bypassPermissions confirmation in the interactive TUI",
+  "interactiveBypass is ignored: skipPermissions governs the interactive transport too",
   "malformed data URI, skipping file part",
   "no active process to respawn (start watchdog); ending turn",
   "no proxyTools entry was recognised; nothing will be proxied this turn",
@@ -7542,6 +7570,20 @@ function parseModelId(modelId) {
   if (!Object.hasOwn(defaultModels, base)) return { model: modelId, fast: false };
   return { model: base.slice(0, -FAST_SUFFIX.length) + account, fast: true };
 }
+var WEB_SEARCH_USD = 0.01;
+function apiCallCostUsd(model, usage) {
+  if (typeof model !== "string" || !usage || typeof usage !== "object") return null;
+  const base = model.replace(/@.*$/, "").replace(/\[1m\]$/i, "").replace(/-\d{8}$/, "");
+  const entry = (usage.speed === "fast" ? defaultModels[`${base}${FAST_SUFFIX}`] : void 0) ?? defaultModels[base];
+  if (!entry) return null;
+  const cost = entry.cost;
+  const count = (value) => typeof value === "number" && Number.isFinite(value) ? value : 0;
+  const split = usage.cache_creation;
+  const write1h = split ? count(split.ephemeral_1h_input_tokens) : 0;
+  const write5m = split ? count(split.ephemeral_5m_input_tokens) : count(usage.cache_creation_input_tokens);
+  const perMillion = count(usage.input_tokens) * cost.input + count(usage.output_tokens) * cost.output + count(usage.cache_read_input_tokens) * cost.cache.read + write5m * cost.cache.write + write1h * cost.input * 2;
+  return perMillion / 1e6 + count(usage.server_tool_use?.web_search_requests) * WEB_SEARCH_USD;
+}
 
 // src/agent-models.ts
 var AGENT_DIR_NAMES = ["agents", "agent"];
@@ -7691,6 +7733,13 @@ function parseAgentFrontmatter(text) {
   }
   return record;
 }
+function agentMarkdownBody(text) {
+  if (!text.startsWith("---")) return text.trim() || void 0;
+  const lines = text.split(/\r?\n/);
+  const close = lines.findIndex((line, index) => index > 0 && line.trim() === "---");
+  if (close === -1) return void 0;
+  return lines.slice(close + 1).join("\n").trim() || void 0;
+}
 function parseFallbackModelList(value) {
   if (Array.isArray(value)) {
     return value.map((entry) => typeof entry === "string" ? entry.trim() : "").filter(Boolean);
@@ -7714,6 +7763,8 @@ async function readAgentMarkdownRecords(directories) {
       try {
         const text = await readFile(path7.join(directory, entry), "utf8");
         records2[name] = parseAgentFrontmatter(text);
+        const prompt = agentMarkdownBody(text);
+        if (prompt) records2[name].prompt = prompt;
       } catch (err) {
         log.debug("failed to read agent markdown", {
           file: path7.join(directory, entry),
@@ -8861,6 +8912,7 @@ function isApiCallRecord(rec) {
 }
 var TurnUsageAccumulator = class {
   calls = /* @__PURE__ */ new Map();
+  models = /* @__PURE__ */ new Map();
   lastKey = null;
   /** Feed every transcript record of the turn, in file order. */
   add(rec) {
@@ -8868,8 +8920,24 @@ var TurnUsageAccumulator = class {
     const id = rec.message.id;
     const key = typeof id === "string" && id.length > 0 ? id : `uuid:${rec.uuid ?? this.calls.size}`;
     this.calls.set(key, rec.message.usage);
+    this.models.set(key, rec.message.model);
     this.lastKey = key;
   }
+  /**
+   * The turn's list-price cost over its distinct calls, the headless
+   * `result`'s `total_cost_usd` (h #g208). Null when no call was made or any
+   * call's model is one the catalog cannot price, never a partial sum.
+   */
+  get costUsd() {
+    if (this.calls.size === 0) return null;
+    let total = 0;
+    for (const [key, usage] of this.calls) {
+      const cost = apiCallCostUsd(this.models.get(key), usage);
+      if (cost === null) return null;
+      total += cost;
+    }
+    return total;
+  }
   /** Distinct API calls seen, for diagnostics. */
   get callCount() {
     return this.calls.size;
@@ -9620,11 +9688,29 @@ var ClaudeSession = class {
   async tailTurn(prompt, onLine, perTurnTimeoutMs, onHeartbeat) {
     const timeout = perTurnTimeoutMs ?? this.o.turnTimeoutMs;
     const usage = new TurnUsageAccumulator();
+    const startedAt = Date.now();
+    let reportedDurationMs = null;
+    let apiError = null;
     const { stopReason, end, denied } = await this.runTurnLoop(
       prompt,
       (raw, rec) => {
         onLine(raw);
         if (rec) usage.add(rec);
+        if (rec?.type === "assistant") {
+          if (rec.isApiErrorMessage === true) {
+            const text = (Array.isArray(rec.message?.content) ? rec.message.content : []).filter((block) => block?.type === "text" && typeof block.text === "string").map((block) => block.text).join("\n");
+            apiError = {
+              text,
+              ...typeof rec.apiErrorStatus === "number" ? { status: rec.apiErrorStatus } : {},
+              ...typeof rec.error === "string" ? { kind: rec.error } : {}
+            };
+          } else if (rec.message?.model !== "<synthetic>") {
+            apiError = null;
+          }
+        }
+        if (isTurnDurationRecord(rec) && typeof rec.durationMs === "number") {
+          reportedDurationMs = rec.durationMs;
+        }
       },
       timeout,
       onHeartbeat
@@ -9642,6 +9728,9 @@ var ClaudeSession = class {
       usage: usage.turnTotal,
       lastCallUsage: usage.lastCall,
       callCount: usage.callCount,
+      costUsd: usage.costUsd,
+      durationMs: reportedDurationMs ?? Date.now() - startedAt,
+      apiError,
       denied
     };
   }
@@ -9789,13 +9878,19 @@ function interactiveExtraArgs(opts) {
   if (opts.fastMode) {
     flagSettings.fastMode = true;
   }
+  if (opts.bypass) {
+    flagSettings.skipDangerousModePermissionPrompt = true;
+    extraArgs.push("--dangerously-skip-permissions");
+  }
   if (Object.keys(flagSettings).length > 0) {
     extraArgs.push("--settings", JSON.stringify(flagSettings));
   }
   if (opts.permissionMode === "bypassPermissions") {
-    log.warn(
-      "interactive permissionMode bypassPermissions ignored: Claude Code prompts for confirmation in the TUI"
-    );
+    if (!opts.bypass) {
+      log.warn(
+        "interactive permissionMode bypassPermissions ignored: Claude Code prompts for confirmation in the TUI"
+      );
+    }
   } else if (opts.permissionMode) {
     extraArgs.push("--permission-mode", opts.permissionMode);
   }
@@ -9847,6 +9942,7 @@ function heartbeatFrame(sessionId, openCall, now = Date.now()) {
 }
 function interactiveResultFrame(opts) {
   const completed = opts.end === "stop" && !!opts.stopReason;
+  const apiError = completed && opts.apiError ? opts.apiError : null;
   let result;
   let terminalReason = "completed";
   if (!completed) {
@@ -9864,20 +9960,35 @@ function interactiveResultFrame(opts) {
   return JSON.stringify({
     type: "result",
     subtype: completed ? "success" : "error_during_execution",
-    is_error: !completed,
+    is_error: !completed || apiError !== null,
     stop_reason: completed ? opts.stopReason : null,
     terminal_reason: terminalReason,
-    result,
+    result: apiError ? apiError.text : result,
+    ...apiError?.status !== void 0 ? { api_error_status: apiError.status } : {},
     session_id: opts.sessionId,
     usage: opts.usage ?? {},
     // The TUI has no `can_use_tool` channel, so a permission dialog is the
     // only way it asks; each one the session denied is reported in the
     // headless field's place, names and ids only (h #g109).
     permission_denials: opts.denials ?? [],
-    total_cost_usd: null,
-    duration_ms: 0
+    total_cost_usd: opts.costUsd ?? null,
+    duration_ms: opts.durationMs ?? 0
   });
 }
+function interactiveSpawnEnv2(env) {
+  if (env.CLAUDE_CODE_MCP_AUTO_BACKGROUND_MS !== void 0) return env;
+  return { ...env, CLAUDE_CODE_MCP_AUTO_BACKGROUND_MS: "0" };
+}
+function streamFrameFromRecord(raw) {
+  if (!raw.includes('"isApiErrorMessage":true')) return raw;
+  try {
+    const rec = JSON.parse(raw);
+    if (rec?.isApiErrorMessage !== true || rec.is_api_error_message !== void 0) return raw;
+    return JSON.stringify({ ...rec, is_api_error_message: true });
+  } catch {
+    return raw;
+  }
+}
 function carriesReplyText(line) {
   try {
     const rec = JSON.parse(line);
@@ -9915,6 +10026,7 @@ function spawnInteractiveProcess(opts) {
     ignoreAnthropicApiKey: opts.ignoreAnthropicApiKey,
     effort: opts.effort ? cliEffortLevel(opts.effort) : void 0,
     resumeSessionId: opts.resumeSessionId,
+    ...opts.forkOf ? { forkOf: opts.forkOf } : {},
     env: opts.env,
     spawnPty: opts.spawnPty,
     onScreen: (event) => {
@@ -9946,6 +10058,7 @@ function spawnInteractiveProcess(opts) {
     effort: opts.effort,
     sessionId: session.sessionId,
     resumed: !!opts.resumeSessionId,
+    forkedFrom: opts.forkOf ?? null,
     jsonlPath: session.jsonlPath
   });
   let startPromise = null;
@@ -9975,14 +10088,14 @@ function spawnInteractiveProcess(opts) {
       }
       openCalls.clear();
       denials = [];
-      const { stopReason, end, usage, lastCallUsage, callCount, denied } = await session.tailTurn(
+      const { stopReason, end, usage, lastCallUsage, callCount, costUsd, durationMs, apiError, denied } = await session.tailTurn(
         userMsg,
         (raw) => {
           try {
             openCalls.add(JSON.parse(raw));
           } catch {
           }
-          emit2(raw);
+          emit2(streamFrameFromRecord(raw));
         },
         void 0,
         // Only to a listening turn: it feeds that turn's watchdog, and the
@@ -10013,7 +10126,10 @@ function spawnInteractiveProcess(opts) {
           end,
           stopReason,
           usage,
-          denials
+          denials,
+          costUsd,
+          durationMs,
+          apiError
         })
       );
     } catch (err) {
@@ -10057,7 +10173,9 @@ function spawnInteractiveProcess(opts) {
       configDir: opts.configDir,
       model: opts.model,
       settingSources: opts.settingSources === void 0 ? null : opts.settingSources,
-      extraArgs: interactiveExtraArgs({ ...opts, permissionsAllow: [], permissionMode: "dontAsk" }),
+      // Tool-free whatever the main spawn's posture: `dontAsk` with nothing
+      // allowed, and never the skip flag, which would win over it (h #g210).
+      extraArgs: interactiveExtraArgs({ ...opts, permissionsAllow: [], permissionMode: "dontAsk", bypass: false }),
       ignoreAnthropicApiKey: opts.ignoreAnthropicApiKey,
       effort: opts.effort ? cliEffortLevel(opts.effort) : void 0,
       env: opts.env,
@@ -10175,7 +10293,7 @@ function spawnInteractiveProcess(opts) {
 import { readFileSync as readFileSync7, writeFileSync as writeFileSync6 } from "fs";
 import { homedir as homedir8 } from "os";
 import { randomUUID as randomUUID6 } from "crypto";
-import { dirname as dirname6, join as join11 } from "path";
+import { basename as basename2, dirname as dirname6, isAbsolute as isAbsolute3, join as join11 } from "path";
 function readPromptFileIfPresent(path11) {
   try {
     const content = readFileSync7(path11, "utf8").trim();
@@ -10281,6 +10399,36 @@ function extractSystemMessages(prompt) {
   }
   return out;
 }
+var CLAUDE_NATIVE_INSTRUCTION_FILES = /* @__PURE__ */ new Set(["CLAUDE.md", "CLAUDE.local.md"]);
+function userAuthoredInstructions(forwarded, opts = {}) {
+  const readFile2 = opts.readFile ?? ((path11) => {
+    try {
+      return readFileSync7(path11, "utf8");
+    } catch {
+      return null;
+    }
+  });
+  const out = [];
+  const agentPrompt = opts.agentPrompt?.trim();
+  if (agentPrompt && forwarded.includes(agentPrompt)) {
+    out.push({ text: agentPrompt, content: agentPrompt });
+  }
+  const seen = /* @__PURE__ */ new Set();
+  for (const match of forwarded.matchAll(/^Instructions from: (.+)$/gm)) {
+    const path11 = match[1].trim();
+    if (seen.has(path11) || !isAbsolute3(path11)) continue;
+    if (CLAUDE_NATIVE_INSTRUCTION_FILES.has(basename2(path11))) continue;
+    seen.add(path11);
+    const file = readFile2(path11);
+    if (!file?.trim()) continue;
+    const start = match.index + match[0].length + 1;
+    const content = forwarded.startsWith(file, start) ? file : forwarded.startsWith(file.trimEnd(), start) ? file.trimEnd() : null;
+    if (content === null) continue;
+    out.push({ text: `Instructions from: ${path11}
+${content}`, content });
+  }
+  return out;
+}
 function buildAppendedSystemPrompt(cwd, includeMultiStepHint = true, extraSystemContent = [], options = {}) {
   const parts = [];
   if (options.compressionSummary?.trim()) {
@@ -10305,6 +10453,11 @@ ${options.compressionSummary.trim()}`
   if (pushGlobal) parts.push(globalAgents);
   if (pushWorkspace) parts.push(workspaceAgents);
   if (pushGlobal || pushWorkspace) parts.push(AGENTS_MAINTENANCE_HINT);
+  for (const instruction of options.userInstructions ?? []) {
+    const authored = instruction.content.trim();
+    if (authored === globalAgents || authored === workspaceAgents) continue;
+    parts.push(instruction.text);
+  }
   if (includeMultiStepHint) parts.push(MULTI_STEP_TASK_HINT);
   const content = parts.join("\n\n");
   if (!content) return void 0;
@@ -11162,6 +11315,7 @@ function createTurnState(init) {
     lastCallUsage: void 0,
     resultFailure: void 0,
     accountLimitHit: null,
+    apiErrorTextShown: null,
     usageLimitNote: false,
     accountBlock: null,
     modelRefusal: null,
@@ -12253,11 +12407,21 @@ ${plan}
           state.hasReceivedContent = true;
         }
         const apiErrorReply = msg.is_api_error_message === true;
-        const limitErrorReply = apiErrorReply && ctx.usageLimitNoteActive && !state.accountBlock && (msg.error === "rate_limit" || isAccountLimitError({
+        const limitFromReply = apiErrorReply && !state.accountBlock && (msg.error === "rate_limit" || isAccountLimitError({
           resultText: msg.message.content.filter((b) => b.type === "text" && b.text).map((b) => String(b.text)).join("\n")
         }));
-        if (limitErrorReply) {
+        const limitErrorReply = limitFromReply && ctx.usageLimitNoteActive;
+        if (limitFromReply) {
           state.accountLimitHit ??= recallAccountLimit(ctx.sourceAccount);
+          const said = limitFactsFromText(
+            msg.message.content.filter((b) => b.type === "text" && b.text).map((b) => String(b.text)).join("\n")
+          );
+          const known = state.accountLimitHit;
+          state.accountLimitHit = {
+            ...known,
+            window: known.window ?? said.window,
+            ...known.resetsAt === void 0 && said.resetsText ? { resetsText: said.resetsText } : {}
+          };
         }
         if (hasText && !hasToolUse) {
           startResultFallback(state);
@@ -12268,6 +12432,7 @@ ${plan}
         for (const block2 of msg.message.content) {
           if (block2.type === "text" && block2.text) {
             if (limitErrorReply) continue;
+            if (apiErrorReply) state.apiErrorTextShown = block2.text;
             resetLastVisibleTextBlock(state);
             const blockId = state.startTextBlock();
             state.controller.enqueue({
@@ -12492,7 +12657,8 @@ ${plan}
         state.usageLimitNote = ctx.usageLimitNoteActive && !!state.accountLimitHit && // An expired login or a billing hold writes its own note just below
         // and says what to run; two notes about one failure is one too many.
         !state.accountBlock && msg.is_error === true;
-        if (!state.currentTextId && msg.is_error && !state.usageLimitNote && typeof msg.result === "string" && msg.result.trim().length > 0) {
+        if (!state.currentTextId && msg.is_error && // Already on screen from the reply frame, word for word.
+        !(typeof msg.result === "string" && state.apiErrorTextShown !== null && msg.result.trim() === state.apiErrorTextShown.trim()) && !state.usageLimitNote && typeof msg.result === "string" && msg.result.trim().length > 0) {
           const errId = state.startTextBlock();
           state.controller.enqueue({
             type: "text-delta",
@@ -13067,12 +13233,12 @@ var ClaudeCodeLanguageModel = class {
     if (turnAbort.aborted) return abortedBeforeWork("selecting the transport");
     const useInteractive = selectedTransport === "interactive";
     const interactiveBypassRequested = this.config.interactiveBypass ?? flagOn(process.env.CLAUDE_CODE_INTERACTIVE_BYPASS);
-    const modelFallbackArmed = attempt?.armed === true && !compactionMode && !useInteractive;
+    const modelFallbackArmed = attempt?.armed === true && !compactionMode;
     const sourceAccount = normalizeAccountName(
       this.config.account ?? DEFAULT_ACCOUNT
     );
     const baseCliPath = this.config.baseCliPath ?? this.config.cliPath;
-    let failover = useInteractive || compactionMode ? { cliPath: this.config.cliPath, modelId: effectiveModelId, failedOver: false } : await resolveFailoverSpawn({
+    let failover = compactionMode ? { cliPath: this.config.cliPath, modelId: effectiveModelId, failedOver: false } : await resolveFailoverSpawn({
       account: sourceAccount,
       baseCliPath,
       cliPath: this.config.cliPath,
@@ -13225,7 +13391,7 @@ var ClaudeCodeLanguageModel = class {
       deleteActiveProcess(sk);
       clearCompression(sk);
     }
-    const failoverAnswer = compactionMode || useInteractive || mode === "generate" ? null : consumeAccountFailoverAnswer(sk, options.prompt, {
+    const failoverAnswer = compactionMode || mode === "generate" ? null : consumeAccountFailoverAnswer(sk, options.prompt, {
       sourceAccount,
       candidates: failoverCandidates(this.config.failoverAccounts, sourceAccount)
     });
@@ -13288,7 +13454,7 @@ var ClaudeCodeLanguageModel = class {
       });
     }
     const processForAccount = getActiveProcess(sk);
-    if (!compactionMode && !useInteractive && processForAccount?.cliPath && processForAccount.cliPath !== cliPath) {
+    if (!compactionMode && processForAccount?.cliPath && processForAccount.cliPath !== cliPath) {
       log.notice("claude process belongs to another account; starting fresh", {
         sessionKey: sk,
         was: processForAccount.cliPath,
@@ -13305,7 +13471,7 @@ var ClaudeCodeLanguageModel = class {
       includeHistoryContext = true;
     }
     let forkFromClaudeSessionId;
-    if (this.config.forkSessions === true && includeHistoryContext && !compactionMode && !useInteractive && failoverAnswer?.kind !== "switch") {
+    if (this.config.forkSessions === true && includeHistoryContext && !compactionMode && failoverAnswer?.kind !== "switch") {
       const parent = findForkParent({
         sessionKey: sk,
         prompt: options.prompt,
@@ -13361,7 +13527,7 @@ var ClaudeCodeLanguageModel = class {
         });
       }
     }
-    if (this.config.forkSessions === true && !compactionMode && !useInteractive) {
+    if (this.config.forkSessions === true && !compactionMode) {
       recordForkFingerprint(sk, options.prompt, cliPath);
     }
     const { model: spawnModelId, fast: fastMode } = parseModelId(failover.modelId);
@@ -13417,6 +13583,7 @@ var ClaudeCodeLanguageModel = class {
     if (useInteractive) reportUnmeasuredInteractiveCli(cliVersion);
     const ptyReadOnly = useInteractive && !compactionMode && !doctor && isReadOnlyPermissionMode(this.config.permissionMode);
     const ptyReadOnlySupported = cliSupportsRestricted(cliVersion) && cliSupportsDontAsk(cliVersion);
+    const ptyBypassSupported = cliSupportsInteractiveBypass(cliVersion);
     if (ptyReadOnly && !ptyReadOnlySupported) {
       throw new Error(
         "The read-only preset on the interactive transport needs Claude Code 2.1.263 or newer (--restricted and --permission-mode dontAsk). Update claude, or use the headless transport."
@@ -13426,14 +13593,13 @@ var ClaudeCodeLanguageModel = class {
       this.config.failoverAccounts,
       sourceAccount
     );
-    const failoverAskActive = failoverAccounts.length > 0 && this.config.accountFailover === "ask" && !compactionMode && !useInteractive && // A `doGenerate` caller takes the override and reports the plain
+    const failoverAskActive = failoverAccounts.length > 0 && this.config.accountFailover === "ask" && !compactionMode && // A `doGenerate` caller takes the override and reports the plain
     // rate-limit error, never the form. See `TurnMode`.
     mode !== "generate" && isAccountFailoverQuestionActive({
       configured: this.config.accountFailover,
       candidates: failoverAccounts,
       opencodeHasQuestion: (await loadLiveToolInfo()).hasQuestion,
       compactionMode,
-      interactive: !!useInteractive,
       // A subagent follows its parent's account for free, because the
       // override is account-scoped. Asking it would put a form in a session
       // the operator is usually not even looking at.
@@ -13784,6 +13950,14 @@ var ClaudeCodeLanguageModel = class {
                   "WebFetch"
                 ]
               ];
+              const userInstructions = self.config.interactiveUserInstructions === true ? userAuthoredInstructions(extractSystemMessages(options.prompt).join("\n\n"), {
+                agentPrompt: getAgentRegistry()[self.getOpencodeAgent(options) ?? ""]?.prompt
+              }) : [];
+              if (userInstructions.length > 0) {
+                log.info("forwarding user-authored instructions to the interactive TUI", {
+                  count: userInstructions.length
+                });
+              }
               const systemPromptFile = self.config.interactiveSystemPrompt === false ? void 0 : buildAppendedSystemPrompt(
                 cwd,
                 self.config.multiStepContinuation !== false,
@@ -13805,7 +13979,8 @@ var ClaudeCodeLanguageModel = class {
                   opencodeCompressEnabled: wiring.opencodeToolDefs.some(
                     (t) => t.name === "compress"
                   ),
-                  compressionSummary: getCompressionSummary(sk)
+                  compressionSummary: getCompressionSummary(sk),
+                  userInstructions
                 }
               );
               if (self.config.interactiveSystemPrompt === false) {
@@ -13815,7 +13990,7 @@ var ClaudeCodeLanguageModel = class {
               }
               if (interactiveBypassRequested) {
                 log.warn(
-                  "interactiveBypass ignored: Claude Code prompts for bypassPermissions confirmation in the interactive TUI"
+                  "interactiveBypass is ignored: skipPermissions governs the interactive transport too"
                 );
               }
               const skillPluginDirs = await resolveSkillPluginDirs({
@@ -13829,13 +14004,19 @@ var ClaudeCodeLanguageModel = class {
               const posture = interactivePermissionPosture({
                 permissionMode: self.config.permissionMode,
                 allow,
-                supportsReadOnly: ptyReadOnlySupported
+                supportsReadOnly: ptyReadOnlySupported,
+                skipPermissions: self.config.skipPermissions,
+                controlRequestBehavior: self.config.controlRequestBehavior,
+                controlRequestToolBehaviors: self.config.controlRequestToolBehaviors,
+                supportsBypass: ptyBypassSupported
               });
               if (!posture) throw new Error("the interactive transport cannot hold this permission posture");
               const ap = spawnInteractiveProcess({
                 cwd,
                 cliPath,
-                configDir: self.config.configDir,
+                // On an account switch, the other account's directory: the
+                // TUI writes its transcript there (h #g209).
+                configDir: self.skillBridgeSpawn(failover).configDir,
                 model: spawnModelId,
                 fastMode,
                 mcpConfigPaths: mcp.paths,
@@ -13843,19 +14024,26 @@ var ClaudeCodeLanguageModel = class {
                 permissionsAllow: posture.allow,
                 permissionMode: posture.permissionMode,
                 restricted: posture.restricted,
-                disallowedTools: wiring.allDisallowed,
+                bypass: posture.bypass,
+                disallowedTools: [...wiring.allDisallowed, ...posture.disallowed],
                 proxyServer: state.proxyServer,
                 systemPromptFile,
                 ignoreAnthropicApiKey: self.config.ignoreAnthropicApiKey,
                 effort: reasoningEffort,
                 resumeSessionId,
+                // A fork of a conversation already served (`forkSessions`):
+                // the TUI branches it instead of the history being replayed.
+                ...forkFromClaudeSessionId && !resumeSessionId ? { forkOf: forkFromClaudeSessionId } : {},
                 // The headless spawn's env, so hygiene, effort and the
-                // agent's prompt cache TTL reach both transports alike.
-                env: claudeSpawnEnv({
-                  ignoreAnthropicApiKey: self.config.ignoreAnthropicApiKey,
-                  effort: reasoningEffort,
-                  promptCacheTtl
-                })
+                // agent's prompt cache TTL reach both transports alike, plus
+                // what keeps a proxied call in the foreground (h #g210).
+                env: interactiveSpawnEnv2(
+                  claudeSpawnEnv({
+                    ignoreAnthropicApiKey: self.config.ignoreAnthropicApiKey,
+                    effort: reasoningEffort,
+                    promptCacheTtl
+                  })
+                )
               });
               ap.proc.once(
                 "exit",
@@ -13863,6 +14051,7 @@ var ClaudeCodeLanguageModel = class {
               );
               ap.mcpHash = mcp.bridgedHash;
               ap.mcpServers = mcp.allEnabledServerNames;
+              ap.cliPath = cliPath;
               setActiveProcess(sk, ap);
               state.proc = ap.proc;
               state.lineEmitter = ap.lineEmitter;
@@ -13870,6 +14059,7 @@ var ClaudeCodeLanguageModel = class {
               log.info("spawned interactive claude session", {
                 sk,
                 resumed: !!resumeSessionId,
+                forked: !!forkFromClaudeSessionId && !resumeSessionId,
                 cliPath,
                 configDir: self.config.configDir,
                 model: effectiveModelId
@@ -14084,7 +14274,8 @@ var ClaudeCodeLanguageModel = class {
                   sourceAccount,
                   candidates: failoverAccounts,
                   resetsAt: state.accountLimitHit?.resetsAt,
-                  window: state.accountLimitHit?.window
+                  window: state.accountLimitHit?.window,
+                  resetsText: state.accountLimitHit?.resetsText
                 })
               });
               state.endTextBlock();
@@ -15323,7 +15514,8 @@ function createClaudeCode(settings = {}) {
       interactive: settings.interactive,
       interactiveBypass: settings.interactiveBypass,
       interactiveAllowTools: settings.interactiveAllowTools,
-      interactiveSystemPrompt: settings.interactiveSystemPrompt
+      interactiveSystemPrompt: settings.interactiveSystemPrompt,
+      interactiveUserInstructions: settings.interactiveUserInstructions
     });
   };
   const provider = function(modelId) {
@@ -15542,7 +15734,8 @@ async function buildAgentRegistry(config) {
       forceModel: pick("forceModel") ?? records2[name]?.forceModel,
       reasoningEffort: pick("reasoningEffort") ?? records2[name]?.reasoningEffort,
       cacheTtl: pick("cacheTtl") ?? records2[name]?.cacheTtl,
-      fallbackModels: declaredChain.length ? declaredChain : records2[name]?.fallbackModels
+      fallbackModels: declaredChain.length ? declaredChain : records2[name]?.fallbackModels,
+      prompt: pick("prompt") ?? records2[name]?.prompt
     };
   }
   setAgentRegistry(records2);