remote-codex 0.11.0 → 0.11.1

package/apps/supervisor-api/dist/index.js

@@ -263,9 +263,19 @@ function pricingModelKeyForModel(model) {
   if (models[modelKey2]) {
     return modelKey2;
   }
-  const claudeDateSuffixMatch = modelKey2.match(/^(claude-[a-z]+-\d+(?:-\d+)?)-20\d{6}$/);
-  if (claudeDateSuffixMatch?.[1] && models[claudeDateSuffixMatch[1]]) {
-    return claudeDateSuffixMatch[1];
+  const providerSeparatorIndex = modelKey2.indexOf("/");
+  const unqualifiedModelKey = providerSeparatorIndex >= 0 ? modelKey2.slice(providerSeparatorIndex + 1) : null;
+  if (unqualifiedModelKey && models[unqualifiedModelKey]) {
+    return unqualifiedModelKey;
+  }
+  for (const candidate of [modelKey2, unqualifiedModelKey]) {
+    if (!candidate) {
+      continue;
+    }
+    const claudeDateSuffixMatch = candidate.match(/^(claude-[a-z]+-\d+(?:-\d+)?)-20\d{6}$/);
+    if (claudeDateSuffixMatch?.[1] && models[claudeDateSuffixMatch[1]]) {
+      return claudeDateSuffixMatch[1];
+    }
   }
   return modelKey2;
 }
@@ -487,6 +497,354 @@ function isUnsupportedHooksListError(error) {
 // ../../packages/agent-runtime/src/unavailable-runtime.ts
 import { EventEmitter } from "events";
 
+// ../../packages/plugin-runtime/src/registry.ts
+var PluginRegistry = class {
+  plugins = /* @__PURE__ */ new Map();
+  enabled = /* @__PURE__ */ new Map();
+  constructor(plugins = []) {
+    for (const plugin of plugins) {
+      this.register(plugin);
+    }
+  }
+  register(plugin) {
+    if (this.plugins.has(plugin.manifest.id)) {
+      throw new Error(`Plugin is already registered: ${plugin.manifest.id}`);
+    }
+    this.plugins.set(plugin.manifest.id, plugin);
+    this.enabled.set(plugin.manifest.id, plugin.enabledByDefault ?? true);
+  }
+  updateImported(plugin) {
+    const existing = this.plugins.get(plugin.manifest.id);
+    if (existing && existing.source !== "imported") {
+      throw new Error(`Built-in plugin cannot be replaced: ${plugin.manifest.id}`);
+    }
+    this.plugins.set(plugin.manifest.id, {
+      ...plugin,
+      source: "imported"
+    });
+    this.enabled.set(plugin.manifest.id, plugin.enabledByDefault ?? true);
+  }
+  list() {
+    return [...this.plugins.values()].map(
+      (plugin) => this.toDto(plugin.manifest)
+    );
+  }
+  get(pluginId) {
+    const plugin = this.plugins.get(pluginId);
+    return plugin ? this.toDto(plugin.manifest) : null;
+  }
+  getManifest(pluginId) {
+    return this.plugins.get(pluginId)?.manifest ?? null;
+  }
+  getRegistered(pluginId) {
+    return this.plugins.get(pluginId) ?? null;
+  }
+  isEnabled(pluginId) {
+    return this.enabled.get(pluginId) ?? false;
+  }
+  setEnabled(pluginId, enabled) {
+    const plugin = this.plugins.get(pluginId);
+    if (!plugin) {
+      throw new Error(`Plugin is not registered: ${pluginId}`);
+    }
+    this.enabled.set(pluginId, enabled);
+    return this.toDto(plugin.manifest);
+  }
+  enabledManifests() {
+    return [...this.plugins.values()].filter((plugin) => this.isEnabled(plugin.manifest.id)).map((plugin) => plugin.manifest);
+  }
+  toDto(manifest) {
+    return {
+      ...manifest,
+      enabled: this.isEnabled(manifest.id),
+      source: this.plugins.get(manifest.id)?.source ?? "builtin"
+    };
+  }
+};
+
+// ../../packages/plugin-runtime/src/artifacts.ts
+var artifactFenceLanguages = /* @__PURE__ */ new Set(["artifact", "remote-codex-artifact"]);
+function stableArtifactId(input) {
+  return [
+    "artifact",
+    input.pluginId.replace(/[^a-zA-Z0-9_-]+/g, "-"),
+    input.artifactType.replace(/[^a-zA-Z0-9_-]+/g, "-"),
+    input.turnId.replace(/[^a-zA-Z0-9_-]+/g, "-"),
+    input.itemId.replace(/[^a-zA-Z0-9_-]+/g, "-"),
+    input.index
+  ].join(":");
+}
+function artifactItemFromArtifact(artifact, sourceItem, sequenceOffset) {
+  return {
+    id: artifact.id,
+    kind: "artifact",
+    text: artifact.title,
+    previewText: artifact.summaryText ?? artifact.title,
+    sequence: sourceItem.sequence === null || sourceItem.sequence === void 0 ? null : sourceItem.sequence + sequenceOffset,
+    sourceTurnId: artifact.sourceTurnId ?? null,
+    artifact
+  };
+}
+function maybeParseArtifactPayload(value) {
+  if (!value || typeof value !== "object") {
+    return null;
+  }
+  const record = value;
+  const type = record.type === "remote-codex.artifact" ? record.artifactType : record.artifactType ?? record.type;
+  if (typeof type !== "string" || !type.trim()) {
+    return null;
+  }
+  return {
+    artifactType: type,
+    title: typeof record.title === "string" ? record.title : null,
+    summaryText: typeof record.summaryText === "string" ? record.summaryText : null,
+    payload: record.payload ?? record
+  };
+}
+function findFencedBlocks(text2, languages) {
+  const blocks = [];
+  const lines = text2.split(/\r?\n/);
+  for (let index = 0; index < lines.length; index += 1) {
+    const line = lines[index] ?? "";
+    const opener = line.match(/^ {0,3}(`{3,}|~{3,})(.*)$/);
+    if (!opener) {
+      continue;
+    }
+    const marker = opener[1] ?? "";
+    const markerChar = marker[0] ?? "`";
+    const markerLength = marker.length;
+    const language = (opener[2] ?? "").trim().split(/\s+/)[0]?.toLowerCase() ?? "";
+    const contentLines = [];
+    index += 1;
+    while (index < lines.length) {
+      const closeLine = lines[index] ?? "";
+      const closePattern = new RegExp(`^ {0,3}\\${markerChar}{${markerLength},}\\s*$`);
+      if (closePattern.test(closeLine)) {
+        break;
+      }
+      contentLines.push(closeLine);
+      index += 1;
+    }
+    if (languages.has(language)) {
+      blocks.push({
+        language,
+        content: contentLines.join("\n").trim()
+      });
+    }
+  }
+  return blocks;
+}
+var ManifestArtifactExtractor = class {
+  constructor(manifests) {
+    this.manifests = manifests;
+  }
+  manifests;
+  extractFromTurn(turn, context) {
+    const results = [];
+    for (const item of turn.items) {
+      const artifacts = this.extractFromItem(turn, item, context);
+      if (artifacts.length > 0) {
+        results.push({ sourceItem: item, artifacts });
+      }
+    }
+    return results;
+  }
+  extractFromItem(turn, item, context) {
+    if (item.kind === "artifact" || !item.text.trim()) {
+      return [];
+    }
+    const artifacts = [];
+    artifacts.push(...this.extractJsonArtifacts(turn, item, context));
+    return artifacts;
+  }
+  extractJsonArtifacts(turn, item, context) {
+    const artifacts = [];
+    for (const block of findFencedBlocks(item.text, artifactFenceLanguages)) {
+      if (!block.content) {
+        continue;
+      }
+      let parsed;
+      try {
+        parsed = JSON.parse(block.content);
+      } catch {
+        continue;
+      }
+      const payload = maybeParseArtifactPayload(parsed);
+      if (!payload || !this.hasArtifactType(payload.artifactType)) {
+        continue;
+      }
+      artifacts.push({
+        id: stableArtifactId({
+          turnId: turn.id,
+          itemId: item.id,
+          pluginId: this.pluginIdForArtifactType(payload.artifactType) ?? "unknown",
+          artifactType: payload.artifactType,
+          index: artifacts.length
+        }),
+        pluginId: this.pluginIdForArtifactType(payload.artifactType) ?? "unknown",
+        type: payload.artifactType,
+        title: payload.title ?? "Plugin artifact",
+        summaryText: payload.summaryText ?? null,
+        payload: payload.payload,
+        sourceTurnId: turn.id,
+        sourceItemId: item.id,
+        createdAt: context.now
+      });
+    }
+    return artifacts;
+  }
+  hasArtifactType(artifactType) {
+    return this.pluginIdForArtifactType(artifactType) !== null;
+  }
+  pluginIdForArtifactType(artifactType) {
+    for (const manifest of this.manifests) {
+      if (manifest.capabilities.artifactTypes.some(
+        (entry) => entry.type === artifactType
+      )) {
+        return manifest.id;
+      }
+    }
+    return null;
+  }
+};
+function appendArtifactItemsToTurns(turns, extractor, context) {
+  return turns.map((turn) => {
+    const extractionResults = extractor.extractFromTurn(turn, context);
+    if (extractionResults.length === 0) {
+      return turn;
+    }
+    const artifactItemsBySourceItemId = /* @__PURE__ */ new Map();
+    for (const result of extractionResults) {
+      artifactItemsBySourceItemId.set(
+        result.sourceItem.id,
+        result.artifacts.map(
+          (artifact, index) => artifactItemFromArtifact(artifact, result.sourceItem, (index + 1) / 100)
+        )
+      );
+    }
+    const items = [];
+    const existingIds = new Set(turn.items.map((item) => item.id));
+    for (const item of turn.items) {
+      items.push(item);
+      const artifactItems = artifactItemsBySourceItemId.get(item.id) ?? [];
+      for (const artifactItem of artifactItems) {
+        if (!existingIds.has(artifactItem.id)) {
+          items.push(artifactItem);
+          existingIds.add(artifactItem.id);
+        }
+      }
+    }
+    return {
+      ...turn,
+      items
+    };
+  });
+}
+
+// ../../packages/plugin-runtime/src/manifest.ts
+function isRecord2(value) {
+  return Boolean(value) && typeof value === "object" && !Array.isArray(value);
+}
+function assertString(value, field) {
+  if (typeof value !== "string" || !value.trim()) {
+    throw new Error(`Plugin manifest field "${field}" must be a non-empty string.`);
+  }
+  return value.trim();
+}
+function optionalStringArray(value, field) {
+  if (value === void 0) {
+    return void 0;
+  }
+  if (!Array.isArray(value) || value.some((entry) => typeof entry !== "string")) {
+    throw new Error(`Plugin manifest field "${field}" must be an array of strings.`);
+  }
+  return value;
+}
+function parsePluginManifest(value) {
+  if (!isRecord2(value)) {
+    throw new Error("Plugin manifest must be an object.");
+  }
+  const capabilities = value.capabilities;
+  if (!isRecord2(capabilities)) {
+    throw new Error('Plugin manifest field "capabilities" must be an object.');
+  }
+  const artifactTypes = capabilities.artifactTypes;
+  if (!Array.isArray(artifactTypes)) {
+    throw new Error('Plugin manifest field "capabilities.artifactTypes" must be an array.');
+  }
+  const timelineRenderers = optionalStringArray(
+    capabilities.timelineRenderers,
+    "capabilities.timelineRenderers"
+  ) ?? [];
+  const threadPanels = capabilities.threadPanels;
+  if (threadPanels !== void 0 && !Array.isArray(threadPanels)) {
+    throw new Error('Plugin manifest field "capabilities.threadPanels" must be an array.');
+  }
+  const frontend = capabilities.frontend;
+  if (frontend !== void 0 && !isRecord2(frontend)) {
+    throw new Error('Plugin manifest field "capabilities.frontend" must be an object.');
+  }
+  const backend = capabilities.backend;
+  if (backend !== void 0 && !isRecord2(backend)) {
+    throw new Error('Plugin manifest field "capabilities.backend" must be an object.');
+  }
+  return {
+    id: assertString(value.id, "id"),
+    name: assertString(value.name, "name"),
+    version: assertString(value.version, "version"),
+    description: assertString(value.description, "description"),
+    remoteCodex: assertString(value.remoteCodex, "remoteCodex"),
+    capabilities: {
+      artifactTypes: artifactTypes.map((entry, index) => {
+        if (!isRecord2(entry)) {
+          throw new Error(
+            `Plugin manifest field "capabilities.artifactTypes[${index}]" must be an object.`
+          );
+        }
+        const parsed = {
+          type: assertString(entry.type, `capabilities.artifactTypes[${index}].type`),
+          title: assertString(entry.title, `capabilities.artifactTypes[${index}].title`)
+        };
+        const fileExtensions = optionalStringArray(
+          entry.fileExtensions,
+          `capabilities.artifactTypes[${index}].fileExtensions`
+        );
+        return fileExtensions ? {
+          ...parsed,
+          fileExtensions
+        } : parsed;
+      }),
+      timelineRenderers,
+      threadPanels: (threadPanels ?? []).map((entry, index) => {
+        if (!isRecord2(entry)) {
+          throw new Error(
+            `Plugin manifest field "capabilities.threadPanels[${index}]" must be an object.`
+          );
+        }
+        return {
+          id: assertString(entry.id, `capabilities.threadPanels[${index}].id`),
+          label: assertString(entry.label, `capabilities.threadPanels[${index}].label`),
+          artifactTypes: optionalStringArray(
+            entry.artifactTypes,
+            `capabilities.threadPanels[${index}].artifactTypes`
+          ) ?? []
+        };
+      }),
+      ...frontend ? {
+        frontend: {
+          ...typeof frontend.entry === "string" ? { entry: frontend.entry } : {},
+          ...typeof frontend.style === "string" ? { style: frontend.style } : {}
+        }
+      } : {},
+      ...backend ? {
+        backend: {
+          ...typeof backend.entry === "string" ? { entry: backend.entry } : {}
+        }
+      } : {}
+    }
+  };
+}
+
 // ../../packages/db/src/client.ts
 import fs2 from "fs";
 import os2 from "os";
@@ -7326,7 +7684,7 @@ var CodexAppServerManager = class extends EventEmitter3 {
 };
 
 // ../../packages/codex/src/hookHistory.ts
-function isRecord2(value) {
+function isRecord3(value) {
   return Boolean(value && typeof value === "object" && !Array.isArray(value));
 }
 function decodeXmlEntities(value) {
@@ -7381,7 +7739,7 @@ function codexHookStatusLabel(value) {
   }
 }
 function hookRunOutputEntryText(entry) {
-  if (!isRecord2(entry)) {
+  if (!isRecord3(entry)) {
     return textFromUnknown(entry);
   }
   return textFromUnknown(entry.text) ?? textFromUnknown(entry.message) ?? textFromUnknown(entry.systemMessage) ?? textFromUnknown(entry.stopReason) ?? textFromUnknown(entry.reason) ?? textFromUnknown(entry.output) ?? textFromUnknown(entry.stdout) ?? textFromUnknown(entry.stderr);
@@ -7475,7 +7833,7 @@ ${entryPreview}` : null
 var DEFERRED_COMMAND_DETAIL_TITLE = "Command Output";
 var DEFERRED_TOOL_DETAIL_TITLE = "Tool Call Details";
 var DEFERRED_AGENT_TOOL_DETAIL_TITLE = "Agent Details";
-function isRecord3(value) {
+function isRecord4(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function stringOrNull(value) {
@@ -7504,6 +7862,36 @@ function stringArray(value) {
 function uniqueStrings(values) {
   return [...new Set(values.filter((value) => Boolean(value?.trim())))];
 }
+function projectRelativePathLabel(value) {
+  const normalized = value?.trim();
+  if (!normalized) {
+    return null;
+  }
+  const slashNormalized = normalized.replace(/\\/g, "/");
+  if (!slashNormalized.startsWith("/")) {
+    return slashNormalized.replace(/^\.\//, "");
+  }
+  const markers = [
+    "/apps/",
+    "/packages/",
+    "/src/",
+    "/test/",
+    "/tests/",
+    "/docs/",
+    "/config/",
+    "/scripts/",
+    "/e2e/",
+    "/.agents/",
+    "/.codex/"
+  ];
+  for (const marker of markers) {
+    const markerIndex = slashNormalized.indexOf(marker);
+    if (markerIndex >= 0) {
+      return slashNormalized.slice(markerIndex + 1);
+    }
+  }
+  return slashNormalized;
+}
 function normalizeTextLines(text2) {
   const lines = text2.replace(/\r\n/g, "\n").split("\n");
   while (lines.length > 1 && lines.at(-1)?.trim() === "") {
@@ -7572,8 +7960,8 @@ function deferCommandHistoryItem(item, deferredDetails) {
 function formatCommandHistoryItem(item, deferredDetails) {
   const nestedRecords = [
     item,
-    isRecord3(item.action) ? item.action : null,
-    isRecord3(item.result) ? item.result : null
+    isRecord4(item.action) ? item.action : null,
+    isRecord4(item.result) ? item.result : null
   ].filter((candidate) => Boolean(candidate));
   const commandText = textFromUnknown2(valueFromNestedRecords(nestedRecords, ["command", "cmd", "argv"])) ?? stringOrNull(item.text) ?? "Command output";
   const outputText = textFromUnknown2(
@@ -7611,13 +7999,13 @@ function deferToolCallHistoryItem(item, deferredDetails) {
   };
 }
 function extractToolCallRecords(item) {
-  const action = isRecord3(item.action) ? item.action : null;
-  const result = isRecord3(item.result) ? item.result : null;
+  const action = isRecord4(item.action) ? item.action : null;
+  const result = isRecord4(item.result) ? item.result : null;
   return {
     action,
     result,
-    input: action && isRecord3(action.input) ? action.input : null,
-    output: result && isRecord3(result.output) ? result.output : null
+    input: action && isRecord4(action.input) ? action.input : null,
+    output: result && isRecord4(result.output) ? result.output : null
   };
 }
 function valueFromNestedRecords(records, keys) {
@@ -7696,20 +8084,20 @@ function formatToolCallHistoryItem(item, deferredDetails, kind = "toolCall") {
   return historyItem;
 }
 function extractWebSearchQueries(item) {
-  const action = isRecord3(item.action) ? item.action : null;
-  const result = isRecord3(item.result) ? item.result : null;
+  const action = isRecord4(item.action) ? item.action : null;
+  const result = isRecord4(item.result) ? item.result : null;
   return uniqueStrings([
     stringOrNull(item.query),
     ...stringArray(item.queries),
     action ? stringOrNull(action.query) : null,
     ...action ? stringArray(action.queries) : [],
-    action && isRecord3(action.input) ? stringOrNull(action.input.query) : null,
+    action && isRecord4(action.input) ? stringOrNull(action.input.query) : null,
     result ? stringOrNull(result.query) : null,
     ...result ? stringArray(result.queries) : []
   ]);
 }
 function normalizeWebSearchSource(value) {
-  if (!isRecord3(value)) {
+  if (!isRecord4(value)) {
     return null;
   }
   const title = stringOrNull(value.title) ?? stringOrNull(value.name);
@@ -7721,8 +8109,8 @@ function normalizeWebSearchSource(value) {
   return { title, url, snippet };
 }
 function extractWebSearchSources(item) {
-  const action = isRecord3(item.action) ? item.action : null;
-  const result = isRecord3(item.result) ? item.result : null;
+  const action = isRecord4(item.action) ? item.action : null;
+  const result = isRecord4(item.result) ? item.result : null;
   const candidates = [
     item.sources,
     action?.sources,
@@ -7763,10 +8151,10 @@ function extractImageAssetPath(item) {
     item.path,
     item.imagePath,
     item.filePath,
-    isRecord3(item.action) ? item.action.path : null,
-    isRecord3(item.action) ? item.action.imagePath : null,
-    isRecord3(item.result) ? item.result.path : null,
-    isRecord3(item.result) ? item.result.imagePath : null
+    isRecord4(item.action) ? item.action.path : null,
+    isRecord4(item.action) ? item.action.imagePath : null,
+    isRecord4(item.result) ? item.result.path : null,
+    isRecord4(item.result) ? item.result.imagePath : null
   ];
   for (const candidate of candidates) {
     const normalized = stringOrNull(candidate);
@@ -7887,10 +8275,10 @@ function extractFileChangeEntries(item) {
   const candidateArrays = [
     item.changes,
     item.files,
-    isRecord3(item.result) ? item.result.changes : null,
-    isRecord3(item.result) ? item.result.files : null,
-    isRecord3(item.action) ? item.action.changes : null,
-    isRecord3(item.action) ? item.action.files : null
+    isRecord4(item.result) ? item.result.changes : null,
+    isRecord4(item.result) ? item.result.files : null,
+    isRecord4(item.action) ? item.action.changes : null,
+    isRecord4(item.action) ? item.action.files : null
   ];
   const normalizedEntries = /* @__PURE__ */ new Map();
   function valueFromRecords(records, keys) {
@@ -7912,16 +8300,16 @@ function extractFileChangeEntries(item) {
         deletions: 0
       };
     }
-    if (!isRecord3(entry)) {
+    if (!isRecord4(entry)) {
       return null;
     }
     const nestedRecords = [
       entry,
-      isRecord3(entry.result) ? entry.result : null,
-      isRecord3(entry.action) ? entry.action : null,
-      isRecord3(entry.stats) ? entry.stats : null,
-      isRecord3(entry.summary) ? entry.summary : null,
-      isRecord3(entry.diff) ? entry.diff : null
+      isRecord4(entry.result) ? entry.result : null,
+      isRecord4(entry.action) ? entry.action : null,
+      isRecord4(entry.stats) ? entry.stats : null,
+      isRecord4(entry.summary) ? entry.summary : null,
+      isRecord4(entry.diff) ? entry.diff : null
     ].filter((candidate) => Boolean(candidate));
     const path22 = uniqueStrings([
       stringOrNull(valueFromRecords(nestedRecords, ["path", "filePath", "targetPath"])),
@@ -7937,7 +8325,7 @@ function extractFileChangeEntries(item) {
           "old_path"
         ])
       )
-    ])[0] ?? null;
+    ]).map(projectRelativePathLabel).find((entry2) => Boolean(entry2)) ?? null;
     const explicitAdditions = numberOrNull(
       valueFromRecords(nestedRecords, [
         "additions",
@@ -7970,7 +8358,7 @@ function extractFileChangeEntries(item) {
     const diffStats = explicitAdditions === 0 && explicitDeletions === 0 && diffText ? countUnifiedDiffStats(diffText) : null;
     const additions = explicitAdditions || diffStats?.additions || 0;
     const deletions = explicitDeletions || diffStats?.deletions || 0;
-    const normalizedPath = path22 ?? (diffText ? extractPathFromDiffText(diffText) : null);
+    const normalizedPath = path22 ?? (diffText ? projectRelativePathLabel(extractPathFromDiffText(diffText)) : null);
     if (!normalizedPath && additions === 0 && deletions === 0) {
       return null;
     }
@@ -8608,11 +8996,11 @@ var HOOK_EVENT_JSON_KEYS = {
 var HOOK_EVENT_DTO_KEYS = Object.fromEntries(
   Object.entries(HOOK_EVENT_JSON_KEYS).map(([dtoKey, jsonKey]) => [jsonKey, dtoKey])
 );
-function isRecord4(value) {
+function isRecord5(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function normalizeHooksJson(value) {
-  if (!isRecord4(value) || !isRecord4(value.hooks)) {
+  if (!isRecord5(value) || !isRecord5(value.hooks)) {
     return { hooks: {} };
   }
   const hooks = {};
@@ -8652,7 +9040,7 @@ function hooksPathForInput(codexHome, workspacePath, input) {
   return input.scope === "global" ? path8.join(codexHome, "hooks.json") : path8.join(workspacePath, ".codex", "hooks.json");
 }
 function hookInputMatches(group, handler, input) {
-  if (!isRecord4(group) || !isRecord4(handler)) {
+  if (!isRecord5(group) || !isRecord5(handler)) {
     return false;
   }
   const matcher = typeof group.matcher === "string" ? group.matcher : null;
@@ -8803,7 +9191,7 @@ var CodexManagementService = class {
     const currentGroups = Array.isArray(config.hooks[targetEventKey]) ? config.hooks[targetEventKey] : [];
     let replacementGroup = null;
     config.hooks[targetEventKey] = currentGroups.map((group) => {
-      if (replacementGroup || !isRecord4(group) || !Array.isArray(group.hooks)) {
+      if (replacementGroup || !isRecord5(group) || !Array.isArray(group.hooks)) {
         return group;
       }
       const hookIndex = group.hooks.findIndex(
@@ -8843,7 +9231,7 @@ var CodexManagementService = class {
         )
       };
     }).filter((group) => {
-      if (!isRecord4(group) || !Array.isArray(group.hooks)) {
+      if (!isRecord5(group) || !Array.isArray(group.hooks)) {
         return true;
       }
       return group.hooks.length > 0;
@@ -8875,12 +9263,12 @@ var CodexManagementService = class {
         continue;
       }
       groups.forEach((group, groupIndex) => {
-        if (!isRecord4(group) || !Array.isArray(group.hooks)) {
+        if (!isRecord5(group) || !Array.isArray(group.hooks)) {
           return;
         }
         const matcher = typeof group.matcher === "string" ? group.matcher : null;
         group.hooks.forEach((handler, handlerIndex) => {
-          if (!isRecord4(handler) || handler.type !== "command") {
+          if (!isRecord5(handler) || handler.type !== "command") {
             return;
           }
           const command = typeof handler.command === "string" ? handler.command : null;
@@ -8924,7 +9312,7 @@ var CodexManagementService = class {
 import { EventEmitter as EventEmitter4 } from "events";
 
 // ../../packages/codex/src/requestMapper.ts
-function isRecord5(value) {
+function isRecord6(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function stringOrNull2(value) {
@@ -9051,7 +9439,7 @@ function yoloApprovalResultForServerRequest(request) {
     case "item/permissions/requestApproval": {
       const params = request.params;
       return {
-        permissions: isRecord5(params.permissions) ? params.permissions : {},
+        permissions: isRecord6(params.permissions) ? params.permissions : {},
         scope: "turn"
       };
     }
@@ -9080,7 +9468,7 @@ function responseKindForApprovalRequest(request) {
   }
 }
 function buildThreadRequestFromMcpElicitation(request) {
-  const meta = isRecord5(request.params._meta) ? request.params._meta : null;
+  const meta = isRecord6(request.params._meta) ? request.params._meta : null;
   const toolTitle = stringOrNull2(meta?.tool_title);
   const toolDescription = stringOrNull2(meta?.tool_description);
   const serverName = stringOrNull2(request.params.serverName) ?? "MCP";
@@ -9129,7 +9517,7 @@ function buildCodexProviderRequestResponse(pending, input) {
       return { decision: allowed ? "accept" : "decline" };
     case "permissionsApproval":
       return allowed ? {
-        permissions: isRecord5(pending.responsePayload?.permissions) ? pending.responsePayload.permissions : {},
+        permissions: isRecord6(pending.responsePayload?.permissions) ? pending.responsePayload.permissions : {},
         scope: "turn"
       } : {
         permissions: {},
@@ -9149,7 +9537,7 @@ function mapCodexProviderRequest(providerRequest, approvalMode) {
   const request = {
     id: Number(providerRequest.id),
     method: providerRequest.method,
-    params: isRecord5(providerRequest.params) ? providerRequest.params : {}
+    params: isRecord6(providerRequest.params) ? providerRequest.params : {}
   };
   const providerRequestId = providerRequest.id;
   const approvalResponseKind = responseKindForApprovalRequest(request);
@@ -9178,7 +9566,7 @@ function mapCodexProviderRequest(providerRequest, approvalMode) {
       responseKind: approvalResponseKind,
       request: threadRequest2
     };
-    if (approvalResponseKind === "permissionsApproval" && isRecord5(params2.permissions)) {
+    if (approvalResponseKind === "permissionsApproval" && isRecord6(params2.permissions)) {
       pendingRequest.responsePayload = { permissions: params2.permissions };
     }
     return {
@@ -9908,7 +10296,7 @@ function isAgentToolName(toolName) {
 function isSkillToolName(toolName) {
   return normalizedToolName(toolName) === "skill";
 }
-function isRecord6(value) {
+function isRecord7(value) {
   return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
 function stringValue(value) {
@@ -9933,20 +10321,52 @@ function readableToolName(toolName) {
   }
   return toolName;
 }
+function projectRelativePathLabel2(value) {
+  const normalized = value?.trim();
+  if (!normalized) {
+    return null;
+  }
+  const slashNormalized = normalized.replace(/\\/g, "/");
+  if (!slashNormalized.startsWith("/")) {
+    return slashNormalized.replace(/^\.\//, "");
+  }
+  const markers = [
+    "/apps/",
+    "/packages/",
+    "/src/",
+    "/test/",
+    "/tests/",
+    "/docs/",
+    "/config/",
+    "/scripts/",
+    "/e2e/",
+    "/.agents/",
+    "/.codex/"
+  ];
+  for (const marker of markers) {
+    const markerIndex = slashNormalized.indexOf(marker);
+    if (markerIndex >= 0) {
+      return slashNormalized.slice(markerIndex + 1);
+    }
+  }
+  return slashNormalized;
+}
 function commandFromInput(input) {
-  if (!isRecord6(input)) {
+  if (!isRecord7(input)) {
     return null;
   }
   return stringValue(input.command) ?? stringValue(input.cmd) ?? stringValue(input.description);
 }
 function pathFromInput(input) {
-  if (!isRecord6(input)) {
+  if (!isRecord7(input)) {
     return null;
   }
-  return stringValue(input.file_path) ?? stringValue(input.filePath) ?? stringValue(input.path) ?? stringValue(input.notebook_path);
+  return projectRelativePathLabel2(
+    stringValue(input.relative_path) ?? stringValue(input.relativePath) ?? stringValue(input.file_path) ?? stringValue(input.filePath) ?? stringValue(input.path) ?? stringValue(input.notebook_path)
+  );
 }
 function summarizeToolInput(input) {
-  if (!isRecord6(input)) {
+  if (!isRecord7(input)) {
     return compactJson(input);
   }
   const description = stringValue(input.description);
@@ -9980,7 +10400,7 @@ function summarizeToolInput(input) {
   return compactJson(input);
 }
 function messageContentText(message) {
-  if (!isRecord6(message)) {
+  if (!isRecord7(message)) {
     return "";
   }
   const content = message.content;
@@ -9991,7 +10411,7 @@ function messageContentText(message) {
     return "";
   }
   return content.map((block) => {
-    if (!isRecord6(block)) {
+    if (!isRecord7(block)) {
       return "";
     }
     if (typeof block.text === "string") {
@@ -10057,7 +10477,7 @@ function toolUseToHistoryItem(input) {
     };
   }
   if (isExitPlanModeToolName(input.name)) {
-    const plan = isRecord6(input.toolInput) ? stringValue(input.toolInput.plan) : null;
+    const plan = isRecord7(input.toolInput) ? stringValue(input.toolInput.plan) : null;
     return {
       id: input.id,
       kind: "plan",
@@ -10113,7 +10533,7 @@ function toolUseToHistoryItem(input) {
     };
   }
   if (isSkillToolName(input.name)) {
-    const skill = isRecord6(input.toolInput) ? stringValue(input.toolInput.skill) : null;
+    const skill = isRecord7(input.toolInput) ? stringValue(input.toolInput.skill) : null;
     const summaryText = skill ? `Skill: ${skill}` : summary ? `${displayName}: ${summary}` : displayName;
     return {
       id: input.id,
@@ -10134,14 +10554,14 @@ function toolUseToHistoryItem(input) {
   };
 }
 function contentBlocks(message) {
-  if (!isRecord6(message) || !Array.isArray(message.content)) {
+  if (!isRecord7(message) || !Array.isArray(message.content)) {
     return [];
   }
   return message.content;
 }
 function toolResultBlocks(message) {
   return contentBlocks(message).map((block) => {
-    if (!isRecord6(block) || block.type !== "tool_result") {
+    if (!isRecord7(block) || block.type !== "tool_result") {
       return null;
     }
     const toolUseId = stringValue(block.tool_use_id);
@@ -10157,7 +10577,7 @@ function toolResultBlocks(message) {
 function suppressedClaudeToolUseIds(message) {
   const ids = /* @__PURE__ */ new Set();
   for (const block of contentBlocks(message)) {
-    if (!isRecord6(block) || block.type !== "tool_use") {
+    if (!isRecord7(block) || block.type !== "tool_use") {
       continue;
     }
     const id = stringValue(block.id);
@@ -10171,7 +10591,7 @@ function suppressedClaudeToolUseIds(message) {
 function assistantMessageToHistoryItems(input) {
   const items = [];
   for (const [index, block] of contentBlocks(input.message).entries()) {
-    if (!isRecord6(block)) {
+    if (!isRecord7(block)) {
       continue;
     }
     const type = block.type;
@@ -10253,13 +10673,13 @@ function assistantMessageToHistoryItems(input) {
   return items;
 }
 function partialTextDelta(input) {
-  if (!isRecord6(input.event)) {
+  if (!isRecord7(input.event)) {
     return null;
   }
   if (input.event.type === "content_block_start") {
     const index2 = typeof input.event.index === "number" ? input.event.index : 0;
     const block = input.event.content_block;
-    if (!isRecord6(block) || block.type !== "text" || typeof block.text !== "string" || !block.text) {
+    if (!isRecord7(block) || block.type !== "text" || typeof block.text !== "string" || !block.text) {
       return null;
     }
     return {
@@ -10272,7 +10692,7 @@ function partialTextDelta(input) {
   }
   const index = typeof input.event.index === "number" ? input.event.index : 0;
   const delta = input.event.delta;
-  if (!isRecord6(delta) || delta.type !== "text_delta" || typeof delta.text !== "string" || !delta.text) {
+  if (!isRecord7(delta) || delta.type !== "text_delta" || typeof delta.text !== "string" || !delta.text) {
     return null;
   }
   return {
@@ -10281,14 +10701,14 @@ function partialTextDelta(input) {
   };
 }
 function partialReasoningDelta(input) {
-  if (!isRecord6(input.event)) {
+  if (!isRecord7(input.event)) {
     return null;
   }
   const index = typeof input.event.index === "number" ? input.event.index : 0;
   const itemId = `${input.messageId}:content:${index}`;
   if (input.event.type === "content_block_start") {
     const block = input.event.content_block;
-    if (!isRecord6(block) || block.type !== "thinking") {
+    if (!isRecord7(block) || block.type !== "thinking") {
       return null;
     }
     const text3 = thinkingTextFromBlock(block) ?? "";
@@ -10303,7 +10723,7 @@ function partialReasoningDelta(input) {
     return null;
   }
   const delta = input.event.delta;
-  if (!isRecord6(delta) || delta.type !== "thinking_delta") {
+  if (!isRecord7(delta) || delta.type !== "thinking_delta") {
     return null;
   }
   const text2 = stringValue(delta.thinking) ?? stringValue(delta.text);
@@ -10318,12 +10738,12 @@ function partialReasoningDelta(input) {
   };
 }
 function toolUseFromPartialStart(input) {
-  if (!isRecord6(input.event) || input.event.type !== "content_block_start") {
+  if (!isRecord7(input.event) || input.event.type !== "content_block_start") {
     return null;
   }
   const index = typeof input.event.index === "number" ? input.event.index : 0;
   const block = input.event.content_block;
-  if (!isRecord6(block)) {
+  if (!isRecord7(block)) {
     return null;
   }
   if (block.type === "tool_use") {
@@ -10360,7 +10780,7 @@ function toolUseFromPartialStart(input) {
 function resultForToolUse(input) {
   if (input.previous) {
     if (input.previous.kind === "plan") {
-      const plan = isRecord6(input.result) ? stringValue(input.result.plan) : null;
+      const plan = isRecord7(input.result) ? stringValue(input.result.plan) : null;
       const nextItem = {
         ...input.previous,
         text: plan ?? input.previous.text,
@@ -10630,7 +11050,7 @@ var DEFAULT_CLAUDE_MODELS = [
     defaultReasoningEffort: null
   }
 ];
-function isRecord7(value) {
+function isRecord8(value) {
   return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
 function toIsoFromMs(value) {
@@ -10775,7 +11195,7 @@ function assistantMessagePayload(message) {
   return message.type === "assistant" ? message.message : null;
 }
 function messageIdFromPayload(message) {
-  return isRecord7(message) && typeof message.id === "string" && message.id ? message.id : null;
+  return isRecord8(message) && typeof message.id === "string" && message.id ? message.id : null;
 }
 function messageUuid(message, fallback) {
   return typeof message.uuid === "string" && message.uuid ? message.uuid : fallback;
@@ -10796,7 +11216,7 @@ function addClaudeUsage(left, right) {
   };
 }
 function normalizeClaudeUsage(value) {
-  if (!isRecord7(value)) {
+  if (!isRecord8(value)) {
     return null;
   }
   const baseInputTokens = finiteNumber(value.input_tokens ?? value.inputTokens);
@@ -10821,7 +11241,7 @@ function normalizeClaudeUsage(value) {
   };
 }
 function usageFromAssistantMessage(message) {
-  if (message.type !== "assistant" || !isRecord7(message.message)) {
+  if (message.type !== "assistant" || !isRecord8(message.message)) {
     return null;
   }
   return normalizeClaudeUsage(message.message.usage);
@@ -10830,11 +11250,11 @@ function usageFromResultMessage(message) {
   return message.type === "result" ? normalizeClaudeUsage(message.usage) : null;
 }
 function contextWindowFromResultMessage(message) {
-  if (message.type !== "result" || !isRecord7(message.modelUsage)) {
+  if (message.type !== "result" || !isRecord8(message.modelUsage)) {
     return null;
   }
   for (const usage of Object.values(message.modelUsage)) {
-    if (!isRecord7(usage)) {
+    if (!isRecord8(usage)) {
       continue;
     }
     const contextWindow = nullableFiniteNumber(usage.contextWindow);
@@ -10853,7 +11273,7 @@ function claudeUsagePayload(usage, modelContextWindow) {
   };
 }
 function streamMessageId(event) {
-  if (!isRecord7(event) || event.type !== "message_start") {
+  if (!isRecord8(event) || event.type !== "message_start") {
     return null;
   }
   const message = event.message;
@@ -10877,7 +11297,7 @@ function normalizeClaudeQuestionOptions(value) {
     return null;
   }
   const options = value.map((entry) => {
-    if (!isRecord7(entry)) {
+    if (!isRecord8(entry)) {
       return null;
     }
     const label = stringFromRecord(entry, "label");
@@ -10894,11 +11314,11 @@ function normalizeClaudeQuestionOptions(value) {
   return options.length > 0 ? options : null;
 }
 function normalizeClaudeAskUserQuestions(input) {
-  if (!isRecord7(input) || !Array.isArray(input.questions)) {
+  if (!isRecord8(input) || !Array.isArray(input.questions)) {
     return [];
   }
   return input.questions.map((entry, index) => {
-    if (!isRecord7(entry)) {
+    if (!isRecord8(entry)) {
       return null;
     }
     const question = stringFromRecord(entry, "question");
@@ -10918,11 +11338,11 @@ function normalizeClaudeAskUserQuestions(input) {
   }).filter((entry) => Boolean(entry));
 }
 function claudeAskUserToolUseFromAssistantMessage(message) {
-  if (!isRecord7(message) || !Array.isArray(message.content)) {
+  if (!isRecord8(message) || !Array.isArray(message.content)) {
     return null;
   }
   for (const [index, block] of message.content.entries()) {
-    if (!isRecord7(block) || block.type !== "tool_use") {
+    if (!isRecord8(block) || block.type !== "tool_use") {
       continue;
     }
     const name = stringFromRecord(block, "name");
@@ -10941,7 +11361,7 @@ function mapClaudeAskUserQuestionRequest(request) {
   if (request.method !== "tool/AskUserQuestion") {
     return null;
   }
-  if (!isRecord7(request.params)) {
+  if (!isRecord8(request.params)) {
     return null;
   }
   const providerSessionId = stringFromRecord(request.params, "providerSessionId");
@@ -11817,13 +12237,13 @@ var ClaudeRuntimeAdapter = class extends EventEmitter5 {
     };
   }
   async userMessageToHistoryItem(id, message, context) {
-    if (!isRecord7(message) || !Array.isArray(message.content)) {
+    if (!isRecord8(message) || !Array.isArray(message.content)) {
       return userMessageToHistoryItem(id, message);
     }
     const parts = [];
     for (let index = 0; index < message.content.length; index += 1) {
       const block = message.content[index];
-      if (!isRecord7(block)) {
+      if (!isRecord8(block)) {
         continue;
       }
       if (block.type === "image") {
@@ -11852,7 +12272,7 @@ var ClaudeRuntimeAdapter = class extends EventEmitter5 {
     if (!input.localThreadId || !input.workspacePath) {
       return null;
     }
-    const source = isRecord7(input.block.source) ? input.block.source : null;
+    const source = isRecord8(input.block.source) ? input.block.source : null;
     if (!source || source.type !== "base64") {
       return null;
     }
@@ -11978,7 +12398,7 @@ var ClaudeRuntimeAdapter = class extends EventEmitter5 {
         const previous = current?.itemsById.get(message.parent_tool_use_id) ?? null;
         upsertCurrentItem(resultForToolUse({
           toolUseId: message.parent_tool_use_id,
-          result: isRecord7(message.message) && "content" in message.message ? message.message.content : message.message,
+          result: isRecord8(message.message) && "content" in message.message ? message.message.content : message.message,
           previous
         }));
       }
@@ -12053,7 +12473,7 @@ async function npmGlobalRoot() {
 
 // ../../packages/opencode/src/historyItems.ts
 import path10 from "path";
-function isRecord8(value) {
+function isRecord9(value) {
   return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
 function stringValue2(value) {
@@ -12084,7 +12504,7 @@ function toolContentText(content) {
     return "";
   }
   return content.map((entry) => {
-    if (!isRecord8(entry)) {
+    if (!isRecord9(entry)) {
       return "";
     }
     if (typeof entry.text === "string") {
@@ -12102,7 +12522,7 @@ function toolStateDetail(state) {
   if (output) {
     parts.push("", "Output:", output);
   }
-  const error = isRecord8(state.error) ? stringValue2(state.error.message) ?? compactJson2(state.error) : stringValue2(state.error);
+  const error = isRecord9(state.error) ? stringValue2(state.error.message) ?? compactJson2(state.error) : stringValue2(state.error);
   if (error) {
     parts.push("", "Error:", error);
   }
@@ -12119,13 +12539,13 @@ function toolStateStatus(state) {
   return "completed";
 }
 function toolSummary(input) {
-  if (!isRecord8(input)) {
+  if (!isRecord9(input)) {
     return stringValue2(input) ?? compactJson2(input);
   }
   return stringValue2(input.description) ?? stringValue2(input.command) ?? stringValue2(input.cmd) ?? stringValue2(input.filePath) ?? stringValue2(input.file_path) ?? stringValue2(input.path) ?? stringValue2(input.file) ?? stringValue2(input.relativePath) ?? stringValue2(input.relative_path) ?? stringValue2(input.pattern) ?? stringValue2(input.query) ?? stringValue2(input.url) ?? compactJson2(input);
 }
 function commandSummary(input, state) {
-  const command = isRecord8(input) ? stringValue2(input.command) ?? stringValue2(input.cmd) : null;
+  const command = isRecord9(input) ? stringValue2(input.command) ?? stringValue2(input.cmd) : null;
   if (command) {
     return command;
   }
@@ -12145,7 +12565,7 @@ function firstStringValue(record, keys) {
   return null;
 }
 function filePathFromInput(input) {
-  if (!isRecord8(input)) {
+  if (!isRecord9(input)) {
     return null;
   }
   return firstStringValue(input, [
@@ -12183,7 +12603,7 @@ function toolIsLowInformationPatch(normalized, state, input, patchText, path22,
   if (path22 || patchText || metadataStats || stringValue2(state.output)) {
     return false;
   }
-  return !isRecord8(input) || Object.keys(input).length === 0;
+  return !isRecord9(input) || Object.keys(input).length === 0;
 }
 function countUnifiedDiffStats2(diffText) {
   if (!diffText) {
@@ -12216,10 +12636,10 @@ function extractPathFromPatchText(patchText) {
   return null;
 }
 function fileChangeStatsFromMetadata(metadata) {
-  if (!isRecord8(metadata) || !Array.isArray(metadata.files)) {
+  if (!isRecord9(metadata) || !Array.isArray(metadata.files)) {
     return null;
   }
-  const files = metadata.files.filter(isRecord8);
+  const files = metadata.files.filter(isRecord9);
   if (files.length === 0) {
     return null;
   }
@@ -12238,7 +12658,7 @@ function todoRecordsFromValue(value) {
   if (Array.isArray(value)) {
     return value;
   }
-  if (isRecord8(value) && Array.isArray(value.todos)) {
+  if (isRecord9(value) && Array.isArray(value.todos)) {
     return value.todos;
   }
   if (typeof value === "string" && value.trim()) {
@@ -12257,13 +12677,13 @@ function planUpdateFromTodoTool(tool) {
   if (normalized !== "todowrite" && normalized !== "todo" && normalized !== "todos") {
     return null;
   }
-  const state = isRecord8(tool.state) ? tool.state : {};
-  const todos = todoRecordsFromValue(state.input) ?? (isRecord8(state.metadata) ? todoRecordsFromValue(state.metadata) : null) ?? todoRecordsFromValue(state.output);
+  const state = isRecord9(tool.state) ? tool.state : {};
+  const todos = todoRecordsFromValue(state.input) ?? (isRecord9(state.metadata) ? todoRecordsFromValue(state.metadata) : null) ?? todoRecordsFromValue(state.output);
   if (!todos || todos.length === 0) {
     return null;
   }
   const plan = todos.map((todo) => {
-    if (!isRecord8(todo)) {
+    if (!isRecord9(todo)) {
       return null;
     }
     const step = stringValue2(todo.content) ?? stringValue2(todo.step) ?? stringValue2(todo.title);
@@ -12281,7 +12701,7 @@ function planUpdateFromTodoTool(tool) {
   } : null;
 }
 function normalizeLegacyPart(part) {
-  if (!isRecord8(part)) {
+  if (!isRecord9(part)) {
     return null;
   }
   const type = stringValue2(part.type);
@@ -12301,15 +12721,15 @@ function normalizeLegacyParts(parts, fallbackText) {
   return [{ type: "text", text: fallbackText }];
 }
 function normalizeLegacyMessage(message) {
-  if (!isRecord8(message) || !isRecord8(message.info) || !Array.isArray(message.parts)) {
+  if (!isRecord9(message) || !isRecord9(message.info) || !Array.isArray(message.parts)) {
     return message;
   }
   const info = message.info;
   const role = stringValue2(info.role) ?? stringValue2(info.type);
   const id = stringValue2(info.id) ?? crypto.randomUUID();
-  const time = isRecord8(info.time) ? info.time : void 0;
+  const time = isRecord9(info.time) ? info.time : void 0;
   if (role === "user") {
-    const text2 = message.parts.map((part) => isRecord8(part) && stringValue2(part.text) ? part.text : null).filter((text3) => Boolean(text3)).join("\n");
+    const text2 = message.parts.map((part) => isRecord9(part) && stringValue2(part.text) ? part.text : null).filter((text3) => Boolean(text3)).join("\n");
     return {
       id,
       type: "user",
@@ -12320,7 +12740,7 @@ function normalizeLegacyMessage(message) {
   if (role !== "assistant") {
     return message;
   }
-  const model = isRecord8(info.model) ? {
+  const model = isRecord9(info.model) ? {
     id: stringValue2(info.model.id) ?? stringValue2(info.model.modelID) ?? stringValue2(info.modelID) ?? "unknown",
     providerID: stringValue2(info.model.providerID) ?? stringValue2(info.providerID) ?? "unknown",
     variant: stringValue2(info.model.variant) ?? stringValue2(info.variant) ?? "default"
@@ -12338,14 +12758,14 @@ function normalizeLegacyMessage(message) {
     content: normalizeLegacyParts(message.parts, stringValue2(info.text)),
     error: info.error,
     cost: numberValue(info.cost) ?? void 0,
-    tokens: isRecord8(info.tokens) ? info.tokens : void 0,
+    tokens: isRecord9(info.tokens) ? info.tokens : void 0,
     finish: stringValue2(info.finish) ?? void 0
   };
 }
 function mapAssistantTool(messageId2, tool, options) {
   const id = stringValue2(tool.id) ?? `${messageId2}:tool`;
   const name = stringValue2(tool.name) ?? stringValue2(tool.tool) ?? "Tool";
-  const state = isRecord8(tool.state) ? tool.state : {};
+  const state = isRecord9(tool.state) ? tool.state : {};
   const input = state.input;
   const summary = toolSummary(input);
   const detailText = [`Tool: ${name}`, "", "Input:", compactJson2(input), "", toolStateDetail(state)].filter(Boolean).join("\n");
@@ -12370,7 +12790,7 @@ function mapAssistantTool(messageId2, tool, options) {
     "patch"
   ].includes(normalized)) {
     const metadataStats = fileChangeStatsFromMetadata(state.metadata);
-    const patchText = isRecord8(input) ? stringValue2(input.patchText) ?? stringValue2(input.patch) ?? stringValue2(input.diff) : null;
+    const patchText = isRecord9(input) ? stringValue2(input.patchText) ?? stringValue2(input.patch) ?? stringValue2(input.diff) : null;
     const path22 = metadataStats?.path ?? filePathFromInput(input) ?? extractPathFromPatchText(patchText);
     if (toolIsLowInformationPatch(normalized, state, input, patchText, path22, metadataStats)) {
       return null;
@@ -12426,7 +12846,7 @@ function mapAssistantTool(messageId2, tool, options) {
     };
   }
   if (normalized === "skill") {
-    const skill = isRecord8(input) ? stringValue2(input.skill) ?? stringValue2(input.name) : null;
+    const skill = isRecord9(input) ? stringValue2(input.skill) ?? stringValue2(input.name) : null;
     return {
       id,
       kind: "skillToolCall",
@@ -12447,12 +12867,12 @@ function mapAssistantTool(messageId2, tool, options) {
 }
 function openCodeMessageToPlanUpdate(message) {
   const normalizedMessage = normalizeLegacyMessage(message);
-  if (!isRecord8(normalizedMessage)) {
+  if (!isRecord9(normalizedMessage)) {
     return null;
   }
   const content = Array.isArray(normalizedMessage.content) ? normalizedMessage.content : [];
   for (const part of content) {
-    if (!isRecord8(part) || stringValue2(part.type) !== "tool") {
+    if (!isRecord9(part) || stringValue2(part.type) !== "tool") {
       continue;
     }
     const planUpdate = planUpdateFromTodoTool(part);
@@ -12494,9 +12914,9 @@ function mapAssistantPart(messageId2, part, index, options) {
     return mapAssistantTool(messageId2, part, options);
   }
   if (partType === "file") {
-    const sourcePath = isRecord8(part.source) ? stringValue2(part.source.path) : null;
+    const sourcePath = isRecord9(part.source) ? stringValue2(part.source.path) : null;
     const filename = displayPath(sourcePath, options) ?? stringValue2(part.filename) ?? stringValue2(part.url) ?? "Attached file";
-    const sourceText = isRecord8(part.source) && isRecord8(part.source.text) ? stringValue2(part.source.text.value) : null;
+    const sourceText = isRecord9(part.source) && isRecord9(part.source.text) ? stringValue2(part.source.text.value) : null;
     return {
       id: partId,
       kind: "fileRead",
@@ -12538,7 +12958,7 @@ function mapAssistantPart(messageId2, part, index, options) {
   }
   if (partType === "agent") {
     const name = stringValue2(part.name) ?? "Agent";
-    const source = isRecord8(part.source) ? stringValue2(part.source.value) : null;
+    const source = isRecord9(part.source) ? stringValue2(part.source.value) : null;
     return {
       id: partId,
       kind: "agentToolCall",
@@ -12561,7 +12981,7 @@ function mapAssistantPart(messageId2, part, index, options) {
     };
   }
   if (partType === "retry") {
-    const error = isRecord8(part.error) ? stringValue2(part.error.message) ?? compactJson2(part.error) : stringValue2(part.error);
+    const error = isRecord9(part.error) ? stringValue2(part.error.message) ?? compactJson2(part.error) : stringValue2(part.error);
     return {
       id: partId,
       kind: "other",
@@ -12588,7 +13008,7 @@ function mapAssistantPart(messageId2, part, index, options) {
 }
 function openCodeMessageToHistoryItems(message, options = {}) {
   message = normalizeLegacyMessage(message);
-  if (!isRecord8(message)) {
+  if (!isRecord9(message)) {
     return [];
   }
   const id = stringValue2(message.id) ?? crypto.randomUUID();
@@ -12616,7 +13036,7 @@ function openCodeMessageToHistoryItems(message, options = {}) {
       text: command,
       previewText: command,
       detailText: stringValue2(message.output) ?? null,
-      status: isRecord8(message.time) && typeof message.time.completed === "number" ? "completed" : "running"
+      status: isRecord9(message.time) && typeof message.time.completed === "number" ? "completed" : "running"
     }];
   }
   if (type === "agent-switched") {
@@ -12628,7 +13048,7 @@ function openCodeMessageToHistoryItems(message, options = {}) {
     }];
   }
   if (type === "model-switched") {
-    const model = isRecord8(message.model) ? [stringValue2(message.model.providerID), stringValue2(message.model.id)].filter(Boolean).join("/") : "unknown";
+    const model = isRecord9(message.model) ? [stringValue2(message.model.providerID), stringValue2(message.model.id)].filter(Boolean).join("/") : "unknown";
     return [{
       id,
       kind: "other",
@@ -12655,7 +13075,7 @@ function openCodeMessageToHistoryItems(message, options = {}) {
   const items = [];
   const content = Array.isArray(message.content) ? message.content : [];
   for (const [index, part] of content.entries()) {
-    if (!isRecord8(part)) {
+    if (!isRecord9(part)) {
       continue;
     }
     const item = mapAssistantPart(id, part, index, options);
@@ -12663,7 +13083,7 @@ function openCodeMessageToHistoryItems(message, options = {}) {
       items.push(item);
     }
   }
-  const error = isRecord8(message.error) ? stringValue2(message.error.message) ?? compactJson2(message.error) : null;
+  const error = isRecord9(message.error) ? stringValue2(message.error.message) ?? compactJson2(message.error) : null;
   if (error) {
     items.push({
       id: `${id}:error`,
@@ -12693,12 +13113,12 @@ function openCodeMessagesToTurns(messages, options = {}) {
   };
   for (const message of messages) {
     const normalizedMessage = normalizeLegacyMessage(message);
-    if (!isRecord8(normalizedMessage)) {
+    if (!isRecord9(normalizedMessage)) {
       continue;
     }
     const id = stringValue2(normalizedMessage.id) ?? crypto.randomUUID();
     const type = stringValue2(normalizedMessage.type);
-    const createdAt = isRecord8(normalizedMessage.time) ? isoFromMs(normalizedMessage.time.created) : null;
+    const createdAt = isRecord9(normalizedMessage.time) ? isoFromMs(normalizedMessage.time.created) : null;
     if (type === "user") {
       flush();
       current = {
@@ -12724,7 +13144,7 @@ function openCodeMessagesToTurns(messages, options = {}) {
     if (items.some((item) => item.kind !== "userMessage" && item.kind !== "other")) {
       current.hasAssistantResult = true;
     }
-    if (isRecord8(normalizedMessage.error)) {
+    if (isRecord9(normalizedMessage.error)) {
       current.error = stringValue2(normalizedMessage.error.message) ?? compactJson2(normalizedMessage.error);
     }
   }
@@ -12787,7 +13207,7 @@ var opencodeCapabilities = {
     costUsd: true
   }
 };
-function isRecord9(value) {
+function isRecord10(value) {
   return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
 function stringValue3(value) {
@@ -12805,12 +13225,12 @@ function isoFromMs2(value) {
   return time === null ? null : new Date(time).toISOString();
 }
 function unwrapResult(result) {
-  if (isRecord9(result) && "error" in result && result.error !== void 0) {
+  if (isRecord10(result) && "error" in result && result.error !== void 0) {
     const error = result.error;
-    const message = isRecord9(error) && typeof error.message === "string" ? error.message : String(error);
+    const message = isRecord10(error) && typeof error.message === "string" ? error.message : String(error);
     throw new Error(message);
   }
-  if (isRecord9(result) && "data" in result) {
+  if (isRecord10(result) && "data" in result) {
     return result.data;
   }
   return result;
@@ -12837,7 +13257,7 @@ function parseModelKey(value) {
   };
 }
 function mapModel3(record, index) {
-  if (!isRecord9(record)) {
+  if (!isRecord10(record)) {
     return null;
   }
   const providerID = stringValue3(record.providerID);
@@ -12847,8 +13267,8 @@ function mapModel3(record, index) {
   }
   const name = stringValue3(record.name) ?? id;
   const variants = Array.isArray(record.variants) ? record.variants : [];
-  const defaultVariant = isRecord9(record.options) ? stringValue3(record.options.variant) : null;
-  const variantIds = variants.map((variant) => isRecord9(variant) ? stringValue3(variant.id) : null).filter((variant) => Boolean(variant));
+  const defaultVariant = isRecord10(record.options) ? stringValue3(record.options.variant) : null;
+  const variantIds = variants.map((variant) => isRecord10(variant) ? stringValue3(variant.id) : null).filter((variant) => Boolean(variant));
   const firstVariant = defaultVariant ?? variantIds[0] ?? null;
   const model = modelKey(providerID, id, firstVariant);
   const enabled = record.enabled !== false;
@@ -12864,24 +13284,24 @@ function mapModel3(record, index) {
   };
 }
 function configuredProviderModelRecords(config) {
-  const data = isRecord9(config) && isRecord9(config.data) ? config.data : config;
-  const providerConfig = isRecord9(data) && isRecord9(data.provider) ? data.provider : isRecord9(data) && isRecord9(data.providers) ? data.providers : null;
+  const data = isRecord10(config) && isRecord10(config.data) ? config.data : config;
+  const providerConfig = isRecord10(data) && isRecord10(data.provider) ? data.provider : isRecord10(data) && isRecord10(data.providers) ? data.providers : null;
   const configured = /* @__PURE__ */ new Map();
   if (!providerConfig) {
     return configured;
   }
   Object.entries(providerConfig).forEach(([providerID, provider]) => {
-    if (!isRecord9(provider) || !isRecord9(provider.models)) {
+    if (!isRecord10(provider) || !isRecord10(provider.models)) {
       return;
     }
     Object.entries(provider.models).forEach(([modelID, model]) => {
-      configured.set(providerModelKey(providerID, modelID), isRecord9(model) ? model : {});
+      configured.set(providerModelKey(providerID, modelID), isRecord10(model) ? model : {});
     });
   });
   return configured;
 }
 function mapProviderModel(provider, record, index, configuredRecord) {
-  if (!isRecord9(provider) || !isRecord9(record)) {
+  if (!isRecord10(provider) || !isRecord10(record)) {
     return null;
   }
   const providerID = stringValue3(record.providerID) ?? stringValue3(provider.id);
@@ -12890,7 +13310,7 @@ function mapProviderModel(provider, record, index, configuredRecord) {
     return null;
   }
   const name = stringValue3(configuredRecord?.name) ?? stringValue3(record.name) ?? id;
-  const variants = configuredRecord ? isRecord9(configuredRecord.variants) ? Object.keys(configuredRecord.variants) : [] : isRecord9(record.variants) ? Object.keys(record.variants) : [];
+  const variants = configuredRecord ? isRecord10(configuredRecord.variants) ? Object.keys(configuredRecord.variants) : [] : isRecord10(record.variants) ? Object.keys(record.variants) : [];
   const model = providerModelKey(providerID, id);
   const providerName = stringValue3(provider.name) ?? providerID;
   const disabled = configuredRecord?.status === "disabled" || record.status === "disabled" || provider.disabled === true;
@@ -12910,15 +13330,15 @@ function mapProviderModel(provider, record, index, configuredRecord) {
   };
 }
 function providerModels(result, configuredModels) {
-  const data = isRecord9(result) && Array.isArray(result.providers) ? result : isRecord9(result) && isRecord9(result.data) && Array.isArray(result.data.providers) ? result.data : null;
+  const data = isRecord10(result) && Array.isArray(result.providers) ? result : isRecord10(result) && isRecord10(result.data) && Array.isArray(result.data.providers) ? result.data : null;
   const providers = Array.isArray(data?.providers) ? data.providers : [];
   const models = [];
   providers.forEach((provider) => {
-    if (!isRecord9(provider) || !isRecord9(provider.models)) {
+    if (!isRecord10(provider) || !isRecord10(provider.models)) {
       return;
     }
     Object.values(provider.models).forEach((model) => {
-      if (!isRecord9(model)) {
+      if (!isRecord10(model)) {
         return;
       }
       const providerID = stringValue3(model.providerID) ?? stringValue3(provider.id);
@@ -12973,7 +13393,7 @@ function modelContextWindowFromTokens(tokens) {
   );
 }
 function openCodeUsageFromTokens(tokens) {
-  if (!isRecord9(tokens)) {
+  if (!isRecord10(tokens)) {
     return null;
   }
   const inputTokens = nonNegativeNumberValue(tokens.input ?? tokens.inputTokens ?? tokens.input_tokens) ?? 0;
@@ -12981,7 +13401,7 @@ function openCodeUsageFromTokens(tokens) {
   const reasoningOutputTokens = nonNegativeNumberValue(
     tokens.reasoning ?? tokens.reasoningOutputTokens ?? tokens.reasoning_output_tokens
   ) ?? 0;
-  const cache = isRecord9(tokens.cache) ? tokens.cache : null;
+  const cache = isRecord10(tokens.cache) ? tokens.cache : null;
   const cachedInputTokens = nonNegativeNumberValue(
     tokens.cachedInputTokens ?? tokens.cached_input_tokens ?? cache?.read
   ) ?? 0;
@@ -13001,10 +13421,10 @@ function openCodeUsageFromTokens(tokens) {
   };
 }
 function messageTokenUsage(message) {
-  if (!isRecord9(message)) {
+  if (!isRecord10(message)) {
     return null;
   }
-  const legacyMessage = isRecord9(message.info) && Array.isArray(message.parts) ? {
+  const legacyMessage = isRecord10(message.info) && Array.isArray(message.parts) ? {
     type: stringValue3(message.info.role) ?? stringValue3(message.info.type),
     content: message.parts,
     tokens: message.info.tokens
@@ -13018,7 +13438,7 @@ function messageTokenUsage(message) {
   }
   const parts = Array.isArray(message.parts) ? message.parts : Array.isArray(message.content) ? message.content : [];
   for (const part of parts) {
-    if (!isRecord9(part)) {
+    if (!isRecord10(part)) {
       continue;
     }
     const partType = stringValue3(part.type);
@@ -13063,10 +13483,7 @@ function turnTokenUsage(messages, model) {
   };
 }
 function openCodeStatusType(value) {
-  if (!isRecord9(value)) {
-    return null;
-  }
-  const type = stringValue3(value.type);
+  const type = typeof value === "string" ? value : isRecord10(value) ? stringValue3(value.type) ?? stringValue3(value.status) ?? (isRecord10(value.status) ? stringValue3(value.status.type) : null) : null;
   return type === "idle" || type === "busy" || type === "retry" ? type : null;
 }
 function permissionRule(permission, action, pattern = "*") {
@@ -13171,21 +13588,21 @@ function turnWithPlanItemForCollaborationMode(turn, collaborationMode) {
   };
 }
 function messageId(message) {
-  if (!isRecord9(message)) {
+  if (!isRecord10(message)) {
     return null;
   }
-  return stringValue3(message.id) ?? (isRecord9(message.info) ? stringValue3(message.info.id) : null);
+  return stringValue3(message.id) ?? (isRecord10(message.info) ? stringValue3(message.info.id) : null);
 }
 function sessionSummary(record) {
-  if (!isRecord9(record)) {
+  if (!isRecord10(record)) {
     return null;
   }
   const id = stringValue3(record.id);
   if (!id) {
     return null;
   }
-  const time = isRecord9(record.time) ? record.time : {};
-  const model = isRecord9(record.model) ? modelKey(
+  const time = isRecord10(record.time) ? record.time : {};
+  const model = isRecord10(record.model) ? modelKey(
     stringValue3(record.model.providerID) ?? "unknown",
     stringValue3(record.model.id) ?? "unknown",
     stringValue3(record.model.variant)
@@ -13648,7 +14065,7 @@ var OpenCodeRuntimeAdapter = class extends EventEmitter6 {
           ...directory ? { directory } : {}
         }
       }));
-      if (!isRecord9(statusMap)) {
+      if (!isRecord10(statusMap)) {
         return null;
       }
       return openCodeStatusType(statusMap[providerSessionId]);
@@ -14460,6 +14877,23 @@ function hasHistoryItemSequence(item) {
 function historyItemSequence(item) {
   return hasHistoryItemSequence(item) ? item.sequence : Number.POSITIVE_INFINITY;
 }
+function historyItemTranscriptOrder(item) {
+  return typeof item.transcriptOrder === "number" && Number.isFinite(item.transcriptOrder) ? item.transcriptOrder : null;
+}
+function copyPersistedOrderingHints(item, persistedItem) {
+  let nextItem = item;
+  if (hasHistoryItemSequence(persistedItem)) {
+    const sequence = historyItemSequence(persistedItem);
+    if (nextItem.sequence !== sequence) {
+      nextItem = { ...nextItem, sequence };
+    }
+  }
+  const transcriptOrder = historyItemTranscriptOrder(persistedItem);
+  if (transcriptOrder !== null && nextItem.transcriptOrder !== transcriptOrder) {
+    nextItem = { ...nextItem, transcriptOrder };
+  }
+  return nextItem;
+}
 function sortHistoryItemsBySequence(items) {
   if (!items.some(hasHistoryItemSequence)) {
     return items;
@@ -14480,6 +14914,9 @@ function sortTurnItemsByRecordedSequence(items) {
   if (!trailingItems.some(hasHistoryItemSequence)) {
     return items;
   }
+  if (trailingItems.some((item) => historyItemTranscriptOrder(item) !== null)) {
+    return items;
+  }
   const sequenceValues = trailingItems.map((item) => historyItemSequence(item)).filter(Number.isFinite);
   const maxSequence = sequenceValues.length > 0 ? Math.max(...sequenceValues) : 0;
   const orderedItems2 = [];
@@ -14555,13 +14992,6 @@ function mergeHistoryItemsBySequence(items, missingItems) {
   }
   return sortTurnItemsByRecordedSequence(mergedItems);
 }
-function copyPersistedSequence(item, persistedItem) {
-  if (!hasHistoryItemSequence(persistedItem)) {
-    return item;
-  }
-  const sequence = historyItemSequence(persistedItem);
-  return item.sequence === sequence ? item : { ...item, sequence };
-}
 function shouldAppendPersistedMissingItem(turn, item) {
   if (item.kind !== "agentMessage") {
     return true;
@@ -14580,16 +15010,26 @@ function mergePersistedHistoryItemsIntoTurns(turns, persistedItemsByTurnId, defe
     }
     let changed = false;
     const persistedItemsById = new Map(persistedItems.map((item) => [item.id, item]));
-    const nextItems = turn.items.map((item) => {
+    const nextItems = turn.items.map((item, transcriptIndex) => {
       const persistedItem = persistedItemsById.get(item.id);
+      const itemWithTranscriptOrder = item.transcriptOrder === transcriptIndex ? item : { ...item, transcriptOrder: transcriptIndex };
       if (!persistedItem) {
-        return item;
+        changed = true;
+        return itemWithTranscriptOrder;
       }
       persistedItemsById.delete(item.id);
       if (item.kind !== persistedItem.kind) {
-        return item;
+        changed = itemWithTranscriptOrder !== item || changed;
+        return itemWithTranscriptOrder;
       }
-      const sequencedItem = copyPersistedSequence(item, persistedItem);
+      const persistedItemWithTranscriptOrder = {
+        ...persistedItem,
+        transcriptOrder: transcriptIndex
+      };
+      const sequencedItem = copyPersistedOrderingHints(
+        itemWithTranscriptOrder,
+        persistedItemWithTranscriptOrder
+      );
       if (sequencedItem !== item) {
         changed = true;
       }
@@ -14598,11 +15038,11 @@ function mergePersistedHistoryItemsIntoTurns(turns, persistedItemsByTurnId, defe
         const persistedText = persistedItem.detailText?.trim() || persistedItem.text.trim();
         if (persistedText.length > existingText.length) {
           changed = true;
-          return persistedItem.kind === "commandExecution" ? deferCommandHistoryItem2(
-            persistedItem,
+          return persistedItemWithTranscriptOrder.kind === "commandExecution" ? deferCommandHistoryItem2(
+            persistedItemWithTranscriptOrder,
             deferredDetails
           ) : deferToolCallHistoryItem2(
-            persistedItem,
+            persistedItemWithTranscriptOrder,
             deferredDetails
           );
         }
@@ -14875,7 +15315,7 @@ var ThreadLiveStateStore = class {
 
 // src/thread-usage-accounting.ts
 var CONTEXT_BASELINE_TOKENS = 12e3;
-function isRecord10(value) {
+function isRecord11(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function numberOrNull2(value) {
@@ -14923,11 +15363,11 @@ function computeContextRemainingPercent(tokensInContextWindow, contextWindow) {
   return clampPercentage(Math.round(remaining / effectiveWindow * 100));
 }
 function buildThreadContextUsageFromPayload(payload, model = null, timestamp = (/* @__PURE__ */ new Date()).toISOString()) {
-  const tokenUsage = isRecord10(payload) ? payload : null;
+  const tokenUsage = isRecord11(payload) ? payload : null;
   const modelContextWindow = numberOrNull2(
     tokenUsage?.modelContextWindow ?? tokenUsage?.model_context_window
   ) ?? contextWindowForModel(model);
-  const lastUsage = isRecord10(tokenUsage?.last) ? tokenUsage.last : null;
+  const lastUsage = isRecord11(tokenUsage?.last) ? tokenUsage.last : null;
   const tokensInContextWindow = numberOrNull2(
     lastUsage?.totalTokens ?? lastUsage?.total_tokens
   );
@@ -14946,7 +15386,7 @@ function buildThreadContextUsageFromPayload(payload, model = null, timestamp = (
   };
 }
 function buildTurnTokenBreakdown(payload) {
-  const usage = isRecord10(payload) ? payload : null;
+  const usage = isRecord11(payload) ? payload : null;
   const totalTokens2 = numberOrNull2(usage?.totalTokens ?? usage?.total_tokens);
   const inputTokens = numberOrNull2(usage?.inputTokens ?? usage?.input_tokens);
   const cachedInputTokens = numberOrNull2(
@@ -14992,12 +15432,12 @@ function subtractTurnTokenBreakdowns(current, previous) {
   };
 }
 function parseThreadTurnTokenUsage(payload) {
-  const tokenUsage = isRecord10(payload) ? payload : null;
+  const tokenUsage = isRecord11(payload) ? payload : null;
   const total = buildTurnTokenBreakdown(
-    isRecord10(tokenUsage?.total) ? tokenUsage.total : null
+    isRecord11(tokenUsage?.total) ? tokenUsage.total : null
   );
   const last = buildTurnTokenBreakdown(
-    isRecord10(tokenUsage?.last) ? tokenUsage.last : null
+    isRecord11(tokenUsage?.last) ? tokenUsage.last : null
   );
   const modelContextWindow = numberOrNull2(
     tokenUsage?.modelContextWindow ?? tokenUsage?.model_context_window
@@ -15021,7 +15461,7 @@ function parseStoredThreadTurnTokenUsageState(value) {
   try {
     const parsed = JSON.parse(value);
     const baselineTotal = buildTurnTokenBreakdown(
-      isRecord10(parsed?.baselineTotal) ? parsed.baselineTotal : null
+      isRecord11(parsed?.baselineTotal) ? parsed.baselineTotal : null
     );
     return {
       baselineTotal,
@@ -15061,12 +15501,12 @@ function stringifyStoredThreadTurnTokenUsageState(state) {
   });
 }
 function buildThreadTurnTokenUsage(payload, baselineTotal, previous = null) {
-  const tokenUsage = isRecord10(payload) ? payload : null;
+  const tokenUsage = isRecord11(payload) ? payload : null;
   const cumulativeTotal = buildTurnTokenBreakdown(
-    isRecord10(tokenUsage?.total) ? tokenUsage.total : null
+    isRecord11(tokenUsage?.total) ? tokenUsage.total : null
   );
   const last = buildTurnTokenBreakdown(
-    isRecord10(tokenUsage?.last) ? tokenUsage.last : null
+    isRecord11(tokenUsage?.last) ? tokenUsage.last : null
   );
   const modelContextWindow = numberOrNull2(
     tokenUsage?.modelContextWindow ?? tokenUsage?.model_context_window
@@ -15138,7 +15578,7 @@ var ThreadUsageAccounting = class {
       input.localThreadId
     );
     const currentCumulativeTotal = buildTurnTokenBreakdown(
-      isRecord10(input.tokenUsage?.total) ? input.tokenUsage.total : null
+      isRecord11(input.tokenUsage?.total) ? input.tokenUsage.total : null
     );
     if (currentCumulativeTotal) {
       this.threadCumulativeTokenUsage.set(input.localThreadId, currentCumulativeTotal);
@@ -15645,7 +16085,7 @@ var ProviderRequestCoordinator = class {
     const defaultMappedRequest = runtime.mapProviderRequest?.(request, {
       approvalMode: "guarded"
     });
-    const providerSessionIdFromParams = isRecord11(request.params) ? request.params.providerSessionId ?? request.params.threadId ?? request.params.conversationId ?? request.params.sessionId : null;
+    const providerSessionIdFromParams = isRecord12(request.params) ? request.params.providerSessionId ?? request.params.threadId ?? request.params.conversationId ?? request.params.sessionId : null;
     const providerSessionId = defaultMappedRequest?.providerSessionId ?? (typeof providerSessionIdFromParams === "string" ? providerSessionIdFromParams : null);
     const record = providerSessionId ? this.callbacks.findRecordByProviderSessionId(request.provider, providerSessionId) : null;
     if (!record) {
@@ -15858,7 +16298,7 @@ function buildRequestAnswerLines(request, input) {
     return `- ${question.question}: ${answers.join(", ")}`;
   }).filter((line) => Boolean(line));
 }
-function isRecord11(value) {
+function isRecord12(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 
@@ -15977,9 +16417,16 @@ var ThreadDetailAssembler = class {
       input.record,
       latestThreadTurnMetadata(input.turnMetadataById)
     );
+    const localTurns = localSession?.turns ?? [...persistedItemsByTurnId.entries()].map(([turnId, items]) => ({
+      id: turnId,
+      startedAt: null,
+      status: "completed",
+      error: null,
+      items: []
+    }));
     const turns = mergePersistedHistoryItemsIntoTurns(
       applyRecordedTurnItemOrders(
-        localSession?.turns ?? [],
+        localTurns,
         this.input.liveState.turnItemOrderSnapshot(input.localThreadId)
       ),
       persistedItemsByTurnId,
@@ -16154,7 +16601,7 @@ var ThreadProviderRuntimeCoordinator = class {
   }
   runtimeForProvider(provider) {
     const normalizedProvider = this.normalizeProvider(provider);
-    const runtime = this.agentRuntimes.getOptional(normalizedProvider);
+    const runtime = this.optionalRuntimeForProvider(normalizedProvider);
     if (!runtime) {
       throw new HttpError(501, {
         code: "service_unavailable",
@@ -16163,6 +16610,9 @@ var ThreadProviderRuntimeCoordinator = class {
     }
     return runtime;
   }
+  optionalRuntimeForProvider(provider) {
+    return this.agentRuntimes.getOptional(this.normalizeProvider(provider)) ?? null;
+  }
   allRuntimes() {
     return this.agentRuntimes.all();
   }
@@ -16173,7 +16623,7 @@ var ThreadProviderRuntimeCoordinator = class {
     return this.providerForRecord({ provider }) === "codex";
   }
   runtimeSupportsFastMode(provider) {
-    return this.runtimeForProvider(provider).capabilities.controls.performanceMode;
+    return this.optionalRuntimeForProvider(provider)?.capabilities.controls.performanceMode ?? false;
   }
   fastModeForProvider(provider, fastMode) {
     return this.runtimeSupportsFastMode(provider) ? normalizeFastMode(fastMode) : false;
@@ -16184,8 +16634,12 @@ var ThreadProviderRuntimeCoordinator = class {
     );
   }
   async listLoadedProviderSessionIds(provider = "codex") {
+    const runtime = this.optionalRuntimeForProvider(provider);
+    if (!runtime) {
+      return /* @__PURE__ */ new Set();
+    }
     return new Set(
-      await this.runtimeForProvider(provider).listLoadedSessions().catch(() => [])
+      await runtime.listLoadedSessions().catch(() => [])
     );
   }
   async listProviderModels(provider = "codex") {
@@ -18703,6 +19157,7 @@ var ProviderFeatureCoordinator = class {
 var DEFAULT_THREAD_TITLE2 = "Untitled thread";
 var GENERIC_REMOTE_THREAD_TITLE = "Thread";
 var IMPLEMENT_APPROVED_PLAN_PROMPT = "Implement the approved plan.";
+var LOCAL_PLAN_DECISION_PREFIX2 = "plan-decision:";
 var FAST_MODE_NOTE_ON = "Fast mode on";
 var FAST_MODE_NOTE_OFF = "Fast mode off";
 async function pathExists3(absPath) {
@@ -18714,10 +19169,11 @@ async function pathExists3(absPath) {
   }
 }
 var ThreadService = class {
-  constructor(db, agentRuntimes, eventBus, localSessionStore, workspaceRoot, providerManagement) {
+  constructor(db, agentRuntimes, eventBus, localSessionStore, workspaceRoot, providerManagement, pluginService) {
     this.db = db;
     this.eventBus = eventBus;
     this.workspaceRoot = workspaceRoot;
+    this.pluginService = pluginService;
     this.providerRuntime = new ThreadProviderRuntimeCoordinator(agentRuntimes);
     this.historyPersistence = new ThreadHistoryPersistenceCoordinator(db, this.liveState);
     this.attachmentCoordinator = new ThreadAttachmentCoordinator(db);
@@ -18764,6 +19220,9 @@ var ThreadService = class {
         listPersistedHistoryItemsByTurnId: (localThreadId) => this.historyPersistence.listPersistedHistoryItemsByTurnId(localThreadId),
         materializeHiddenRuntimeTurns: (localThreadId, turns) => this.materializeHiddenRuntimeTurns(localThreadId, turns),
         readRemoteSession: async (record, options) => {
+          if (!this.optionalRuntimeForProvider(record.provider)) {
+            return null;
+          }
           const workspace = getWorkspaceRecordById(this.db, record.workspaceId);
           return this.sessionCoordinator.readRemoteSession({
             provider: record.provider,
@@ -18909,6 +19368,7 @@ var ThreadService = class {
   db;
   eventBus;
   workspaceRoot;
+  pluginService;
   liveState = new ThreadLiveStateStore();
   detailAssembler;
   usageAccounting;
@@ -18933,6 +19393,9 @@ var ThreadService = class {
   runtimeForProvider(provider) {
     return this.providerRuntime.runtimeForProvider(provider);
   }
+  optionalRuntimeForProvider(provider) {
+    return this.providerRuntime.optionalRuntimeForProvider(provider);
+  }
   providerForRecord(record) {
     return this.providerRuntime.providerForRecord(record);
   }
@@ -19117,14 +19580,25 @@ var ThreadService = class {
       options
     });
     const updated = getThreadRecordById(this.db, record.id);
-    const pagedTurns = this.detailAssembler.sliceTurns(cachedDetail.turns, options);
+    const enrichedTurns = this.pluginService?.enrichTurnsWithArtifacts({
+      threadId: updated.id,
+      workspacePath: workspace.absPath,
+      turns: cachedDetail.turns
+    }) ?? cachedDetail.turns;
+    const pagedTurns = this.detailAssembler.sliceTurns(enrichedTurns, options);
+    this.syncPendingPlanDecisionRequestFromTurns(
+      updated.id,
+      updated.collaborationMode,
+      enrichedTurns
+    );
     const liveItems = this.liveState.getLiveItems(
       updated.id,
-      cachedDetail.turns,
+      enrichedTurns,
       pagedTurns.turns
     );
     const goalHistory = this.goalCoordinator.listThreadGoalHistory(updated.id);
-    const goal = await this.goalCoordinator.getThreadGoalForRecord(updated).catch(() => null) ?? this.goalCoordinator.localGoalSnapshotForFallback(goalHistory);
+    const remoteGoal = updated.isConnected === false || !this.optionalRuntimeForProvider(updated.provider) ? null : await this.goalCoordinator.getThreadGoalForRecord(updated).catch(() => null);
+    const goal = remoteGoal ?? this.goalCoordinator.localGoalSnapshotForFallback(goalHistory);
     const pendingRequests = this.listPendingRequests(updated.id);
     return {
       thread: this.toThreadDto(updated, loadedIds),
@@ -19631,16 +20105,25 @@ var ThreadService = class {
       requestId,
       input
     );
-    if (!requestResponse) {
+    let resolvedRequestResponse = requestResponse;
+    if (!resolvedRequestResponse && requestId.startsWith(LOCAL_PLAN_DECISION_PREFIX2)) {
+      await this.syncPendingPlanDecisionRequestFromCurrentDetail(localThreadId);
+      resolvedRequestResponse = this.requestCoordinator.respondToRequest(
+        localThreadId,
+        requestId,
+        input
+      );
+    }
+    if (!resolvedRequestResponse) {
       throw new HttpError(404, {
         code: "not_found",
         message: "Request was not found for this thread."
       });
     }
-    if (requestResponse.source === "server") {
-      const pending = requestResponse.pending;
+    if (resolvedRequestResponse.source === "server") {
+      const pending = resolvedRequestResponse.pending;
       this.requestCoordinator.respondToProviderRequest(record.provider, pending, input);
-      if (requestResponse.continuationPrompt) {
+      if (resolvedRequestResponse.continuationPrompt) {
         const providerSessionId = this.requireProviderSessionId(record);
         const connectedRecord = {
           ...record,
@@ -19663,7 +20146,7 @@ var ThreadService = class {
           approvalMode: record.approvalMode ?? "yolo"
         });
         await this.promptTurnCoordinator.startPromptTurn(localThreadId, connectedRecord, {
-          prompt: requestResponse.continuationPrompt,
+          prompt: resolvedRequestResponse.continuationPrompt,
           effectiveModel: turnConfig.effectiveModel,
           normalizedReasoning: turnConfig.normalizedReasoning,
           collaborationMode: turnConfig.collaborationMode,
@@ -19674,7 +20157,7 @@ var ThreadService = class {
           displayTurnId: pending.request.turnId
         });
       }
-    } else if (requestResponse.selectedAction === "implement") {
+    } else if (resolvedRequestResponse.selectedAction === "implement") {
       await this.importCoordinator.ensureImportedThreadConnectedForImplementation({
         source: record.source,
         provider: record.provider,
@@ -19693,7 +20176,7 @@ var ThreadService = class {
     }
     this.auxiliaryState.appendAnsweredRequestNote(
       localThreadId,
-      requestResponse.answeredNote
+      resolvedRequestResponse.answeredNote
     );
     this.requestCoordinator.emitRequestResolved(localThreadId, requestId);
     return this.getThreadDetail(localThreadId);
@@ -19753,6 +20236,49 @@ var ThreadService = class {
       latestTurn: remoteSession.turns.at(-1) ?? null
     });
   }
+  syncPendingPlanDecisionRequestFromTurns(localThreadId, collaborationMode, turns) {
+    const latestTurn = turns.at(-1) ?? null;
+    this.requestCoordinator.syncPendingPlanDecisionRequest({
+      localThreadId,
+      collaborationMode,
+      latestTurn: latestTurn ? {
+        providerTurnId: latestTurn.id,
+        status: latestTurn.status,
+        items: latestTurn.items.map((item) => ({ kind: item.kind }))
+      } : null
+    });
+  }
+  async syncPendingPlanDecisionRequestFromCurrentDetail(localThreadId) {
+    const record = getThreadRecordById(this.db, localThreadId);
+    if (!record) {
+      return;
+    }
+    const turnMetadataById = new Map(
+      listThreadTurnMetadataByThreadId(this.db, localThreadId).map((entry) => [
+        entry.turnId,
+        {
+          model: entry.model ?? null,
+          reasoningEffort: entry.reasoningEffort ?? null,
+          reasoningEffortAvailable: entry.reasoningEffortAvailable ?? null,
+          pricingModelKey: entry.pricingModelKey ?? null,
+          pricingTierKey: normalizePricingTier(entry.pricingTierKey),
+          tokenUsageJson: entry.tokenUsageJson ?? null,
+          createdAt: entry.createdAt ?? null
+        }
+      ])
+    );
+    const cachedDetail = await this.detailAssembler.buildCacheEntry({
+      localThreadId,
+      record,
+      turnMetadataById
+    });
+    const updated = getThreadRecordById(this.db, localThreadId) ?? record;
+    this.syncPendingPlanDecisionRequestFromTurns(
+      updated.id,
+      updated.collaborationMode,
+      cachedDetail.turns
+    );
+  }
 };
 
 // src/routes/agent-runtimes.ts
@@ -21135,6 +21661,72 @@ async function registerWorkspaceRoutes(app2) {
   });
 }
 
+// src/routes/plugins.ts
+import { z as z8 } from "zod";
+var pluginParamsSchema = z8.object({
+  pluginId: z8.string().min(1)
+});
+var updatePluginSchema = z8.object({
+  enabled: z8.boolean()
+});
+var importPluginSchema = z8.object({
+  enabled: z8.boolean().optional(),
+  manifestJson: z8.string().optional(),
+  manifest: z8.unknown().optional()
+}).refine((value) => value.manifest !== void 0 || value.manifestJson !== void 0, {
+  message: "Plugin import requires manifest or manifestJson."
+});
+async function registerPluginRoutes(app2) {
+  app2.get("/api/plugins", async () => {
+    return app2.services.pluginService.listPlugins();
+  });
+  app2.post("/api/plugins/import", async (request) => {
+    const parsed = importPluginSchema.parse(request.body);
+    const body = {
+      ...parsed.enabled === void 0 ? {} : { enabled: parsed.enabled },
+      ...parsed.manifest === void 0 ? {} : { manifest: parsed.manifest },
+      ...parsed.manifestJson === void 0 ? {} : { manifestJson: parsed.manifestJson }
+    };
+    try {
+      return app2.services.pluginService.importPlugin(body);
+    } catch (error) {
+      if (error instanceof SyntaxError) {
+        throw new HttpError(400, {
+          code: "bad_request",
+          message: "Plugin manifest JSON is invalid."
+        });
+      }
+      throw new HttpError(400, {
+        code: "bad_request",
+        message: error instanceof Error ? error.message : "Plugin import failed."
+      });
+    }
+  });
+  app2.get("/api/plugins/:pluginId", async (request) => {
+    const { pluginId } = pluginParamsSchema.parse(request.params);
+    const plugin = app2.services.pluginService.getPlugin(pluginId);
+    if (!plugin) {
+      throw new HttpError(404, {
+        code: "not_found",
+        message: "Plugin was not found."
+      });
+    }
+    return plugin;
+  });
+  app2.patch("/api/plugins/:pluginId", async (request) => {
+    const { pluginId } = pluginParamsSchema.parse(request.params);
+    const body = updatePluginSchema.parse(request.body);
+    try {
+      return app2.services.pluginService.setPluginEnabled(pluginId, body.enabled);
+    } catch {
+      throw new HttpError(404, {
+        code: "not_found",
+        message: "Plugin was not found."
+      });
+    }
+  });
+}
+
 // src/provider-host-config-service.ts
 import fs18 from "fs/promises";
 import path18 from "path";
@@ -22495,6 +23087,212 @@ function tokenizeTmuxInput(data) {
   return tokens;
 }
 
+// ../../packages/plugin-xyz-viewer/src/manifest.ts
+var XYZ_MOLECULE_ARTIFACT_TYPE = "chemistry.molecule3d";
+var xyzViewerPluginManifest = {
+  id: "remote-codex.xyz-viewer",
+  name: "XYZ Molecule Viewer",
+  version: "0.1.0",
+  description: "A draft built-in plugin for previewing xyz, extxyz, cif, and pdb molecular structures with 3Dmol.js.",
+  remoteCodex: "^0.11.0",
+  capabilities: {
+    artifactTypes: [
+      {
+        type: XYZ_MOLECULE_ARTIFACT_TYPE,
+        title: "3D Molecule",
+        fileExtensions: ["xyz", "extxyz", "cif", "pdb"]
+      }
+    ],
+    timelineRenderers: [XYZ_MOLECULE_ARTIFACT_TYPE],
+    threadPanels: [
+      {
+        id: "xyz-viewer",
+        label: "Molecules",
+        artifactTypes: [XYZ_MOLECULE_ARTIFACT_TYPE]
+      }
+    ],
+    frontend: {
+      entry: "./dist/index.js",
+      style: "./src/styles.css"
+    }
+  }
+};
+
+// src/plugins/builtin-plugins.ts
+var builtinPlugins = [
+  {
+    manifest: xyzViewerPluginManifest,
+    enabledByDefault: true
+  }
+];
+
+// src/plugins/plugin-service.ts
+var PluginService = class {
+  constructor(registry, settingsStore) {
+    this.registry = registry;
+    this.settingsStore = settingsStore;
+    this.loadPersistedSettings();
+  }
+  registry;
+  settingsStore;
+  settings = {
+    enabled: {},
+    imported: []
+  };
+  listPlugins() {
+    return this.registry.list();
+  }
+  getPlugin(pluginId) {
+    return this.registry.get(pluginId);
+  }
+  setPluginEnabled(pluginId, enabled) {
+    const plugin = this.registry.setEnabled(pluginId, enabled);
+    this.settings.enabled[pluginId] = enabled;
+    this.persistSettings();
+    return plugin;
+  }
+  importPlugin(input) {
+    const manifestInput = input.manifest ?? this.parseManifestJson(input.manifestJson);
+    const manifest = parsePluginManifest(manifestInput);
+    const enabled = input.enabled ?? true;
+    const existing = this.registry.getRegistered(manifest.id);
+    if (existing && existing.source !== "imported") {
+      throw new Error(`Built-in plugin cannot be replaced: ${manifest.id}`);
+    }
+    this.registerImportedManifest(manifest, enabled);
+    const existingIndex = this.settings.imported.findIndex(
+      (entry) => entry.id === manifest.id
+    );
+    if (existingIndex >= 0) {
+      this.settings.imported[existingIndex] = manifest;
+    } else {
+      this.settings.imported.push(manifest);
+    }
+    this.settings.enabled[manifest.id] = enabled;
+    this.persistSettings();
+    const plugin = this.registry.get(manifest.id);
+    if (!plugin) {
+      throw new Error(`Plugin import failed: ${manifest.id}`);
+    }
+    return plugin;
+  }
+  enrichTurnsWithArtifacts(input) {
+    const manifests = this.registry.enabledManifests();
+    if (manifests.length === 0) {
+      return input.turns;
+    }
+    return appendArtifactItemsToTurns(
+      input.turns,
+      new ManifestArtifactExtractor(manifests),
+      {
+        threadId: input.threadId,
+        workspacePath: input.workspacePath,
+        now: (/* @__PURE__ */ new Date()).toISOString()
+      }
+    );
+  }
+  loadPersistedSettings() {
+    if (!this.settingsStore) {
+      return;
+    }
+    this.settings = this.settingsStore.load();
+    for (const manifest of this.settings.imported) {
+      this.registerImportedManifest(
+        manifest,
+        this.settings.enabled[manifest.id] ?? true
+      );
+    }
+    for (const [pluginId, enabled] of Object.entries(this.settings.enabled)) {
+      if (this.registry.get(pluginId)) {
+        this.registry.setEnabled(pluginId, enabled);
+      }
+    }
+  }
+  registerImportedManifest(manifest, enabled) {
+    if (this.registry.get(manifest.id)) {
+      const existing = this.registry.getRegistered(manifest.id);
+      if (existing?.source === "imported") {
+        this.registry.updateImported({
+          manifest,
+          enabledByDefault: enabled,
+          source: "imported"
+        });
+      } else {
+        this.registry.setEnabled(manifest.id, enabled);
+      }
+      return;
+    }
+    this.registry.register({
+      manifest,
+      enabledByDefault: enabled,
+      source: "imported"
+    });
+  }
+  persistSettings() {
+    this.settingsStore?.save(this.settings);
+  }
+  parseManifestJson(manifestJson) {
+    if (!manifestJson?.trim()) {
+      throw new Error("Plugin import requires a manifest object or manifestJson string.");
+    }
+    return JSON.parse(manifestJson);
+  }
+};
+
+// src/plugins/plugin-settings-store.ts
+var PLUGIN_SETTINGS_POLICY_KEY = "plugins";
+function emptySettings() {
+  return {
+    enabled: {},
+    imported: []
+  };
+}
+function parseEnabled(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value)) {
+    return {};
+  }
+  const output = {};
+  for (const [key, enabled] of Object.entries(value)) {
+    if (typeof enabled === "boolean") {
+      output[key] = enabled;
+    } else if (enabled && typeof enabled === "object" && !Array.isArray(enabled) && typeof enabled.enabled === "boolean") {
+      output[key] = enabled.enabled;
+    }
+  }
+  return output;
+}
+var PluginSettingsStore = class {
+  constructor(db) {
+    this.db = db;
+  }
+  db;
+  load() {
+    const record = getPolicyRecordByKey(this.db, PLUGIN_SETTINGS_POLICY_KEY);
+    if (!record?.valueJson) {
+      return emptySettings();
+    }
+    try {
+      const parsed = JSON.parse(record.valueJson);
+      return {
+        enabled: parseEnabled(parsed.enabled),
+        imported: Array.isArray(parsed.imported) ? parsed.imported.map((entry) => parsePluginManifest(entry)) : []
+      };
+    } catch {
+      return emptySettings();
+    }
+  }
+  save(settings) {
+    upsertPolicyRecord(
+      this.db,
+      PLUGIN_SETTINGS_POLICY_KEY,
+      JSON.stringify({
+        enabled: settings.enabled,
+        imported: settings.imported
+      })
+    );
+  }
+};
+
 // src/app.ts
 var MAX_PROMPT_ATTACHMENTS2 = 10;
 var MAX_PROMPT_ATTACHMENT_BYTES2 = 25 * 1024 * 1024;
@@ -22554,6 +23352,9 @@ function buildApp(options = {}) {
   const database = createDatabase(config.databaseUrl);
   seedDefaults(database.db);
   const eventBus = new SupervisorEventBus();
+  const pluginRegistry = new PluginRegistry(builtinPlugins);
+  const pluginSettingsStore = new PluginSettingsStore(database.db);
+  const pluginService = new PluginService(pluginRegistry, pluginSettingsStore);
   const runtimeBootstrap = options.runtimeBootstrap ?? createAgentRuntimeBootstrap(config);
   const agentRuntimes = options.agentRuntimes ?? runtimeBootstrap.agentRuntimes;
   const threadService = new ThreadService(
@@ -22562,7 +23363,8 @@ function buildApp(options = {}) {
     eventBus,
     runtimeBootstrap.localCodexSessionStore,
     config.workspaceRoot,
-    runtimeBootstrap.codexManagement
+    runtimeBootstrap.codexManagement,
+    pluginService
   );
   const shellService = options.shellService ?? new ShellSessionService(database.db, eventBus, new TmuxManager());
   const providerHostConfigService = new ProviderHostConfigService(
@@ -22589,7 +23391,9 @@ function buildApp(options = {}) {
     eventBus,
     threadService,
     shellService,
-    providerHostConfigService
+    providerHostConfigService,
+    pluginRegistry,
+    pluginService
   });
   app2.register(async (realtimeApp) => {
     await realtimeApp.register(websocket);
@@ -22731,6 +23535,7 @@ function buildApp(options = {}) {
   app2.register(registerSystemRoutes);
   app2.register(registerAgentRuntimeRoutes);
   app2.register(registerShellRoutes);
+  app2.register(registerPluginRoutes);
   app2.register(registerThreadRoutes);
   app2.register(registerWorkspaceRoutes);
   app2.setNotFoundHandler((_request, reply) => {