@adhdev/daemon-core 0.9.82-rc.144 → 0.9.82-rc.145

package/dist/index.js

@@ -4598,13 +4598,34 @@ var init_provider_schema = __esm({
             }
           }
         },
+        nativeHistory: {
+          type: "object",
+          description: "Native transcript adapter declaration. v1 canonical field name. Daemon reads/lists provider-native history files via the named scripts (or the built-in adapter identified by $schema).",
+          additionalProperties: true,
+          properties: {
+            $schema: { type: "string" },
+            format: { type: "string" },
+            watchPath: { type: "string" },
+            mode: { enum: ["native-source", "materialized-mirror", "disabled", "daemon-mirror"] },
+            contractVersion: { type: "string" },
+            scripts: {
+              type: "object",
+              additionalProperties: false,
+              properties: {
+                readSession: { type: "string" },
+                listSessions: { type: "string" }
+              }
+            }
+          }
+        },
         canonicalHistory: {
           type: "object",
-          additionalProperties: false,
+          description: "Deprecated v0 alias for `nativeHistory`. The loader copies this block into `nativeHistory` at load time. New manifests should use `nativeHistory` directly.",
+          additionalProperties: true,
           properties: {
             format: { type: "string" },
             watchPath: { type: "string" },
-            mode: { enum: ["native-source", "daemon-mirror"] },
+            mode: { enum: ["native-source", "materialized-mirror", "disabled", "daemon-mirror"] },
             contractVersion: { type: "string" },
             scripts: {
               type: "object",
@@ -4629,11 +4650,6 @@ var init_provider_schema = __esm({
           description: "Declarative TUI parsing primitives. When present, daemon's builder synthesises detectStatus / parseApproval / parseSession from these blocks. Each block is identified by its $schema.",
           additionalProperties: true
         },
-        nativeHistory: {
-          type: "object",
-          description: "Declarative native-history adapter declaration. Daemon's builder routes readChat history through the named adapter ($schema).",
-          additionalProperties: true
-        },
         overrides: {
           type: "object",
           description: "Optional JS override pointers. Presence promotes the provider tier to `extended`. Each value identifies the handler being overridden and the relative path to the JS file implementing it.",
@@ -5891,6 +5907,11 @@ function buildParseSessionFromTui(spec) {
     dispatchOrder: spec.dispatchOrder
   }) : () => null;
   const parseApproval = spec.modal ? buildParseApprovalFromTui(spec.modal) : () => null;
+  const sessionIdRe = spec.sessionIdExtraction ? new RegExp(
+    spec.sessionIdExtraction.regex,
+    spec.sessionIdExtraction.flags ?? "i"
+  ) : null;
+  const sessionIdScope = spec.sessionIdExtraction?.scope ?? "tail";
   return function parseSession(input) {
     const status = detectStatus(input) ?? "idle";
     const modal = parseApproval(input);
@@ -5941,13 +5962,20 @@ function buildParseSessionFromTui(spec) {
       if (cont) last.content = last.content ? `${last.content}
 ${cont}` : cont;
     }
-    return {
+    const result = {
       status,
       messages,
       activeModal: modal,
       modal,
       parsedStatus: status
     };
+    if (sessionIdRe) {
+      const haystack = stripAnsi2(pickInputText(input, sessionIdScope));
+      const match = haystack.match(sessionIdRe);
+      const captured = match?.[1]?.trim();
+      if (captured) result.providerSessionId = captured;
+    }
+    return result;
   };
 }
 var crypto3, ANSI_RE, OSC_RE;
@@ -20078,7 +20106,7 @@ function isCurrentRuntimePtySafelyAttributed(args) {
   return true;
 }
 function supportsCliNativeTranscript(providerType, provider) {
-  if (provider?.category === "cli" && isNativeSourceCanonicalHistory(provider?.canonicalHistory)) {
+  if (provider?.category === "cli" && isNativeSourceCanonicalHistory(provider?.nativeHistory)) {
     return true;
   }
   if (CLI_NATIVE_TRANSCRIPT_PROVIDERS.has(providerType)) {
@@ -20426,7 +20454,7 @@ function summarizeProviderForDebug(provider) {
     name: provider.name,
     category: provider.category,
     version: provider.version,
-    canonicalHistory: provider.canonicalHistory,
+    canonicalHistory: provider.nativeHistory,
     historyBehavior: provider.historyBehavior,
     webviewMatchText: provider.webviewMatchText,
     scriptNames: scripts,
@@ -20777,8 +20805,8 @@ async function handleChatHistory(h, args) {
     const exactNativeHistoryScope = Boolean(
       typeof args?.targetSessionId === "string" && args.targetSessionId.trim() || typeof args?.historySessionId === "string" && args.historySessionId.trim() || typeof args?.providerSessionId === "string" && args.providerSessionId.trim()
     );
-    const result = supportsCliNativeTranscript(agentStr, provider) && isNativeSourceCanonicalHistory(provider?.canonicalHistory) ? readCliProviderNativeHistory(agentStr, {
-      canonicalHistory: provider?.canonicalHistory,
+    const result = supportsCliNativeTranscript(agentStr, provider) && isNativeSourceCanonicalHistory(provider?.nativeHistory) ? readCliProviderNativeHistory(agentStr, {
+      canonicalHistory: provider?.nativeHistory,
       historySessionId,
       workspace,
       offset: offset || 0,
@@ -20787,7 +20815,7 @@ async function handleChatHistory(h, args) {
       historyBehavior: provider?.historyBehavior,
       scripts: provider?.scripts
     }) : readProviderChatHistory(agentStr, {
-      canonicalHistory: provider?.canonicalHistory,
+      canonicalHistory: provider?.nativeHistory,
       historySessionId,
       workspace,
       offset: offset || 0,
@@ -20796,7 +20824,7 @@ async function handleChatHistory(h, args) {
       historyBehavior: provider?.historyBehavior,
       scripts: provider?.scripts
     });
-    if (supportsCliNativeTranscript(agentStr, provider) && isNativeSourceCanonicalHistory(provider?.canonicalHistory)) {
+    if (supportsCliNativeTranscript(agentStr, provider) && isNativeSourceCanonicalHistory(provider?.nativeHistory)) {
       const lookup = result.lookup === "workspace" ? "workspace" : "session";
       const messages = Array.isArray(result.messages) ? normalizeNativeHistoryMessages(agentStr, result.messages, result?.providerSessionId) : [];
       const historyProviderSessionId = typeof result?.providerSessionId === "string" ? result.providerSessionId : readHistorySessionIdFromMessages(messages) || historySessionId;
@@ -20877,7 +20905,7 @@ async function handleReadChat(h, args) {
       let selectedStatus = returnedStatus;
       const sessionWorkspace = typeof h.currentSession?.workspace === "string" ? h.currentSession.workspace : typeof adapter.workingDir === "string" ? adapter.workingDir : void 0;
       const intendedWorkspace = typeof args?.workspace === "string" ? args.workspace : void 0;
-      const supportsNative = supportsCliNativeTranscript(providerType, provider) && isNativeSourceCanonicalHistory(provider?.canonicalHistory);
+      const supportsNative = supportsCliNativeTranscript(providerType, provider) && isNativeSourceCanonicalHistory(provider?.nativeHistory);
       const agentStr = provider?.type || args?.agentType || getCurrentProviderType(h, adapter.cliType);
       const workspace = sessionWorkspace;
       const nativeHistoryLimit = Math.max(
@@ -20895,7 +20923,7 @@ async function handleReadChat(h, args) {
       if (supportsNative) {
         try {
           nativeHistory = readCliProviderNativeHistory(agentStr, {
-            canonicalHistory: provider?.canonicalHistory,
+            canonicalHistory: provider?.nativeHistory,
             historySessionId: nativeHistorySessionId,
             workspace,
             offset: 0,
@@ -20956,7 +20984,7 @@ async function handleReadChat(h, args) {
         });
         const mayProbeLiveCodexWorkspaceNative = adapter.cliType === "codex-cli" && liveCurrentRuntimePtySafe && !(typeof args?.providerSessionId === "string" && args.providerSessionId.trim()) && !(providerSessionId && providerSessionId.trim()) && (!historyProviderSessionId || historyProviderSessionId === nativeHistorySessionId || historyProviderSessionId === historySessionId);
         const liveWorkspaceNativeHistory = mayProbeLiveCodexWorkspaceNative ? readLiveCodexWorkspaceNativeHistory(agentStr, {
-          canonicalHistory: provider?.canonicalHistory,
+          canonicalHistory: provider?.nativeHistory,
           workspace,
           offset: 0,
           limit: nativeHistoryLimit,
@@ -21065,7 +21093,7 @@ async function handleReadChat(h, args) {
           returnedStatus: String(selectedStatus || ""),
           selectedMessageSource: messageSource.selected,
           messageSource,
-          shouldPreferAdapterMessages: supportsCliNativeTranscript(providerType, provider) && isNativeSourceCanonicalHistory(provider?.canonicalHistory) && messageSource.selected !== "native-history" && typeof messageSource.fallbackReason === "string" && messageSource.fallbackReason.startsWith("native_history_") && messageSource.fallbackReason !== "native_history_not_checked" && !isUnsafeNativeTranscriptFallback(messageSource.fallbackReason) && !(selectedTranscriptAuthority === "provider" && selectedCoverage === "full"),
+          shouldPreferAdapterMessages: supportsCliNativeTranscript(providerType, provider) && isNativeSourceCanonicalHistory(provider?.nativeHistory) && messageSource.selected !== "native-history" && typeof messageSource.fallbackReason === "string" && messageSource.fallbackReason.startsWith("native_history_") && messageSource.fallbackReason !== "native_history_not_checked" && !isUnsafeNativeTranscriptFallback(messageSource.fallbackReason) && !(selectedTranscriptAuthority === "provider" && selectedCoverage === "full"),
           parsedMsgCount: parsedRecord.messages.length,
           returnedMsgCount: selectedMessages.length
         },
@@ -21080,9 +21108,9 @@ async function handleReadChat(h, args) {
       const agentStr = provider?.type || args?.agentType || getCurrentProviderType(h);
       const workspace = typeof h.currentSession?.workspace === "string" ? h.currentSession.workspace : void 0;
       const intendedWorkspace = typeof args?.workspace === "string" ? args.workspace : void 0;
-      const supportsNative = supportsCliNativeTranscript(agentStr, provider) && isNativeSourceCanonicalHistory(provider?.canonicalHistory);
+      const supportsNative = supportsCliNativeTranscript(agentStr, provider) && isNativeSourceCanonicalHistory(provider?.nativeHistory);
       const history = supportsNative ? readCliProviderNativeHistory(agentStr, {
-        canonicalHistory: provider?.canonicalHistory,
+        canonicalHistory: provider?.nativeHistory,
         historySessionId,
         workspace,
         offset: 0,
@@ -21091,7 +21119,7 @@ async function handleReadChat(h, args) {
         historyBehavior: provider?.historyBehavior,
         scripts: provider?.scripts
       }) : readProviderChatHistory(agentStr, {
-        canonicalHistory: provider?.canonicalHistory,
+        canonicalHistory: provider?.nativeHistory,
         historySessionId,
         workspace,
         offset: 0,
@@ -25312,7 +25340,7 @@ ${effect.notification.body || ""}`.trim();
   }
   syncCanonicalSavedHistoryIfNeeded() {
     if (!this.providerSessionId) return false;
-    const canonicalHistory = this.provider.canonicalHistory;
+    const canonicalHistory = this.provider.nativeHistory;
     if (!canonicalHistory) return false;
     if (isNativeSourceCanonicalHistory(canonicalHistory)) {
       const cacheKey = [this.type, this.providerSessionId, this.workingDir].join("\0");
@@ -25369,8 +25397,8 @@ ${effect.notification.body || ""}`.trim();
   restorePersistedHistoryFromCurrentSession() {
     if (!this.providerSessionId) return;
     this.syncCanonicalSavedHistoryIfNeeded();
-    const restoredHistory = isNativeSourceCanonicalHistory(this.provider.canonicalHistory) ? readProviderChatHistory(this.type, {
-      canonicalHistory: this.provider.canonicalHistory,
+    const restoredHistory = isNativeSourceCanonicalHistory(this.provider.nativeHistory) ? readProviderChatHistory(this.type, {
+      canonicalHistory: this.provider.nativeHistory,
       historySessionId: this.providerSessionId,
       workspace: this.workingDir,
       offset: 0,
@@ -27708,10 +27736,13 @@ var KNOWN_PROVIDER_FIELDS = /* @__PURE__ */ new Set([
   "approvalPositiveHints",
   "sessionIdPattern",
   "historyBehavior",
-  "canonicalHistory",
-  // v1 contract spelling; the loader aliases nativeHistory →
-  // canonicalHistory so downstream code reads the legacy name.
+  // v1 canonical field name. The loader fills this in for legacy v0
+  // manifests that ship the old `canonicalHistory` spelling.
   "nativeHistory",
+  // Deprecated v0 alias for `nativeHistory`. Kept in the allowed-keys
+  // list so legacy provider.json manifests don't trip the unknown-key
+  // warning during the one-release deprecation window.
+  "canonicalHistory",
   "autoFixProfile",
   "ideLevelScripts",
   "allowInputDuringGeneration",
@@ -27787,7 +27818,7 @@ function validateProviderDefinition(raw) {
     warnings.push("Extension providers should have extensionId");
   }
   validateCapabilities(provider, controls, errors);
-  validateCanonicalHistory(provider.canonicalHistory, errors);
+  validateNativeHistory(provider.nativeHistory, errors);
   validateMeshCoordinator(provider.meshCoordinator, errors);
   for (const control of controls) {
     validateControl(control, errors);
@@ -27875,40 +27906,40 @@ function validateCapabilities(provider, controls, errors) {
     errors.push("providers declaring controls must set capabilities.controls.typedResults=true");
   }
 }
-function validateCanonicalHistory(raw, errors) {
+function validateNativeHistory(raw, errors) {
   if (raw === void 0) return;
   if (!raw || typeof raw !== "object" || Array.isArray(raw)) {
-    errors.push("canonicalHistory must be an object");
+    errors.push("nativeHistory must be an object");
     return;
   }
-  const canonicalHistory = raw;
-  const format = canonicalHistory.format;
+  const nativeHistory = raw;
+  const format = nativeHistory.format;
   if (format !== void 0 && (typeof format !== "string" || !format.trim())) {
-    errors.push("canonicalHistory.format must be a non-empty string when provided");
+    errors.push("nativeHistory.format must be a non-empty string when provided");
   }
-  const watchPath = canonicalHistory.watchPath;
+  const watchPath = nativeHistory.watchPath;
   if (watchPath !== void 0 && (typeof watchPath !== "string" || !watchPath.trim())) {
-    errors.push("canonicalHistory.watchPath must be a non-empty string when provided");
+    errors.push("nativeHistory.watchPath must be a non-empty string when provided");
   }
-  const mode = canonicalHistory.mode;
+  const mode = nativeHistory.mode;
   if (mode !== void 0 && !["native-source", "materialized-mirror", "disabled"].includes(String(mode))) {
-    errors.push("canonicalHistory.mode must be one of: native-source, materialized-mirror, disabled");
+    errors.push("nativeHistory.mode must be one of: native-source, materialized-mirror, disabled");
   }
-  const chatContractVersion = canonicalHistory.contractVersion;
+  const chatContractVersion = nativeHistory.contractVersion;
   if (chatContractVersion !== void 0 && chatContractVersion !== "1.0" && chatContractVersion !== "2.0") {
-    errors.push(`canonicalHistory.contractVersion must be '1.0' or '2.0' when provided (got ${JSON.stringify(chatContractVersion)})`);
+    errors.push(`nativeHistory.contractVersion must be '1.0' or '2.0' when provided (got ${JSON.stringify(chatContractVersion)})`);
   }
-  const scripts = canonicalHistory.scripts;
+  const scripts = nativeHistory.scripts;
   if (scripts === void 0) return;
   if (!scripts || typeof scripts !== "object" || Array.isArray(scripts)) {
-    errors.push("canonicalHistory.scripts must be an object");
+    errors.push("nativeHistory.scripts must be an object");
     return;
   }
   const scriptConfig = scripts;
   for (const key of ["readSession", "listSessions"]) {
     const value = scriptConfig[key];
     if (typeof value !== "string" || !value.trim()) {
-      errors.push(`canonicalHistory.scripts.${key} must be a non-empty string`);
+      errors.push(`nativeHistory.scripts.${key} must be a non-empty string`);
     }
   }
 }
@@ -29601,8 +29632,12 @@ ${formatManifestValidationIssues2(validation2.issues)}`);
             ...providerFields,
             ...extensionIdPattern instanceof RegExp ? { extensionIdPattern } : {}
           };
-          if (normalizedProvider.nativeHistory && !normalizedProvider.canonicalHistory) {
-            normalizedProvider.canonicalHistory = normalizedProvider.nativeHistory;
+          const nh = normalizedProvider.nativeHistory;
+          const ch = normalizedProvider.canonicalHistory;
+          if (nh && !ch) {
+            normalizedProvider.canonicalHistory = nh;
+          } else if (ch && !nh) {
+            normalizedProvider.nativeHistory = ch;
           }
           const validation = validateProviderDefinition(normalizedProvider);
           for (const warning of validation.warnings) {
@@ -34298,7 +34333,7 @@ var DaemonCommandRouter = class {
         const requestedProviderSessionId = typeof args?.providerSessionId === "string" ? args.providerSessionId.trim() : typeof args?.activeProviderSessionId === "string" ? args.activeProviderSessionId.trim() : "";
         const providerMeta = this.deps.providerLoader.resolve?.(providerType) || this.deps.providerLoader.getMeta(providerType);
         const { sessions: historySessions, hasMore, source } = listProviderHistorySessions(providerType, {
-          canonicalHistory: providerMeta?.canonicalHistory,
+          canonicalHistory: providerMeta?.nativeHistory,
           offset,
           limit,
           historyBehavior: providerMeta?.historyBehavior,