@codexhost/cli-darwin-x64 0.2.5 → 0.2.6

package/app/host-runtime.mjs

@@ -14588,8 +14588,11 @@ var codexhostErrorSchema = external_exports.strictObject({
   code: external_exports.string().min(1),
   message: external_exports.string().min(1),
   retryable: external_exports.boolean(),
-  diagnostic: external_exports.string().min(1).optional()
-}).superRefine(rejectExplicitUndefined(["diagnostic"]));
+  diagnostic: external_exports.string().min(1).optional(),
+  stage: external_exports.string().min(1).optional(),
+  durationMs: external_exports.number().int().nonnegative().optional(),
+  stderrTail: external_exports.string().min(1).optional()
+}).superRefine(rejectExplicitUndefined(["diagnostic", "stage", "durationMs", "stderrTail"]));
 
 // packages/shared-contracts/dist/ids.js
 var opaqueIdSchema = external_exports.string().refine((value) => value.trim().length > 0, {
@@ -14934,6 +14937,47 @@ var threadOwnershipListResultSchema = external_exports.object({
   }
 });
 
+// packages/shared-contracts/dist/harness-commands.js
+var commandIdSchema = external_exports.string().trim().min(1).max(128).regex(/^[A-Za-z0-9._:-]+$/u).brand();
+var commandInvocationSchema = external_exports.string().min(1).max(128);
+var commandLabelSchema = external_exports.string().trim().min(1).max(128);
+var commandDescriptionSchema = external_exports.string().trim().min(1).max(512);
+var harnessCommandDescriptorSchema = external_exports.object({
+  id: commandIdSchema,
+  invocation: commandInvocationSchema,
+  label: commandLabelSchema,
+  description: commandDescriptionSchema.optional(),
+  argumentMode: external_exports.enum(["none", "text"])
+}).strict();
+var harnessCommandCatalogSchema = external_exports.object({
+  commands: external_exports.array(harnessCommandDescriptorSchema)
+}).strict().superRefine((catalog, context) => {
+  const ids = /* @__PURE__ */ new Set();
+  for (const [index, command] of catalog.commands.entries()) {
+    if (ids.has(command.id)) {
+      context.addIssue({
+        code: "custom",
+        message: "Harness command IDs must be unique",
+        path: ["commands", index, "id"]
+      });
+    }
+    ids.add(command.id);
+  }
+});
+var threadCommandsInspectParamsSchema = external_exports.object({
+  threadId: hostThreadIdSchema
+}).strict();
+var threadCommandExecuteParamsSchema = external_exports.object({
+  threadId: hostThreadIdSchema,
+  commandId: commandIdSchema,
+  turnId: hostTurnIdSchema.optional(),
+  arguments: jsonObjectSchema.optional()
+}).strict();
+var threadCommandExecuteResultSchema = external_exports.object({
+  accepted: external_exports.literal(true),
+  turnId: hostTurnIdSchema
+}).strict();
+
 // packages/shared-contracts/dist/json-rpc.js
 var jsonRpcVersionSchema = external_exports.literal("2.0").optional();
 var absentSchema = external_exports.never().optional();
@@ -15159,6 +15203,15 @@ var HarnessOutputChannel = class {
   }
 };
 
+// packages/harness-adapter/dist/diagnostics.js
+var DIAGNOSTIC_TAIL_MAX_LENGTH = 8e3;
+var SENSITIVE_VALUE_PATTERN = /(api[_-]?key|access[_-]?token|auth(?:orization)?|password|secret)(\s*[:=]\s*)([^\s,;]+)/giu;
+var BEARER_PATTERN = /\bBearer\s+[A-Za-z0-9._~+/=-]+/giu;
+function sanitizeDiagnosticTail(value) {
+  const redacted = value.replace(BEARER_PATTERN, "Bearer [redacted]").replace(SENSITIVE_VALUE_PATTERN, "$1$2[redacted]");
+  return redacted.length <= DIAGNOSTIC_TAIL_MAX_LENGTH ? redacted : redacted.slice(-DIAGNOSTIC_TAIL_MAX_LENGTH);
+}
+
 // packages/harness-adapter/dist/usage.js
 var tokenFields = [
   "inputTokens",
@@ -42168,6 +42221,7 @@ var ClaudeSdkTransport = class {
   #active = null;
   #closePromise = null;
   #consumeTask = null;
+  #stderrTail = "";
   #interactionOrdinal = 0;
   #query = null;
   #started = false;
@@ -42465,7 +42519,9 @@ var ClaudeSdkTransport = class {
       stdio: ["pipe", "pipe", "pipe"],
       windowsHide: true
     });
-    child.stderr.resume();
+    child.stderr.on("data", (chunk) => {
+      this.#stderrTail = sanitizeDiagnosticTail(`${this.#stderrTail}${chunk.toString()}`);
+    });
     this.#children.push(child);
     return child;
   }
