@codexhost/cli-darwin-x64 0.14.0 → 0.16.0

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

@@ -777,10 +777,10 @@ function mergeDefs(...defs) {
 function cloneDef(schema) {
   return mergeDefs(schema._zod.def);
 }
-function getElementAtPath(obj, path19) {
-  if (!path19)
+function getElementAtPath(obj, path18) {
+  if (!path18)
     return obj;
-  return path19.reduce((acc, key) => acc?.[key], obj);
+  return path18.reduce((acc, key) => acc?.[key], obj);
 }
 function promiseAllObject(promisesObj) {
   const keys = Object.keys(promisesObj);
@@ -1189,11 +1189,11 @@ function explicitlyAborted(x, startIndex = 0) {
   }
   return false;
 }
-function prefixIssues(path19, issues) {
+function prefixIssues(path18, issues) {
   return issues.map((iss) => {
     var _a4;
     (_a4 = iss).path ?? (_a4.path = []);
-    iss.path.unshift(path19);
+    iss.path.unshift(path18);
     return iss;
   });
 }
@@ -1340,16 +1340,16 @@ function flattenError(error52, mapper = (issue2) => issue2.message) {
 }
 function formatError(error52, mapper = (issue2) => issue2.message) {
   const fieldErrors = { _errors: [] };
-  const processError = (error53, path19 = []) => {
+  const processError = (error53, path18 = []) => {
     for (const issue2 of error53.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
-        issue2.errors.map((issues) => processError({ issues }, [...path19, ...issue2.path]));
+        issue2.errors.map((issues) => processError({ issues }, [...path18, ...issue2.path]));
       } else if (issue2.code === "invalid_key") {
-        processError({ issues: issue2.issues }, [...path19, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path18, ...issue2.path]);
       } else if (issue2.code === "invalid_element") {
-        processError({ issues: issue2.issues }, [...path19, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path18, ...issue2.path]);
       } else {
-        const fullpath = [...path19, ...issue2.path];
+        const fullpath = [...path18, ...issue2.path];
         if (fullpath.length === 0) {
           fieldErrors._errors.push(mapper(issue2));
         } else {
@@ -1376,17 +1376,17 @@ function formatError(error52, mapper = (issue2) => issue2.message) {
 }
 function treeifyError(error52, mapper = (issue2) => issue2.message) {
   const result = { errors: [] };
-  const processError = (error53, path19 = []) => {
+  const processError = (error53, path18 = []) => {
     var _a4, _b2;
     for (const issue2 of error53.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
-        issue2.errors.map((issues) => processError({ issues }, [...path19, ...issue2.path]));
+        issue2.errors.map((issues) => processError({ issues }, [...path18, ...issue2.path]));
       } else if (issue2.code === "invalid_key") {
-        processError({ issues: issue2.issues }, [...path19, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path18, ...issue2.path]);
       } else if (issue2.code === "invalid_element") {
-        processError({ issues: issue2.issues }, [...path19, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path18, ...issue2.path]);
       } else {
-        const fullpath = [...path19, ...issue2.path];
+        const fullpath = [...path18, ...issue2.path];
         if (fullpath.length === 0) {
           result.errors.push(mapper(issue2));
           continue;
@@ -1418,8 +1418,8 @@ function treeifyError(error52, mapper = (issue2) => issue2.message) {
 }
 function toDotPath(_path) {
   const segs = [];
-  const path19 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
-  for (const seg of path19) {
+  const path18 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
+  for (const seg of path18) {
     if (typeof seg === "number")
       segs.push(`[${seg}]`);
     else if (typeof seg === "symbol")
@@ -3040,10 +3040,10 @@ var $ZodObject = /* @__PURE__ */ $constructor("$ZodObject", (inst, def) => {
     const shape = def.shape;
     const propValues = {};
     for (const key in shape) {
-      const field = shape[key]._zod;
-      if (field.values) {
+      const field2 = shape[key]._zod;
+      if (field2.values) {
         propValues[key] ?? (propValues[key] = /* @__PURE__ */ new Set());
-        for (const v of field.values)
+        for (const v of field2.values)
           propValues[key].add(v);
       }
     }
@@ -14111,13 +14111,13 @@ function resolveRef(ref, ctx) {
   if (!ref.startsWith("#")) {
     throw new Error("External $ref is not supported, only local refs (#/...) are allowed");
   }
-  const path19 = ref.slice(1).split("/").filter(Boolean);
-  if (path19.length === 0) {
+  const path18 = ref.slice(1).split("/").filter(Boolean);
+  if (path18.length === 0) {
     return ctx.rootSchema;
   }
   const defsKey = ctx.version === "draft-2020-12" ? "$defs" : "definitions";
-  if (path19[0] === defsKey) {
-    const key = path19[1];
+  if (path18[0] === defsKey) {
+    const key = path18[1];
     if (!key || !ctx.defs[key]) {
       throw new Error(`Reference not found: ${ref}`);
     }
@@ -14683,6 +14683,8 @@ var usageStatisticsTotalsSchema = external_exports.strictObject({
   cachedInputTokens: count,
   cacheWriteInputTokens: count,
   cacheKnownInputTokens: count,
+  cacheHitCachedInputTokens: count,
+  cacheHitInputTokens: count,
   outputTokens: count,
   reasoningOutputTokens: count,
   /** USD at the public price, summed over the priced requests only. */
@@ -14790,6 +14792,51 @@ var hostInteractionIdSchema = opaqueIdSchema.brand();
 var threadPrewarmDiscardParamsSchema = external_exports.object({ threadId: hostThreadIdSchema });
 var threadPrewarmDiscardResultSchema = external_exports.object({ discarded: external_exports.boolean() });
 
+// ../../shared-contracts/dist/thread-questions.js
+var field = external_exports.discriminatedUnion("type", [
+  external_exports.object({
+    id: external_exports.string().min(1),
+    type: external_exports.literal("choice"),
+    prompt: external_exports.string(),
+    options: external_exports.array(external_exports.object({
+      value: external_exports.string().min(1),
+      label: external_exports.string(),
+      description: external_exports.string().optional()
+    })).min(1),
+    multiple: external_exports.boolean(),
+    allowOther: external_exports.boolean(),
+    optional: external_exports.boolean()
+  }),
+  external_exports.object({
+    id: external_exports.string().min(1),
+    type: external_exports.literal("text"),
+    prompt: external_exports.string(),
+    multiline: external_exports.boolean(),
+    secret: external_exports.literal(false),
+    optional: external_exports.boolean(),
+    placeholder: external_exports.string().optional(),
+    prefill: external_exports.string().optional()
+  })
+]);
+var threadQuestionSchema = external_exports.object({
+  interactionId: external_exports.string().min(1),
+  turnId: external_exports.string().min(1),
+  title: external_exports.string().optional(),
+  questions: external_exports.array(field).min(1)
+}).refine(({ questions }) => questions.some((q) => q.type === "choice" && q.multiple), {
+  message: "Shared cards require at least one multi-select question"
+});
+var threadQuestionsListParamsSchema = external_exports.strictObject({ threadId: external_exports.string().min(1) });
+var threadQuestionsResultSchema = external_exports.object({ questions: external_exports.array(threadQuestionSchema) });
+var threadQuestionRespondParamsSchema = external_exports.strictObject({
+  threadId: external_exports.string().min(1),
+  turnId: external_exports.string().min(1),
+  interactionId: external_exports.string().min(1),
+  answers: external_exports.record(external_exports.string(), external_exports.array(external_exports.string())),
+  cancelled: external_exports.boolean().default(false)
+});
+var threadQuestionRespondResultSchema = external_exports.object({ accepted: external_exports.literal(true) });
+
 // ../../shared-contracts/dist/console.js
 var consoleAnnouncementSchema = external_exports.strictObject({
   title: external_exports.string().trim().min(1).max(200),
@@ -16111,26 +16158,26 @@ function parseHostUsage(value) {
     }
   }
   const indicators = value.composerIndicators === void 0 ? {} : { composerIndicators: composerIndicatorsSchema.parse(value.composerIndicators) };
-  for (const field of [
+  for (const field2 of [
     "totalCredits",
     "contextUsagePercent",
     "apiOutputTokensPerSecond"
   ]) {
-    const candidate = value[field];
+    const candidate = value[field2];
     if (candidate !== void 0 && (typeof candidate !== "number" || !Number.isFinite(candidate) || candidate < 0)) {
-      throw new Error(`Harness Usage '${field}' must be a finite non-negative number`);
+      throw new Error(`Harness Usage '${field2}' must be a finite non-negative number`);
     }
   }
-  for (const field of tokenFields) {
-    const candidate = value[field];
+  for (const field2 of tokenFields) {
+    const candidate = value[field2];
     if (candidate !== void 0 && (typeof candidate !== "number" || !Number.isSafeInteger(candidate) || candidate < 0)) {
-      throw new Error(`Harness Usage '${field}' must be a non-negative safe integer`);
+      throw new Error(`Harness Usage '${field2}' must be a non-negative safe integer`);
     }
   }
-  for (const field of safeIntegerFields) {
-    const candidate = value[field];
+  for (const field2 of safeIntegerFields) {
+    const candidate = value[field2];
     if (candidate !== void 0 && (typeof candidate !== "number" || !Number.isSafeInteger(candidate) || candidate < 0)) {
-      throw new Error(`Harness Usage '${field}' must be a non-negative safe integer`);
+      throw new Error(`Harness Usage '${field2}' must be a non-negative safe integer`);
     }
   }
   if (value.outputTokensPerSecond !== void 0 && (typeof value.outputTokensPerSecond !== "number" || !Number.isFinite(value.outputTokensPerSecond) || value.outputTokensPerSecond < 0)) {
@@ -16139,10 +16186,10 @@ function parseHostUsage(value) {
   if (value.totalCostUsd !== void 0 && (typeof value.totalCostUsd !== "number" || !Number.isFinite(value.totalCostUsd) || value.totalCostUsd < 0)) {
     throw new Error("Harness Usage 'totalCostUsd' must be a finite non-negative number");
   }
-  for (const field of percentFields) {
-    const candidate = value[field];
+  for (const field2 of percentFields) {
+    const candidate = value[field2];
     if (candidate !== void 0 && (typeof candidate !== "number" || !Number.isFinite(candidate) || candidate < 0 || candidate > 100)) {
-      throw new Error(`Harness Usage '${field}' must be between 0 and 100`);
+      throw new Error(`Harness Usage '${field2}' must be between 0 and 100`);
     }
   }
   if (value.sessionCacheUsage !== void 0) {
@@ -16213,19 +16260,19 @@ function parseHostUsageRequest(value) {
   if (typeof value.requestId !== "string" || value.requestId.length === 0) {
     throw new Error("Harness Usage request 'requestId' must be a non-empty string");
   }
-  for (const field of ["model", "provider"]) {
-    const candidate = value[field];
+  for (const field2 of ["model", "provider"]) {
+    const candidate = value[field2];
     if (candidate !== void 0 && (typeof candidate !== "string" || candidate.length === 0)) {
-      throw new Error(`Harness Usage request '${field}' must be a non-empty string`);
+      throw new Error(`Harness Usage request '${field2}' must be a non-empty string`);
     }
   }
   if (value.historical !== void 0 && typeof value.historical !== "boolean") {
     throw new Error("Harness Usage request 'historical' must be a boolean");
   }
-  for (const field of requestTokenFields) {
-    const candidate = value[field];
+  for (const field2 of requestTokenFields) {
+    const candidate = value[field2];
     if (candidate !== void 0 && (typeof candidate !== "number" || !Number.isSafeInteger(candidate) || candidate < 0)) {
-      throw new Error(`Harness Usage request '${field}' must be a non-negative safe integer`);
+      throw new Error(`Harness Usage request '${field2}' must be a non-negative safe integer`);
     }
   }
   if (value.inputTokens === void 0 || value.outputTokens === void 0) {
@@ -16373,6 +16420,7 @@ var HARNESS_BROKER_PROTOCOL_VERSION = 1;
 var HARNESS_BROKER_MAX_FRAME_BYTES = 8 * 1024 * 1024;
 var HARNESS_BROKER_MAX_PENDING_REQUESTS = 32;
 var HARNESS_BROKER_REQUEST_TIMEOUT_MS = 15e3;
+var HARNESS_BROKER_SESSION_IMPORT_PAGE_SIZE = 100;
 var HARNESS_BROKER_IDLE_TIMEOUT_MS = 60 * 60 * 1e3;
 var HARNESS_BROKER_RETIRING_ERROR_CODE = "brokerRetiring";
 var harnessBrokerMethodSchema = external_exports.enum([
@@ -16380,6 +16428,8 @@ var harnessBrokerMethodSchema = external_exports.enum([
   "adapter.inspectAccount",
   "adapter.credits",
   "adapter.open",
+  "adapter.sessionImport.list",
+  "adapter.sessionImport.resolve",
   "adapter.subagent.readSnapshot",
   "session.readSnapshot",
   "session.readCapabilities",
@@ -16482,30 +16532,6 @@ function consumeBrokerFrames(socket, onFrame, onError) {
   });
 }
 
-// ../../harness-broker/dist/paths.js
-import os from "node:os";
-import path from "node:path";
-var HARNESS_BROKER_DESCRIPTOR_ENV = "CODEXHOST_CLAUDE_BROKER_DESCRIPTOR";
-var HARNESS_BROKER_DESCRIPTOR_FILE = "claude-code-broker-v1.json";
-function defaultHarnessBrokerDirectory(environment = process.env) {
-  const home = environment.HOME || os.homedir();
-  return path.join(home, ".codexhost", "harness-broker");
-}
-function defaultHarnessBrokerDescriptorPath(environment = process.env, harnessId = "claude-code") {
-  harnessPluginIdSchema.parse(harnessId);
-  if (harnessId !== "claude-code")
-    return path.join(defaultHarnessBrokerDirectory(environment), `${harnessId}-broker-v1.json`);
-  return environment[HARNESS_BROKER_DESCRIPTOR_ENV] ?? path.join(defaultHarnessBrokerDirectory(environment), HARNESS_BROKER_DESCRIPTOR_FILE);
-}
-function harnessBrokerLaunchAgentLabel(harnessId = "claude-code") {
-  harnessPluginIdSchema.parse(harnessId);
-  return harnessId === "claude-code" ? "ai.bytepioneer.codexhost.native-harness-broker" : `ai.bytepioneer.codexhost.${harnessId}-broker`;
-}
-function harnessBrokerLaunchAgentPlistPath(environment = process.env, harnessId = "claude-code") {
-  const home = environment.HOME || os.homedir();
-  return path.join(home, "Library", "LaunchAgents", `${harnessBrokerLaunchAgentLabel(harnessId)}.plist`);
-}
-
 // ../../harness-broker/dist/validation.js
 var cwdSchema = external_exports.string().min(1).max(16384);
 var brokerEnvironmentSchema = external_exports.object({
@@ -16556,7 +16582,31 @@ var brokerOpenInputSchema = external_exports.discriminatedUnion("kind", [
   forkSchema,
   rollbackSchema
 ]);
-var brokerInspectInputSchema = external_exports.object({ cwd: cwdSchema.optional(), refresh: external_exports.boolean().optional() }).strict();
+var brokerInspectInputSchema = external_exports.object({
+  cwd: cwdSchema.optional(),
+  refresh: external_exports.boolean().optional(),
+  purpose: external_exports.literal("availability").optional()
+}).strict();
+var brokerSessionImportListParamsSchema = external_exports.object({
+  offset: external_exports.number().int().nonnegative().safe(),
+  limit: external_exports.number().int().min(1).max(HARNESS_BROKER_SESSION_IMPORT_PAGE_SIZE)
+}).strict();
+var brokerSessionImportResolveParamsSchema = external_exports.object({ nativeSessionId: harnessSessionImportIdSchema }).strict();
+var brokerSessionImportPageSchema = external_exports.object({
+  candidates: external_exports.array(harnessSessionImportCandidateSchema).max(HARNESS_BROKER_SESSION_IMPORT_PAGE_SIZE),
+  total: external_exports.number().int().nonnegative().safe()
+}).strict();
+var brokerSessionImportSourceSchema = external_exports.object({
+  candidate: harnessSessionImportCandidateSchema,
+  nativeRef: nativeSessionRefSchema
+}).strict().superRefine((source, context) => {
+  if (source.nativeRef.nativeSessionId !== source.candidate.nativeSessionId) {
+    context.addIssue({
+      code: "custom",
+      message: "Session import source identity does not match"
+    });
+  }
+});
 var textInputSchema = external_exports.object({ type: external_exports.literal("text"), text: external_exports.string().max(4e6) }).strict();
 var turnStartSchema = external_exports.object({
   type: external_exports.literal("turn.start"),
@@ -16727,6 +16777,107 @@ var harnessOutputSchema = external_exports.custom((value) => {
   return false;
 });
 
+// ../../harness-broker/dist/session-import-client.js
+function createBrokerSessionImportCapability(input) {
+  let listing = null;
+  const closed = () => ({
+    ok: false,
+    error: { code: "invalidState", message: "Harness broker adapter is closed", retryable: false }
+  });
+  const invalid = () => ({
+    ok: false,
+    error: {
+      code: "protocolError",
+      message: "Harness broker returned invalid Session import metadata",
+      retryable: false
+    }
+  });
+  const list = async () => {
+    try {
+      const candidates = [];
+      const identities = /* @__PURE__ */ new Set();
+      let total;
+      for (; ; ) {
+        if (input.isClosed())
+          return closed();
+        const result = await input.request("adapter.sessionImport.list", {
+          offset: candidates.length,
+          limit: HARNESS_BROKER_SESSION_IMPORT_PAGE_SIZE
+        });
+        if (input.isClosed())
+          return closed();
+        if (!result.ok)
+          return result;
+        const page = brokerSessionImportPageSchema.safeParse(result.value);
+        if (!page.success || total !== void 0 && total !== page.data.total || page.data.total < candidates.length + page.data.candidates.length || page.data.candidates.length === 0 && candidates.length < page.data.total)
+          return invalid();
+        total = page.data.total;
+        for (const candidate of page.data.candidates) {
+          if (identities.has(candidate.nativeSessionId))
+            return invalid();
+          identities.add(candidate.nativeSessionId);
+          candidates.push(candidate);
+        }
+        if (candidates.length === total)
+          return { ok: true, value: candidates };
+      }
+    } catch (error52) {
+      return { ok: false, error: input.error(error52) };
+    }
+  };
+  return {
+    listCandidates() {
+      if (input.isClosed())
+        return Promise.resolve(closed());
+      listing ??= list().finally(() => {
+        listing = null;
+      });
+      return listing;
+    },
+    async resolveCandidate(nativeSessionId) {
+      if (input.isClosed())
+        return closed();
+      try {
+        const result = await input.request("adapter.sessionImport.resolve", { nativeSessionId });
+        if (input.isClosed())
+          return closed();
+        if (!result.ok)
+          return result;
+        const source = brokerSessionImportSourceSchema.safeParse(result.value);
+        if (!source.success || source.data.nativeRef.harnessId !== input.harnessId || source.data.candidate.nativeSessionId !== nativeSessionId)
+          return invalid();
+        return { ok: true, value: source.data };
+      } catch (error52) {
+        return { ok: false, error: input.error(error52) };
+      }
+    }
+  };
+}
+
+// ../../harness-broker/dist/paths.js
+import os from "node:os";
+import path from "node:path";
+var HARNESS_BROKER_DESCRIPTOR_ENV = "CODEXHOST_CLAUDE_BROKER_DESCRIPTOR";
+var HARNESS_BROKER_DESCRIPTOR_FILE = "claude-code-broker-v1.json";
+function defaultHarnessBrokerDirectory(environment = process.env) {
+  const home = environment.HOME || os.homedir();
+  return path.join(home, ".codexhost", "harness-broker");
+}
+function defaultHarnessBrokerDescriptorPath(environment = process.env, harnessId = "claude-code") {
+  harnessPluginIdSchema.parse(harnessId);
+  if (harnessId !== "claude-code")
+    return path.join(defaultHarnessBrokerDirectory(environment), `${harnessId}-broker-v1.json`);
+  return environment[HARNESS_BROKER_DESCRIPTOR_ENV] ?? path.join(defaultHarnessBrokerDirectory(environment), HARNESS_BROKER_DESCRIPTOR_FILE);
+}
+function harnessBrokerLaunchAgentLabel(harnessId = "claude-code") {
+  harnessPluginIdSchema.parse(harnessId);
+  return harnessId === "claude-code" ? "ai.bytepioneer.codexhost.native-harness-broker" : `ai.bytepioneer.codexhost.${harnessId}-broker`;
+}
+function harnessBrokerLaunchAgentPlistPath(environment = process.env, harnessId = "claude-code") {
+  const home = environment.HOME || os.homedir();
+  return path.join(home, "Library", "LaunchAgents", `${harnessBrokerLaunchAgentLabel(harnessId)}.plist`);
+}
+
 // ../../harness-broker/dist/client.js
 function unavailable(message, retryable = true) {
   return { code: "unavailable", message, retryable, stage: "harnessBroker" };
@@ -17263,6 +17414,7 @@ var BrokeredHarnessAdapter = class {
   commandCatalog;
   liveCommandCatalog;
   harnessId;
+  sessionImport;
   credits;
   refreshCredits;
   #descriptorPath;
@@ -17285,6 +17437,14 @@ var BrokeredHarnessAdapter = class {
   };
   constructor(input = {}) {
     this.harnessId = harnessPluginIdSchema.parse(input.harnessId ?? "claude-code");
+    if (input.sessionImport) {
+      this.sessionImport = createBrokerSessionImportCapability({
+        harnessId: this.harnessId,
+        request: async (method, params) => parseHarnessResult(await this.#request(method, params, method === "adapter.sessionImport.resolve")),
+        isClosed: () => this.#closed,
+        error: (error52) => this.#error(error52)
+      });
+    }
     if (input.accountCredits !== false) {
       this.credits = () => this.#credits;
       this.refreshCredits = () => this.#refreshAccountCredits();
@@ -17748,7 +17908,7 @@ function claudePromptCacheIndicators(accountCreditsSupported, lastResponseAtUnix
 
 // dist/claude-code-adapter.js
 import { randomUUID as randomUUID5 } from "node:crypto";
-import path16 from "node:path";
+import path15 from "node:path";
 
 // ../../../node_modules/@anthropic-ai/claude-agent-sdk/sdk.mjs
 import { createRequire as jre } from "node:module";
@@ -54388,7 +54548,6 @@ var ClaudePendingSessions = class {
 };
 
 // dist/claude-fork.js
-import path12 from "node:path";
 import { isDeepStrictEqual } from "node:util";
 
 // dist/file-change.js
@@ -54530,6 +54689,17 @@ function targetedSubagentId(argumentsValue) {
     return void 0;
   return boundedString(argumentsValue.to ?? argumentsValue.recipient ?? argumentsValue.agentId, SUBAGENT_DESCRIPTION_LIMIT);
 }
+function claudeSendMessageFailed(nativeResult, outputText) {
+  if (isRecord7(nativeResult) && typeof nativeResult.success === "boolean") {
+    return nativeResult.success === false;
+  }
+  try {
+    const parsed = JSON.parse(outputText ?? "");
+    return isRecord7(parsed) && parsed.success === false;
+  } catch {
+    return false;
+  }
+}
 function includesAuthenticationFailure(errors) {
   return errors.some((error52) => AUTHENTICATION_ERRORS.has(error52));
 }
@@ -55260,7 +55430,7 @@ var ClaudeNativeTurnAccumulator = class {
         events.push({
           type: "subagent.completed",
           callId,
-          isError,
+          isError: isError || tool.name === "SendMessage" && claudeSendMessageFailed(nativeResult, outputText),
           ...subagentContinuesInBackground(nativeResult, outputText) ? { continuesInBackground: true } : {},
           ...agentId ? { nativeSubagentId: agentId } : {},
           ...resultSummary ? { resultSummary } : {}
@@ -55393,7 +55563,7 @@ function conversationMessages(values, sessionId) {
   let promptId = null;
   const occupancy = new ClaudeBackgroundOccupancy();
   let accumulator = new ClaudeNativeTurnAccumulator();
-  const sends = /* @__PURE__ */ new Set();
+  const sends = /* @__PURE__ */ new Map();
   let pendingNotification = false;
   for (const value of values) {
     if (!isRecord8(value))
@@ -55426,17 +55596,19 @@ function conversationMessages(values, sessionId) {
     for (const event of accumulator.consume(value).events) {
       if (event.type === "subagent.started") {
         if (event.operation === "send") {
-          sends.add(event.callId);
-          if (event.nativeSubagentId)
-            occupancy.occupyAgent(event.nativeSubagentId);
+          sends.set(event.callId, event.nativeSubagentId);
         } else if (event.background)
           occupancy.occupySpawn(event.callId, event.nativeSubagentId);
       } else if (event.type === "subagent.completed") {
-        if (!event.isError && (event.continuesInBackground || sends.has(event.callId))) {
+        if (sends.has(event.callId)) {
+          const agentId = event.nativeSubagentId ?? sends.get(event.callId);
+          if (!event.isError && agentId)
+            occupancy.occupyAgent(agentId);
+          sends.delete(event.callId);
+        } else if (!event.isError && event.continuesInBackground) {
           occupancy.occupySpawn(event.callId, event.nativeSubagentId);
         } else
           occupancy.release(event.callId, event.nativeSubagentId);
-        sends.delete(event.callId);
       } else if (event.type === "workflow.launched" && event.background && !event.isError) {
         occupancy.occupySpawn(event.callId, event.taskId);
       } else if (event.type === "subagent.settled") {
@@ -55613,7 +55785,7 @@ function mapClaudeSnapshot(values, sessionId) {
           if (!result)
             continue;
           const output = toolResultOutput(result);
-          const failed = result.is_error === true;
+          const failed = result.is_error === true || block.name === "SendMessage" && claudeSendMessageFailed(void 0, output);
           const toolOutcome = failed ? {
             status: "failed",
             error: {
@@ -55908,12 +56080,6 @@ async function forkClaudeSession(input) {
       error: error51("protocolError", "Claude Code Session working directory is unavailable", false)
     };
   }
-  if (path12.resolve(sourceInfo.cwd) !== input.cwd) {
-    return {
-      ok: false,
-      error: error51("unsupported", "Claude Code cannot Fork across working directories", false)
-    };
-  }
   const source = await readSnapshot(input.dependencies, input.cwd, sourceRef.data.nativeSessionId);
   if (!source.ok)
     return source;
@@ -56013,13 +56179,13 @@ import { readFile as readFile6, rename as rename4, rm as rm5, stat as stat5, wri
 
 // dist/claude-transcript.js
 import os6 from "node:os";
-import path13 from "node:path";
+import path12 from "node:path";
 import { readFile as readFile5, readdir as readdir3, stat as stat4 } from "node:fs/promises";
 function projectDirectoryName(cwd) {
   return cwd.replace(/[^A-Za-z0-9]/gu, "-");
 }
 function configDirectory(environment) {
-  return environment.CLAUDE_CONFIG_DIR ? path13.resolve(environment.CLAUDE_CONFIG_DIR) : path13.join(os6.homedir(), ".claude");
+  return environment.CLAUDE_CONFIG_DIR ? path12.resolve(environment.CLAUDE_CONFIG_DIR) : path12.join(os6.homedir(), ".claude");
 }
 async function existingFile(file2) {
   try {
@@ -56029,9 +56195,9 @@ async function existingFile(file2) {
   }
 }
 async function findClaudeTranscript(input) {
-  const projectsDirectory = path13.join(configDirectory(input.environment), "projects");
+  const projectsDirectory = path12.join(configDirectory(input.environment), "projects");
   const name = `${input.sessionId}.jsonl`;
-  const expected = path13.join(projectsDirectory, projectDirectoryName(input.cwd), name);
+  const expected = path12.join(projectsDirectory, projectDirectoryName(input.cwd), name);
   if (await existingFile(expected))
     return expected;
   let projects;
@@ -56041,7 +56207,7 @@ async function findClaudeTranscript(input) {
     return null;
   }
   for (const project2 of projects) {
-    const candidate = path13.join(projectsDirectory, project2, name);
+    const candidate = path12.join(projectsDirectory, project2, name);
     if (await existingFile(candidate))
       return candidate;
   }
@@ -56151,7 +56317,7 @@ async function remapForkedSessionReferences(input) {
 import { Buffer as Buffer2 } from "node:buffer";
 import { readFile as readFile7 } from "node:fs/promises";
 import os7 from "node:os";
-import path14 from "node:path";
+import path13 from "node:path";
 
 // dist/thinking-options.js
 var option = (id2, label) => ({
@@ -56244,7 +56410,7 @@ function decodeClaudeModelRef(ref) {
   return value === "default" ? void 0 : value;
 }
 function resolveClaudeConfigDirectory(environment = process.env) {
-  return path14.resolve(environment.CLAUDE_CONFIG_DIR ?? path14.join(os7.homedir(), ".claude"));
+  return path13.resolve(environment.CLAUDE_CONFIG_DIR ?? path13.join(os7.homedir(), ".claude"));
 }
 function parseModelPickerOptions(value) {
   if (!Array.isArray(value))
@@ -56286,7 +56452,7 @@ function parseClaudeModelPickerSettings(value) {
   };
 }
 async function readClaudeUserModelPicker(environment = process.env) {
-  const settingsPath = path14.join(resolveClaudeConfigDirectory(environment), "settings.json");
+  const settingsPath = path13.join(resolveClaudeConfigDirectory(environment), "settings.json");
   let raw;
   try {
     raw = await readFile7(settingsPath, "utf8");
@@ -56632,7 +56798,7 @@ function projectClaudeAccountUsage(usage, account) {
 
 // dist/process-fence.js
 import { execFile as execFile3 } from "node:child_process";
-import path15 from "node:path";
+import path14 from "node:path";
 import { setTimeout as setTimeout2 } from "node:timers/promises";
 import { promisify } from "node:util";
 var executeFile = promisify(execFile3);
@@ -56656,9 +56822,9 @@ async function closeClaudeProcessGroup(child, timeoutMs) {
     if (child.exitCode !== null || child.signalCode !== null)
       throw new Error("Claude process tree cannot be confirmed after its Windows root exited");
     const root = process.env.SystemRoot ?? process.env.SYSTEMROOT;
-    if (!root || !path15.win32.isAbsolute(root))
+    if (!root || !path14.win32.isAbsolute(root))
       throw new Error("Windows SystemRoot is unavailable");
-    await executeFile(path15.win32.join(root, "System32", "taskkill.exe"), ["/PID", String(pid), "/T", "/F"], {
+    await executeFile(path14.win32.join(root, "System32", "taskkill.exe"), ["/PID", String(pid), "/T", "/F"], {
       timeout: timeoutMs,
       windowsHide: true
     });
@@ -56958,6 +57124,8 @@ var ClaudeSdkTransport = class {
   /** Root tool calls of the requested Turn that have started and not yet returned a result. */
   #rootToolCalls = /* @__PURE__ */ new Set();
   #pendingSteers = /* @__PURE__ */ new Map();
+  /** Written steers Claude has not yet drained into a native turn, by message ID. */
+  #steerTakeovers = /* @__PURE__ */ new Map();
   #autonomous = null;
   #autonomousTurnHandler = null;
   #idleHandler = null;
@@ -57081,9 +57249,16 @@ var ClaudeSdkTransport = class {
    * `priority: "next"` joins after the current tool call, and a tool result is always followed by
    * another model request. So a steer written while a root tool call runs folds into this Turn;
    * one written while Claude streams its final text may instead run as the next Turn.
+   *
+   * A held Turn's continuation steers as well: while its idle stream is live, the pushed input
+   * runs as that Turn's next Segment, and the background work the Turn waits on keeps running.
    */
   canSteerActiveTurn() {
-    return this.#nativeSteer && this.#active !== null && this.#rootToolCalls.size > 0;
+    if (!this.#nativeSteer)
+      return false;
+    if (this.#active !== null)
+      return this.#rootToolCalls.size > 0;
+    return this.#idleLive && this.#idleHandler !== null;
   }
   #observeRootToolCalls(message) {
     if (!isRecord11(message) || message.parent_tool_use_id != null)
@@ -57117,11 +57292,11 @@ var ClaudeSdkTransport = class {
       this.#slashCommands = parseClaudeSlashCommands(message.commands);
     }
   }
-  async getContextUsage() {
+  async getContextUsage(detail = "full") {
     const activeQuery = this.#query;
     if (!this.#started || !activeQuery)
       return null;
-    return parseContextUsage(await activeQuery.getContextUsage());
+    return parseContextUsage(await activeQuery.getContextUsage({ detail }));
   }
   getPermissionMode() {
     if (!this.#started || !this.#query)
@@ -57259,7 +57434,7 @@ var ClaudeSdkTransport = class {
    * The Turn ending first therefore does not reject it, and a missing `queued` receipt resolves
    * after a bounded wait so callers that serialize requests are never held indefinitely.
    */
-  steer(text2, messageId) {
+  steer(text2, messageId, onTakeover) {
     if (this.#closePromise || !this.#started || !this.#query || !this.canSteerActiveTurn()) {
       return Promise.reject(new ClaudeSteerMissedTurnError());
     }
@@ -57280,9 +57455,14 @@ var ClaudeSdkTransport = class {
       this.#pendingSteers.delete(messageId);
       return Promise.reject(new ClaudeSteerMissedTurnError());
     }
+    if (onTakeover)
+      this.#steerTakeovers.set(messageId, onTakeover);
     const pending = this.#pendingSteers.get(messageId);
     if (pending) {
-      pending.timer = setTimeout(() => this.#acceptSteer(messageId), this.#steerQueuedTimeoutMs);
+      pending.timer = setTimeout(() => {
+        this.#acceptSteer(messageId);
+        this.#takeOverSteer(messageId, false);
+      }, this.#steerQueuedTimeoutMs);
       pending.timer.unref?.();
     }
     return promise2;
@@ -57295,6 +57475,13 @@ var ClaudeSdkTransport = class {
     clearTimeout(pending.timer);
     pending.resolve();
   }
+  #takeOverSteer(messageId, started) {
+    const onTakeover = this.#steerTakeovers.get(messageId);
+    if (!onTakeover)
+      return;
+    this.#steerTakeovers.delete(messageId);
+    onTakeover(started);
+  }
   respondToInteraction(response) {
     const pending = this.#interactions.get(response.requestId);
     if (!pending) {
@@ -57576,6 +57763,9 @@ var ClaudeSdkTransport = class {
     }
   }
   #rejectPendingSteers() {
+    for (const messageId of [...this.#steerTakeovers.keys()]) {
+      this.#takeOverSteer(messageId, false);
+    }
     const pending = [...this.#pendingSteers.values()];
     this.#pendingSteers.clear();
     const error52 = new Error("Claude Code steer receipt was lost after input was written");
@@ -57584,16 +57774,24 @@ var ClaudeSdkTransport = class {
       entry.reject(error52);
     }
   }
-  /** `queued` is Claude's acceptance of this message into the running Session. */
+  /**
+   * `queued` is Claude's acceptance of this message into the running Session. `started` is its
+   * drain into a native turn, folded into the running one or run as the next; a terminal state
+   * without `started` means no native turn takes it over.
+   */
   #observeSteer(message) {
-    if (this.#pendingSteers.size === 0 || !isRecord11(message) || message.type !== "command_lifecycle") {
+    if (this.#pendingSteers.size === 0 && this.#steerTakeovers.size === 0 || !isRecord11(message) || message.type !== "command_lifecycle") {
       return;
     }
-    if (message.state !== "queued")
-      return;
     if (typeof message.command_uuid !== "string" || message.command_uuid.length === 0)
       return;
-    this.#acceptSteer(message.command_uuid);
+    if (message.state === "queued") {
+      this.#acceptSteer(message.command_uuid);
+      return;
+    }
+    if (["started", "completed", "cancelled", "discarded", "refused"].includes(String(message.state))) {
+      this.#takeOverSteer(message.command_uuid, message.state === "started");
+    }
   }
   #observeBackgroundTasks(message) {
     if (!isRecord11(message) || message.type !== "system")
@@ -57706,13 +57904,13 @@ var ClaudeSdkTransport = class {
         throw new Error("Claude SDK Query ended unexpectedly");
     } catch (error52) {
       const active = this.#active;
+      if (!this.#closePromise)
+        this.#onFault(error52);
       this.#closeInteractions("all", "cancelled");
       this.#rejectPendingSteers();
       this.#rootToolCalls.clear();
       this.#active = null;
       active?.reject(error52);
-      if (!this.#closePromise)
-        this.#onFault(error52);
     }
   }
   #spawn(options) {
@@ -58009,7 +58207,7 @@ var ClaudeSubagentLifecycle = class {
     });
     const outcome = cancellationRequested ? { status: "cancelled", reason: "Cancelled by user" } : event.isError ? { status: "failed", error: subagentFailure() } : { status: "succeeded" };
     this.#emit({ type: "item.completed", turnId, snapshot: { item, outcome } });
-    return subagent;
+    return { operation: active.item.operation, subagent };
   }
   finalize(turnId, outcome) {
     for (const [callId, active] of this.#delegations) {
@@ -58217,9 +58415,9 @@ function stringField(value, keys) {
   if (!isRecord12(value))
     return void 0;
   for (const key of keys) {
-    const field = value[key];
-    if (typeof field === "string" && field.length > 0)
-      return field;
+    const field2 = value[key];
+    if (typeof field2 === "string" && field2.length > 0)
+      return field2;
   }
   return void 0;
 }
@@ -58905,10 +59103,12 @@ var ClaudeHarnessSession = class {
     },
     history: { fork: true, forkAcrossCwd: false, rollbackLastTurn: true },
     subagents: { observe: true, readTranscript: true },
-    // Read live: native delivery joins this Turn only while a requested Turn runs a root tool call
-    // on a CLI that confirms steers (`msg_lifecycle_v1`). Otherwise the Host stops and restarts.
+    // Read live: native delivery joins this Turn while a root tool call runs, or while a held
+    // Turn's continuation waits on background work, on a CLI that confirms steers
+    // (`msg_lifecycle_v1`). A Turn whose cancellation is in flight must not take more input;
+    // every other case stops and restarts.
     get steer() {
-      return session.#transport?.canSteerActiveTurn?.() === true;
+      return session.#transport?.canSteerActiveTurn?.() === true && session.#active?.cancellationRequested !== true;
     }
   }))(this);
   commands;
@@ -58955,7 +59155,6 @@ var ClaudeHarnessSession = class {
   #lastAssistantResponseAtUnix;
   #accountCreditsSupported;
   #minimumContextUsedTokens = null;
-  #latestRequestModel = null;
   #calibratedInputTokens = 0;
   #calibratedOutputTokens = 0;
   #calibratedCostUsd = 0;
@@ -59235,6 +59434,7 @@ var ClaudeHarnessSession = class {
       nativeTurnKey,
       nativeTurnRef: null,
       cancellationRequested: false,
+      steersAwaitingNative: /* @__PURE__ */ new Set(),
       usageRequestIds: /* @__PURE__ */ new Set(),
       estimatedInputTokens: 0,
       estimatedOutputTokens: 0,
@@ -59271,9 +59471,13 @@ var ClaudeHarnessSession = class {
     return { ok: true, value: { turnId: command.turnId } };
   }
   async #steer(command) {
-    if (!this.#active || this.#active.command.turnId !== command.turnId) {
+    const active = this.#active;
+    if (!active || active.command.turnId !== command.turnId) {
       return { ok: false, error: invalidState("Claude Code steer target is not the active Turn") };
     }
+    if (active.cancellationRequested) {
+      return { ok: false, error: invalidState("Claude Code steer target is being cancelled") };
+    }
     const text2 = command.input.map((input) => input.text).join("\n");
     if (text2.length === 0) {
       return {
@@ -59299,10 +59503,13 @@ var ClaudeHarnessSession = class {
         }
       };
     }
+    const messageId = this.#randomUUID();
+    active.steersAwaitingNative.add(messageId);
     try {
-      await transport.steer(text2, this.#randomUUID());
+      await transport.steer(text2, messageId, (started) => this.#takeOverSteer(active, messageId, started));
     } catch (error52) {
       if (error52 instanceof ClaudeSteerMissedTurnError) {
+        this.#takeOverSteer(active, messageId, false);
         return { ok: false, error: invalidState("Claude Code steer missed the active Turn") };
       }
       throw error52;
@@ -59405,6 +59612,7 @@ var ClaudeHarnessSession = class {
       nativeTurnKey,
       nativeTurnRef: null,
       cancellationRequested: false,
+      steersAwaitingNative: /* @__PURE__ */ new Set(),
       usageRequestIds: /* @__PURE__ */ new Set(),
       estimatedInputTokens: 0,
       estimatedOutputTokens: 0,
@@ -59453,15 +59661,16 @@ var ClaudeHarnessSession = class {
       };
     }
   }
-  refreshUsage() {
+  async refreshUsage() {
+    await this.#contextRefreshInFlight;
     if (this.#phase !== "open" || !this.#transport)
-      return Promise.resolve();
+      return;
     const now = Date.now();
     if (now < this.#contextUsageFreshUntilMs || now < this.#contextUsageCooldownUntilMs) {
-      return Promise.resolve();
+      return;
     }
     this.#requestContextUsage(this.#transport, this.#active?.command.turnId, CONTEXT_USAGE_RETRY_DELAYS_MS);
-    return this.#contextRefreshInFlight ?? Promise.resolve();
+    await this.#contextRefreshInFlight;
   }
   blocksRollback(sessionId) {
     return this.#sessionId === sessionId && (this.#phase !== "open" || this.#active !== null || this.#acceptingTurn || this.#configurationTask !== null || this.#readingHistory);
@@ -59766,7 +59975,7 @@ var ClaudeHarnessSession = class {
     active.cancellationRequested = true;
     const transport = this.#transport;
     const taskIds = this.#backgroundTaskIds(active);
-    if (transport && (taskIds.length > 0 || active.held && (active.rootSegmentActive || this.#occupancy.awaitingContinuation))) {
+    if (transport && (taskIds.length > 0 || active.held && (active.rootSegmentActive || this.#occupancy.awaitingContinuation || active.steersAwaitingNative.size > 0))) {
       await this.#cancelBackgroundWork(active, transport, taskIds);
       return { ok: true, value: { cancellationRequested: true } };
     }
@@ -59841,6 +60050,11 @@ var ClaudeHarnessSession = class {
       return;
     if (cancellation.stopping || cancellation.interrupting || active.rootSegmentActive)
       return;
+    if (active.steersAwaitingNative.size > 0) {
+      this.#armCancelEscalation(active);
+      return;
+    }
+    this.#clearCancelEscalation();
     this.#clearCancellationQuiet(cancellation);
     const quiet = setTimeout(() => {
       cancellation.quiet = null;
@@ -60120,10 +60334,7 @@ var ClaudeHarnessSession = class {
         }
         this.#completeAgentItem(active, { status: "succeeded" }, false);
         active.subagents.start(active.command.turnId, event);
-        if (event.operation === "send") {
-          if (event.nativeSubagentId)
-            this.#occupancy.occupyAgent(event.nativeSubagentId);
-        } else if (event.background) {
+        if (event.operation === "spawn" && event.background) {
           this.#occupancy.occupySpawn(event.callId, event.nativeSubagentId);
         }
         return;
@@ -60142,7 +60353,13 @@ var ClaudeHarnessSession = class {
         }
         return;
       case "subagent.completed": {
-        const subagent = active.subagents.complete(active.command.turnId, event, active.cancellationRequested);
+        const { operation, subagent } = active.subagents.complete(active.command.turnId, event, active.cancellationRequested);
+        if (operation === "send") {
+          if (subagent.status === "running" && subagent.nativeSubagentId) {
+            this.#occupancy.occupyAgent(subagent.nativeSubagentId);
+          }
+          return;
+        }
         if (subagent.status === "running") {
           this.#occupancy.occupySpawn(event.callId, subagent.nativeSubagentId);
           return;
@@ -60454,6 +60671,7 @@ var ClaudeHarnessSession = class {
     const active = {
       command: { type: "turn.start", turnId, input: [] },
       compactionItem: null,
+      steersAwaitingNative: /* @__PURE__ */ new Set(),
       item,
       agentMessageOrdinal: 1,
       assistantMessageId: null,
@@ -60586,7 +60804,7 @@ var ClaudeHarnessSession = class {
       this.#finishFailed(active, transportFailure(result.kind));
     }
   }
-  #requestContextUsage(transport, turnId, retryDelaysMs) {
+  #requestContextUsage(transport, turnId, retryDelaysMs, detail = "full") {
     if (this.#phase !== "open" || this.#transport !== transport)
       return;
     if (this.#contextRefreshInFlight)
@@ -60595,7 +60813,8 @@ var ClaudeHarnessSession = class {
       transport,
       ...turnId !== void 0 ? { turnId } : {},
       generation: this.#usageGeneration,
-      retryDelaysMs
+      retryDelaysMs,
+      detail
     };
     this.#contextRefreshInFlight = this.#drainContextUsage();
   }
@@ -60621,14 +60840,16 @@ var ClaudeHarnessSession = class {
         return;
       }
       try {
-        const context = await request.transport.getContextUsage();
+        const context = await request.transport.getContextUsage(request.detail);
         if (this.#phase !== "open" || this.#transport !== request.transport || this.#usageGeneration !== request.generation || this.#contextRefreshPending !== null) {
           return;
         }
         if (context === null)
           continue;
-        this.#contextUsageFreshUntilMs = Date.now() + CONTEXT_USAGE_TTL_MS;
-        this.#contextUsageCooldownUntilMs = 0;
+        if (request.detail === "full") {
+          this.#contextUsageFreshUntilMs = Date.now() + CONTEXT_USAGE_TTL_MS;
+          this.#contextUsageCooldownUntilMs = 0;
+        }
         this.#mergeAndPublishUsage({
           contextUsedTokens: Math.max(context.usedTokens, this.#minimumContextUsedTokens ?? 0),
           contextWindowTokens: context.maxTokens
@@ -60637,7 +60858,7 @@ var ClaudeHarnessSession = class {
       } catch {
       }
     }
-    if (this.#phase === "open" && this.#transport === request.transport && this.#usageGeneration === request.generation) {
+    if (request.detail === "full" && this.#phase === "open" && this.#transport === request.transport && this.#usageGeneration === request.generation) {
       this.#contextUsageCooldownUntilMs = Date.now() + CONTEXT_USAGE_FAILURE_COOLDOWN_MS;
     }
   }
@@ -60703,8 +60924,6 @@ var ClaudeHarnessSession = class {
     const promptTokens = usage.inputTokens + usage.cacheCreationInputTokens + usage.cacheReadInputTokens;
     if (promptTokens > 0)
       this.#minimumContextUsedTokens = promptTokens;
-    if (usage.model)
-      this.#latestRequestModel = usage.model;
     const cacheHitRatePercent = claudeCacheHitRatePercent(usage);
     const contextWindowTokens = this.#latestUsage?.contextWindowTokens;
     this.#mergeAndPublishUsage({
@@ -60746,24 +60965,11 @@ var ClaudeHarnessSession = class {
       if (cacheHitRatePercent !== void 0)
         delta.cacheHitRatePercent = cacheHitRatePercent;
     }
-    if (this.#latestUsage?.contextWindowTokens === void 0 && this.#minimumContextUsedTokens !== null) {
-      const contextWindowTokens = this.#resultContextWindow(event.modelUsage);
-      if (contextWindowTokens !== void 0) {
-        delta.contextUsedTokens = this.#minimumContextUsedTokens;
-        delta.contextWindowTokens = contextWindowTokens;
-      }
+    if (this.#transport && this.#minimumContextUsedTokens !== null && event.modelUsage?.some(({ contextWindowTokens }) => contextWindowTokens !== void 0)) {
+      this.#requestContextUsage(this.#transport, active.command.turnId, [0], "summary");
     }
     this.#mergeAndPublishUsage(delta, active.command.turnId);
   }
-  /** The latest request's Model, else the Model that carried the most prompt tokens. */
-  #resultContextWindow(modelUsage) {
-    if (!modelUsage?.length)
-      return void 0;
-    const latest = this.#latestRequestModel;
-    const matched = latest ? modelUsage.find(({ model: model2 }) => model2 === latest) : void 0;
-    const main = matched ?? modelUsage.reduce((best, entry) => (entry.promptTokens ?? entry.inputTokens) > (best.promptTokens ?? best.inputTokens) ? entry : best);
-    return main.contextWindowTokens;
-  }
   /**
    * Plan usage is account-wide, not Thread-scoped, so every observation is
    * offered to the Adapter's shared cache regardless of this Session's own
@@ -60842,7 +61048,7 @@ var ClaudeHarnessSession = class {
     this.#clearContinuationQuiescence();
     const quiescence = setTimeout(() => {
       this.#continuationQuiescence = null;
-      if (this.#active !== active || !active.held || active.rootSegmentActive || this.#phase !== "open") {
+      if (this.#active !== active || !active.held || active.rootSegmentActive || active.steersAwaitingNative.size > 0 || this.#phase !== "open") {
         return;
       }
       this.#occupancy.releaseContinuations();
@@ -60863,6 +61069,30 @@ var ClaudeHarnessSession = class {
     active.rootSegmentActive = true;
     this.#clearContinuationQuiescence();
   }
+  /**
+   * A drained steer runs in a native turn whose result still reaches this Turn, folded into the
+   * running Root Segment or as the held Turn's next one. A steer that ends without one releases
+   * its keep-open, so a Turn held only for it settles as if the steer had never been written.
+   */
+  #takeOverSteer(active, messageId, started) {
+    if (!active.steersAwaitingNative.delete(messageId) || this.#active !== active)
+      return;
+    if (started) {
+      this.#handleTurnEvent(active, { type: "segment.started" });
+      return;
+    }
+    if (active.cancellation) {
+      this.#settleCancellation(active);
+      return;
+    }
+    if (!active.held || active.rootSegmentActive || active.steersAwaitingNative.size > 0 || this.#phase !== "open") {
+      return;
+    }
+    if (this.#occupancy.awaitingContinuation)
+      this.#armContinuationQuiescence(active);
+    else if (!this.#occupancy.unsettled)
+      this.#finish(active, { status: "succeeded" });
+  }
   #finish(active, outcome) {
     if (this.#active !== active)
       return;
@@ -60873,7 +61103,7 @@ var ClaudeHarnessSession = class {
       active.cancellation = null;
     }
     this.#clearContinuationQuiescence();
-    const hold = outcome.status === "succeeded" && !active.cancellationRequested && this.#occupancy.unsettled;
+    const hold = outcome.status === "succeeded" && !active.cancellationRequested && (this.#occupancy.unsettled || active.steersAwaitingNative.size > 0);
     this.#closeActiveInteractions(active, outcome.status === "succeeded" ? "superseded" : "cancelled", hold);
     const itemOutcome2 = outcome;
     if (active.compactionItem)
@@ -61139,7 +61369,7 @@ var ClaudeCodeAdapter = class {
         error: invalidState("Claude Code Adapter is closing")
       };
     }
-    const cwd = path16.resolve(input.cwd ?? process.cwd());
+    const cwd = path15.resolve(input.cwd ?? process.cwd());
     if (!input.refresh) {
       const cached2 = this.#inspectionCache.get(cwd);
       if (cached2)
@@ -61343,7 +61573,7 @@ var ClaudeCodeAdapter = class {
       }
       requestedPermissionModeId = CLAUDE_DEFAULT_PERMISSION_MODE_ID;
     }
-    const cwd = path16.resolve(input.cwd);
+    const cwd = path15.resolve(input.cwd);
     if (input.kind === "rollbackLastTurn") {
       for (const source of this.#sessions) {
         const ready = await source.prepareRollback(input.sourceRef.nativeSessionId);
@@ -61503,7 +61733,7 @@ var ClaudeCodeAdapter = class {
 // dist/installation.js
 import { readFile as readFile8, realpath as realpath5 } from "node:fs/promises";
 import { homedir as homedir2 } from "node:os";
-import path17 from "node:path";
+import path16 from "node:path";
 async function readSettings(file2) {
   const text2 = await readFile8(file2, "utf8").catch((error52) => {
     if (error52.code === "ENOENT")
@@ -61524,9 +61754,9 @@ function createClaudeInstallation(environment, command) {
         ...command ? { command } : {}
       });
       const home = environment.HOME ?? environment.USERPROFILE ?? homedir2();
-      const config2 = environment.CLAUDE_CONFIG_DIR ? path17.resolve(home, environment.CLAUDE_CONFIG_DIR) : path17.join(home, ".claude");
-      const managedFile = process.platform === "darwin" ? "/Library/Application Support/ClaudeCode/managed-settings.json" : process.platform === "win32" ? path17.join(environment.ProgramFiles ?? "C:\\Program Files", "ClaudeCode", "managed-settings.json") : "/etc/claude-code/managed-settings.json";
-      const user = await readSettings(path17.join(config2, "settings.json"));
+      const config2 = environment.CLAUDE_CONFIG_DIR ? path16.resolve(home, environment.CLAUDE_CONFIG_DIR) : path16.join(home, ".claude");
+      const managedFile = process.platform === "darwin" ? "/Library/Application Support/ClaudeCode/managed-settings.json" : process.platform === "win32" ? path16.join(environment.ProgramFiles ?? "C:\\Program Files", "ClaudeCode", "managed-settings.json") : "/etc/claude-code/managed-settings.json";
+      const user = await readSettings(path16.join(config2, "settings.json"));
       const managed = await readSettings(managedFile);
       const settings = { ...user, ...managed, env: { ...user.env, ...managed.env } };
       const env = { ...environment, ...settings.env };
@@ -61539,10 +61769,10 @@ function createClaudeInstallation(environment, command) {
         throw new Error("Unknown Claude release channel");
       const latestVersion = installationVersion(await fetchInstallationText(`https://downloads.claude.ai/claude-code-releases/${channel}`));
       const npm = await npmInstallation(executable, ["@anthropic-ai/claude-code"], env);
-      const launcher = path17.join(home, ".local", "bin", process.platform === "win32" ? "claude.exe" : "claude");
+      const launcher = path16.join(home, ".local", "bin", process.platform === "win32" ? "claude.exe" : "claude");
       const selected = await realpath5(executable);
-      const versions = path17.join(home, ".local", "share", "claude", "versions") + path17.sep;
-      const native = path17.resolve(executable) === launcher && (selected.startsWith(versions) || process.platform === "win32" && selected === launcher);
+      const versions = path16.join(home, ".local", "share", "claude", "versions") + path16.sep;
+      const native = path16.resolve(executable) === launcher && (selected.startsWith(versions) || process.platform === "win32" && selected === launcher);
       const blocked = !!env.DISABLE_UPDATES && env.DISABLE_UPDATES !== "0" || !!settings.minimumVersion && newerInstallationVersion(latestVersion, installationVersion(settings.minimumVersion)) || !!settings.requiredMaximumVersion && newerInstallationVersion(installationVersion(settings.requiredMaximumVersion), latestVersion);
       const canUpdate = !blocked && (npm?.canUpdate ?? native);
       update = async () => {
@@ -61573,7 +61803,7 @@ function createClaudeInstallation(environment, command) {
 }
 
 // dist/user-shell-environment.js
-import path18 from "node:path";
+import path17 from "node:path";
 import { execFile as execFile4 } from "node:child_process";
 var ENVIRONMENT_MARKER = Buffer.from("\0CODEXHOST_USER_SHELL_ENV_V1\0");
 var ENVIRONMENT_COMMAND = "printf '\\0CODEXHOST_USER_SHELL_ENV_V1\\0'; /usr/bin/env -0";
@@ -61616,7 +61846,7 @@ async function withUserShellEnvironment(environment, dependencies) {
   if (platform === "win32" || !environment.HOME)
     return environment;
   const shell = environment.SHELL?.trim() || defaultShell(platform);
-  if (!shell || !SUPPORTED_SHELLS.has(path18.basename(shell)))
+  if (!shell || !SUPPORTED_SHELLS.has(path17.basename(shell)))
     return environment;
   const cacheKey = `${platform}\0${shell}\0${environment.HOME}`;
   const cached2 = dependencies ? void 0 : shellEnvironmentCache.get(cacheKey);
@@ -61654,6 +61884,7 @@ async function createHarnessAdapter(context) {
   const environment = await withUserShellEnvironment({ ...context.environment });
   if (context.platform === "darwin" && context.managedRemoteHost) {
     return new BrokeredHarnessAdapter({
+      sessionImport: true,
       forwardDelegationEnvironment: true,
       commandCatalog: claudeCommandCatalog,
       liveCommandCatalog: true,