@cydm/pie 2.7.6 → 2.7.8

package/dist/cli.js

@@ -23,7 +23,7 @@ import {
   logTransportLifecycle,
   migrateConfigFromAgentDir,
   truncateHeadTail
-} from "./chunks/chunk-GAUIKMBA.js";
+} from "./chunks/chunk-E6F4BTNN.js";
 import {
   resolveCliProjectRoot
 } from "./chunks/chunk-WLFOBECN.js";
@@ -47,6 +47,7 @@ import {
   createEmptyExecutionState,
   createExecutionStateStore,
   createFileObservationState,
+  createHostEnvelopeProjectorRegistry,
   createPolicyEnforcedTools,
   createReadFileUnderstandingHandler,
   createSearchContextTool,
@@ -71,11 +72,13 @@ import {
   interactionAttentionResolution,
   isCompactSummaryMessage,
   isExtensionEnabled,
+  isHostContextBlock,
   isToolAllowedInPlanMode,
   maybeAdvanceTodoExecutionState,
   modalityForReadFileUnderstandingKind,
   pauseExecutionState,
   prepareSessionCompaction,
+  projectHostEnvelopes,
   registerInteractionHandler,
   requestInteraction,
   resolveExtensionIdentity,
@@ -85,8 +88,8 @@ import {
   shouldPreserveExecutionStateForUserText,
   supersedeExecutionState,
   verifyPreparedCompactionCommit
-} from "./chunks/chunk-YWWLRZSG.js";
-import "./chunks/chunk-5YWEUFLM.js";
+} from "./chunks/chunk-P22SYVGO.js";
+import "./chunks/chunk-W5B3OXHQ.js";
 import {
   Deref,
   EMPTY_ASSISTANT_CONTENT_ERROR,
@@ -111,7 +114,7 @@ import {
   sortToolModelCandidatesByCapability,
   streamSimple,
   type_exports
-} from "./chunks/chunk-ZF5FHTES.js";
+} from "./chunks/chunk-2FEDB5GR.js";
 import {
   IsArray,
   IsBigInt,
@@ -53655,7 +53658,12 @@ var ModelRegistry = class {
 import * as fs4 from "fs";
 import * as path4 from "path";
 function getDisabledToolNames(settingsManager) {
-  return new Set(typeof settingsManager?.getDisabledTools === "function" ? settingsManager.getDisabledTools() : []);
+  const disabled = new Set(typeof settingsManager?.getDisabledTools === "function" ? settingsManager.getDisabledTools() : []);
+  if (disabled.has("bash") || disabled.has("shell")) {
+    disabled.add("bash");
+    disabled.add("shell");
+  }
+  return disabled;
 }
 function filterEnabledTools(tools, settingsManager) {
   const disabled = getDisabledToolNames(settingsManager);
@@ -53983,11 +53991,12 @@ var SettingsManager = class {
   }
   /** Whether a runtime tool is enabled; absent means "enabled". */
   isToolEnabled(name) {
-    return !this.getDisabledTools().includes(name);
+    return !getDisabledToolNames(this).has(name);
   }
   /** Enable/disable a runtime tool by name (persisted in settings.json). */
   setToolEnabled(name, enabled) {
-    const disabled = this.getDisabledTools().filter((tool) => tool !== name);
+    const isShell = name === "shell" || name === "bash";
+    const disabled = this.getDisabledTools().filter((tool) => isShell ? tool !== "shell" && tool !== "bash" : tool !== name);
     if (!enabled) disabled.push(name);
     disabled.sort();
     const nextTools = { ...this.settings.tools ?? {} };
@@ -54427,8 +54436,8 @@ var MODE_RULES = {
     "File tools read and write inside the current workspace.",
     "~/.pie is allowlisted for Pie configuration and session support.",
     "Shell commands run from the workspace and return structured output, timeout, and truncation details.",
-    "web_research is read-only, uses provider-native web/search/fetch capabilities, and does not grant bash/curl web scraping permission.",
-    "Desktop control runs through the computer-use-axi skill CLI via bash: observation commands only read the screen, while act synthesizes real desktop input and goes through normal shell permission prompts.",
+    "web_research is read-only, uses provider-native web/search/fetch capabilities, and does not grant shell/curl web scraping permission.",
+    "Desktop control runs through the computer-use-axi skill CLI via the shell tool: observation commands only read the screen, while act synthesizes real desktop input and goes through normal shell permission prompts.",
     "Protected paths from extensions can block reads/writes even when tools are present."
   ],
   plan: [
@@ -54454,7 +54463,9 @@ var MODE_TITLES = {
 function buildPermissionsData() {
   return {
     modes: Object.fromEntries(Object.entries(MODE_RULES).map(([key, rules]) => [key, [...rules]])),
-    tools: Object.entries(BUILTIN_TOOL_CAPABILITY_METADATA).map(([name, meta]) => ({
+    // The legacy bash policy key supports old history/settings; it is not a
+    // second executable tool and must not be advertised as one here.
+    tools: Object.entries(BUILTIN_TOOL_CAPABILITY_METADATA).filter(([name]) => name !== "bash").map(([name, meta]) => ({
       name,
       ...meta.riskClass ? { riskClass: meta.riskClass } : {},
       ...meta.permissionScope ? { permissionScope: meta.permissionScope } : {},
@@ -54478,7 +54489,7 @@ ${toolLines}
 
 Disable or narrow capabilities:
   - Start from a trusted cwd.
-  - Use selected tools or extension policy to omit write_file, edit_file, bash, or host-specific tools.
+  - Use selected tools or extension policy to omit write_file, edit_file, the shell tool, or host-specific tools.
   - Keep API keys in environment variables or ~/.pie/models.json, not in prompts.`;
 }
 
@@ -56581,6 +56592,10 @@ function createExtensionContext(extension, cwd, uiContext, abortFn, isIdleFn, ha
       if (!actions?.registerProvider) throw new Error("registerProvider is not available in this host mode");
       return actions.registerProvider(name, config);
     },
+    registerHostEnvelopeProjector(projector) {
+      if (!actions?.registerHostEnvelopeProjector) throw new Error("registerHostEnvelopeProjector is not available in this host mode");
+      return actions.registerHostEnvelopeProjector(projector);
+    },
     async loginProvider(name) {
       if (!actions?.loginProvider) throw new Error("loginProvider is not available in this host mode");
       return actions.loginProvider(name);
@@ -64338,6 +64353,10 @@ var ExtensionRunner = class {
         if (!runner.actions.registerProvider) throw new Error("registerProvider is not available in this host mode");
         return runner.trackUnregisterHandle(runner.actions.registerProvider(name, config));
       },
+      registerHostEnvelopeProjector: (projector) => {
+        if (!runner.actions.registerHostEnvelopeProjector) throw new Error("registerHostEnvelopeProjector is not available in this host mode");
+        return runner.trackUnregisterHandle(runner.actions.registerHostEnvelopeProjector(projector));
+      },
       loginProvider: async (name) => {
         if (!runner.actions.loginProvider) throw new Error("loginProvider is not available in this host mode");
         return runner.actions.loginProvider(name);
@@ -72295,7 +72314,7 @@ ${displayLines.map((line) => theme.fg("toolOutput", line)).join("\n")}`;
 ${theme.fg("warning", `[Truncated: ${warnings.join(", ")}]`)}`;
         }
       }
-    } else if (this.toolName === "bash") {
+    } else if (this.toolName === "bash" || this.toolName === "shell") {
       const command = str(this.args?.command);
       const timeout = this.args?.timeout;
       const timeoutSuffix = timeout ? theme.fg("muted", ` (timeout ${timeout}s)`) : "";
@@ -76118,14 +76137,15 @@ function handleHotkeysCommand(host) {
     "",
     theme.fg("muted", "Editor shortcuts:"),
     "  Enter              Submit message",
-    "  Shift+Enter        New line",
+    "  Shift+Enter        New line (if ineffective, use Ctrl+J)",
+    "  Ctrl+J             New line (fallback)",
     `  ${theme.fg("dim", kb.getKeys("steer").join(" / "))} ${theme.fg("muted", "Queue steering message for the active turn")}`,
     `  ${theme.fg("dim", kb.getKeys("dequeue").join(" / "))} ${theme.fg("muted", "Restore queued messages")}`,
     "  /                  Show slash commands",
     "  Esc                Cancel autocomplete",
     "",
     theme.fg("muted", "Direct mode:"),
-    "  !!command          Execute bash command (bypasses AI)",
+    "  !!command          Execute a shell command (bypasses AI)",
     "",
     theme.bold(theme.fg("accent", "Slash Commands")),
     "",
@@ -76659,6 +76679,369 @@ function renderCompactionDiffPanel(target, stats) {
   target.safeRequestRender();
 }
 
+// src/runtime/runtime-mode-context.ts
+var RUNTIME_MODE_ENVELOPE_KIND = "pie.runtimeMode";
+var RUNTIME_MODE_ENVELOPE_VERSION = 1;
+function runtimeModeEnvelopeRegistry() {
+  return sharedRuntimeModeRegistry ??= createHostEnvelopeProjectorRegistry([{
+    kind: RUNTIME_MODE_ENVELOPE_KIND,
+    version: RUNTIME_MODE_ENVELOPE_VERSION,
+    project: (data) => buildRuntimeModeContext(runtimeModeStateFromEnvelope(data))
+  }]);
+}
+var sharedRuntimeModeRegistry;
+function runtimeModeStateFromEnvelope(data) {
+  return {
+    planMode: data.planMode === "planning" ? "planning" : "off",
+    yoloMode: data.yoloMode === true,
+    filesystemScope: data.filesystemScope === "all" ? "all" : "workspace",
+    pendingTransition: typeof data.pendingTransition === "string" ? data.pendingTransition : void 0,
+    activeToolNames: Array.isArray(data.activeToolNames) ? data.activeToolNames.filter((name) => typeof name === "string") : [],
+    planDisabledToolNames: Array.isArray(data.planDisabledToolNames) ? data.planDisabledToolNames.filter((name) => typeof name === "string") : [],
+    currentDate: typeof data.currentDate === "string" ? data.currentDate : void 0,
+    timeZone: typeof data.timeZone === "string" ? data.timeZone : void 0
+  };
+}
+function runtimeModeEnvelopeData(state) {
+  return {
+    planMode: state.planMode,
+    yoloMode: state.yoloMode,
+    filesystemScope: state.filesystemScope,
+    ...state.pendingTransition ? { pendingTransition: state.pendingTransition } : {},
+    activeToolNames: [...state.activeToolNames],
+    planDisabledToolNames: [...state.planDisabledToolNames],
+    ...state.currentDate ? { currentDate: state.currentDate } : {},
+    ...state.timeZone ? { timeZone: state.timeZone } : {}
+  };
+}
+function runtimeModeEnvelopeBlock(state) {
+  return {
+    type: "hostContext",
+    kind: RUNTIME_MODE_ENVELOPE_KIND,
+    version: RUNTIME_MODE_ENVELOPE_VERSION,
+    data: runtimeModeEnvelopeData(state)
+  };
+}
+function isAgentMessage(value) {
+  return !!value && typeof value === "object" && "role" in value;
+}
+function prependRuntimeModeBlockToPrompt(input, block) {
+  if (!block) return input;
+  if (typeof input === "string") {
+    return [{ ...block }, { type: "text", text: input }];
+  }
+  if (Array.isArray(input)) {
+    if (input.length > 0 && isAgentMessage(input[0])) {
+      return prependBlockToMessages(input, block);
+    }
+    return [block, ...input];
+  }
+  if (isAgentMessage(input)) {
+    return prependBlockToMessages([input], block)[0];
+  }
+  return [block, ...input];
+}
+function prependBlockToMessages(messages, block) {
+  const next = [...messages];
+  let target = -1;
+  for (let index = next.length - 1; index >= 0; index--) {
+    if (next[index]?.role === "user") {
+      target = index;
+      break;
+    }
+  }
+  if (target < 0) {
+    next.push({ role: "user", content: [block], timestamp: Date.now() });
+    return next;
+  }
+  const message = next[target];
+  if (Array.isArray(message.content)) {
+    next[target] = { ...message, content: [block, ...message.content] };
+  } else if (typeof message.content === "string") {
+    next[target] = { ...message, content: [block, { type: "text", text: message.content }] };
+  } else {
+    next.splice(target, 0, { role: "user", content: [block], timestamp: Date.now() });
+  }
+  return next;
+}
+var RUNTIME_MODE_CONTEXT_MARKER = "<runtime-mode-context>";
+var RUNTIME_MODE_CONTEXT_END_MARKER = "</runtime-mode-context>";
+function buildRuntimeModeContext(state) {
+  const lines = [
+    RUNTIME_MODE_CONTEXT_MARKER,
+    "Current runtime mode:"
+  ];
+  if (state.planMode === "planning") {
+    lines.push(
+      "- Plan mode: active (workspace read-only; plan_scratch permits session-local temporary drafts; submit the finished plan by calling plan_submit with the ordered steps for user approval)."
+    );
+    if (state.planDisabledToolNames.length > 0) {
+      lines.push(
+        `- Disabled this turn by plan mode (calls are denied): ${state.planDisabledToolNames.join(", ")}. Do not call them while planning.`
+      );
+    }
+  } else {
+    lines.push("- Plan mode: off.");
+  }
+  lines.push(
+    `- YOLO mode: ${state.yoloMode ? "on (filesystem sandbox directory restrictions are disabled)" : "off (workspace/protected-path restrictions apply)"}.`,
+    `- Filesystem scope: ${state.filesystemScope === "all" ? "all local paths may be passed directly to file tools when permitted" : "workspace paths and configured safe roots only"}.`
+  );
+  if (state.pendingTransition) {
+    const transitionText = {
+      entered_yolo: "YOLO mode was just enabled for this turn.",
+      exited_yolo: "YOLO mode was just disabled; do not assume previous absolute-path access still applies.",
+      entered_plan: "Plan mode was just enabled; analyze and plan without changing the workspace. Use plan_scratch for temporary drafts, then submit the finished plan by calling plan_submit with the ordered steps for user approval.",
+      exited_plan: "Plan mode was just disabled; execution tools may be used when the task requires them."
+    };
+    lines.push(`- Transition: ${transitionText[state.pendingTransition]}`);
+  }
+  if (state.currentDate) {
+    lines.push(`- Current date: ${state.currentDate}${state.timeZone ? ` (${state.timeZone})` : ""}.`);
+  }
+  if (state.activeToolNames.length > 0) {
+    lines.push(`- Active tools: ${state.activeToolNames.join(", ")}.`);
+  }
+  lines.push(RUNTIME_MODE_CONTEXT_END_MARKER);
+  return lines.join("\n");
+}
+function runtimeModeBlockKey(state) {
+  return JSON.stringify({
+    planMode: state.planMode,
+    yoloMode: state.yoloMode,
+    filesystemScope: state.filesystemScope,
+    currentDate: state.currentDate ?? null,
+    activeToolNames: state.activeToolNames,
+    planDisabledToolNames: state.planDisabledToolNames
+  });
+}
+function shouldInjectRuntimeModeBlock(lastKey, state) {
+  if (lastKey === null) return true;
+  return runtimeModeBlockKey(state) !== lastKey;
+}
+function runtimeModeTraceData(state) {
+  return {
+    yoloMode: state.yoloMode,
+    planMode: state.planMode,
+    filesystemScope: state.filesystemScope,
+    pendingTransition: state.pendingTransition,
+    currentDate: state.currentDate,
+    timeZone: state.timeZone,
+    activeToolCount: state.activeToolNames.length,
+    planDisabledToolCount: state.planDisabledToolNames.length
+  };
+}
+function currentDateInZone(timeZone) {
+  const parts = new Intl.DateTimeFormat("en-US", {
+    year: "numeric",
+    month: "2-digit",
+    day: "2-digit",
+    timeZone
+  }).formatToParts(/* @__PURE__ */ new Date());
+  const part = (type) => parts.find((p) => p.type === type)?.value ?? "00";
+  return `${part("year")}-${part("month")}-${part("day")}`;
+}
+var RUNTIME_MODE_BLOCK_START_MARKER = "<runtime-mode-context>";
+function leadingRuntimeBlock(text) {
+  const withoutLeadingWhitespace = text.replace(/^[\t ]+/, "");
+  if (!withoutLeadingWhitespace.startsWith(RUNTIME_MODE_BLOCK_START_MARKER)) return null;
+  const markerStart = text.length - withoutLeadingWhitespace.length;
+  const endIndex = text.indexOf(RUNTIME_MODE_CONTEXT_END_MARKER, markerStart);
+  if (endIndex < 0) return null;
+  const block = text.slice(markerStart, endIndex + RUNTIME_MODE_CONTEXT_END_MARKER.length);
+  const rest = text.slice(endIndex + RUNTIME_MODE_CONTEXT_END_MARKER.length).replace(/^[\t ]*(?:\r?\n){0,2}/, "");
+  return { block, rest };
+}
+function stripLeadingRuntimeBlock(text) {
+  const leading = leadingRuntimeBlock(text);
+  return leading ? { rest: leading.rest } : null;
+}
+function lastUserMessageCarriesEnvelopeBlock(messages, block) {
+  for (let index = messages.length - 1; index >= 0; index -= 1) {
+    const message = messages[index];
+    if (message?.role !== "user") continue;
+    const content = message.content;
+    if (!Array.isArray(content) || content.length === 0) return false;
+    const first = content[0];
+    return first?.type === "hostContext" && first.kind === block.kind && first.version === block.version && JSON.stringify(first.data) === JSON.stringify(block.data);
+  }
+  return false;
+}
+function refreshRuntimeModeBlockOnLastUserMessage(messages, block) {
+  for (let i = messages.length - 1; i >= 0; i--) {
+    const message = messages[i];
+    if (message?.role !== "user") continue;
+    const content = message.content;
+    if (typeof content === "string") {
+      const stripped = stripLeadingRuntimeBlock(content);
+      const rest = stripped ? stripped.rest : content;
+      if (!rest) {
+        const copy2 = [...messages];
+        copy2[i] = { ...message, content: [block] };
+        return copy2;
+      }
+      const copy = [...messages];
+      copy[i] = { ...message, content: [block, { type: "text", text: rest }] };
+      return copy;
+    }
+    if (Array.isArray(content)) {
+      const first = content[0];
+      if (first?.type === "hostContext") {
+        if (first === block) return messages;
+        const copy2 = [...messages];
+        const contentCopy = [...content];
+        contentCopy[0] = block;
+        copy2[i] = { ...message, content: contentCopy };
+        return copy2;
+      }
+      let userBlocks = content;
+      const firstText = content[0];
+      if (firstText?.type === "text" && typeof firstText.text === "string") {
+        const stripped = stripLeadingRuntimeBlock(firstText.text);
+        if (stripped) {
+          userBlocks = stripped.rest ? [{ type: "text", text: stripped.rest }, ...content.slice(1)] : content.slice(1);
+        }
+      }
+      const copy = [...messages];
+      copy[i] = { ...message, content: [block, ...userBlocks] };
+      return copy;
+    }
+    return messages;
+  }
+  return messages;
+}
+var RuntimeModeBlockInjector = class {
+  constructor(options) {
+    this.options = options;
+  }
+  options;
+  lastKey = null;
+  /** Exact frozen envelope block, including its consumed one-shot transition. */
+  lastFrozenBlock = null;
+  /**
+   * Request-view overlay. While active, the CURRENT block is re-derived on
+   * every request from the live message snapshot and applied to the latest
+   * user message. It is not cached into history and it ends only when a real
+   * user message freezes the current block (see `nextBlock` + the transform),
+   * so consecutive tool rounds after a compaction retry keep the fresh state
+   * instead of losing it after one request.
+   */
+  overlayActive = false;
+  reset() {
+    this.lastKey = null;
+    this.lastFrozenBlock = null;
+    this.overlayActive = true;
+  }
+  /**
+   * Arm the request-view overlay without resetting the frozen-block key. Used
+   * when the runtime shape changed while a turn is still running (compaction
+   * checkpoint committed, plan approval, YOLO toggle inside a tool turn): the
+   * next and subsequent model requests must see the current state even though
+   * no new user message has been accepted yet.
+   */
+  armRefresh() {
+    this.overlayActive = true;
+  }
+  /**
+   * Envelope block to prepend to the next user message, or null when
+   * unchanged. Does NOT end the overlay: the block is only proof once the
+   * message carrying it reaches the request transform.
+   */
+  nextBlock() {
+    return this.freshBlock();
+  }
+  /**
+   * Current envelope block for a request that reuses existing history
+   * (overflow retry after compaction, manual-compact continue, or the tool
+   * rounds that follow a mid-turn mode change). Returns the same block for
+   * every request until the latest user message itself carries that block;
+   * then the overlay is retired and null is returned. Derivation is per
+   * request from the given snapshot; no message array is cached.
+   */
+  consumeRetryRefreshBlock(messages) {
+    if (!this.overlayActive) return null;
+    const state = this.options.getState();
+    const block = runtimeModeEnvelopeBlock(state);
+    const frozenCurrent = this.lastKey === runtimeModeBlockKey(state) ? this.lastFrozenBlock : null;
+    if (messages && (lastUserMessageCarriesEnvelopeBlock(messages, block) || frozenCurrent !== null && lastUserMessageCarriesEnvelopeBlock(messages, frozenCurrent))) {
+      this.overlayActive = false;
+      return null;
+    }
+    return block;
+  }
+  freshBlock() {
+    const state = this.options.getState();
+    if (!shouldInjectRuntimeModeBlock(this.lastKey, state)) return null;
+    this.lastKey = runtimeModeBlockKey(state);
+    if (state.pendingTransition) this.options.consumeTransition();
+    this.options.noteTrace(state);
+    this.lastFrozenBlock = runtimeModeEnvelopeBlock(state);
+    return this.lastFrozenBlock;
+  }
+};
+
+// src/runtime/host-envelope-registry.ts
+var sharedCliEnvelopeRegistry;
+function cliHostEnvelopeRegistry() {
+  if (sharedCliEnvelopeRegistry) return sharedCliEnvelopeRegistry;
+  sharedCliEnvelopeRegistry = createHostEnvelopeProjectorRegistry();
+  for (const { kind, version } of runtimeModeEnvelopeRegistry().listPins()) {
+    sharedCliEnvelopeRegistry.register({
+      kind,
+      version,
+      project: (data) => runtimeModeEnvelopeRegistry().resolve(kind, version).project(data)
+    });
+  }
+  return sharedCliEnvelopeRegistry;
+}
+function registerExternalHostEnvelopeProjector(projector) {
+  cliHostEnvelopeRegistry().register(projector);
+  return () => {
+  };
+}
+function cliHostEnvelopeKinds() {
+  return cliHostEnvelopeRegistry().listPins().map(({ kind, version }) => `${kind}@${version}`).sort();
+}
+function projectCliHostEnvelopes(messages) {
+  return projectHostEnvelopes(messages, cliHostEnvelopeRegistry());
+}
+function isIntakeHostContextError(value) {
+  return value.code !== void 0;
+}
+function intakeHostContextBlock(value) {
+  if (!isHostContextBlock(value)) {
+    return {
+      ok: false,
+      code: "host_context_invalid_shape",
+      message: "hostContext must be { type: 'hostContext', kind: string, version: integer >= 1, data: object }"
+    };
+  }
+  const block = value;
+  const projector = cliHostEnvelopeRegistry().resolve(block.kind, block.version);
+  if (!projector) {
+    return {
+      ok: false,
+      code: "host_context_unknown_projector",
+      message: `no projector for ${block.kind}@${block.version}; this build supports: ${cliHostEnvelopeKinds().join(", ")}`
+    };
+  }
+  try {
+    const text = projector.project(block.data);
+    if (typeof text !== "string" || text.trim().length === 0) throw new Error("projector returned empty text");
+  } catch (error) {
+    return {
+      ok: false,
+      code: "host_context_unknown_projector",
+      message: `projector for ${block.kind}@${block.version} rejected the data: ${error instanceof Error ? error.message : String(error)}`
+    };
+  }
+  return { ok: true, block };
+}
+function intakeHostContextFailure(value) {
+  const result = intakeHostContextBlock(value);
+  return isIntakeHostContextError(result) ? { code: result.code, message: result.message } : void 0;
+}
+
 // src/commands/interactive-compact-command.ts
 async function handleCompactCommand(host) {
   if (host.submitLock || host.isProcessing || host.isCompacting) {
@@ -76712,7 +77095,7 @@ async function handleCompactCommand(host) {
     if (beforeCompact?.summary) {
       summary = beforeCompact.summary;
     } else {
-      summary = await createCompactionSummary(preparation.messages, compactOptions);
+      summary = await createCompactionSummary(projectCliHostEnvelopes(preparation.messages), compactOptions);
     }
     const verified = verifyPreparedCompactionCommit({
       preparation,
@@ -78884,9 +79267,7 @@ function queueMessage(host, text, mode, options = {}) {
   const clearEditor = options.clearEditor ?? true;
   host.sessionTrace.notePendingUserText(text);
   const runtimeBlock = host.runtimeModeBlockForNextMessage?.();
-  const content = runtimeBlock ? `${runtimeBlock}
-
-${text}` : text;
+  const content = runtimeBlock ? [runtimeBlock, { type: "text", text }] : [{ type: "text", text }];
   void host.agentSessionController.prompt(
     { role: "user", content, timestamp: Date.now() },
     {
@@ -79274,7 +79655,11 @@ When the user asks about Pie itself, its extensions, skills, TUI, model configur
 function buildCliSystemPrompt(options) {
   const tools = options.tools.map((tool) => ({
     name: tool.name,
-    description: ""
+    description: "",
+    // Metadata travels with the projection: the <tools> section resolves
+    // policy from tool-carried metadata first, so a renamed tool cannot
+    // silently disappear from the prompt.
+    capabilityMetadata: tool.capabilityMetadata
   }));
   return [
     options.customPrompt?.trim() || "You are Pie, a helpful AI coding assistant.",
@@ -79373,7 +79758,7 @@ async function createCliAutoCompactionResult(params) {
     systemPrompt: params.systemPrompt,
     signal: params.context.signal
   };
-  const summary = await createCompactionSummary(params.context.messages, compactOptions);
+  const summary = await createCompactionSummary(projectCliHostEnvelopes(params.context.messages), compactOptions);
   if (params.context.signal?.aborted) {
     return { aborted: true };
   }
@@ -79580,10 +79965,7 @@ function estimateMessageTokens(msg) {
   return estimateTokens(msg);
 }
 function buildSystemPrompt(host) {
-  const tools = (host.agent?.state?.tools ?? host.options.tools ?? []).filter((tool) => typeof tool.name === "string").map((tool) => ({
-    name: tool.name,
-    description: tool.description
-  }));
+  const tools = (host.agent?.state?.tools ?? host.options.tools ?? []).filter((tool) => typeof tool.name === "string");
   return buildCliSystemPrompt({
     cwd: host.options.cwd,
     tools,
@@ -79593,7 +79975,7 @@ function buildSystemPrompt(host) {
 }
 function getAllToolNames(host) {
   if (!host.agent?.state?.tools) {
-    return [...CLI_FILESYSTEM_TOOL_NAMES, "bash"];
+    return [...CLI_FILESYSTEM_TOOL_NAMES, "shell"];
   }
   return host.agent.state.tools.map((tool) => tool.name);
 }
@@ -80594,277 +80976,6 @@ function createInteractiveAgentSessionController(host) {
   });
 }
 
-// src/runtime/runtime-mode-context.ts
-function isAgentMessage(value) {
-  return !!value && typeof value === "object" && "role" in value;
-}
-function prependRuntimeModeBlockToPrompt(input, block) {
-  if (!block) return input;
-  if (typeof input === "string") {
-    return input.trim() ? `${block}
-
-${input}` : block;
-  }
-  if (Array.isArray(input)) {
-    if (input.length > 0 && isAgentMessage(input[0])) {
-      return prependBlockToMessages(input, block);
-    }
-    return [{ type: "text", text: block }, ...input];
-  }
-  if (isAgentMessage(input)) {
-    return prependBlockToMessages([input], block)[0];
-  }
-  return [{ type: "text", text: block }, ...input];
-}
-function prependBlockToMessages(messages, block) {
-  const next = [...messages];
-  let target = -1;
-  for (let index = next.length - 1; index >= 0; index--) {
-    if (next[index]?.role === "user") {
-      target = index;
-      break;
-    }
-  }
-  if (target < 0) {
-    next.push({ role: "user", content: block, timestamp: Date.now() });
-    return next;
-  }
-  const message = next[target];
-  if (typeof message.content === "string") {
-    next[target] = { ...message, content: `${block}
-
-${message.content}` };
-  } else if (Array.isArray(message.content)) {
-    next[target] = { ...message, content: [{ type: "text", text: block }, ...message.content] };
-  } else {
-    next.splice(target, 0, { role: "user", content: block, timestamp: Date.now() });
-  }
-  return next;
-}
-var RUNTIME_MODE_CONTEXT_MARKER = "<runtime-mode-context>";
-var RUNTIME_MODE_CONTEXT_END_MARKER = "</runtime-mode-context>";
-function buildRuntimeModeContext(state) {
-  const lines = [
-    RUNTIME_MODE_CONTEXT_MARKER,
-    "Current runtime mode:"
-  ];
-  if (state.planMode === "planning") {
-    lines.push(
-      "- Plan mode: active (workspace read-only; plan_scratch permits session-local temporary drafts; submit the finished plan by calling plan_submit with the ordered steps for user approval)."
-    );
-    if (state.planDisabledToolNames.length > 0) {
-      lines.push(
-        `- Disabled this turn by plan mode (calls are denied): ${state.planDisabledToolNames.join(", ")}. Do not call them while planning.`
-      );
-    }
-  } else {
-    lines.push("- Plan mode: off.");
-  }
-  lines.push(
-    `- YOLO mode: ${state.yoloMode ? "on (filesystem sandbox directory restrictions are disabled)" : "off (workspace/protected-path restrictions apply)"}.`,
-    `- Filesystem scope: ${state.filesystemScope === "all" ? "all local paths may be passed directly to file tools when permitted" : "workspace paths and configured safe roots only"}.`
-  );
-  if (state.pendingTransition) {
-    const transitionText = {
-      entered_yolo: "YOLO mode was just enabled for this turn.",
-      exited_yolo: "YOLO mode was just disabled; do not assume previous absolute-path access still applies.",
-      entered_plan: "Plan mode was just enabled; analyze and plan without changing the workspace. Use plan_scratch for temporary drafts, then submit the finished plan by calling plan_submit with the ordered steps for user approval.",
-      exited_plan: "Plan mode was just disabled; execution tools may be used when the task requires them."
-    };
-    lines.push(`- Transition: ${transitionText[state.pendingTransition]}`);
-  }
-  if (state.currentDate) {
-    lines.push(`- Current date: ${state.currentDate}${state.timeZone ? ` (${state.timeZone})` : ""}.`);
-  }
-  if (state.activeToolNames.length > 0) {
-    lines.push(`- Active tools: ${state.activeToolNames.join(", ")}.`);
-  }
-  lines.push(RUNTIME_MODE_CONTEXT_END_MARKER);
-  return lines.join("\n");
-}
-function runtimeModeBlockKey(state) {
-  return JSON.stringify({
-    planMode: state.planMode,
-    yoloMode: state.yoloMode,
-    filesystemScope: state.filesystemScope,
-    currentDate: state.currentDate ?? null,
-    activeToolNames: state.activeToolNames,
-    planDisabledToolNames: state.planDisabledToolNames
-  });
-}
-function shouldInjectRuntimeModeBlock(lastKey, state) {
-  if (lastKey === null) return true;
-  return runtimeModeBlockKey(state) !== lastKey;
-}
-function runtimeModeTraceData(state) {
-  return {
-    yoloMode: state.yoloMode,
-    planMode: state.planMode,
-    filesystemScope: state.filesystemScope,
-    pendingTransition: state.pendingTransition,
-    currentDate: state.currentDate,
-    timeZone: state.timeZone,
-    activeToolCount: state.activeToolNames.length,
-    planDisabledToolCount: state.planDisabledToolNames.length
-  };
-}
-function currentDateInZone(timeZone) {
-  const parts = new Intl.DateTimeFormat("en-US", {
-    year: "numeric",
-    month: "2-digit",
-    day: "2-digit",
-    timeZone
-  }).formatToParts(/* @__PURE__ */ new Date());
-  const part = (type) => parts.find((p) => p.type === type)?.value ?? "00";
-  return `${part("year")}-${part("month")}-${part("day")}`;
-}
-var RUNTIME_MODE_BLOCK_START_MARKER = "<runtime-mode-context>";
-function leadingRuntimeBlock(text) {
-  const withoutLeadingWhitespace = text.replace(/^[\t ]+/, "");
-  if (!withoutLeadingWhitespace.startsWith(RUNTIME_MODE_BLOCK_START_MARKER)) return null;
-  const markerStart = text.length - withoutLeadingWhitespace.length;
-  const endIndex = text.indexOf(RUNTIME_MODE_CONTEXT_END_MARKER, markerStart);
-  if (endIndex < 0) return null;
-  const block = text.slice(markerStart, endIndex + RUNTIME_MODE_CONTEXT_END_MARKER.length);
-  const rest = text.slice(endIndex + RUNTIME_MODE_CONTEXT_END_MARKER.length).replace(/^[\t ]*(?:\r?\n){0,2}/, "");
-  return { block, rest };
-}
-function stripLeadingRuntimeBlock(text) {
-  const leading = leadingRuntimeBlock(text);
-  return leading ? { rest: leading.rest } : null;
-}
-function leadingRuntimeBlockOfMessage(message) {
-  if (message.role !== "user") return null;
-  const content = message.content;
-  if (typeof content === "string") return leadingRuntimeBlock(content)?.block ?? null;
-  if (!Array.isArray(content)) return null;
-  const first = content[0];
-  if (first?.type !== "text" || typeof first.text !== "string") return null;
-  return leadingRuntimeBlock(first.text)?.block ?? null;
-}
-function lastUserMessageCarriesRuntimeBlock(messages, block) {
-  for (let index = messages.length - 1; index >= 0; index -= 1) {
-    const message = messages[index];
-    if (message?.role !== "user") continue;
-    return leadingRuntimeBlockOfMessage(message) === block;
-  }
-  return false;
-}
-function applyRuntimeBlockToText(text, block) {
-  const split = stripLeadingRuntimeBlock(text);
-  const rest = split ? split.rest : text;
-  const next = rest.length > 0 ? `${block}
-
-${rest}` : block;
-  return next === text ? text : next;
-}
-function applyRuntimeBlockToContentArray(content, block) {
-  const first = content[0];
-  if (first && typeof first === "object" && first.type === "text" && typeof first.text === "string") {
-    const text = first.text;
-    if (stripLeadingRuntimeBlock(text)) {
-      const nextText = applyRuntimeBlockToText(text, block);
-      if (nextText === text) return content;
-      const copy = [...content];
-      copy[0] = { ...first, text: nextText };
-      return copy;
-    }
-  }
-  return [{ type: "text", text: block }, ...content];
-}
-function refreshRuntimeModeBlockOnLastUserMessage(messages, block) {
-  for (let i = messages.length - 1; i >= 0; i--) {
-    const message = messages[i];
-    if (message?.role !== "user") continue;
-    const content = message.content;
-    if (typeof content === "string") {
-      const next = applyRuntimeBlockToText(content, block);
-      if (next === content) return messages;
-      const copy = [...messages];
-      copy[i] = { ...message, content: next };
-      return copy;
-    }
-    if (Array.isArray(content)) {
-      const next = applyRuntimeBlockToContentArray(content, block);
-      if (next === content) return messages;
-      const copy = [...messages];
-      copy[i] = { ...message, content: next };
-      return copy;
-    }
-    return messages;
-  }
-  return messages;
-}
-var RuntimeModeBlockInjector = class {
-  constructor(options) {
-    this.options = options;
-  }
-  options;
-  lastKey = null;
-  /** Exact frozen block, including its consumed one-shot transition. */
-  lastFrozenBlock = null;
-  /**
-   * Request-view overlay. While active, the CURRENT block is re-derived on
-   * every request from the live message snapshot and applied to the latest
-   * user message. It is not cached into history and it ends only when a real
-   * user message freezes the current block (see `nextBlock` + the transform),
-   * so consecutive tool rounds after a compaction retry keep the fresh state
-   * instead of losing it after one request.
-   */
-  overlayActive = false;
-  reset() {
-    this.lastKey = null;
-    this.lastFrozenBlock = null;
-    this.overlayActive = true;
-  }
-  /**
-   * Arm the request-view overlay without resetting the frozen-block key. Used
-   * when the runtime shape changed while a turn is still running (compaction
-   * checkpoint committed, plan approval, YOLO toggle inside a tool turn): the
-   * next and subsequent model requests must see the current state even though
-   * no new user message has been accepted yet.
-   */
-  armRefresh() {
-    this.overlayActive = true;
-  }
-  /**
-   * Block to prepend to the next user message, or null when unchanged. Does
-   * NOT end the overlay: the block is only proof once the message carrying it
-   * reaches the request transform.
-   */
-  nextBlock() {
-    return this.freshBlock();
-  }
-  /**
-   * Current block for a request that reuses existing history (overflow retry
-   * after compaction, manual-compact continue, or the tool rounds that follow
-   * a mid-turn mode change). Returns the same block for every request until
-   * the latest user message itself carries that block; then the overlay is
-   * retired and null is returned. Derivation is per request from the given
-   * snapshot; no message array is cached.
-   */
-  consumeRetryRefreshBlock(messages) {
-    if (!this.overlayActive) return null;
-    const state = this.options.getState();
-    const block = buildRuntimeModeContext(state);
-    const frozenCurrent = this.lastKey === runtimeModeBlockKey(state) ? this.lastFrozenBlock : null;
-    if (messages && (lastUserMessageCarriesRuntimeBlock(messages, block) || frozenCurrent !== null && lastUserMessageCarriesRuntimeBlock(messages, frozenCurrent))) {
-      this.overlayActive = false;
-      return null;
-    }
-    return block;
-  }
-  freshBlock() {
-    const state = this.options.getState();
-    if (!shouldInjectRuntimeModeBlock(this.lastKey, state)) return null;
-    this.lastKey = runtimeModeBlockKey(state);
-    if (state.pendingTransition) this.options.consumeTransition();
-    this.options.noteTrace(state);
-    this.lastFrozenBlock = buildRuntimeModeContext(state);
-    return this.lastFrozenBlock;
-  }
-};
-
 // src/runtime/cache-retention.ts
 function createCacheRetentionStreamFn(configured, getConfiguredRetention) {
   const base = configured ?? ((model, context, options) => streamSimple(model, context, options));
@@ -81727,6 +81838,7 @@ async function loadInteractiveExtensions(host) {
       host.noteRuntimeModeChanged("extension_register_provider");
       return unregister;
     },
+    registerHostEnvelopeProjector: (projector) => registerExternalHostEnvelopeProjector(projector),
     loginProvider: async (name) => {
       const loggedIn = await loginExtensionProvider({
         provider: name,
@@ -81860,7 +81972,7 @@ var InteractiveMode = class {
   pendingYoloModeTransition = null;
   executionReminder = null;
   pendingRuntimeGuardAdvisory = null;
-  /** Freezes runtime mode blocks into user messages (cache-stable history). */
+  /** Freezes runtime mode envelope blocks into user messages (cache-stable history). */
   runtimeModeBlocks = new RuntimeModeBlockInjector({
     getState: () => this.getRuntimeModeState(),
     consumeTransition: () => this.consumeRuntimeModeTransition(),
@@ -82037,7 +82149,7 @@ var InteractiveMode = class {
   });
   rebuildSkillAwareTools(sourceTools) {
     const preservedTools = sourceTools.filter(
-      (tool) => !CLI_FILESYSTEM_TOOL_NAMES.includes(tool.name) && tool.name !== "bash"
+      (tool) => !CLI_FILESYSTEM_TOOL_NAMES.includes(tool.name) && tool.name !== "bash" && tool.name !== "shell"
     );
     const bashTool = createBashTool(this.options.cwd, { isYoloMode: () => this.yoloMode, getEnv: () => computerUseOwnerEnv(this.sessionManager.getActiveSessionId() || COMPUTER_USE_STANDALONE_OWNER, String(process.pid)) });
     const fileSystemToolOptions = (allowlistedDirs) => ({
@@ -82092,16 +82204,13 @@ var InteractiveMode = class {
   resetRuntimeModeBlocks() {
     this.runtimeModeBlocks.reset();
   }
-  /** Runtime mode block for the next user message; frozen into it (append-only history, cache-stable prefixes). */
+  /** Runtime mode envelope block for the next user message; frozen into it (append-only history, cache-stable prefixes). */
   runtimeModeBlockForNextMessage() {
     return this.runtimeModeBlocks.nextBlock();
   }
   getPendingRuntimeModeTransition() {
-    if (this.pendingYoloModeTransition === "enter") return "entered_yolo";
-    if (this.pendingYoloModeTransition === "exit") return "exited_yolo";
-    if (this.pendingPlanModeTransition === "enter") return "entered_plan";
-    if (this.pendingPlanModeTransition === "exit") return "exited_plan";
-    return void 0;
+    const yolo = this.pendingYoloModeTransition === "enter" ? "entered_yolo" : this.pendingYoloModeTransition === "exit" ? "exited_yolo" : void 0;
+    return yolo ?? (this.pendingPlanModeTransition === "enter" ? "entered_plan" : this.pendingPlanModeTransition === "exit" ? "exited_plan" : void 0);
   }
   consumeRuntimeModeTransition() {
     this.pendingYoloModeTransition = null;
@@ -82190,7 +82299,7 @@ var InteractiveMode = class {
   async init() {
     const activeSession = this.sessionManager.getActiveSession();
     this.thinkingLevel = resolveInitialThinkingLevel({ session: activeSession, settingsManager: this.options.settingsManager });
-    const { Agent } = await import("./chunks/src-6WK5KYWQ.js");
+    const { Agent } = await import("./chunks/src-C2CBPEUY.js");
     this.agent = new Agent({
       initialState: {
         systemPrompt: this.buildSystemPrompt(),
@@ -82201,14 +82310,21 @@ var InteractiveMode = class {
       apiKey: this.options.apiKey,
       sessionId: activeSession?.id,
       streamFn: createTransportDiagnosticsStreamFn(createCacheRetentionStreamFn(this.options.streamFn, () => this.options.settingsManager.getPromptCacheRetention()), createTraceTransportSink((type, meta) => this.sessionTrace.noteRuntimeEvent(type, meta))),
-      transformContext: async (messages) => applyRuntimeRequestTransform(messages, {
-        takeAdvisory: () => {
-          const advisory = this.pendingRuntimeGuardAdvisory;
-          this.pendingRuntimeGuardAdvisory = null;
-          return advisory;
-        },
-        takeRetryBlock: (snapshot) => this.runtimeModeBlocks.consumeRetryRefreshBlock(snapshot)
-      })
+      transformContext: async (messages) => {
+        const structured = applyRuntimeRequestTransform(messages, {
+          takeAdvisory: () => {
+            const advisory = this.pendingRuntimeGuardAdvisory;
+            this.pendingRuntimeGuardAdvisory = null;
+            return advisory;
+          },
+          takeRetryBlock: (snapshot) => this.runtimeModeBlocks.consumeRetryRefreshBlock(snapshot)
+        });
+        return projectHostEnvelopes(
+          structured,
+          cliHostEnvelopeRegistry(),
+          (outcome) => this.sessionTrace.noteRuntimeEvent(outcome.degraded ? "host_envelope_degraded" : "host_envelope_projected", outcome.audit)
+        );
+      }
     });
     this.agentSessionController = createInteractiveAgentSessionController(this.controllerSetupHost);
     this.updateTerminalTitle();
@@ -82995,6 +83111,7 @@ async function loadPrintModeExtensions(params) {
     setSessionName: (name) => params.sessionManager.setSessionName(name),
     getSessionName: () => params.sessionManager.getSessionName(),
     registerProvider: (name, config) => params.modelRegistry.registerProvider(name, config),
+    registerHostEnvelopeProjector: (projector) => registerExternalHostEnvelopeProjector(projector),
     loginProvider: (name) => loginExtensionProvider({
       provider: name,
       modelRegistry: params.modelRegistry,
@@ -83049,7 +83166,7 @@ async function runPrintMode(params) {
 `);
     console.log("Assistant: ");
   }
-  const { Agent: AgentClass } = await import("./chunks/src-6WK5KYWQ.js");
+  const { Agent: AgentClass } = await import("./chunks/src-C2CBPEUY.js");
   let agent;
   const printModeExtensions = await loadPrintModeExtensions({
     cwd: runtime.cwd,
@@ -83082,7 +83199,7 @@ async function runPrintMode(params) {
     cwd: runtime.cwd,
     skillsSection: runtime.skillsSection,
     knowledgeSection: runtime.knowledgeSection,
-    tools: printModeTools.map((tool) => ({ name: tool.name, description: tool.description }))
+    tools: printModeTools
   });
   const printThinkingLevel = resolveInitialThinkingLevel({ session: runtime.sessionManager.getActiveSession(), settingsManager: runtime.settingsManager });
   agent = new AgentClass({
@@ -83093,6 +83210,12 @@ async function runPrintMode(params) {
       thinkingLevel: printThinkingLevel
     },
     apiKey: runtime.apiKey,
+    // Print mode restores interactive sessions verbatim (AgentSessionController
+    // loads stored history on construction). Those sessions carry persisted
+    // hostContext facts; project them to model-visible text or the provider
+    // converters reject the request (`Unprojected hostContext block`). The
+    // persisted history is never rewritten — projection builds the wire view.
+    transformContext: async (messages) => projectCliHostEnvelopes(messages),
     // Body-free transport timeline for the main (print-mode) agent.
     streamFn: createTransportDiagnosticsStreamFn(params.streamFn ?? streamSimple, logTransportLifecycle)
   });
@@ -83336,14 +83459,17 @@ function parseInput(line) {
     };
   }
   if (parsed.type === "sidechat.request" && typeof parsed.requestId === "string" && typeof parsed.prompt === "string") {
+    if (parsed.hostContext !== void 0 && !isHostContextBlock(parsed.hostContext)) return null;
     return {
       type: "sidechat.request",
       sessionId: typeof parsed.sessionId === "string" ? parsed.sessionId : void 0,
       requestId: parsed.requestId,
-      prompt: parsed.prompt
+      prompt: parsed.prompt,
+      hostContext: parsed.hostContext
     };
   }
   if ((parsed.type === "turn.request" || parsed.type === "turn.input") && typeof parsed.turnId === "string" && typeof parsed.prompt === "string") {
+    if (parsed.hostContext !== void 0 && !isHostContextBlock(parsed.hostContext)) return null;
     const streamingBehavior = parsed.streamingBehavior;
     if (streamingBehavior !== void 0 && streamingBehavior !== "steer" && streamingBehavior !== "followUp") {
       return null;
@@ -83353,6 +83479,7 @@ function parseInput(line) {
       sessionId: typeof parsed.sessionId === "string" ? parsed.sessionId : void 0,
       turnId: parsed.turnId,
       prompt: parsed.prompt,
+      hostContext: parsed.hostContext,
       streamingBehavior,
       cwd: typeof parsed.cwd === "string" ? parsed.cwd : void 0,
       metadata: isRecord3(parsed.metadata) ? parsed.metadata : void 0
@@ -83461,6 +83588,7 @@ async function loadJsonModeExtensions(params) {
     getRuntimeTools: () => params.getAgent()?.state.tools ?? [],
     resolveModelClass: (modelClass) => params.runtime.modelRegistry.resolveModelClass(modelClass),
     resolveModelRef: (modelRef) => params.runtime.modelRegistry.resolveModelRef(modelRef),
+    registerHostEnvelopeProjector: (projector) => registerExternalHostEnvelopeProjector(projector),
     getMessages: () => params.getAgent()?.state.messages ?? [],
     getSessionMetadata: () => ({ ...params.runtime.sessionManager.getActiveSession()?.metadata ?? {} }),
     setSessionMetadata: (key, value) => {
@@ -83535,7 +83663,14 @@ async function runJsonEventsMode(params) {
   const prewarmTimeoutMs = Number(process.env.PIE_JSON_EVENTS_PREWARM_TIMEOUT_MS || 1e4);
   const sidechatTimeoutMs = Number(process.env.PIE_JSON_EVENTS_SIDECHAT_TIMEOUT_MS || 3e5);
   await prewarmRuntime();
-  writeEvent({ type: "agent.ready", sessionId });
+  writeEvent({
+    type: "agent.ready",
+    sessionId,
+    // Capability broadcast: the envelope kinds THIS build can project at
+    // intake (embedded external kinds included), so embedders can probe
+    // before their first turn instead of learning mismatches from failures.
+    capabilities: { hostContextKinds: cliHostEnvelopeKinds() }
+  });
   function trackSidechatPromise(promise) {
     activeSidechatPromise = promise;
     void promise.finally(() => {
@@ -83637,7 +83772,7 @@ async function runJsonEventsMode(params) {
       timestamp: startedAt,
       message: {
         role: "user",
-        content: message.prompt,
+        content: message.hostContext ? [message.hostContext, { type: "text", text: message.prompt }] : message.prompt,
         timestamp: startedAt
       }
     };
@@ -83850,6 +83985,11 @@ async function runJsonEventsMode(params) {
     });
   }
   async function handleSidechat(message) {
+    const hostContextFailure = validateIntakeHostContext(message);
+    if (hostContextFailure) {
+      writeSidechatFailure(message, hostContextFailure.message, hostContextFailure.code);
+      return;
+    }
     if (isSessionMismatch(message)) {
       writeSidechatFailure(message, sessionMismatchError(message.sessionId), "session_mismatch");
       return;
@@ -83905,7 +84045,7 @@ async function runJsonEventsMode(params) {
         return;
       }
       const parent = agent;
-      const { Agent: AgentClass } = await import("./chunks/src-6WK5KYWQ.js");
+      const { Agent: AgentClass } = await import("./chunks/src-C2CBPEUY.js");
       const sideAgent = new AgentClass({
         initialState: {
           systemPrompt: parent.state.systemPrompt,
@@ -83915,6 +84055,9 @@ async function runJsonEventsMode(params) {
           messages: structuredClone(parent.state.messages)
         },
         apiKey: runtime.apiKey,
+        // The sidechat snapshot clones the parent's stored history, including
+        // persisted hostContext facts; project them like the main agent does.
+        transformContext: async (messages) => projectCliHostEnvelopes(messages),
         // Same body-free transport timeline as the main agent: a sidechat is
         // an independent Responses request and previously had no record at all
         // when it stalled. `streamSimple` matches the host default when the
@@ -83928,7 +84071,7 @@ async function runJsonEventsMode(params) {
       }, sidechatTimeoutMs);
       timer.unref?.();
       try {
-        await sideAgent.prompt(message.prompt);
+        await sideAgent.prompt(sidechatPromptBlocks(message));
       } finally {
         clearTimeout(timer);
       }
@@ -84259,7 +84402,7 @@ async function runJsonEventsMode(params) {
     if (runtime.initialModel.unconfigured || controller) {
       return;
     }
-    const { Agent: AgentClass } = await import("./chunks/src-6WK5KYWQ.js");
+    const { Agent: AgentClass } = await import("./chunks/src-C2CBPEUY.js");
     if (runtimeClosing) return;
     const jsonModeExtensions = await loadJsonModeExtensions({ runtime, getAgent: () => agent });
     if (runtimeClosing) {
@@ -84286,7 +84429,7 @@ async function runJsonEventsMode(params) {
       skillsSection: runtime.skillsSection,
       knowledgeSection: runtime.knowledgeSection,
       appendSystemPrompt: params.developerInstructions,
-      tools: tools.map((tool) => ({ name: tool.name, description: tool.description }))
+      tools
     });
     agent = new AgentClass({
       initialState: {
@@ -84296,6 +84439,10 @@ async function runJsonEventsMode(params) {
         thinkingLevel
       },
       apiKey: runtime.apiKey,
+      // Restored interactive sessions carry persisted hostContext facts; project
+      // them to model-visible text at the request boundary or the provider
+      // converters reject the request (`Unprojected hostContext block`).
+      transformContext: async (messages) => projectCliHostEnvelopes(messages),
       // Body-free transport timeline for the main (JSON-events) agent.
       streamFn: createJsonEventsTransportStreamFn(params.streamFn)
     });
@@ -84429,7 +84576,27 @@ async function runJsonEventsMode(params) {
       syncSessionModelMetadata(runtime.sessionManager, runtime.model, thinkingLevel);
     }
   }
+  function promptInputFor(message) {
+    return message.hostContext ? [message.hostContext, { type: "text", text: message.prompt }] : message.prompt;
+  }
+  function sidechatPromptBlocks(message) {
+    return message.hostContext ? [message.hostContext, { type: "text", text: message.prompt }] : [{ type: "text", text: message.prompt }];
+  }
+  function validateIntakeHostContext(message) {
+    return message.hostContext ? intakeHostContextFailure(message.hostContext) : void 0;
+  }
   async function runTurn(message) {
+    const hostContextFailure = validateIntakeHostContext(message);
+    if (hostContextFailure) {
+      writeEvent({
+        type: "turn.failed",
+        sessionId,
+        turnId: message.turnId,
+        error: hostContextFailure.message,
+        ...hostContextFailure.code === "host_context_unknown_projector" ? { hostContextKinds: cliHostEnvelopeKinds() } : {}
+      });
+      return;
+    }
     if (isSessionMismatch(message)) {
       writeEvent({
         type: "turn.failed",
@@ -84527,7 +84694,7 @@ async function runJsonEventsMode(params) {
     try {
       trace?.notePendingUserText(message.prompt);
       trace?.noteDispatchStart({ mode: "json-events" });
-      await controller.prompt(message.prompt, { source: "json-events" });
+      await controller.prompt(promptInputFor(message), { source: "json-events" });
       trace?.noteDispatchSettled({ mode: "json-events" });
       trace?.noteWaitForIdleStart({ mode: "json-events" });
       await controller.waitForSettled();
@@ -84592,7 +84759,7 @@ async function runJsonEventsMode(params) {
         mode: message.streamingBehavior,
         turnId: message.turnId
       });
-      await activeController.prompt(message.prompt, {
+      await activeController.prompt(promptInputFor(message), {
         source: "json-events",
         streamingBehavior: message.streamingBehavior,
         displayText: message.prompt,
@@ -84797,6 +84964,8 @@ Commands:
 
 Interactive Mode Key Bindings:
   Enter            Submit message
+  Shift+Enter      New line; if ineffective, use Ctrl+J
+  Ctrl+J           New line (fallback)
   \\ + Enter       New line (fallback)
   Alt+Enter        Queue steering message for the active turn
   Ctrl+C           Exit
@@ -84866,7 +85035,7 @@ async function runWithJsonEventsConsoleIsolation(fn) {
 }
 async function createCliTestStreamFnFromEnv() {
   if (!process.env.PIE_TEST_MOCK_STREAM_SEQUENCE) return void 0;
-  return (await import("./chunks/test-stream-7EH7BGY6.js")).createTestStreamFnFromSequenceEnv();
+  return (await import("./chunks/test-stream-LDVUVSUP.js")).createTestStreamFnFromSequenceEnv();
 }
 function resolveJsonEventsDetailFlag() {
   for (let index = 0; index < process.argv.length; index += 1) {