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

package/dist/providers/contracts.d.ts

@@ -445,8 +445,16 @@ export interface ProviderModule {
     /** History behavior config — controls message filtering and collapse during replay */
     historyBehavior?: ProviderHistoryBehavior;
     /**
-     * Canonical history sync config — for providers that maintain native history files.
-     * When set, daemon syncs from native format into ADHDev JSONL store on each tick.
+     * Native history config — for providers that maintain native history files.
+     * When set, daemon reads/lists provider-native transcripts directly. This is
+     * the canonical v1 field name; the legacy `canonicalHistory` field name is
+     * still accepted by the loader and aliased onto this field at load time.
+     */
+    nativeHistory?: NativeHistoryConfig;
+    /**
+     * @deprecated Legacy v0 alias for {@link ProviderModule.nativeHistory}.
+     * Loader populates this from `nativeHistory` so existing internal readers
+     * keep working during the transition. Remove after one release.
      */
     canonicalHistory?: ProviderCanonicalHistoryConfig;
     /**
@@ -577,20 +585,25 @@ export interface ProviderHistoryBehavior {
  * daemon-core. They let each provider own native transcript file discovery and
  * parsing while daemon-core only validates/pages the normalized result.
  */
-export interface ProviderCanonicalHistoryScriptsConfig {
+export interface NativeHistoryScriptsConfig {
     /** Reads one native session. Default: 'readNativeHistory'. */
     readSession?: string;
     /** Lists native sessions with summary metadata. Default: 'listNativeHistory'. */
     listSessions?: string;
 }
 /**
- * Canonical history sync config — for providers that maintain their own native history files.
+ * @deprecated Use {@link NativeHistoryScriptsConfig}. Retained as an alias for
+ * one release so external consumers that referenced the old name keep compiling.
+ */
+export type ProviderCanonicalHistoryScriptsConfig = NativeHistoryScriptsConfig;
+/**
+ * Native history config — for providers that maintain their own native history files.
  *
  * Preferred mode is provider-owned scripts via `scripts`. `format` is now an
  * opaque provider label retained for diagnostics/backward compatibility; daemon
  * live paths must not branch on provider-specific format values.
  */
-export interface ProviderCanonicalHistoryConfig {
+export interface NativeHistoryConfig {
     /** Opaque provider-owned history format label. */
     format?: string;
     /** Optional native history glob/template for diagnostics only. */
@@ -618,6 +631,11 @@ export interface ProviderCanonicalHistoryConfig {
      */
     contractVersion?: import('./transcript-v2.js').ChatContractVersion;
 }
+/**
+ * @deprecated Use {@link NativeHistoryConfig}. Retained as an alias for one
+ * release so external consumers that referenced the old name keep compiling.
+ */
+export type ProviderCanonicalHistoryConfig = NativeHistoryConfig;
 /**
  * Auto-implement spawn config — controls how the provider is spawned for autonomous AI-driven
  * provider script implementation (dev-auto-implement.ts).

package/dist/providers/sdk/v1/builders/cli/parse-session.d.ts

@@ -40,12 +40,20 @@ export interface TranscriptPtySpec {
     stripLeadingChrome?: boolean;
     scope?: 'screen' | 'buffer' | 'tail';
 }
+export interface SessionIdExtractionSpec {
+    $schema?: 'adhdev:tui/session-id-extraction@1';
+    regex: string;
+    flags?: string;
+    scope?: 'screen' | 'tail' | 'buffer';
+    label?: string;
+}
 export interface ParseSessionTuiSpec {
     spinner?: any;
     settledPrompt?: any;
     modal?: ModalTuiSpec;
     dispatchOrder?: any;
     transcriptPty: TranscriptPtySpec;
+    sessionIdExtraction?: SessionIdExtractionSpec;
 }
 export interface SynthesizedMessage {
     role: 'user' | 'assistant';
@@ -67,6 +75,7 @@ export interface SynthesizedSession {
     parsedStatus: string | null;
     transcriptAuthority?: 'provider' | 'daemon';
     coverage?: 'full' | 'tail' | 'current-turn';
+    providerSessionId?: string;
 }
 export declare function normalizeMessageIdentity<T extends {
     role?: string;

package/dist/providers/sdk/v1/index.d.ts

@@ -12,7 +12,7 @@ export { buildDetectStatusFromTui, type DetectStatusTuiSpec, } from './builders/
 export { buildParseApprovalFromTui, type ModalTuiSpec, } from './builders/cli/parse-approval.js';
 export { applyVisibleRegion, type VisibleRegionSpec, } from './builders/cli/visible-region.js';
 export { buildParseApprovalFromSquash, compactText, type ApprovalSquashSpec, } from './builders/cli/parse-approval-squash.js';
-export { buildParseSessionFromTui, normalizeMessageIdentity, type ParseSessionTuiSpec, type TranscriptPtySpec, type SynthesizedMessage, type SynthesizedSession, } from './builders/cli/parse-session.js';
+export { buildParseSessionFromTui, normalizeMessageIdentity, type ParseSessionTuiSpec, type TranscriptPtySpec, type SessionIdExtractionSpec, type SynthesizedMessage, type SynthesizedSession, } from './builders/cli/parse-session.js';
 export { buildDetectStatusFromAcp, type AcpSessionSpec, type AcpStatusInput, type AcpDetectedStatus, } from './builders/acp/detect-status.js';
 export { loadFixtureExpected, replayFixture, formatReplayReport, type FixtureExpected, type FixtureAnchor, type MessageShape, type AnchorReplayResult, type FixtureReplayResult, type CliProviderHandlers, type ReplayOptions, } from './fixture-tooling/index.js';
 export { analyzeOverrideTaint, formatTaintResult, type TaintLevel, type TaintCategory, type TaintFinding, type TaintResult, validateCliProviderManifest, formatManifestValidationIssues, type ManifestValidationIssue, type ManifestValidationResult, } from './validators/index.js';

package/dist/providers/sdk/v1/types/cli/index.d.ts

@@ -191,7 +191,9 @@ export interface CliListNativeHistoryEntry {
 export type CliListNativeHistoryFn = () => {
     sessions: CliListNativeHistoryEntry[];
 };
-export interface CliCanonicalHistoryDef {
+export interface CliNativeHistoryDef {
+    /** Built-in adapter $schema (e.g. "adhdev:native-history/claude-jsonl@1"). */
+    $schema?: string;
     format: string;
     watchPath: string;
     mode: 'native-source' | 'daemon-mirror';
@@ -201,6 +203,11 @@ export interface CliCanonicalHistoryDef {
         listSessions?: string;
     };
 }
+/**
+ * @deprecated Use {@link CliNativeHistoryDef}. Retained as an alias for one
+ * release so SDK consumers that referenced the v0 name keep compiling.
+ */
+export type CliCanonicalHistoryDef = CliNativeHistoryDef;
 export interface CliPatternEntry {
     source: string;
     flags?: string;
@@ -259,7 +266,9 @@ export interface CliProviderManifest {
     capabilities?: CapabilitiesDef;
     /** Mesh coordinator setup */
     meshCoordinator?: MeshCoordinatorDef;
-    /** Native history */
+    /** Native history (v1 canonical field name) */
+    nativeHistory?: CliNativeHistoryDef;
+    /** @deprecated v0 alias for `nativeHistory`. */
     canonicalHistory?: CliCanonicalHistoryDef;
     /** Settings (UI toggles persisted to ~/.adhdev/config.json) */
     settings?: SettingsDef;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/daemon-core",
-  "version": "0.9.82-rc.144",
+  "version": "0.9.82-rc.145",
   "description": "ADHDev daemon core — CDP, IDE detection, providers, command execution",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/commands/chat-commands.ts

@@ -904,7 +904,7 @@ function supportsCliNativeTranscript(providerType: string, provider?: ProviderMo
     // provider.json. We trust that declaration regardless of the legacy
     // allow-list. A2 will additionally require canonicalHistory.contractVersion
     // to be a supported value (transcript-v2.ts).
-    if (provider?.category === 'cli' && isNativeSourceCanonicalHistory(provider?.canonicalHistory)) {
+    if (provider?.category === 'cli' && isNativeSourceCanonicalHistory(provider?.nativeHistory)) {
         return true;
     }
     // Last-resort fallback for early call sites where the provider module is
@@ -1429,7 +1429,7 @@ function summarizeProviderForDebug(provider: ProviderModule | undefined): Record
         name: provider.name,
         category: provider.category,
         version: (provider as any).version,
-        canonicalHistory: provider.canonicalHistory,
+        canonicalHistory: provider.nativeHistory,
         historyBehavior: provider.historyBehavior,
         webviewMatchText: provider.webviewMatchText,
         scriptNames: scripts,
@@ -1809,9 +1809,9 @@ export async function handleChatHistory(h: CommandHelpers, args: any): Promise<C
             || (typeof args?.historySessionId === 'string' && args.historySessionId.trim())
             || (typeof args?.providerSessionId === 'string' && args.providerSessionId.trim())
         );
-        const result = supportsCliNativeTranscript(agentStr, provider) && isNativeSourceCanonicalHistory(provider?.canonicalHistory)
+        const result = supportsCliNativeTranscript(agentStr, provider) && isNativeSourceCanonicalHistory(provider?.nativeHistory)
             ? readCliProviderNativeHistory(agentStr, {
-                canonicalHistory: provider?.canonicalHistory,
+                canonicalHistory: provider?.nativeHistory,
                 historySessionId,
                 workspace,
                 offset: offset || 0,
@@ -1821,7 +1821,7 @@ export async function handleChatHistory(h: CommandHelpers, args: any): Promise<C
                 scripts: provider?.scripts as any,
             })
             : readProviderChatHistory(agentStr, {
-                canonicalHistory: provider?.canonicalHistory,
+                canonicalHistory: provider?.nativeHistory,
                 historySessionId,
                 workspace,
                 offset: offset || 0,
@@ -1830,7 +1830,7 @@ export async function handleChatHistory(h: CommandHelpers, args: any): Promise<C
                 historyBehavior: provider?.historyBehavior,
                 scripts: provider?.scripts as any,
             });
-        if (supportsCliNativeTranscript(agentStr, provider) && isNativeSourceCanonicalHistory(provider?.canonicalHistory)) {
+        if (supportsCliNativeTranscript(agentStr, provider) && isNativeSourceCanonicalHistory(provider?.nativeHistory)) {
             const lookup = (result as any).lookup === 'workspace' ? 'workspace' : 'session';
             const messages = Array.isArray((result as any).messages)
                 ? normalizeNativeHistoryMessages(agentStr, (result as any).messages as ChatMessage[], (result as any)?.providerSessionId)
@@ -1969,7 +1969,7 @@ export async function handleReadChat(h: CommandHelpers, args: any): Promise<Comm
             // ───────────────────────────────────────────────────────────
 
             const supportsNative = supportsCliNativeTranscript(providerType, provider)
-                && isNativeSourceCanonicalHistory(provider?.canonicalHistory);
+                && isNativeSourceCanonicalHistory(provider?.nativeHistory);
             const agentStr = provider?.type || args?.agentType || getCurrentProviderType(h, adapter.cliType);
             const workspace = sessionWorkspace;
             const nativeHistoryLimit = Math.max(
@@ -1995,7 +1995,7 @@ export async function handleReadChat(h: CommandHelpers, args: any): Promise<Comm
             if (supportsNative) {
                 try {
                     nativeHistory = readCliProviderNativeHistory(agentStr, {
-                        canonicalHistory: provider?.canonicalHistory,
+                        canonicalHistory: provider?.nativeHistory,
                         historySessionId: nativeHistorySessionId,
                         workspace,
                         offset: 0,
@@ -2089,7 +2089,7 @@ export async function handleReadChat(h: CommandHelpers, args: any): Promise<Comm
                     && (!historyProviderSessionId || historyProviderSessionId === nativeHistorySessionId || historyProviderSessionId === historySessionId);
                 const liveWorkspaceNativeHistory = mayProbeLiveCodexWorkspaceNative
                     ? readLiveCodexWorkspaceNativeHistory(agentStr, {
-                        canonicalHistory: provider?.canonicalHistory,
+                        canonicalHistory: provider?.nativeHistory,
                         workspace,
                         offset: 0,
                         limit: nativeHistoryLimit,
@@ -2200,7 +2200,7 @@ export async function handleReadChat(h: CommandHelpers, args: any): Promise<Comm
                     selectedMessageSource: (messageSource as any).selected,
                     messageSource,
                     shouldPreferAdapterMessages: supportsCliNativeTranscript(providerType, provider)
-                        && isNativeSourceCanonicalHistory(provider?.canonicalHistory)
+                        && isNativeSourceCanonicalHistory(provider?.nativeHistory)
                         && (messageSource as any).selected !== 'native-history'
                         && typeof (messageSource as any).fallbackReason === 'string'
                         && (messageSource as any).fallbackReason.startsWith('native_history_')
@@ -2229,10 +2229,10 @@ export async function handleReadChat(h: CommandHelpers, args: any): Promise<Comm
                 : undefined;
             const intendedWorkspace = typeof args?.workspace === 'string' ? args.workspace : undefined;
             const supportsNative = supportsCliNativeTranscript(agentStr, provider)
-                && isNativeSourceCanonicalHistory(provider?.canonicalHistory);
+                && isNativeSourceCanonicalHistory(provider?.nativeHistory);
             const history = supportsNative
                 ? readCliProviderNativeHistory(agentStr, {
-                    canonicalHistory: provider?.canonicalHistory,
+                    canonicalHistory: provider?.nativeHistory,
                     historySessionId,
                     workspace,
                     offset: 0,
@@ -2242,7 +2242,7 @@ export async function handleReadChat(h: CommandHelpers, args: any): Promise<Comm
                     scripts: provider?.scripts as any,
                 })
                 : readProviderChatHistory(agentStr, {
-                    canonicalHistory: provider?.canonicalHistory,
+                    canonicalHistory: provider?.nativeHistory,
                     historySessionId,
                     workspace,
                     offset: 0,

package/src/commands/router.ts

@@ -3855,7 +3855,7 @@ export class DaemonCommandRouter {
                         : '';
                 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,

package/src/providers/cli-provider-instance.ts

@@ -1692,7 +1692,7 @@ export class CliProviderInstance implements ProviderInstance {
 
     private syncCanonicalSavedHistoryIfNeeded(): boolean {
         if (!this.providerSessionId) return false;
-        const canonicalHistory = this.provider.canonicalHistory;
+        const canonicalHistory = this.provider.nativeHistory;
         if (!canonicalHistory) return false;
 
         if (isNativeSourceCanonicalHistory(canonicalHistory)) {
@@ -1754,9 +1754,9 @@ export class CliProviderInstance implements ProviderInstance {
     private restorePersistedHistoryFromCurrentSession(): void {
         if (!this.providerSessionId) return;
         this.syncCanonicalSavedHistoryIfNeeded();
-        const restoredHistory = isNativeSourceCanonicalHistory(this.provider.canonicalHistory)
+        const restoredHistory = isNativeSourceCanonicalHistory(this.provider.nativeHistory)
             ? readProviderChatHistory(this.type, {
-                canonicalHistory: this.provider.canonicalHistory,
+                canonicalHistory: this.provider.nativeHistory,
                 historySessionId: this.providerSessionId,
                 workspace: this.workingDir,
                 offset: 0,

package/src/providers/contracts.ts

@@ -541,8 +541,16 @@ export interface ProviderModule {
   /** History behavior config — controls message filtering and collapse during replay */
   historyBehavior?: ProviderHistoryBehavior;
   /**
-   * Canonical history sync config — for providers that maintain native history files.
-   * When set, daemon syncs from native format into ADHDev JSONL store on each tick.
+   * Native history config — for providers that maintain native history files.
+   * When set, daemon reads/lists provider-native transcripts directly. This is
+   * the canonical v1 field name; the legacy `canonicalHistory` field name is
+   * still accepted by the loader and aliased onto this field at load time.
+   */
+  nativeHistory?: NativeHistoryConfig;
+  /**
+   * @deprecated Legacy v0 alias for {@link ProviderModule.nativeHistory}.
+   * Loader populates this from `nativeHistory` so existing internal readers
+   * keep working during the transition. Remove after one release.
    */
   canonicalHistory?: ProviderCanonicalHistoryConfig;
   /**
@@ -688,7 +696,7 @@ export interface ProviderHistoryBehavior {
  * daemon-core. They let each provider own native transcript file discovery and
  * parsing while daemon-core only validates/pages the normalized result.
  */
-export interface ProviderCanonicalHistoryScriptsConfig {
+export interface NativeHistoryScriptsConfig {
   /** Reads one native session. Default: 'readNativeHistory'. */
   readSession?: string;
   /** Lists native sessions with summary metadata. Default: 'listNativeHistory'. */
@@ -696,13 +704,19 @@ export interface ProviderCanonicalHistoryScriptsConfig {
 }
 
 /**
- * Canonical history sync config — for providers that maintain their own native history files.
+ * @deprecated Use {@link NativeHistoryScriptsConfig}. Retained as an alias for
+ * one release so external consumers that referenced the old name keep compiling.
+ */
+export type ProviderCanonicalHistoryScriptsConfig = NativeHistoryScriptsConfig;
+
+/**
+ * Native history config — for providers that maintain their own native history files.
  *
  * Preferred mode is provider-owned scripts via `scripts`. `format` is now an
  * opaque provider label retained for diagnostics/backward compatibility; daemon
  * live paths must not branch on provider-specific format values.
  */
-export interface ProviderCanonicalHistoryConfig {
+export interface NativeHistoryConfig {
   /** Opaque provider-owned history format label. */
   format?: string;
   /** Optional native history glob/template for diagnostics only. */
@@ -731,6 +745,12 @@ export interface ProviderCanonicalHistoryConfig {
   contractVersion?: import('./transcript-v2.js').ChatContractVersion;
 }
 
+/**
+ * @deprecated Use {@link NativeHistoryConfig}. Retained as an alias for one
+ * release so external consumers that referenced the old name keep compiling.
+ */
+export type ProviderCanonicalHistoryConfig = NativeHistoryConfig;
+
 /**
  * Auto-implement spawn config — controls how the provider is spawned for autonomous AI-driven
  * provider script implementation (dev-auto-implement.ts).

package/src/providers/provider-loader.ts

@@ -1958,15 +1958,20 @@ export class ProviderLoader {
             ...(extensionIdPattern instanceof RegExp ? { extensionIdPattern } : {}),
           };
 
-          // v1 manifest contract calls this block `nativeHistory`; the
-          // daemon's runtime + downstream code still reads
-          // `canonicalHistory` (the legacy name used since v0). Alias
-          // them when only the v1 spelling is present so authors using
-          // the new contract get the same behavior without having to
-          // duplicate the block. If both are set the explicit
-          // canonicalHistory wins — caller signaled it intentionally.
-          if ((normalizedProvider as any).nativeHistory && !(normalizedProvider as any).canonicalHistory) {
-            (normalizedProvider as any).canonicalHistory = (normalizedProvider as any).nativeHistory;
+          // v1 manifests use `nativeHistory` as the canonical field name.
+          // Legacy v0 manifests use `canonicalHistory`. The daemon's
+          // runtime + downstream code reads `provider.nativeHistory`, so
+          // for legacy manifests we copy `canonicalHistory` into
+          // `nativeHistory` here. We also keep `canonicalHistory`
+          // populated in both directions (deprecated alias) so any
+          // external consumers still reading the old name keep working
+          // during the one-release deprecation window.
+          const nh = (normalizedProvider as any).nativeHistory;
+          const ch = (normalizedProvider as any).canonicalHistory;
+          if (nh && !ch) {
+            (normalizedProvider as any).canonicalHistory = nh;
+          } else if (ch && !nh) {
+            (normalizedProvider as any).nativeHistory = ch;
           }
 
           const validation = validateProviderDefinition(normalizedProvider);

package/src/providers/provider-schema.ts

@@ -37,10 +37,13 @@ const KNOWN_PROVIDER_FIELDS = new Set<string>([
   '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',
@@ -133,7 +136,7 @@ export function validateProviderDefinition(raw: unknown): ProviderValidationResu
   }
 
   validateCapabilities(provider as unknown as ProviderModule, controls, errors)
-  validateCanonicalHistory(provider.canonicalHistory, errors)
+  validateNativeHistory(provider.nativeHistory, errors)
   validateMeshCoordinator(provider.meshCoordinator, errors)
 
   for (const control of controls) {
@@ -233,43 +236,43 @@ function validateCapabilities(provider: ProviderModule, controls: ProviderContro
   }
 }
 
-function validateCanonicalHistory(raw: unknown, errors: string[]): void {
+function validateNativeHistory(raw: unknown, errors: string[]): void {
   if (raw === undefined) 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 as Record<string, unknown>
-  const format = canonicalHistory.format
+  const nativeHistory = raw as Record<string, unknown>
+  const format = nativeHistory.format
   if (format !== undefined && (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 !== undefined && (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 !== undefined && !['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')
   }
 
   // Chat transcript contract version (transcript-v2.ts). Absent → treated as
   // v1 by readDeclaredChatContractVersion(). A2 will reject unrecognised
   // values at load time; A1 only validates the field shape.
-  const chatContractVersion = canonicalHistory.contractVersion
+  const chatContractVersion = nativeHistory.contractVersion
   if (chatContractVersion !== undefined
       && 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 === undefined) 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
   }
 
@@ -277,7 +280,7 @@ function validateCanonicalHistory(raw: unknown, errors: string[]): void {
   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`)
     }
   }
 }

package/src/providers/sdk/v1/builders/cli/parse-session.ts

@@ -48,12 +48,21 @@ export interface TranscriptPtySpec {
     scope?: 'screen' | 'buffer' | 'tail'
 }
 
+export interface SessionIdExtractionSpec {
+    $schema?: 'adhdev:tui/session-id-extraction@1'
+    regex: string
+    flags?: string
+    scope?: 'screen' | 'tail' | 'buffer'
+    label?: string
+}
+
 export interface ParseSessionTuiSpec {
     spinner?: any
     settledPrompt?: any
     modal?: ModalTuiSpec
     dispatchOrder?: any
     transcriptPty: TranscriptPtySpec
+    sessionIdExtraction?: SessionIdExtractionSpec
 }
 
 // ─── Output shape ────────────────────────────────
@@ -73,6 +82,7 @@ export interface SynthesizedSession {
     parsedStatus: string | null
     transcriptAuthority?: 'provider' | 'daemon'
     coverage?: 'full' | 'tail' | 'current-turn'
+    providerSessionId?: string
 }
 
 // ─── ANSI / line helpers ─────────────────────────
@@ -176,6 +186,16 @@ export function buildParseSessionFromTui(spec: ParseSessionTuiSpec): (input: any
         : () => null
     const parseApproval = spec.modal ? buildParseApprovalFromTui(spec.modal) : () => null
 
+    // Optional session-id extraction (tui/session-id-extraction@1). Compile once
+    // so each parseSession call is a single regex.exec on the chosen scope.
+    const sessionIdRe = spec.sessionIdExtraction
+        ? new RegExp(
+            spec.sessionIdExtraction.regex,
+            spec.sessionIdExtraction.flags ?? 'i',
+        )
+        : null
+    const sessionIdScope: TranscriptPtySpec['scope'] = spec.sessionIdExtraction?.scope ?? 'tail'
+
     return function parseSession(input: any): SynthesizedSession {
         // status + modal first
         const status = detectStatus(input as any) ?? 'idle'
@@ -236,12 +256,21 @@ export function buildParseSessionFromTui(spec: ParseSessionTuiSpec): (input: any
             if (cont) last.content = last.content ? `${last.content}\n${cont}` : cont
         }
 
-        return {
+        const result: SynthesizedSession = {
             status,
             messages,
             activeModal: modal,
             modal,
             parsedStatus: status,
         }
+
+        if (sessionIdRe) {
+            const haystack = stripAnsi(pickInputText(input, sessionIdScope))
+            const match = haystack.match(sessionIdRe)
+            const captured = match?.[1]?.trim()
+            if (captured) result.providerSessionId = captured
+        }
+
+        return result
     }
 }

package/src/providers/sdk/v1/index.ts

@@ -33,6 +33,7 @@ export {
   normalizeMessageIdentity,
   type ParseSessionTuiSpec,
   type TranscriptPtySpec,
+  type SessionIdExtractionSpec,
   type SynthesizedMessage,
   type SynthesizedSession,
 } from './builders/cli/parse-session.js';

package/src/providers/sdk/v1/schemas/cli/provider.schema.json

@@ -309,13 +309,34 @@
         }
       }
     },
+    "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",
@@ -340,11 +361,6 @@
       "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.",

package/src/providers/sdk/v1/schemas/primitives/tui-session-id-extraction-v1.json

@@ -0,0 +1,46 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$id": "adhdev:tui/session-id-extraction@1",
+  "title": "tui/session-id-extraction — v1",
+  "description": "Declares a regex that captures the provider-issued session UUID off the PTY chrome (e.g. codex footer `gpt-5.5 high · ~/Work/adhdev · 019e8e58-4bd2-7c80-8f5b-b49b6c0e25fa`). The builder runs the regex over the chosen scope's text and exposes the captured group (1) as `providerSessionId` on the parseSession result, so downstream native-history lookup can locate the matching transcript file (`~/.codex/sessions/*-019e8e58-...jsonl`, `~/.claude/projects/*/<uuid>.jsonl`, etc.). Without this primitive a manifest had to ship a scripts/v1 override or fall back to v0 scripts/1.0 just to surface a session id — that's the gap this closes.",
+  "type": "object",
+  "required": ["$schema", "regex"],
+  "additionalProperties": false,
+  "properties": {
+    "$schema": {
+      "const": "adhdev:tui/session-id-extraction@1"
+    },
+    "regex": {
+      "type": "string",
+      "description": "ECMAScript regex source. Capture group 1 must hold the session identifier."
+    },
+    "flags": {
+      "type": "string",
+      "pattern": "^[gimsuy]*$",
+      "default": "i"
+    },
+    "scope": {
+      "default": "tail",
+      "enum": ["screen", "tail", "buffer"],
+      "description": "Which input view to search. `tail` (default) covers the recent buffer where chrome footers usually live; `screen` is just the visible frame; `buffer` is the full scrollback."
+    },
+    "label": {
+      "type": "string",
+      "description": "Optional tag included in debug traces — handy when a manifest declares more than one extraction candidate during authoring."
+    }
+  },
+  "examples": [
+    {
+      "$schema": "adhdev:tui/session-id-extraction@1",
+      "regex": "(?:gpt-|o\\d|codex-)[^·]+·[^·]+·\\s*([0-9a-f-]{36})",
+      "scope": "tail",
+      "label": "codex-footer"
+    },
+    {
+      "$schema": "adhdev:tui/session-id-extraction@1",
+      "regex": "session id:\\s*([0-9a-f-]{36})",
+      "flags": "i",
+      "scope": "buffer"
+    }
+  ]
+}