@@ -42480,6 +42536,7 @@ var ClaudeSdkTransport = class {
 };
 var ClaudeSdkModelInspector = class {
   #children = [];
+  #stderrTail = "";
   #closeTimeoutMs;
   #command;
   #cwd;
@@ -42488,6 +42545,9 @@ var ClaudeSdkModelInspector = class {
   #queryFactory;
   #closePromise = null;
   #query = null;
+  get stderrTail() {
+    return this.#stderrTail;
+  }
   constructor(options) {
     this.#closeTimeoutMs = options.closeTimeoutMs;
     this.#command = options.command;
@@ -42564,7 +42624,9 @@ var ClaudeSdkModelInspector = class {
       stdio: ["pipe", "pipe", "pipe"],
       windowsHide: true
     });
-    child.stderr.resume();
+    child.stderr.on("data", (chunk) => {
+      this.#stderrTail = sanitizeDiagnosticTail(`${this.#stderrTail}${chunk.toString()}`);
+    });
     this.#children.push(child);
     return child;
   }
@@ -43747,10 +43809,14 @@ var ClaudeCodeAdapter = class {
   }
   async #inspectModels(cwd) {
     let inspector = null;
+    const startedAt = Date.now();
+    let stage = "resolve-executable";
     try {
       this.#dependencies.inspectInstallation();
+      stage = "startup";
       inspector = this.#dependencies.createInspector({ cwd });
       this.#inspectors.add(inspector);
+      stage = "model-catalog";
       const snapshot = await inspector.inspect();
       const permissionModes = snapshot.canSelectPermissionMode ? claudePermissionModeCatalogForModels(snapshot.models) : void 0;
       if (!snapshot.canSelectModel) {
@@ -43791,7 +43857,12 @@ var ClaudeCodeAdapter = class {
       } : startupFailure(error54);
       return {
         status: normalized.code === "notInstalled" ? "notInstalled" : "error",
-        error: normalized
+        error: {
+          ...normalized,
+          stage,
+          durationMs: Date.now() - startedAt,
+          ...inspector?.stderrTail ? { stderrTail: inspector.stderrTail } : {}
+        }
       };
     } finally {
       if (inspector) {
@@ -45154,7 +45225,27 @@ function resolveDeepSeekCommand(configured, environment) {
   if (dsh)
     return { command: dsh, arguments: [], kind: "dsh" };
   const npx = resolveExecutable(process.platform === "win32" ? "npx.cmd" : "npx", environment);
-  return npx ? { command: npx, arguments: ["--no-install", "@deepseek-ai/dsh"], kind: "npx" } : null;
+  return npx ? {
+    command: npx,
+    arguments: ["--offline", "--no-install", "@deepseek-ai/dsh"],
+    kind: "npx"
+  } : null;
+}
+function deepSeekProcessInvocation(command, arguments_2, environment, platform = process.platform) {
+  const extension = path5.win32.extname(command).toLowerCase();
+  if (platform !== "win32" || ![".cmd", ".bat"].includes(extension)) {
+    return { command, arguments: arguments_2, windowsVerbatimArguments: false };
+  }
+  const quote = (value) => `"${value.replaceAll("%", "%%").replaceAll('"', '""')}"`;
+  const commandLine = [command, ...arguments_2].map(quote).join(" ");
+  return {
+    command: environmentValue(environment, "ComSpec") ?? "cmd.exe",
+    arguments: ["/d", "/v:off", "/s", "/c", `"${commandLine}"`],
+    windowsVerbatimArguments: true
+  };
+}
+function isMissingExecutableError(error54) {
+  return typeof error54 === "object" && error54 !== null && "code" in error54 && error54.code === "ENOENT";
 }
 function unwrap(response, operation) {
   if (response.result.ok)
@@ -45174,13 +45265,15 @@ var DeepSeekHostConnection = class {
   #closePromise = null;
   #connectPromise = null;
   #managedProcess = null;
+  #stderrTail = "";
   #pumpPromise = null;
   constructor(options = {}, dependencies = {
     createClient: (endpoint, timeoutMs) => new NodeDeepSeekHostClient(endpoint, timeoutMs),
     spawn: (command, args, spawnOptions) => spawn2(command, args, {
       env: spawnOptions.env,
       stdio: spawnOptions.stdio,
-      windowsHide: true
+      windowsHide: true,
+      windowsVerbatimArguments: spawnOptions.windowsVerbatimArguments
     }),
     sleep: (milliseconds) => new Promise((resolve2) => setTimeout(resolve2, milliseconds))
   }) {
@@ -45195,6 +45288,9 @@ var DeepSeekHostConnection = class {
   get client() {
     return this.#client;
   }
+  get stderrTail() {
+    return this.#stderrTail;
+  }
   connect() {
     this.#connectPromise ??= this.#performConnect();
     return this.#connectPromise;
@@ -45233,19 +45329,28 @@ var DeepSeekHostConnection = class {
         "--port",
         endpoint.port || "80"
       ];
-      const child = this.#dependencies.spawn(invocation.command, args, {
+      const processInvocation = deepSeekProcessInvocation(invocation.command, args, this.#environment);
+      const child = this.#dependencies.spawn(processInvocation.command, processInvocation.arguments, {
         env: this.#environment,
-        stdio: "ignore"
+        stdio: "pipe",
+        windowsVerbatimArguments: processInvocation.windowsVerbatimArguments
       });
       this.#managedProcess = child;
+      child.stderr?.on("data", (chunk) => {
+        this.#stderrTail = sanitizeDiagnosticTail(`${this.#stderrTail}${chunk.toString()}`);
+      });
       let processError = null;
       child.once("error", (error54) => {
         processError = error54;
       });
       const deadline = Date.now() + this.#startupTimeoutMs;
       for (; ; ) {
-        if (processError)
-          throw processError;
+        if (processError) {
+          if (isMissingExecutableError(processError)) {
+            throw new DeepSeekHarnessTransportError("notInstalled", "DeepSeek Harness command is not installed");
+          }
+          throw new DeepSeekHarnessTransportError("unavailable", `DeepSeek Harness Web could not start: ${String(processError)}`);
+        }
         if (child.exitCode !== null || child.signalCode !== null) {
           if (invocation.kind === "npx") {
             throw new DeepSeekHarnessTransportError("notInstalled", "DeepSeek Harness package is not installed");
@@ -47094,13 +47199,17 @@ var DeepSeekHarnessAdapter = class {
     if (this.#closePromise) {
       return { status: "unavailable", error: invalidState2("DeepSeek Harness Adapter is closing") };
     }
+    const startedAt = Date.now();
+    let stage = "startup";
     try {
       await this.#connection.connect();
+      stage = "host-describe";
       const [description, directory] = await Promise.all([
         this.#connection.client.host.describe({}),
         this.#connection.client.llm.models({})
       ]);
       const host2 = unwrapRpc(description, "host.describe");
+      stage = "model-catalog";
       const models = unwrapRpc(directory, "llm.models");
       if (!nonBlankString(host2.provider) || !nonBlankString(host2.model)) {
         throw new DeepSeekHarnessTransportError("protocolError", "DeepSeek Harness Host has no default Model selection");
@@ -47124,7 +47233,12 @@ var DeepSeekHarnessAdapter = class {
       const normalized = normalizedError(error54, "unavailable");
       return {
         status: normalized.code === "notInstalled" ? "notInstalled" : "unavailable",
-        error: normalized
+        error: {
+          ...normalized,
+          stage,
+          durationMs: Date.now() - startedAt,
+          ...normalized.stderrTail || !this.#connection.stderrTail ? {} : { stderrTail: this.#connection.stderrTail }
+        }
       };
     }
   }
@@ -51955,6 +52069,27 @@ function mapGrokReplay(replay, harnessId, sessionId, cwd, knownTurnRefs = [], to
       if (isSyntheticGrokTurnKey(event.nativeTurnKey))
         continue;
       completeTurn(terminalOutcome(event.stopReason), event.nativeTurnKey);
+    } else if (event.type === "compaction.started") {
+      completeReasoning();
+      completeAgent();
+    } else if (event.type === "compaction.completed") {
+      completeReasoning();
+      completeAgent();
+      const outcome = event.outcome === "succeeded" ? { status: "succeeded" } : event.outcome === "cancelled" ? { status: "cancelled", reason: "Context compaction was cancelled" } : {
+        status: "failed",
+        error: {
+          code: "nativeFailure",
+          message: event.errorMessage ?? "Grok context compaction failed",
+          retryable: true
+        }
+      };
+      items.push({
+        item: {
+          type: "contextCompaction",
+          itemId: stableId("compaction", turnIndex, ++messageIndex)
+        },
+        outcome
+      });
     } else if (event.type === "agent.text") {
       if (!agent) {
         completeReasoning();
@@ -52201,13 +52336,122 @@ async function forkGrokSession(input) {
   return { ok: true, value: { sessionId: derivedSessionId } };
 }
 
+// packages/adapters/grok/dist/grok-compaction.js
+var GROK_SESSION_UPDATE_EXTENSION_METHODS = [
+  "_x.ai/session/update",
+  "x.ai/session_notification"
+];
+function isRecord12(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function optionalNonNegativeInt(value) {
+  return typeof value === "number" && Number.isSafeInteger(value) && value >= 0 ? value : void 0;
+}
+function firstPresent(record3, keys) {
+  for (const key of keys) {
+    if (record3[key] !== void 0)
+      return record3[key];
+  }
+  return void 0;
+}
+function optionalErrorMessage(record3) {
+  const value = firstPresent(record3, ["errorMessage", "error_message", "message"]);
+  return typeof value === "string" && value.length > 0 ? value : void 0;
+}
+function isGrokExtensionSessionUpdateMethod(method) {
+  return GROK_SESSION_UPDATE_EXTENSION_METHODS.includes(method);
+}
+function grokCompactionEventFromUpdate(update) {
+  if (!isRecord12(update) || typeof update.sessionUpdate !== "string")
+    return null;
+  const tokensUsed = optionalNonNegativeInt(firstPresent(update, ["tokensUsed", "tokens_used"]));
+  const contextWindowTokens = optionalNonNegativeInt(firstPresent(update, ["contextWindowTokens", "contextWindow", "context_window"]));
+  const tokensBefore = optionalNonNegativeInt(firstPresent(update, ["tokensBefore", "tokens_before"]));
+  const tokensAfter = optionalNonNegativeInt(firstPresent(update, ["tokensAfter", "tokens_after"]));
+  if (update.sessionUpdate === "auto_compact_started") {
+    return {
+      type: "compaction.started",
+      ...tokensUsed !== void 0 ? { tokensUsed } : {},
+      ...contextWindowTokens !== void 0 ? { contextWindowTokens } : {}
+    };
+  }
+  if (update.sessionUpdate === "auto_compact_completed") {
+    return {
+      type: "compaction.completed",
+      outcome: "succeeded",
+      ...tokensBefore !== void 0 ? { tokensBefore } : {},
+      ...tokensAfter !== void 0 ? { tokensAfter } : {},
+      ...contextWindowTokens !== void 0 ? { contextWindowTokens } : {}
+    };
+  }
+  if (update.sessionUpdate === "auto_compact_failed") {
+    const errorMessage5 = optionalErrorMessage(update);
+    return {
+      type: "compaction.completed",
+      outcome: "failed",
+      ...errorMessage5 ? { errorMessage: errorMessage5 } : {}
+    };
+  }
+  if (update.sessionUpdate === "auto_compact_cancelled") {
+    return { type: "compaction.completed", outcome: "cancelled" };
+  }
+  return null;
+}
+
+// packages/adapters/grok/dist/grok-manual-compaction.js
+var GROK_COMPACT_CONVERSATION_METHOD = "x.ai/compact_conversation";
+var GROK_COMPACT_CONVERSATION_FALLBACK_METHOD = "_x.ai/compact_conversation";
+function isRecord13(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function optionalNonNegativeInt2(value) {
+  return typeof value === "number" && Number.isSafeInteger(value) && value >= 0 ? value : void 0;
+}
+function optionalErrorMessage2(value) {
+  return typeof value === "string" && value.length > 0 ? value : void 0;
+}
+function parseGrokCompactResult(value, cancelled = false) {
+  if (cancelled)
+    return { outcome: "cancelled" };
+  if (!isRecord13(value))
+    return { outcome: "succeeded" };
+  const tokensBefore = optionalNonNegativeInt2(value.tokensBefore ?? value.tokens_before);
+  const tokensAfter = optionalNonNegativeInt2(value.tokensAfter ?? value.tokens_after);
+  const contextWindowTokens = optionalNonNegativeInt2(value.contextWindowTokens ?? value.context_window);
+  const errorMessage5 = optionalErrorMessage2(value.errorMessage ?? value.error_message ?? value.message);
+  const outcome = value.outcome;
+  if (outcome === "cancelled" || value.aborted === true) {
+    return {
+      outcome: "cancelled",
+      ...tokensBefore !== void 0 ? { tokensBefore } : {},
+      ...tokensAfter !== void 0 ? { tokensAfter } : {},
+      ...contextWindowTokens !== void 0 ? { contextWindowTokens } : {}
+    };
+  }
+  if (outcome === "failed" || value.success === false || errorMessage5) {
+    return {
+      outcome: "failed",
+      ...tokensBefore !== void 0 ? { tokensBefore } : {},
+      ...tokensAfter !== void 0 ? { tokensAfter } : {},
+      ...contextWindowTokens !== void 0 ? { contextWindowTokens } : {},
+      ...errorMessage5 ? { errorMessage: errorMessage5 } : {}
+    };
+  }
+  return {
+    outcome: "succeeded",
+    ...tokensBefore !== void 0 ? { tokensBefore } : {},
+    ...tokensAfter !== void 0 ? { tokensAfter } : {},
+    ...contextWindowTokens !== void 0 ? { contextWindowTokens } : {}
+  };
+}
+
 // packages/adapters/grok/dist/grok-rewind.js
 import path10 from "node:path";
 var GROK_REWIND_EXECUTE_METHOD = "_x.ai/rewind/execute";
 function error53(code, message3, retryable = false) {
   return { code, message: message3, retryable };
 }
-function isRecord12(value) {
+function isRecord14(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function buildGrokRewindParams(input) {
@@ -52219,10 +52463,10 @@ function buildGrokRewindParams(input) {
   };
 }
 function parseGrokRewindResponse(value) {
-  if (!isRecord12(value))
+  if (!isRecord14(value))
     return null;
-  const payload = typeof value.success !== "boolean" && isRecord12(value.result) ? value.result : value;
-  if (!isRecord12(payload) || typeof payload.success !== "boolean")
+  const payload = typeof value.success !== "boolean" && isRecord14(value.result) ? value.result : value;
+  if (!isRecord14(payload) || typeof payload.success !== "boolean")
     return null;
   return rewindPayload(payload);
 }
@@ -52333,13 +52577,15 @@ async function rewindGrokLastTurn(input) {
 // packages/adapters/grok/dist/acp-transport.js
 var GrokTransportError = class extends Error {
   kind;
+  diagnostic;
   constructor(kind, message3, options) {
     super(message3, options);
     this.kind = kind;
+    this.diagnostic = options?.diagnostic;
     this.name = "GrokTransportError";
   }
 };
-function isRecord13(value) {
+function isRecord15(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function errorText(error54) {
@@ -52371,6 +52617,9 @@ function withTimeout(promise2, milliseconds, operation) {
       clearTimeout(timeout);
   });
 }
+function yieldToEventLoop() {
+  return new Promise((resolve2) => setImmediate(resolve2));
+}
 function waitForExit(child, timeoutMs) {
   if (child.exitCode !== null || child.signalCode !== null)
     return Promise.resolve(true);
@@ -52392,7 +52641,7 @@ function signalProcessTree(child, signal) {
   try {
     process.kill(-child.pid, signal);
   } catch (error54) {
-    if (!isRecord13(error54) || error54.code !== "ESRCH")
+    if (!isRecord15(error54) || error54.code !== "ESRCH")
       throw error54;
   }
 }
@@ -52414,6 +52663,9 @@ function transportEvent(update, metadata) {
     }
     return { type: "rewind.marker", targetPromptIndex, ...metadata ? { metadata } : {} };
   }
+  const compaction = grokCompactionEventFromUpdate(extension);
+  if (compaction)
+    return compaction;
   switch (update.sessionUpdate) {
     case "user_message_chunk":
     case "agent_message_chunk":
@@ -52474,7 +52726,7 @@ async function readNativeSignals(options, sessionId) {
   }
 }
 function isMissingFile(error54) {
-  return isRecord13(error54) && error54.code === "ENOENT";
+  return isRecord15(error54) && error54.code === "ENOENT";
 }
 async function locateGrokNativeSession(options, sessionId) {
   if (sessionId.length === 0)
@@ -52497,7 +52749,7 @@ async function locateGrokNativeSession(options, sessionId) {
     try {
       summaryRaw = await readFile(path11.join(grokHomeDir(options), "sessions", entry.name, sessionId, "summary.json"), "utf8");
     } catch (error54) {
-      if (isMissingFile(error54) || isRecord13(error54) && error54.code === "ENOTDIR")
+      if (isMissingFile(error54) || isRecord15(error54) && error54.code === "ENOTDIR")
         continue;
       throw new GrokTransportError("unavailable", "Grok Native Session metadata could not be read", {
         cause: error54
@@ -52509,10 +52761,10 @@ async function locateGrokNativeSession(options, sessionId) {
     } catch {
       continue;
     }
-    if (!isRecord13(parsed))
+    if (!isRecord15(parsed))
       continue;
     const info = parsed.info;
-    const cwd = isRecord13(info) && typeof info.cwd === "string" && info.cwd.length > 0 ? path11.resolve(info.cwd) : path11.resolve(decodeURIComponent(entry.name));
+    const cwd = isRecord15(info) && typeof info.cwd === "string" && info.cwd.length > 0 ? path11.resolve(info.cwd) : path11.resolve(decodeURIComponent(entry.name));
     const sourceWorkspaceDir = typeof parsed.source_workspace_dir === "string" && parsed.source_workspace_dir.length > 0 ? path11.resolve(parsed.source_workspace_dir) : void 0;
     matches.push({
       cwd,
@@ -52545,12 +52797,12 @@ function parseNativeHistory(contents, sessionId) {
     } catch {
       throw new GrokTransportError("protocolError", "Grok Native history contains invalid JSON");
     }
-    if (!isRecord13(record3) || !isRecord13(record3.params))
+    if (!isRecord15(record3) || !isRecord15(record3.params))
       continue;
     const params = record3.params;
-    if (params.sessionId !== sessionId || !isRecord13(params.update))
+    if (params.sessionId !== sessionId || !isRecord15(params.update))
       continue;
-    const metadata = isRecord13(params._meta) ? params._meta : void 0;
+    const metadata = isRecord15(params._meta) ? params._meta : void 0;
     const event = transportEvent(params.update, metadata);
     if (event)
       events.push(metadata ? { ...event, metadata } : event);
@@ -52559,6 +52811,7 @@ function parseNativeHistory(contents, sessionId) {
 }
 var GrokAcpTransport = class {
   #options;
+  #activeCompact = null;
   #activePrompt = null;
   #child = null;
   #closed = false;
@@ -52567,6 +52820,7 @@ var GrokAcpTransport = class {
   #initialize = null;
   #replay = null;
   #sessionId = null;
+  #stderrTail = "";
   constructor(options) {
     this.#options = {
       commandTimeoutMs: 3e4,
@@ -52579,6 +52833,9 @@ var GrokAcpTransport = class {
       throw new Error("Grok ACP Session is not open");
     return this.#sessionId;
   }
+  get stderrTail() {
+    return this.#stderrTail;
+  }
   async inspect() {
     if (this.#sessionId)
       throw new Error("Grok ACP inspection cannot reuse an open Session");
@@ -52747,7 +53004,9 @@ var GrokAcpTransport = class {
       windowsVerbatimArguments: invocation.windowsVerbatimArguments
     });
     this.#child = child;
-    child.stderr.resume();
+    child.stderr.on("data", (chunk) => {
+      this.#stderrTail = sanitizeDiagnosticTail(`${this.#stderrTail}${chunk.toString()}`);
+    });
     await withTimeout(new Promise((resolve2, reject) => {
       child.once("spawn", resolve2);
       child.once("error", reject);
@@ -52755,7 +53014,8 @@ var GrokAcpTransport = class {
     const stream = ndJsonStream2(Writable.toWeb(child.stdin), Readable.toWeb(child.stdout));
     const connection = new ClientSideConnection(() => ({
       sessionUpdate: (params) => this.#handleUpdate(params),
-      requestPermission: (params) => this.#handlePermission(params)
+      requestPermission: (params) => this.#handlePermission(params),
+      extNotification: (method, params) => this.#handleExtensionNotification(method, params)
     }), stream);
     this.#connection = connection;
     child.once("error", (error54) => this.#fault(new GrokTransportError("processExited", error54.message)));
@@ -52794,6 +53054,40 @@ var GrokAcpTransport = class {
         this.#activePrompt = null;
     }
   }
+  async compact(userContext, onEvent) {
+    const connection = this.#connection;
+    if (!connection || !this.#sessionId || this.#closed || this.#closing) {
+      throw new GrokTransportError("unavailable", "Grok ACP Session is unavailable");
+    }
+    if (this.#activePrompt || this.#activeCompact) {
+      throw new GrokTransportError("unavailable", "Grok ACP Session already has an active operation");
+    }
+    const active = { onEvent, cancellationRequested: false };
+    this.#activeCompact = active;
+    try {
+      const params = {
+        sessionId: this.#sessionId,
+        ...userContext !== void 0 ? { userContext } : {}
+      };
+      let raw;
+      try {
+        raw = await connection.request(GROK_COMPACT_CONVERSATION_METHOD, params);
+      } catch (error54) {
+        if (!isGrokMethodNotFound(error54))
+          throw error54;
+        raw = await connection.request(GROK_COMPACT_CONVERSATION_FALLBACK_METHOD, params);
+      }
+      await yieldToEventLoop();
+      return parseGrokCompactResult(raw, active.cancellationRequested);
+    } catch (error54) {
+      if (error54 instanceof GrokTransportError)
+        throw error54;
+      throw new GrokTransportError("unavailable", "Grok Native Compact failed", { cause: error54 });
+    } finally {
+      if (this.#activeCompact === active)
+        this.#activeCompact = null;
+    }
+  }
   async setModel(modelId, reasoningEffort) {
     const connection = this.#connection;
     if (!connection || !this.#sessionId)
@@ -52803,7 +53097,7 @@ var GrokAcpTransport = class {
       modelId,
       ...reasoningEffort ? { reasoningEffort } : {}
     });
-    if (!isRecord13(response) || !isRecord13(response._meta) || !isRecord13(response._meta.model)) {
+    if (!isRecord15(response) || !isRecord15(response._meta) || !isRecord15(response._meta.model)) {
       throw new GrokTransportError("protocolError", "Grok rejected Model configuration");
     }
     const selected = response._meta.model.Ok;
@@ -52813,9 +53107,11 @@ var GrokAcpTransport = class {
   }
   cancel() {
     const connection = this.#connection;
-    if (!connection || !this.#sessionId || !this.#activePrompt) {
-      return Promise.reject(new Error("Grok ACP Session has no cancellable Prompt"));
+    if (!connection || !this.#sessionId || !this.#activePrompt && !this.#activeCompact) {
+      return Promise.reject(new Error("Grok ACP Session has no cancellable operation"));
     }
+    if (this.#activeCompact)
+      this.#activeCompact.cancellationRequested = true;
     return connection.cancel({ sessionId: this.#sessionId });
   }
   async close() {
@@ -52839,19 +53135,29 @@ var GrokAcpTransport = class {
     this.#closed = true;
     this.#closing = false;
     this.#activePrompt = null;
+    this.#activeCompact = null;
   }
   #handleUpdate(notification) {
     if (this.#sessionId && notification.sessionId !== this.#sessionId)
       return;
-    const metadata = isRecord13(notification._meta) ? notification._meta : void 0;
+    const metadata = isRecord15(notification._meta) ? notification._meta : void 0;
     const event = transportEvent(notification.update, metadata);
     if (!event)
       return;
     const enriched = metadata ? { ...event, metadata } : event;
     if (this.#replay)
       this.#replay.push(enriched);
+    else if (this.#activePrompt)
+      this.#activePrompt.onEvent(enriched);
     else
-      this.#activePrompt?.onEvent(enriched);
+      this.#activeCompact?.onEvent(enriched);
+  }
+  #handleExtensionNotification(method, params) {
+    if (!isGrokExtensionSessionUpdateMethod(method))
+      return;
+    if (typeof params.sessionId !== "string" || !isRecord15(params.update))
+      return;
+    this.#handleUpdate(params);
   }
   #handlePermission(params) {
     if (params.sessionId !== this.#sessionId || !this.#activePrompt) {
@@ -52867,7 +53173,7 @@ var GrokAcpTransport = class {
 };
 
 // packages/adapters/grok/dist/grok-models.js
-function isRecord14(value) {
+function isRecord16(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function nonBlank(value) {
@@ -52879,7 +53185,7 @@ function thinkingOptions(value) {
   const seen = /* @__PURE__ */ new Set();
   const options = [];
   for (const candidate of value) {
-    if (!isRecord14(candidate) || !nonBlank(candidate.label))
+    if (!isRecord16(candidate) || !nonBlank(candidate.label))
       continue;
     const id2 = harnessThinkingOptionIdSchema.safeParse(candidate.id ?? candidate.value);
     if (!id2.success || seen.has(id2.data))
@@ -52890,7 +53196,7 @@ function thinkingOptions(value) {
   return options;
 }
 function parseGrokModelState(value) {
-  if (!isRecord14(value) || !nonBlank(value.currentModelId) || !Array.isArray(value.availableModels)) {
+  if (!isRecord16(value) || !nonBlank(value.currentModelId) || !Array.isArray(value.availableModels)) {
     return null;
   }
   const currentModel = harnessModelRefSchema.safeParse({ id: value.currentModelId });
@@ -52901,12 +53207,12 @@ function parseGrokModelState(value) {
   const models = [];
   let currentThinkingOptionId;
   for (const candidate of value.availableModels) {
-    if (!isRecord14(candidate) || !nonBlank(candidate.modelId) || !nonBlank(candidate.name))
+    if (!isRecord16(candidate) || !nonBlank(candidate.modelId) || !nonBlank(candidate.name))
       continue;
     const ref = harnessModelRefSchema.safeParse({ id: candidate.modelId });
     if (!ref.success)
       continue;
-    const metadata = isRecord14(candidate._meta) ? candidate._meta : {};
+    const metadata = isRecord16(candidate._meta) ? candidate._meta : {};
     const options2 = thinkingOptions(metadata.reasoningEfforts);
     if (typeof metadata.totalContextTokens === "number" && Number.isSafeInteger(metadata.totalContextTokens) && metadata.totalContextTokens > 0) {
       contextWindowTokensByModel.set(ref.data.id, metadata.totalContextTokens);
@@ -52941,10 +53247,10 @@ function parseGrokModelState(value) {
   };
 }
 function modelStateFromInitialize(response) {
-  return parseGrokModelState(isRecord14(response._meta) ? response._meta.modelState : void 0);
+  return parseGrokModelState(isRecord16(response._meta) ? response._meta.modelState : void 0);
 }
 function modelStateFromSessionResponse(response) {
-  return parseGrokModelState(isRecord14(response) ? response.models : void 0);
+  return parseGrokModelState(isRecord16(response) ? response.models : void 0);
 }
 function stateForGrokModel(modelState, nativeState, model = modelState.currentModel, thinkingOptionId = modelState.currentThinkingOptionId) {
   const selectedModel = model;
@@ -52967,7 +53273,7 @@ import os4 from "node:os";
 import path12 from "node:path";
 var GROK_CREDITS_ENDPOINT = "https://cli-chat-proxy.grok.com/v1/billing?format=credits";
 var REQUEST_TIMEOUT_MS = 15e3;
-function isRecord15(value) {
+function isRecord17(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function finitePercent(value) {
@@ -52997,7 +53303,7 @@ function productUsageFrom(value) {
   if (!Array.isArray(value))
     return void 0;
   const products = value.flatMap((entry) => {
-    if (!isRecord15(entry) || typeof entry.product !== "string")
+    if (!isRecord17(entry) || typeof entry.product !== "string")
       return [];
     const usagePercent = finitePercent(entry.usagePercent);
     return usagePercent === void 0 ? [] : [{ product: entry.product, usagePercent }];
@@ -53005,13 +53311,13 @@ function productUsageFrom(value) {
   return products.length > 0 ? products : void 0;
 }
 function parseGrokCreditsResponse(value, fetchedAt = (/* @__PURE__ */ new Date()).toISOString()) {
-  if (!isRecord15(value) || !isRecord15(value.config))
+  if (!isRecord17(value) || !isRecord17(value.config))
     return null;
   const config2 = value.config;
-  const period = isRecord15(config2.currentPeriod) ? config2.currentPeriod : void 0;
+  const period = isRecord17(config2.currentPeriod) ? config2.currentPeriod : void 0;
   const resetsAt = (typeof period?.end === "string" && period.end.length > 0 ? period.end : void 0) ?? (typeof config2.billingPeriodEnd === "string" && config2.billingPeriodEnd.length > 0 ? config2.billingPeriodEnd : void 0);
-  const onDemandCap = isRecord15(config2.onDemandCap) ? nonNegativeNumber(config2.onDemandCap.val) : void 0;
-  const onDemandUsed = isRecord15(config2.onDemandUsed) ? nonNegativeNumber(config2.onDemandUsed.val) : void 0;
+  const onDemandCap = isRecord17(config2.onDemandCap) ? nonNegativeNumber(config2.onDemandCap.val) : void 0;
+  const onDemandUsed = isRecord17(config2.onDemandUsed) ? nonNegativeNumber(config2.onDemandUsed.val) : void 0;
   const usedPercent = finitePercent(config2.creditUsagePercent) ?? (onDemandCap !== void 0 && onDemandCap > 0 && onDemandUsed !== void 0 ? Math.min(100, Math.max(0, onDemandUsed / onDemandCap * 100)) : resetsAt ? 0 : void 0);
   if (usedPercent === void 0)
     return null;
@@ -53025,11 +53331,11 @@ function parseGrokCreditsResponse(value, fetchedAt = (/* @__PURE__ */ new Date()
   };
 }
 function selectAccessToken(auth, now) {
-  if (!isRecord15(auth))
+  if (!isRecord17(auth))
     return null;
-  const entries = Object.entries(auth).filter(([, value]) => isRecord15(value) && typeof value.key === "string" && value.key.length > 0).sort(([left], [right]) => Number(right.startsWith("https://auth.x.ai")) - Number(left.startsWith("https://auth.x.ai")));
+  const entries = Object.entries(auth).filter(([, value]) => isRecord17(value) && typeof value.key === "string" && value.key.length > 0).sort(([left], [right]) => Number(right.startsWith("https://auth.x.ai")) - Number(left.startsWith("https://auth.x.ai")));
   for (const [, value] of entries) {
-    if (!isRecord15(value) || typeof value.key !== "string")
+    if (!isRecord17(value) || typeof value.key !== "string")
       continue;
     if (typeof value.expires_at === "string") {
       const expiresAt = Date.parse(value.expires_at);
@@ -53069,7 +53375,7 @@ async function fetchGrokCredits(input = {}) {
 
 // packages/adapters/grok/dist/grok-usage.js
 var USD_TICKS_PER_DOLLAR = 1e10;
-function isRecord16(value) {
+function isRecord18(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function optionalToken(value) {
@@ -53086,7 +53392,7 @@ function combineUsage(base, next) {
   return base === null ? next : parseHostUsage({ ...base, ...next });
 }
 function usageFromNative(value) {
-  if (!isRecord16(value))
+  if (!isRecord18(value))
     return null;
   const inputTokens = optionalToken(value.inputTokens);
   const cachedRead = optionalToken(value.cachedReadTokens);
@@ -53113,7 +53419,7 @@ function usageFromPrompt(response) {
   return response.usage ? usageFromNative(response.usage) : null;
 }
 function usageFromSignals(value) {
-  if (!isRecord16(value))
+  if (!isRecord18(value))
     return null;
   try {
     return parseHostUsage({
@@ -53133,7 +53439,7 @@ var summedUsageFields = [
   "totalTokens"
 ];
 function nativeCostTicks(value) {
-  if (!isRecord16(value))
+  if (!isRecord18(value))
     return void 0;
   const ticks = value.costUsdTicks;
   if (typeof ticks !== "number" || !Number.isSafeInteger(ticks) || ticks < 0)
@@ -53194,10 +53500,23 @@ function sessionUsageFromHistory(events) {
     return null;
   }
 }
+function usageFromCompact(tokensAfter, contextWindowTokens) {
+  if (tokensAfter === void 0 || contextWindowTokens === void 0 || !Number.isSafeInteger(tokensAfter) || tokensAfter < 0 || !Number.isSafeInteger(contextWindowTokens) || contextWindowTokens <= 0) {
+    return null;
+  }
+  try {
+    return parseHostUsage({
+      contextUsedTokens: tokensAfter,
+      contextWindowTokens
+    });
+  } catch {
+    return null;
+  }
+}
 function usageFromUpdate(update, metadata, contextWindowTokens) {
   try {
     if (update?.sessionUpdate === "usage_update") {
-      const cost = isRecord16(update.cost) ? update.cost : null;
+      const cost = isRecord18(update.cost) ? update.cost : null;
       return parseHostUsage({
         contextUsedTokens: update.used,
         contextWindowTokens: update.size,
@@ -53219,6 +53538,17 @@ function usageFromUpdate(update, metadata, contextWindowTokens) {
 
 // packages/adapters/grok/dist/grok-adapter.js
 var grokHarnessId = harnessIdSchema.parse("grok");
+var grokCommandCatalog = harnessCommandCatalogSchema.parse({
+  commands: [
+    {
+      id: "grok.compact",
+      invocation: "/compact",
+      label: "Compact context",
+      description: "Compact the current conversation context",
+      argumentMode: "text"
+    }
+  ]
+});
 function capabilitiesForModels(modelState) {
   return {
     configuration: {
@@ -53238,7 +53568,8 @@ function normalizeError(error54, fallback) {
     return {
       code: error54.kind,
       message: error54.message,
-      retryable: !["notInstalled", "protocolError"].includes(error54.kind)
+      retryable: !["notInstalled", "protocolError"].includes(error54.kind),
+      ...error54.diagnostic ? { diagnostic: error54.diagnostic } : {}
     };
   }
   return {
@@ -53275,6 +53606,7 @@ function terminalOutcome2(response, cancelled) {
 var GrokHarnessSession = class {
   harnessId = grokHarnessId;
   capabilities;
+  commands;
   initialState;
   initialUsage;
   outputs;
@@ -53306,6 +53638,10 @@ var GrokHarnessSession = class {
     this.initialUsage = options.initialUsage ?? null;
     this.#usage = this.initialUsage;
     this.capabilities = capabilitiesForModels(modelState);
+    this.commands = {
+      list: async () => ({ ok: true, value: grokCommandCatalog }),
+      execute: (command) => this.#executeHarnessCommand(command)
+    };
     this.#state = stateForGrokModel(modelState, { nativeRef: nativeRef(opened.sessionId) });
     this.initialState = this.#state;
     this.#snapshot = {
@@ -53344,6 +53680,8 @@ var GrokHarnessSession = class {
   async execute(command) {
     if (this.#phase !== "open")
       return { ok: false, error: invalidState3("Grok Session is not open") };
+    if ("commandId" in command)
+      return this.#executeHarnessCommand(command);
     if (command.type === "turn.cancel")
       return this.#cancel(command);
     if (command.type === "interaction.respond")
@@ -53398,6 +53736,9 @@ var GrokHarnessSession = class {
       agentMessageId: null,
       reasoning: null,
       reasoningMessageId: null,
+      compactionItem: null,
+      compactionContextWindow: void 0,
+      compactionTerminal: null,
       tools: /* @__PURE__ */ new Map(),
       completedItems: [],
       approvals: /* @__PURE__ */ new Map(),
@@ -53414,6 +53755,111 @@ var GrokHarnessSession = class {
     }));
     return { ok: true, value: { turnId: command.turnId } };
   }
+  async #executeHarnessCommand(command) {
+    if (command.commandId !== "grok.compact") {
+      return {
+        ok: false,
+        error: {
+          code: "unsupported",
+          message: `Grok does not expose Harness command '${command.commandId}'`,
+          retryable: false
+        }
+      };
+    }
+    if (this.#active || this.#configuring) {
+      return {
+        ok: false,
+        error: {
+          code: "sessionBusy",
+          message: "Grok Session already has an active operation",
+          retryable: true
+        }
+      };
+    }
+    const arguments_2 = command.arguments;
+    const userContext = arguments_2?.text;
+    if (userContext !== void 0 && typeof userContext !== "string") {
+      return {
+        ok: false,
+        error: {
+          code: "invalidRequest",
+          message: "Grok compact command argument 'text' must be a string",
+          retryable: false
+        }
+      };
+    }
+    if (arguments_2 && Object.keys(arguments_2).some((key) => key !== "text")) {
+      return {
+        ok: false,
+        error: {
+          code: "invalidRequest",
+          message: "Grok compact command has an unknown argument",
+          retryable: false
+        }
+      };
+    }
+    let resolveCompletion = () => void 0;
+    const completion = new Promise((resolve2) => {
+      resolveCompletion = resolve2;
+    });
+    const active = {
+      command: { type: "turn.start", turnId: command.turnId, input: [] },
+      agent: null,
+      agentMessageId: null,
+      reasoning: null,
+      reasoningMessageId: null,
+      compactionItem: null,
+      compactionContextWindow: void 0,
+      compactionTerminal: null,
+      tools: /* @__PURE__ */ new Map(),
+      completedItems: [],
+      approvals: /* @__PURE__ */ new Map(),
+      cancellationRequested: false,
+      beforeNativeTurnKeys: /* @__PURE__ */ new Set(),
+      completion,
+      resolveCompletion
+    };
+    this.#active = active;
+    this.#event({ type: "turn.started", turnId: command.turnId });
+    void this.#transport.compact(userContext, (event) => this.#handleEvent(active, event)).then((result) => this.#settleManualCompact(active, result), (error54) => this.#finish(active, active.compactionTerminal ? this.#turnOutcomeFromCompaction(active.compactionTerminal) : {
+      status: "failed",
+      error: normalizeError(error54, "nativeFailure")
+    }));
+    return { ok: true, value: { turnId: command.turnId } };
+  }
+  #settleManualCompact(active, result) {
+    if (this.#active !== active)
+      return;
+    const terminal = active.compactionTerminal;
+    if (!terminal) {
+      this.#completeCompaction(active, {
+        type: "compaction.completed",
+        outcome: result.outcome,
+        ...result.tokensBefore !== void 0 ? { tokensBefore: result.tokensBefore } : {},
+        ...result.tokensAfter !== void 0 ? { tokensAfter: result.tokensAfter } : {},
+        ...result.contextWindowTokens !== void 0 ? { contextWindowTokens: result.contextWindowTokens } : {},
+        ...result.errorMessage ? { errorMessage: result.errorMessage } : {}
+      });
+    }
+    this.#finish(active, terminal ? this.#turnOutcomeFromCompaction(terminal) : result.outcome === "succeeded" ? { status: "succeeded" } : result.outcome === "cancelled" ? { status: "cancelled", reason: "Context compaction was cancelled" } : {
+      status: "failed",
+      error: {
+        code: "nativeFailure",
+        message: result.errorMessage ?? "Grok context compaction failed",
+        retryable: true
+      }
+    });
+  }
+  #turnOutcomeFromCompaction(event) {
+    return event.outcome === "succeeded" ? { status: "succeeded" } : event.outcome === "cancelled" ? { status: "cancelled", reason: "Context compaction was cancelled" } : {
+      status: "failed",
+      error: {
+        code: "nativeFailure",
+        message: event.errorMessage ?? "Grok context compaction failed",
+        retryable: true
+      }
+    };
+  }
   close() {
     if (!this.#closePromise)
       this.#closePromise = this.#close().finally(this.#onClosed);
@@ -53572,9 +54018,57 @@ var GrokHarnessSession = class {
       this.#startTool(active, event);
     else if (event.type === "tool.update")
       this.#updateTool(active, event);
-    else if (event.type === "usage" || event.type === "turn.completed")
+    else if (event.type === "compaction.started")
+      this.#startCompaction(active, event);
+    else if (event.type === "compaction.completed") {
+      active.compactionTerminal = event;
+      this.#completeCompaction(active, event);
+    } else if (event.type === "usage" || event.type === "turn.completed")
       return;
   }
+  #startCompaction(active, event) {
+    if (active.compactionItem)
+      return;
+    this.#completeReasoning(active, { status: "succeeded" });
+    this.#completeAgent(active, { status: "succeeded" });
+    if (event.contextWindowTokens !== void 0) {
+      active.compactionContextWindow = event.contextWindowTokens;
+    }
+    const item = {
+      type: "contextCompaction",
+      itemId: hostItemIdSchema.parse(this.#randomUUID())
+    };
+    active.compactionItem = item;
+    this.#event({ type: "item.started", turnId: active.command.turnId, item });
+  }
+  #completeCompaction(active, event) {
+    if (!active.compactionItem) {
+      this.#startCompaction(active, {
+        type: "compaction.started",
+        ...event.contextWindowTokens !== void 0 ? { contextWindowTokens: event.contextWindowTokens } : {}
+      });
+    }
+    const item = active.compactionItem;
+    if (!item)
+      return;
+    active.compactionItem = null;
+    const contextWindowTokens = event.contextWindowTokens ?? active.compactionContextWindow ?? (this.#state.effectiveModel ? this.#modelState.contextWindowTokensByModel.get(this.#state.effectiveModel.id) : void 0);
+    active.compactionContextWindow = void 0;
+    const outcome = event.outcome === "succeeded" ? { status: "succeeded" } : event.outcome === "cancelled" ? { status: "cancelled", reason: "Context compaction was cancelled" } : {
+      status: "failed",
+      error: {
+        code: "nativeFailure",
+        message: event.errorMessage ?? "Grok context compaction failed",
+        retryable: true
+      }
+    };
+    this.#completeItem(active, item, outcome);
+    if (event.outcome !== "succeeded")
+      return;
+    const usage = usageFromCompact(event.tokensAfter, contextWindowTokens);
+    if (usage)
+      this.#publishUsage(usage, active.command.turnId);
+  }
   #appendAgent(active, text, messageId) {
     const identity = messageId ?? "agent";
     if (active.agentMessageId !== identity) {
@@ -53756,6 +54250,10 @@ var GrokHarnessSession = class {
     const itemOutcome3 = outcome;
     this.#completeReasoning(active, itemOutcome3);
     this.#completeAgent(active, itemOutcome3);
+    if (active.compactionItem) {
+      this.#completeItem(active, active.compactionItem, itemOutcome3);
+      active.compactionItem = null;
+    }
     for (const tool of active.tools.values())
       this.#completeItem(active, tool.item, itemOutcome3);
     active.tools.clear();
@@ -53888,9 +54386,13 @@ var GrokAdapter = class {
         return cached2;
     }
     let transport = null;
+    const startedAt = Date.now();
+    let stage = "spawn";
     try {
       transport = this.#createTransport(cwd, () => void 0);
+      stage = "startup";
       const initialize = await transport.inspect();
+      stage = "model-catalog";
       const modelState = modelStateFromInitialize(initialize);
       if (!modelState)
         throw new GrokTransportError("protocolError", "Grok returned an invalid Model catalog");
@@ -53908,7 +54410,12 @@ var GrokAdapter = class {
       const normalized = normalizeError(error54, "unavailable");
       return {
         status: normalized.code === "notInstalled" ? "notInstalled" : "error",
-        error: normalized
+        error: {
+          ...normalized,
+          stage,
+          durationMs: Date.now() - startedAt,
+          ...normalized.diagnostic || !transport?.stderrTail ? {} : { stderrTail: transport.stderrTail }
+        }
       };
     }
   }
@@ -54210,7 +54717,7 @@ function normalizePiModelCatalog(nativeModels, effectiveModel, thinkingLevels, e
 
 // packages/adapters/pi/dist/pi-history.js
 var piHarnessId = harnessIdSchema.parse("pi");
-function isRecord17(value) {
+function isRecord19(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function textContent(value) {
@@ -54218,12 +54725,12 @@ function textContent(value) {
     return value;
   if (!Array.isArray(value))
     return "";
-  return value.filter((part) => isRecord17(part) && part.type === "text" && typeof part.text === "string").map((part) => part.text).join("");
+  return value.filter((part) => isRecord19(part) && part.type === "text" && typeof part.text === "string").map((part) => part.text).join("");
 }
 function thinkingContent(value) {
   if (!Array.isArray(value))
     return "";
-  return value.filter((part) => isRecord17(part) && part.type === "thinking" && typeof part.thinking === "string").map((part) => part.thinking).join("");
+  return value.filter((part) => isRecord19(part) && part.type === "thinking" && typeof part.thinking === "string").map((part) => part.thinking).join("");
 }
 function validatedEntry(value) {
   if (typeof value.id !== "string" || value.id.length === 0 || value.parentId !== null && typeof value.parentId !== "string" || typeof value.type !== "string") {
@@ -54254,7 +54761,7 @@ function activePiEntries(history) {
   return reversed.reverse();
 }
 function message(entry) {
-  return entry.type === "message" && isRecord17(entry.message) ? entry.message : null;
+  return entry.type === "message" && isRecord19(entry.message) ? entry.message : null;
 }
 function messageRole(entry) {
   const value = message(entry)?.role;
@@ -54316,7 +54823,7 @@ function snapshotItems(entries, outcome) {
       let projectedText = false;
       let projectedReasoning = false;
       for (const [ordinal, part] of content.entries()) {
-        if (!isRecord17(part))
+        if (!isRecord19(part))
           continue;
         if (part.type === "thinking" && !projectedReasoning && reasoning.length > 0) {
           const item2 = {
@@ -54584,14 +55091,14 @@ function withNodeRuntimeOnPath2(environment, runtimeExecutable = process.execPat
 }
 
 // packages/adapters/pi/dist/pi-usage.js
-function isRecord18(value) {
+function isRecord20(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function nonNegativeSafeInteger2(value) {
   return typeof value === "number" && Number.isSafeInteger(value) && value >= 0 ? value : null;
 }
 function optionalPiCacheHitRatePercent(value) {
-  if (!isRecord18(value) || value.role !== "assistant" || !isRecord18(value.usage))
+  if (!isRecord20(value) || value.role !== "assistant" || !isRecord20(value.usage))
     return null;
   const input = nonNegativeSafeInteger2(value.usage.input);
   const cacheRead = nonNegativeSafeInteger2(value.usage.cacheRead);
@@ -54604,20 +55111,20 @@ function optionalPiCacheHitRatePercent(value) {
 function latestPiCacheHitRatePercent(history) {
   let latest = null;
   for (const entry of activePiEntries(history)) {
-    if (entry.type === "message" && isRecord18(entry.message) && entry.message.role === "assistant") {
+    if (entry.type === "message" && isRecord20(entry.message) && entry.message.role === "assistant") {
       latest = optionalPiCacheHitRatePercent(entry.message);
     }
   }
   return latest;
 }
 function responseData(response, operation) {
-  if (!isRecord18(response.data)) {
+  if (!isRecord20(response.data)) {
     throw new Error(`Pi RPC ${operation} response has no data`);
   }
   return response.data;
 }
 function contextUsage(value) {
-  if (!isRecord18(value))
+  if (!isRecord20(value))
     throw new Error("Pi RPC context Usage is invalid");
   return parseHostUsage({
     contextUsedTokens: value.tokens,
@@ -54627,15 +55134,15 @@ function contextUsage(value) {
 function parsePiSessionUsage(response) {
   const data = responseData(response, "Session stats");
   const tokens = data.tokens;
-  if (tokens !== void 0 && !isRecord18(tokens)) {
+  if (tokens !== void 0 && !isRecord20(tokens)) {
     throw new Error("Pi RPC Session stats tokens are invalid");
   }
   return parseHostUsage({
-    ...isRecord18(tokens) && tokens.input !== void 0 ? { inputTokens: tokens.input } : {},
-    ...isRecord18(tokens) && tokens.cacheRead !== void 0 ? { cachedInputTokens: tokens.cacheRead } : {},
-    ...isRecord18(tokens) && tokens.cacheWrite !== void 0 ? { cacheWriteInputTokens: tokens.cacheWrite } : {},
-    ...isRecord18(tokens) && tokens.output !== void 0 ? { outputTokens: tokens.output } : {},
-    ...isRecord18(tokens) && tokens.total !== void 0 ? { totalTokens: tokens.total } : {},
+    ...isRecord20(tokens) && tokens.input !== void 0 ? { inputTokens: tokens.input } : {},
+    ...isRecord20(tokens) && tokens.cacheRead !== void 0 ? { cachedInputTokens: tokens.cacheRead } : {},
+    ...isRecord20(tokens) && tokens.cacheWrite !== void 0 ? { cacheWriteInputTokens: tokens.cacheWrite } : {},
+    ...isRecord20(tokens) && tokens.output !== void 0 ? { outputTokens: tokens.output } : {},
+    ...isRecord20(tokens) && tokens.total !== void 0 ? { totalTokens: tokens.total } : {},
     ...data.cost !== void 0 ? { totalCostUsd: data.cost } : {},
     ...data.contextUsage !== void 0 ? contextUsage(data.contextUsage) : {}
   });
@@ -54658,7 +55165,7 @@ function optionalPiStateContextUsage(value) {
 import { open, realpath } from "node:fs/promises";
 var MAX_SESSION_HEADER_BYTES = 64 * 1024;
 var utf8Decoder = new TextDecoder("utf-8", { fatal: true });
-function isRecord19(value) {
+function isRecord21(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 async function readPiSessionHeader(sessionFile) {
@@ -54678,7 +55185,7 @@ async function readPiSessionHeader(sessionFile) {
     } catch {
       throw new Error("Pi Session header is not valid JSON");
     }
-    if (!isRecord19(parsed) || parsed.type !== "session" || typeof parsed.id !== "string" || parsed.id.length === 0 || typeof parsed.cwd !== "string" || parsed.cwd.length === 0) {
+    if (!isRecord21(parsed) || parsed.type !== "session" || typeof parsed.id !== "string" || parsed.id.length === 0 || typeof parsed.cwd !== "string" || parsed.cwd.length === 0) {
       throw new Error("Pi Session header is invalid");
     }
     return { type: "session", id: parsed.id, cwd: parsed.cwd };
@@ -54705,9 +55212,11 @@ async function verifyPiSessionCwd(input) {
 // packages/adapters/pi/dist/pi-rpc-session.js
 var PiRpcFaultError = class extends Error {
   kind;
-  constructor(kind, message3) {
+  diagnostic;
+  constructor(kind, message3, diagnostic) {
     super(message3);
     this.kind = kind;
+    this.diagnostic = diagnostic;
     this.name = "PiRpcFaultError";
   }
 };
@@ -54720,7 +55229,7 @@ var PiRpcUnsupportedCommandError = class extends Error {
   }
 };
 var textDecoder = new TextDecoder("utf-8", { fatal: true });
-function isRecord20(value) {
+function isRecord22(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function message2(value) {
@@ -54732,13 +55241,13 @@ function nonBlankString2(value) {
 function parseNativeModel(value, context) {
   if (value === null || value === void 0)
     return null;
-  if (!isRecord20(value) || !nonBlankString2(value.provider) || !nonBlankString2(value.id)) {
+  if (!isRecord22(value) || !nonBlankString2(value.provider) || !nonBlankString2(value.id)) {
     throw new PiRpcFaultError("protocolError", `Pi RPC returned an invalid ${context} Model`);
   }
   return { provider: value.provider, id: value.id };
 }
 function sessionStateData(response) {
-  const data = isRecord20(response.data) ? response.data : null;
+  const data = isRecord22(response.data) ? response.data : null;
   if (!data)
     throw new PiRpcFaultError("protocolError", "Pi RPC state response has no data");
   return data;
@@ -54770,13 +55279,13 @@ function parseSessionStreaming(response) {
   return isStreaming;
 }
 function parseSessionHistory(response) {
-  const data = isRecord20(response.data) ? response.data : null;
+  const data = isRecord22(response.data) ? response.data : null;
   if (!data || !Array.isArray(data.entries)) {
     throw new PiRpcFaultError("protocolError", "Pi RPC entries response has no Entries");
   }
   const entries = data.entries.map((entry) => {
     const parsed = jsonValueSchema.safeParse(entry);
-    if (!parsed.success || !isRecord20(parsed.data)) {
+    if (!parsed.success || !isRecord22(parsed.data)) {
       throw new PiRpcFaultError("protocolError", "Pi RPC entries response contains an invalid Entry");
     }
     return parsed.data;
@@ -54787,7 +55296,7 @@ function parseSessionHistory(response) {
   return { entries, leafId: data.leafId };
 }
 function parseAvailableThinkingLevels(response) {
-  const data = isRecord20(response.data) ? response.data : null;
+  const data = isRecord22(response.data) ? response.data : null;
   if (!data || !Array.isArray(data.levels) || data.levels.length === 0) {
     throw new PiRpcFaultError("protocolError", "Pi RPC Thinking catalog response has no levels");
   }
@@ -54804,35 +55313,35 @@ function parseAvailableThinkingLevels(response) {
   return levels;
 }
 function parseAvailableModels(response) {
-  const data = isRecord20(response.data) ? response.data : null;
+  const data = isRecord22(response.data) ? response.data : null;
   if (!data || !Array.isArray(data.models)) {
     throw new PiRpcFaultError("protocolError", "Pi RPC Model catalog response has no models");
   }
   return data.models.map((model) => {
     const parsed = parseNativeModel(model, "catalog");
-    if (!parsed || !isRecord20(model) || typeof model.reasoning !== "boolean") {
+    if (!parsed || !isRecord22(model) || typeof model.reasoning !== "boolean") {
       throw new PiRpcFaultError("protocolError", "Pi RPC catalog contains a Model without reasoning capability");
     }
     return { ...parsed, reasoning: model.reasoning };
   });
 }
 function assistantText2(value) {
-  if (!isRecord20(value) || value.role !== "assistant" || !Array.isArray(value.content))
+  if (!isRecord22(value) || value.role !== "assistant" || !Array.isArray(value.content))
     return null;
-  return value.content.filter((content) => isRecord20(content) && content.type === "text" && typeof content.text === "string").map((content) => content.text).join("");
+  return value.content.filter((content) => isRecord22(content) && content.type === "text" && typeof content.text === "string").map((content) => content.text).join("");
 }
 function assistantMessageId(value) {
-  if (!isRecord20(value) || value.role !== "assistant")
+  if (!isRecord22(value) || value.role !== "assistant")
     return null;
   return nonBlankString2(value.responseId) ? value.responseId : null;
 }
 function assistantReasoning(value) {
-  if (!isRecord20(value) || value.role !== "assistant" || !Array.isArray(value.content))
+  if (!isRecord22(value) || value.role !== "assistant" || !Array.isArray(value.content))
     return null;
-  return value.content.filter((content) => isRecord20(content) && content.type === "thinking" && typeof content.thinking === "string").map((content) => content.thinking).join("");
+  return value.content.filter((content) => isRecord22(content) && content.type === "thinking" && typeof content.thinking === "string").map((content) => content.thinking).join("");
 }
 function assistantFailure(value) {
-  if (!isRecord20(value) || value.role !== "assistant")
+  if (!isRecord22(value) || value.role !== "assistant")
     return void 0;
   if (value.stopReason !== "error" && value.stopReason !== "aborted")
     return null;
@@ -54852,7 +55361,7 @@ function signalProcessTree2(child, signal) {
   try {
     process.kill(-child.pid, signal);
   } catch (error54) {
-    if (!isRecord20(error54) || error54.code !== "ESRCH")
+    if (!isRecord22(error54) || error54.code !== "ESRCH")
       throw error54;
   }
 }
@@ -54921,6 +55430,8 @@ var PiRpcSession = class {
   #pending = /* @__PURE__ */ new Map();
   #state = null;
   #latestCacheHitRatePercent;
+  #manualCompaction = null;
+  #stderrTail = "";
   constructor(options, processAdapter = nodeProcessAdapter) {
     if (options.sessionFile && options.forkSessionFile) {
       throw new Error("Pi RPC cannot combine Session resume and Fork startup");
@@ -54941,6 +55452,9 @@ var PiRpcSession = class {
       throw new Error("Pi RPC Session has not started");
     return this.#state;
   }
+  get stderrTail() {
+    return this.#stderrTail;
+  }
   async start() {
     if (this.#child || this.#closed)
       throw new Error("Pi RPC Session cannot be started twice");
@@ -54964,14 +55478,16 @@ var PiRpcSession = class {
         this.#fail(new PiRpcFaultError("protocolError", "Pi RPC stdout ended mid-frame"));
       }
     });
-    child.stderr.resume();
+    child.stderr.on("data", (chunk) => {
+      this.#stderrTail = sanitizeDiagnosticTail(`${this.#stderrTail}${chunk.toString()}`);
+    });
     child.once("error", (error54) => {
-      const kind = isRecord20(error54) && error54.code === "ENOENT" ? "notInstalled" : "unavailable";
-      this.#fail(new PiRpcFaultError(kind, `Pi RPC failed to start: ${error54.message}`));
+      const kind = isRecord22(error54) && error54.code === "ENOENT" ? "notInstalled" : "unavailable";
+      this.#fail(new PiRpcFaultError(kind, `Pi RPC failed to start: ${error54.message}`, this.stderrTail));
     });
     child.once("exit", (code, signal) => {
       if (!this.#closed) {
-        this.#fail(new PiRpcFaultError("processExited", `Pi RPC exited (code=${code}, signal=${signal})`));
+        this.#fail(new PiRpcFaultError("processExited", `Pi RPC exited (code=${code}, signal=${signal})`, this.stderrTail));
       }
     });
     await Promise.race([
@@ -54999,6 +55515,25 @@ var PiRpcSession = class {
       throw error54;
     }
   }
+  async compact(customInstructions, onEvent) {
+    if (!this.#child || !this.#state || this.#closed || this.#failed) {
+      throw new Error("Pi RPC Session is unavailable");
+    }
+    if (this.#activeTurn || this.#manualCompaction || this.#compactionActive) {
+      throw new Error("Pi RPC Session already has an active operation");
+    }
+    const result = new Promise((resolve2, reject) => {
+      this.#manualCompaction = { onEvent, resolve: resolve2, reject };
+    });
+    try {
+      await this.#send("compact", customInstructions ? { customInstructions } : {});
+    } catch (error54) {
+      const pending = this.#manualCompaction;
+      this.#manualCompaction = null;
+      pending?.reject(error54 instanceof Error ? error54 : new Error(message2(error54)));
+    }
+    return result;
+  }
   async getSessionUsage() {
     try {
       const usage = parsePiSessionUsage(await this.#send("get_session_stats", {}));
@@ -55218,7 +55753,7 @@ var PiRpcSession = class {
       this.#buffer = this.#buffer.subarray(newline3 + 1);
       try {
         const value = JSON.parse(textDecoder.decode(frame));
-        if (!isRecord20(value) || typeof value.type !== "string") {
+        if (!isRecord22(value) || typeof value.type !== "string") {
           throw new PiRpcFaultError("protocolError", "Pi RPC returned an invalid envelope");
         }
         this.#handle(value);
@@ -55238,9 +55773,10 @@ var PiRpcSession = class {
     if (value.type === "compaction_start") {
       this.#compactionActive = true;
       this.#compactionTurn = this.#activeTurn;
-      this.#compactionTurn?.onEvent({ type: "compaction.started" });
+      const onEvent = this.#activeTurn?.onEvent ?? this.#manualCompaction?.onEvent;
+      onEvent?.({ type: "compaction.started" });
       for (const pending of this.#pending.values()) {
-        if (pending.command !== "prompt" || !pending.timeout)
+        if (pending.command !== "prompt" && pending.command !== "compact" || !pending.timeout)
           continue;
         clearTimeout(pending.timeout);
         pending.timeout = null;
@@ -55252,13 +55788,23 @@ var PiRpcSession = class {
       const compactionTurn = this.#compactionTurn;
       this.#compactionTurn = null;
       for (const [id2, pending] of this.#pending) {
-        if (pending.command === "prompt")
+        if (pending.command === "prompt" || pending.command === "compact") {
           this.#armCommandTimeout(id2, pending);
+        }
       }
-      compactionTurn?.onEvent({
+      const outcome = value.aborted === true ? "cancelled" : isRecord22(value.result) ? "succeeded" : "failed";
+      const event = {
         type: "compaction.completed",
-        outcome: value.aborted === true ? "cancelled" : isRecord20(value.result) ? "succeeded" : "failed",
+        outcome,
         ...nonBlankString2(value.errorMessage) ? { errorMessage: value.errorMessage } : {}
+      };
+      compactionTurn?.onEvent(event);
+      const manual = this.#manualCompaction;
+      this.#manualCompaction = null;
+      manual?.onEvent(event);
+      manual?.resolve({
+        outcome,
+        ...event.errorMessage ? { errorMessage: event.errorMessage } : {}
       });
       return;
     }
@@ -55277,7 +55823,7 @@ var PiRpcSession = class {
       this.#startAssistantMessage(active, value.message);
       return;
     }
-    if (value.type === "message_update" && isRecord20(value.assistantMessageEvent)) {
+    if (value.type === "message_update" && isRecord22(value.assistantMessageEvent)) {
       const event = value.assistantMessageEvent;
       if (event.type === "text_delta" && typeof event.delta === "string") {
         const messageId = this.#ensureAssistantMessage(active, value.message);
@@ -55592,7 +56138,7 @@ var PiRpcSession = class {
     });
   }
   #armCommandTimeout(id2, pending) {
-    if (pending.timeout || this.#pending.get(id2) !== pending || pending.command === "prompt" && this.#compactionActive) {
+    if (pending.timeout || this.#pending.get(id2) !== pending || (pending.command === "prompt" || pending.command === "compact") && this.#compactionActive) {
       return;
     }
     pending.timeout = setTimeout(() => {
@@ -55657,6 +56203,9 @@ var PiRpcSession = class {
       pending.reject(error54);
     }
     this.#pending.clear();
+    const manual = this.#manualCompaction;
+    this.#manualCompaction = null;
+    manual?.reject(error54);
     this.#rejectActiveTurn(error54);
   }
   #fail(error54) {
@@ -55670,8 +56219,19 @@ var PiRpcSession = class {
 
 // packages/adapters/pi/dist/pi-adapter.js
 var piHarnessId2 = harnessIdSchema.parse("pi");
+var piCommandCatalog = harnessCommandCatalogSchema.parse({
+  commands: [
+    {
+      id: "pi.compact",
+      invocation: "/compact",
+      label: "Compact context",
+      description: "Compact the current conversation context",
+      argumentMode: "text"
+    }
+  ]
+});
 var DEFAULT_TOOL_OUTPUT_LIMIT3 = 64e3;
-function isRecord21(value) {
+function isRecord23(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function errorMessage(error54) {
@@ -55699,7 +56259,8 @@ function normalizedError2(error54, fallbackCode) {
     return {
       code: error54.kind,
       message: error54.message,
-      retryable: error54.kind !== "notInstalled"
+      retryable: error54.kind !== "notInstalled",
+      ...error54.diagnostic ? { stderrTail: error54.diagnostic } : {}
     };
   }
   return {
@@ -55745,7 +56306,7 @@ function nativeModelForHistory(state) {
   return nativeModelFromState(state);
 }
 function sessionFileFromRef(ref) {
-  if (ref.harnessId !== piHarnessId2 || !isRecord21(ref.locator) || typeof ref.locator.sessionFile !== "string" || ref.locator.sessionFile.length === 0) {
+  if (ref.harnessId !== piHarnessId2 || !isRecord23(ref.locator) || typeof ref.locator.sessionFile !== "string" || ref.locator.sessionFile.length === 0) {
     throw new Error("Pi Native Session Ref has no resumable Session file");
   }
   return ref.locator.sessionFile;
@@ -55760,9 +56321,9 @@ function toolFailure2(toolName) {
 function nativeText(value) {
   if (typeof value === "string")
     return value;
-  if (!isRecord21(value) || !Array.isArray(value.content))
+  if (!isRecord23(value) || !Array.isArray(value.content))
     return "";
-  return value.content.filter((content) => isRecord21(content) && content.type === "text" && typeof content.text === "string").map(({ text }) => text).join("");
+  return value.content.filter((content) => isRecord23(content) && content.type === "text" && typeof content.text === "string").map(({ text }) => text).join("");
 }
 function boundedOutput(value, limit) {
   const text = nativeText(value);
@@ -55778,10 +56339,10 @@ function outputText(output) {
   return output?.content.filter((content) => content.type === "text").map(({ text }) => text).join("") ?? "";
 }
 function stringField3(value, key) {
-  return isRecord21(value) && typeof value[key] === "string" ? value[key] : void 0;
+  return isRecord23(value) && typeof value[key] === "string" ? value[key] : void 0;
 }
 function numberField2(value, key) {
-  if (!isRecord21(value))
+  if (!isRecord23(value))
     return void 0;
   const field = value[key];
   return typeof field === "number" || field === null ? field : void 0;
@@ -55790,7 +56351,7 @@ function stripDiffPrefix(path21) {
   return path21.startsWith("a/") || path21.startsWith("b/") ? path21.slice(2) : path21;
 }
 function reliableFileChange(result) {
-  if (!isRecord21(result) || !isRecord21(result.details) || typeof result.details.patch !== "string") {
+  if (!isRecord23(result) || !isRecord23(result.details) || typeof result.details.patch !== "string") {
     return null;
   }
   const patch = result.details.patch;
@@ -55817,6 +56378,7 @@ function delay3(milliseconds) {
 var PiHarnessSession = class {
   harnessId = piHarnessId2;
   capabilities;
+  commands;
   initialState;
   initialUsage;
   outputs;
@@ -55855,6 +56417,10 @@ var PiHarnessSession = class {
       },
       history: { fork: true, forkAcrossCwd: true, rollbackLastTurn: true }
     };
+    this.commands = {
+      list: async () => ({ ok: true, value: piCommandCatalog }),
+      execute: (command) => this.#executeHarnessCommand(command)
+    };
     this.#transport = options.startedTransport ?? null;
     this.initialState = options.startedTransport ? harnessStateFromPi(options.startedTransport.state, options.startedThinkingLevels ?? null) : {};
     this.initialUsage = options.initialUsage ?? null;
@@ -56238,6 +56804,112 @@ var PiHarnessSession = class {
       return { ok: false, error: normalized };
     }
   }
+  async #executeHarnessCommand(command) {
+    if (command.commandId !== "pi.compact") {
+      return {
+        ok: false,
+        error: {
+          code: "unsupported",
+          message: `Pi does not expose Harness command '${command.commandId}'`,
+          retryable: false
+        }
+      };
+    }
+    if (this.#acceptingTurn || this.#active || this.#configuring) {
+      return {
+        ok: false,
+        error: {
+          code: "sessionBusy",
+          message: "Pi Session already has an active operation",
+          retryable: true
+        }
+      };
+    }
+    const arguments_2 = command.arguments;
+    const customInstructions = arguments_2?.text;
+    if (customInstructions !== void 0 && typeof customInstructions !== "string") {
+      return {
+        ok: false,
+        error: {
+          code: "invalidRequest",
+          message: "Pi compact command argument 'text' must be a string",
+          retryable: false
+        }
+      };
+    }
+    if (arguments_2 && Object.keys(arguments_2).some((key) => key !== "text")) {
+      return {
+        ok: false,
+        error: {
+          code: "invalidRequest",
+          message: "Pi compact command has an unknown argument",
+          retryable: false
+        }
+      };
+    }
+    this.#acceptingTurn = true;
+    try {
+      let transport;
+      try {
+        transport = await this.#ensureTransport();
+      } catch (error54) {
+        return { ok: false, error: normalizedError2(error54, "unavailable") };
+      }
+      const turnCommand = {
+        type: "turn.start",
+        turnId: command.turnId,
+        input: []
+      };
+      let resolveCompletion = () => void 0;
+      const completion = new Promise((resolve2) => {
+        resolveCompletion = resolve2;
+      });
+      const active = {
+        command: turnCommand,
+        agentItem: null,
+        agentMessageId: null,
+        compactionItem: null,
+        sawAssistantMessage: false,
+        reasoningItem: null,
+        tools: /* @__PURE__ */ new Map(),
+        interactions: /* @__PURE__ */ new Map(),
+        interactionByNativeId: /* @__PURE__ */ new Map(),
+        cancellationRequested: false,
+        beforeNativeTurnKeys: /* @__PURE__ */ new Set(),
+        completion,
+        resolveCompletion
+      };
+      this.#active = active;
+      this.#event({ type: "turn.started", turnId: command.turnId });
+      void transport.compact(customInstructions, (event) => this.#handleTurnEvent(active, event)).then((result) => {
+        if (result.outcome === "succeeded") {
+          this.#completeTurn(active, { status: "succeeded" });
+        } else if (result.outcome === "cancelled") {
+          this.#completeTurn(active, {
+            status: "cancelled",
+            reason: "Context compaction was cancelled"
+          });
+        } else {
+          this.#completeTurn(active, {
+            status: "failed",
+            error: {
+              code: "nativeFailure",
+              message: result.errorMessage ?? "Pi context compaction failed",
+              retryable: true
+            }
+          });
+        }
+      }).catch((error54) => {
+        this.#completeTurn(active, {
+          status: "failed",
+          error: normalizedError2(error54, "nativeFailure")
+        });
+      });
+      return { ok: true, value: { turnId: command.turnId } };
+    } finally {
+      this.#acceptingTurn = false;
+    }
+  }
   async #ensureTransport() {
     if (this.#transport)
       return this.#transport;
@@ -56783,11 +57455,16 @@ var PiAdapter = class {
     });
   }
   async #inspectCwd(cwd) {
+    const startedAt = Date.now();
+    let stage = "spawn";
     const transport = this.#createTransport({ cwd, onFault: () => void 0 });
     this.#inspections.add(transport);
     try {
+      stage = "startup";
       await transport.start();
+      stage = "model-catalog";
       const models = await transport.getAvailableModels();
+      stage = "capabilities";
       const thinkingLevels = await transport.getAvailableThinkingLevels();
       this.#thinkingSelectionSupported = thinkingLevels !== null;
       const catalog = normalizePiModelCatalog(models, nativeModelFromState(transport.state), thinkingLevels, transport.state.thinkingLevel);
@@ -56809,7 +57486,12 @@ var PiAdapter = class {
       const normalized = normalizedError2(error54, "unavailable");
       return {
         status: normalized.code === "notInstalled" ? "notInstalled" : "error",
-        error: normalized
+        error: {
+          ...normalized,
+          stage,
+          durationMs: Date.now() - startedAt,
+          ...normalized.stderrTail || !transport.stderrTail ? {} : { stderrTail: transport.stderrTail }
+        }
       };
     } finally {
       this.#inspections.delete(transport);
@@ -57700,7 +58382,7 @@ var packageMetadata5 = {
 var TITLE_MAX_LENGTH = 120;
 var DESCRIPTION_MAX_LENGTH = 500;
 var SERVER_NAME_MAX_LENGTH = 80;
-function isRecord22(value) {
+function isRecord24(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function boundedText(value, field, maxLength) {
@@ -57744,7 +58426,7 @@ function responseError(message3) {
 function responsePersist(value) {
   if (value === void 0 || value === null)
     return null;
-  if (!isRecord22(value) || Object.keys(value).length !== 1 || value.persist !== "session" && value.persist !== "always") {
+  if (!isRecord24(value) || Object.keys(value).length !== 1 || value.persist !== "session" && value.persist !== "always") {
     throw responseError("contains malformed persist metadata");
   }
   return value.persist;
@@ -57787,7 +58469,7 @@ function projectCodexApprovalRequest(input) {
     },
     denyResponse,
     parseResponse(result) {
-      if (!isRecord22(result) || typeof result.action !== "string") {
+      if (!isRecord24(result) || typeof result.action !== "string") {
         throw responseError("missing action");
       }
       if (Object.keys(result).some((key) => key !== "action" && key !== "content" && key !== "_meta")) {
@@ -57795,7 +58477,7 @@ function projectCodexApprovalRequest(input) {
       }
       const selectedPersist = responsePersist(result._meta);
       if (result.action === "accept") {
-        if ("content" in result && (!isRecord22(result.content) || Object.keys(result.content).length !== 0)) {
+        if ("content" in result && (!isRecord24(result.content) || Object.keys(result.content).length !== 0)) {
           throw responseError("contains non-empty accepted content");
         }
         if (selectedPersist === "session") {
@@ -57822,7 +58504,7 @@ function projectCodexApprovalRequest(input) {
 }
 
 // packages/protocol-core/dist/codex-question.js
-function isRecord23(value) {
+function isRecord25(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function responseError2(message3) {
@@ -57891,7 +58573,7 @@ function projectCodexQuestionRequest(input) {
       }
     },
     parseResponse(result) {
-      if (!isRecord23(result) || !isRecord23(result.answers)) {
+      if (!isRecord25(result) || !isRecord25(result.answers)) {
         throw responseError2("missing answers object");
       }
       const rawAnswers = result.answers;
@@ -57904,7 +58586,7 @@ function projectCodexQuestionRequest(input) {
         const question = interaction.questions.find(({ id: id2 }) => id2 === questionId);
         if (!question)
           throw responseError2("contains an unknown Question ID");
-        if (!isRecord23(answerValue) || !Array.isArray(answerValue.answers)) {
+        if (!isRecord25(answerValue) || !Array.isArray(answerValue.answers)) {
           throw responseError2("answer entry has no answers array");
         }
         const values = answerValue.answers;
@@ -58514,7 +59196,7 @@ var CodexTurnProjector = class {
 };
 
 // packages/protocol-core/dist/thread-fork.js
-function isRecord24(value) {
+function isRecord26(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function optionalText(params, name, options = {}) {
@@ -58537,7 +59219,7 @@ function optionalBoolean(params, name) {
 function decodeThreadForkRequest(request) {
   if (request.method !== "thread/fork")
     return null;
-  if (!isRecord24(request.params))
+  if (!isRecord26(request.params))
     throw new Error("thread/fork params must be an object");
   const params = request.params;
   const threadId2 = optionalText(params, "threadId");
@@ -58573,7 +59255,7 @@ function decodeThreadForkRequest(request) {
 function decodeThreadRollbackRequest(request) {
   if (request.method !== "thread/rollback")
     return null;
-  if (!isRecord24(request.params))
+  if (!isRecord26(request.params))
     throw new Error("thread/rollback params must be an object");
   const { threadId: threadId2, numTurns } = request.params;
   if (typeof threadId2 !== "string" || threadId2.length === 0) {
@@ -58667,13 +59349,13 @@ var THREAD_SOURCE_KINDS = /* @__PURE__ */ new Set([
   "subAgentOther",
   "unknown"
 ]);
-function isRecord25(value) {
+function isRecord27(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function paramsObject(request, method) {
   if (request.params === void 0 && method === "thread/list")
     return {};
-  if (!isRecord25(request.params))
+  if (!isRecord27(request.params))
     throw new Error(`${method} params must be an object`);
   return request.params;
 }
@@ -58745,7 +59427,7 @@ function cursorPayload(value) {
   };
 }
 function parseCursorPayload(value) {
-  if (!isRecord25(value) || value.formatVersion !== 1)
+  if (!isRecord27(value) || value.formatVersion !== 1)
     throw new Error("Host cursor is invalid");
   const { queryFingerprint: fingerprint, sortDirection: sortDirection2, officialCursor, officialDone } = value;
   const { externalAnchor: externalAnchor2, externalDone } = value;
@@ -58754,7 +59436,7 @@ function parseCursorPayload(value) {
   }
   let anchor = null;
   if (externalAnchor2 !== null) {
-    if (!isRecord25(externalAnchor2) || !Number.isSafeInteger(externalAnchor2.timestamp) || typeof externalAnchor2.threadId !== "string" || externalAnchor2.threadId.length === 0) {
+    if (!isRecord27(externalAnchor2) || !Number.isSafeInteger(externalAnchor2.timestamp) || typeof externalAnchor2.threadId !== "string" || externalAnchor2.threadId.length === 0) {
       throw new Error("Host cursor is invalid");
     }
     anchor = {
@@ -58874,7 +59556,7 @@ function decodeThreadMetadataUpdateRequest(request) {
   if (params.gitInfo === null) {
     gitInfo = null;
   } else if (params.gitInfo !== void 0) {
-    if (!isRecord25(params.gitInfo)) {
+    if (!isRecord27(params.gitInfo)) {
       throw new Error("thread/metadata/update params.gitInfo must be an object or null");
     }
     gitInfo = {};
@@ -58902,7 +59584,7 @@ function optionalCursor(value, name) {
   return value;
 }
 function decodeOfficialThreadListPage(value) {
-  if (!isRecord25(value) || !Array.isArray(value.data) || value.data.some((row) => !isRecord25(row))) {
+  if (!isRecord27(value) || !Array.isArray(value.data) || value.data.some((row) => !isRecord27(row))) {
     throw new Error("Official thread/list response is invalid");
   }
   return {
@@ -60131,6 +60813,12 @@ var ExternalThreadRuntime = class {
     const effectiveModel = input.requestedModel ?? initialState.effectiveModel;
     const effectiveThinkingOptionId = input.requestedThinkingOptionId ?? initialState.effectiveThinkingOptionId;
     const effectivePermissionModeId = input.requestedPermissionModeId ?? initialState.effectivePermissionModeId;
+    const observerState = {
+      ...initialState,
+      ...effectiveModel ? { effectiveModel } : {},
+      ...effectiveThinkingOptionId ? { effectiveThinkingOptionId } : {},
+      ...effectivePermissionModeId ? { effectivePermissionModeId } : {}
+    };
     const externalThread = {
       id: input.record.hostThreadId,
       cwd: input.record.cwd,
@@ -60142,7 +60830,7 @@ var ExternalThreadRuntime = class {
       ...effectivePermissionModeId ? { requestedPermissionModeId: effectivePermissionModeId } : {},
       record: input.record,
       sessionId: input.sessionId,
-      stateObserver: new SessionStateObserver(initialState),
+      stateObserver: new SessionStateObserver(observerState),
       thread: input.thread,
       transportModelId: input.record.transportModelId,
       turns: input.turns,
@@ -60153,6 +60841,7 @@ var ExternalThreadRuntime = class {
       usageTurnId: null,
       projectedTurns: /* @__PURE__ */ new Map(),
       responseGates: /* @__PURE__ */ new Map(),
+      ephemeralTurnIds: /* @__PURE__ */ new Set(),
       persistenceError: null,
       ignoredInteractionIds: /* @__PURE__ */ new Set()
     };
@@ -60308,7 +60997,7 @@ var ExternalThreadRuntime = class {
 import { randomUUID as randomUUID8 } from "node:crypto";
 var INTERNAL_REQUEST_PREFIX = "codexhost:official:";
 var MAX_RETIRED_IDS = 1024;
-function isRecord26(value) {
+function isRecord28(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 var OfficialRequestBroker = class {
@@ -60351,7 +61040,7 @@ var OfficialRequestBroker = class {
     });
   }
   handle(value) {
-    if (!isRecord26(value) || typeof value.id !== "string") return false;
+    if (!isRecord28(value) || typeof value.id !== "string") return false;
     const pending = this.#pending.get(value.id);
     if (!pending) return this.#retired.has(value.id);
     clearTimeout(pending.timeout);
@@ -60380,11 +61069,11 @@ var OfficialRequestBroker = class {
 };
 
 // packages/host-runtime/src/route-observation.ts
-function isRecord27(value) {
+function isRecord29(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function classifyThreadPurpose(request) {
-  return isRecord27(request.params) && request.params.ephemeral === true ? "ephemeral" : "conversation";
+  return isRecord29(request.params) && request.params.ephemeral === true ? "ephemeral" : "conversation";
 }
 var RequestRouteObservationTracker = class {
   #nextCreateOrdinal = 0;
@@ -60409,13 +61098,13 @@ var RequestRouteObservationTracker = class {
     this.#createByThreadId.set(threadId2, tracked);
   }
   bindOfficialResponse(response) {
-    if (!isRecord27(response) || !("id" in response)) return;
+    if (!isRecord29(response) || !("id" in response)) return;
     const tracked = this.#pendingByRequestId.get(response.id);
     if (!tracked) return;
     this.#pendingByRequestId.delete(response.id);
     const result = response.result;
-    const thread = isRecord27(result) ? result.thread : null;
-    if (isRecord27(thread) && typeof thread.id === "string") {
+    const thread = isRecord29(result) ? result.thread : null;
+    if (isRecord29(thread) && typeof thread.id === "string") {
       this.#createByThreadId.set(thread.id, tracked);
     }
   }
@@ -60581,11 +61270,11 @@ var OfficialThreadListError = class extends Error {
   }
   rpcError;
 };
-function isRecord28(value) {
+function isRecord30(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function officialThreadListPageFromResponse(response) {
-  if (isRecord28(response.error)) {
+  if (isRecord30(response.error)) {
     if (!Number.isSafeInteger(response.error.code) || typeof response.error.message !== "string") {
       throw new Error("Official thread/list error response is invalid");
     }
@@ -60745,14 +61434,14 @@ async function aggregateThreadList(input) {
 }
 
 // packages/host-runtime/src/app-server-host.ts
-function isRecord29(value) {
+function isRecord31(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function isCreditsAdapter(adapter) {
   return typeof adapter.credits === "function" && typeof adapter.refreshCredits === "function";
 }
 function projectAccountCredits(value) {
-  if (!isRecord29(value)) return null;
+  if (!isRecord31(value)) return null;
   const rest = { ...value };
   delete rest.fetchedAt;
   const parsed = accountCreditsSnapshotSchema.safeParse(rest);
@@ -60852,12 +61541,12 @@ function classifyCreateRequestRoute(request, defaultAgent2) {
   };
 }
 function requestObject(request) {
-  if (!isRecord29(request.params)) throw new Error(`${request.method} params must be an object`);
+  if (!isRecord31(request.params)) throw new Error(`${request.method} params must be an object`);
   return request.params;
 }
 function requestText(params) {
   if (!Array.isArray(params.input)) throw new Error("turn/start input must be an array");
-  const text = params.input.filter((item) => isRecord29(item) && item.type === "text").map((item) => item.text).filter((value) => typeof value === "string").join("\n");
+  const text = params.input.filter((item) => isRecord31(item) && item.type === "text").map((item) => item.text).filter((value) => typeof value === "string").join("\n");
   if (!text) throw new Error("turn/start must contain text input");
   return text;
 }
@@ -61046,6 +61735,14 @@ var AppServerHost = class {
         await this.#selectThreadPermissionMode(request);
         continue;
       }
+      if (request.method === "codexhost/thread/commands/inspect") {
+        await this.#inspectThreadCommands(request);
+        continue;
+      }
+      if (request.method === "codexhost/thread/command/execute") {
+        await this.#executeThreadCommand(request);
+        continue;
+      }
       if (request.method === "thread/list") {
         let listRequest;
         try {
@@ -61131,7 +61828,7 @@ var AppServerHost = class {
         continue;
       }
       if (request.method === "thread/fork") {
-        const params = isRecord29(request.params) ? request.params : {};
+        const params = isRecord31(request.params) ? request.params : {};
         const resolution = typeof params.threadId === "string" ? await this.#resolveExternalThread(params.threadId) : { kind: "official" };
         if (resolution.kind === "error") {
           await this.#writer.json(
@@ -61154,7 +61851,7 @@ var AppServerHost = class {
         }
       }
       if (request.method === "thread/rollback") {
-        const params = isRecord29(request.params) ? request.params : {};
+        const params = isRecord31(request.params) ? request.params : {};
         const resolution = typeof params.threadId === "string" ? await this.#resolveExternalThread(params.threadId) : { kind: "official" };
         if (resolution.kind === "error") {
           await this.#writer.json(
@@ -61294,7 +61991,7 @@ var AppServerHost = class {
           continue;
         }
       }
-      if (request.method.startsWith("thread/") && !EXPLICIT_EXTERNAL_THREAD_METHODS.has(request.method) && isRecord29(request.params) && typeof request.params.threadId === "string") {
+      if (request.method.startsWith("thread/") && !EXPLICIT_EXTERNAL_THREAD_METHODS.has(request.method) && isRecord31(request.params) && typeof request.params.threadId === "string") {
         const location = await this.#locateExternalThread(request.params.threadId);
         if (await this.#writeResolutionError(request, location)) continue;
         if (location.kind === "external") {
@@ -61540,6 +62237,156 @@ var AppServerHost = class {
       );
     }
   }
+  async #inspectThreadCommands(request) {
+    const params = threadCommandsInspectParamsSchema.safeParse(request.params);
+    if (!params.success) {
+      await this.#writer.json(
+        rpcError(request, -32602, "Invalid Thread command inspection params")
+      );
+      return;
+    }
+    const resolution = await this.#resolveExternalThread(params.data.threadId);
+    if (await this.#writeResolutionError(request, resolution)) return;
+    if (resolution.kind !== "external" || !resolution.thread.session.commands) {
+      await this.#writer.json(rpcEnvelope(request, { result: { commands: [] } }));
+      return;
+    }
+    const result = await resolution.thread.session.commands.list();
+    if (!result.ok) {
+      await this.#writer.json(rpcError(request, -32078, result.error.message));
+      return;
+    }
+    try {
+      await this.#writer.json(
+        rpcEnvelope(request, {
+          result: jsonValueSchema.parse(harnessCommandCatalogSchema.parse(result.value))
+        })
+      );
+    } catch (error54) {
+      await this.#writer.json(
+        rpcError(request, -32078, `Harness command catalog is invalid: ${errorMessage3(error54)}`)
+      );
+    }
+  }
+  async #executeThreadCommand(request) {
+    const params = threadCommandExecuteParamsSchema.safeParse(request.params);
+    if (!params.success) {
+      await this.#writer.json(rpcError(request, -32602, "Invalid Thread command parameters"));
+      return;
+    }
+    const resolution = await this.#resolveExternalThread(params.data.threadId);
+    if (await this.#writeResolutionError(request, resolution)) return;
+    if (resolution.kind !== "external") {
+      await this.#writer.json(rpcError(request, -32078, "Thread is not externally owned"));
+      return;
+    }
+    const thread = resolution.thread;
+    if (thread.running) {
+      await this.#writer.json(
+        rpcError(request, -32072, "External Thread already has an active operation")
+      );
+      return;
+    }
+    const commands = thread.session.commands;
+    if (!commands) {
+      await this.#writer.json(
+        rpcError(request, -32078, "External Harness does not expose commands")
+      );
+      return;
+    }
+    const catalog = await commands.list();
+    if (!catalog.ok) {
+      await this.#writer.json(rpcError(request, -32078, catalog.error.message));
+      return;
+    }
+    if (!catalog.value.commands.some(({ id: id2 }) => id2 === params.data.commandId)) {
+      await this.#writer.json(
+        rpcError(
+          request,
+          -32078,
+          `External Harness does not expose command '${params.data.commandId}'`
+        )
+      );
+      return;
+    }
+    try {
+      await this.#startExternalCommand(
+        request,
+        thread,
+        params.data.commandId,
+        params.data.arguments,
+        params.data.turnId,
+        "command"
+      );
+    } catch (error54) {
+      this.#diagnose(error54);
+      await this.#writer.json(
+        rpcError(request, -32073, `External Harness command failed: ${errorMessage3(error54)}`)
+      );
+    }
+  }
+  async #startExternalCommand(request, thread, commandId, arguments_2, requestedTurnId, responseKind) {
+    const commands = thread.session.commands;
+    if (!commands) {
+      await this.#writer.json(
+        rpcError(request, -32078, "External Harness does not expose commands")
+      );
+      return;
+    }
+    if (thread.running) {
+      await this.#writer.json(
+        rpcError(request, -32072, "External Thread already has an active operation")
+      );
+      return;
+    }
+    const turnId = requestedTurnId ?? hostTurnIdSchema.parse(randomUUID9());
+    const projection = {
+      projector: new CodexTurnProjector({
+        threadId: thread.id,
+        turnId,
+        cwd: thread.cwd,
+        startedAtMs: Date.now()
+      })
+    };
+    const gate = turnProjectionGate();
+    thread.running = true;
+    thread.activeTurnId = turnId;
+    thread.projectedTurns.set(turnId, projection);
+    thread.responseGates.set(turnId, gate);
+    thread.ephemeralTurnIds.add(turnId);
+    let result;
+    try {
+      result = await commands.execute({
+        turnId,
+        commandId,
+        ...arguments_2 ? { arguments: arguments_2 } : {}
+      });
+    } catch (error54) {
+      thread.running = false;
+      thread.activeTurnId = null;
+      thread.projectedTurns.delete(turnId);
+      thread.responseGates.delete(turnId);
+      thread.ephemeralTurnIds.delete(turnId);
+      gate.resolve();
+      throw error54;
+    }
+    if (!result.ok) {
+      thread.running = false;
+      thread.activeTurnId = null;
+      thread.projectedTurns.delete(turnId);
+      thread.responseGates.delete(turnId);
+      thread.ephemeralTurnIds.delete(turnId);
+      gate.resolve();
+      await this.#writer.json(rpcError(request, -32073, result.error.message));
+      return;
+    }
+    try {
+      const response = responseKind === "command" ? jsonValueSchema.parse(threadCommandExecuteResultSchema.parse(result.value)) : { turn: projection.projector.pendingTurn() };
+      await this.#writer.json(rpcEnvelope(request, { result: response }));
+    } finally {
+      gate.resolve();
+    }
+  }
   async #selectThreadModel(request) {
     const params = threadModelSelectParamsSchema.safeParse(request.params);
     if (!params.success) {
@@ -62117,10 +62964,10 @@ var AppServerHost = class {
       ...typeof params.serviceTier === "string" ? { serviceTier: params.serviceTier } : {}
     });
     try {
-      if (params.initialTurnsPage !== void 0 && params.initialTurnsPage !== null && !isRecord29(params.initialTurnsPage)) {
+      if (params.initialTurnsPage !== void 0 && params.initialTurnsPage !== null && !isRecord31(params.initialTurnsPage)) {
         throw new ExternalHistoryRequestError("initialTurnsPage must be an object");
       }
-      const initialPageParams = isRecord29(params.initialTurnsPage) ? params.initialTurnsPage : null;
+      const initialPageParams = isRecord31(params.initialTurnsPage) ? params.initialTurnsPage : null;
       const initialTurnsPage = initialPageParams ? listExternalTurns(turns, initialPageParams) : null;
       const paginated = thread.record.historyMode === "paginated";
       const turnsBackwardsCursor = paginated ? listExternalTurns(turns, { limit: 1, itemsView: "notLoaded" }).backwardsCursor : null;
@@ -62180,6 +63027,36 @@ var AppServerHost = class {
       await this.#writer.json(rpcError(request, -32602, errorMessage3(error54)));
       return;
     }
+    if (thread.session.commands) {
+      const catalog = await thread.session.commands.list();
+      if (!catalog.ok) {
+        await this.#writer.json(rpcError(request, -32073, catalog.error.message));
+        return;
+      }
+      const matched = catalog.value.commands.toSorted((left, right) => right.invocation.length - left.invocation.length).find((command) => {
+        if (text === command.invocation) return true;
+        return command.argumentMode === "text" && text.startsWith(`${command.invocation} `);
+      });
+      if (matched) {
+        const argumentText = text.slice(matched.invocation.length).trimStart();
+        try {
+          await this.#startExternalCommand(
+            request,
+            thread,
+            matched.id,
+            argumentText.length > 0 ? { text: argumentText } : void 0,
+            void 0,
+            "turn"
+          );
+        } catch (error54) {
+          this.#diagnose(error54);
+          await this.#writer.json(
+            rpcError(request, -32073, `External Harness command failed: ${errorMessage3(error54)}`)
+          );
+        }
+        return;
+      }
+    }
     const turnId = hostTurnIdSchema.parse(randomUUID9());
     const startedAtMs = Date.now();
     const projection = {
@@ -62301,7 +63178,8 @@ var AppServerHost = class {
       await this.#resolveDesktopApproval(event.interactionId);
       await this.#resolveDesktopQuestion(event.interactionId);
     }
-    if (event.type === "turn.completed") {
+    const ephemeralTurn = event.type === "turn.completed" && thread.ephemeralTurnIds.has(event.turnId);
+    if (event.type === "turn.completed" && !ephemeralTurn) {
       const persistenceError = await this.#persistTerminalIdentity(thread, event);
       if (persistenceError) {
         event = {
@@ -62325,10 +63203,14 @@ var AppServerHost = class {
     if (event.type === "turn.completed") {
       if (!result.completedTurn) throw new Error("Turn projector returned no completed Turn");
       const completedAt = Math.floor(Date.now() / 1e3);
-      thread.turns.push(result.completedTurn);
+      if (ephemeralTurn) {
+        thread.ephemeralTurnIds.delete(event.turnId);
+      } else {
+        thread.turns.push(result.completedTurn);
+        thread.thread.updatedAt = completedAt;
+        thread.thread.recencyAt = completedAt;
+      }
       thread.historyHydrated = false;
-      thread.thread.updatedAt = completedAt;
-      thread.thread.recencyAt = completedAt;
       thread.running = false;
       thread.activeTurnId = null;
       thread.projectedTurns.delete(event.turnId);
@@ -62372,7 +63254,7 @@ var AppServerHost = class {
     }
   }
   async #handleDesktopApprovalResponse(value) {
-    if (!isRecord29(value) || !isHostApprovalRequestId(value.id)) return false;
+    if (!isRecord31(value) || !isHostApprovalRequestId(value.id)) return false;
     const pending = this.#pendingDesktopApprovals.get(value.id);
     if (!pending) return true;
     this.#pendingDesktopApprovals.delete(value.id);
@@ -62494,7 +63376,7 @@ var AppServerHost = class {
     }
   }
   async #handleDesktopQuestionResponse(value) {
-    if (!isRecord29(value) || !isHostQuestionRequestId(value.id)) return false;
+    if (!isRecord31(value) || !isHostQuestionRequestId(value.id)) return false;
     const pending = this.#pendingDesktopQuestions.get(value.id);
     if (!pending) return true;
     this.#pendingDesktopQuestions.delete(value.id);