@adhdev/daemon-core 0.9.4 → 0.9.6

package/dist/providers/cli-provider-instance.d.ts

@@ -51,6 +51,13 @@ export declare class CliProviderInstance implements ProviderInstance {
     private runtimeMessages;
     private lastPersistedHistoryMessages;
     private lastCanonicalHermesSyncMtimeMs;
+    private lastCanonicalHermesExistCheckAt;
+    private lastCanonicalHermesWatchPath;
+    private lastCanonicalClaudeRebuildMtimeMs;
+    private lastCanonicalClaudeCheckAt;
+    private cachedSqliteDb;
+    private cachedSqliteDbPath;
+    private cachedSqliteDbMissingUntil;
     readonly instanceId: string;
     private suppressIdleHistoryReplay;
     private errorMessage;

package/dist/providers/contracts.d.ts

@@ -329,12 +329,21 @@ export interface ProviderModule {
     extensionIdPattern_flags?: string;
     compatibility?: ProviderCompatibilityEntry[];
     defaultScriptDir?: string;
+    /**
+     * Scripts that can run at the IDE main-page level (not just inside the extension webview session frame).
+     * Default: ['listModes', 'setMode', 'listModels', 'setModel'].
+     * Add extra scripts here if the provider supports them at the IDE level (e.g. 'setModelGui').
+     * Replaces hardcoded claude-code-vscode special-case in stream-commands.ts.
+     */
+    ideLevelScripts?: string[];
     binary?: string;
     spawn?: {
         command: string;
         args?: string[];
         shell?: boolean;
         env?: Record<string, string>;
+        /** Auto-implement spawn config — controls how this provider is invoked for autonomous script generation */
+        autoImpl?: ProviderAutoImplSpawnConfig;
     };
     /** Delay before submitting typed CLI input (provider-specific TUI tuning) */
     sendDelayMs?: number;
@@ -360,6 +369,24 @@ export interface ProviderModule {
     allowInputDuringGeneration?: boolean;
     /** Approval button priority hints used when auto-approve must pick a positive action */
     approvalPositiveHints?: string[];
+    /**
+     * Regex pattern (as string) that a valid provider session ID must match.
+     * If set and the ID doesn't match, it is rejected (treated as invalid).
+     * Replaces hardcoded HERMES_SESSION_ID_RE / CLAUDE_SESSION_ID_RE checks.
+     */
+    sessionIdPattern?: string;
+    /** 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.
+     */
+    canonicalHistory?: ProviderCanonicalHistoryConfig;
+    /**
+     * Auto-fix verification profile — provider-specific test expectations for `provider fix`.
+     * If not set, provider fix runs without pre/post verification.
+     */
+    autoFixProfile?: ProviderAutoFixProfile;
     scripts?: ProviderScripts;
     vscodeCommands?: {
         focusPanel?: string;
@@ -438,6 +465,90 @@ export interface ProviderResumeCapability {
     resumeSessionArgs?: string[];
     newSessionArgs?: string[];
     sessionIdFormat?: 'uuid' | 'string';
+    /** Skip session ID probing when launchMode is 'new' — for providers that manage their own session IDs on new sessions */
+    skipProbeOnNewSession?: boolean;
+    /**
+     * Subcommands that carry a session ID as their next positional argument.
+     * e.g. ['resume', 'fork'] for codex-cli (codex resume <id> / codex fork <id>).
+     * Replaces the hardcoded readCodexResumeSessionId check in cli-manager.ts.
+     */
+    sessionIdFromSubcommand?: string[];
+    /**
+     * When --session-id is present without an explicit resume flag, treat as 'new' rather than 'resume'.
+     * e.g. goose-cli passes --session-id on new sessions but requires --resume/-r to actually resume.
+     * Replaces the hardcoded goose-cli check in cli-manager.ts.
+     */
+    sessionIdIsNewByDefault?: boolean;
+}
+/**
+ * History behavior config — controls how history messages are processed for this provider.
+ * Replaces hardcoded agentType checks in chat-history.ts.
+ */
+export interface ProviderHistoryBehavior {
+    /** Collapse consecutive assistant turns during history replay (e.g. codex-cli shows replayed intermediate turns) */
+    collapseConsecutiveAssistantTurns?: boolean;
+    /** Regex patterns (as strings) to filter out from assistant messages — e.g. CLI starter prompt suggestions */
+    filterAssistantPatterns?: string[];
+    /** If true, session ID must match sessionIdPattern exactly — reject and return '' if it doesn't match */
+    requireStrictSessionIdFormat?: boolean;
+}
+/**
+ * Canonical history sync config — for providers that maintain their own native history files.
+ * When set, daemon syncs from the provider's native format into the ADHDev JSONL store.
+ * Replaces hardcoded hermes-cli / claude-cli checks in cli-provider-instance.ts.
+ */
+export interface ProviderCanonicalHistoryConfig {
+    /**
+     * Native history format.
+     * - 'hermes-json': single JSON file per session (~/.hermes/sessions/session_{{sessionId}}.json)
+     * - 'claude-jsonl': JSONL transcript under ~/.claude/projects/
+     */
+    format: 'hermes-json' | 'claude-jsonl';
+    /**
+     * Path to the native history file. Supports ~ and {{sessionId}} placeholder.
+     * e.g. "~/.hermes/sessions/session_{{sessionId}}.json"
+     */
+    watchPath: string;
+}
+/**
+ * Auto-implement spawn config — controls how the provider is spawned for autonomous AI-driven
+ * provider script implementation (dev-auto-implement.ts).
+ * Replaces hardcoded per-command branching.
+ */
+export interface ProviderAutoImplSpawnConfig {
+    /**
+     * How the meta-prompt is passed to the agent.
+     * - 'flag': passed via a CLI flag (e.g. `claude -p "..."`)
+     * - 'stdin': piped via stdin (generic fallback)
+     * - 'subcommand': prepended as a subcommand (e.g. `codex exec "..."`)
+     */
+    promptMode: 'flag' | 'stdin' | 'subcommand';
+    /** CLI flag used to pass the prompt (promptMode: 'flag') — e.g. '-p' */
+    promptFlag?: string;
+    /** Subcommand prepended before the prompt (promptMode: 'subcommand') — e.g. 'exec' */
+    subcommand?: string;
+    /** Extra args appended in auto-impl mode — e.g. ['--dangerously-skip-permissions'] */
+    extraArgs?: string[];
+    /** Custom meta-prompt template; use {{promptFile}} placeholder. If omitted, generic prompt is used. */
+    metaPrompt?: string;
+    /**
+     * If true, schedule an auto-stop timer when the agent output goes quiet during verification.
+     * Replaces the hardcoded `command !== 'codex'` check in dev-auto-implement.ts.
+     */
+    autoStopOnQuiet?: boolean;
+}
+/**
+ * Auto-fix verification profile — provider-specific test expectations for `provider fix`.
+ * Replaces the hardcoded CLI_AUTO_FIX_VERIFICATION_PROFILES record in provider-commands.ts.
+ */
+export interface ProviderAutoFixProfile {
+    fixtureName: string;
+    description: string;
+    inspectFields?: string[];
+    focusAreas?: string[];
+    lastAssistantMustContainAny?: string[];
+    lastAssistantMustNotContainAny?: string[];
+    timeoutMs?: number;
 }
 /**
  * Declarative session ID probe config for CLI providers.

package/dist/providers/provider-session-id.d.ts

@@ -1,2 +1,6 @@
-export declare function normalizeProviderSessionId(providerType: string | undefined, providerSessionId: string | null | undefined): string;
-export declare function isLegacyVolatileSessionReadKey(key: string | null | undefined): boolean;
+import type { ProviderModule } from './contracts.js';
+/**
+ * Normalize and validate a provider session ID using the declarative `sessionIdPattern`
+ * from the provider's ProviderModule definition.
+ */
+export declare function normalizeProviderSessionId(provider: ProviderModule | undefined, providerSessionId: string | null | undefined): string;

package/node_modules/@adhdev/session-host-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/session-host-core",
-  "version": "0.9.4",
+  "version": "0.9.6",
   "description": "ADHDev local session host core \u2014 session registry, protocol, buffers",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/daemon-core",
-  "version": "0.9.4",
+  "version": "0.9.6",
   "description": "ADHDev daemon core \u2014 CDP, IDE detection, providers, command execution",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/commands/cli-manager.ts

@@ -131,8 +131,8 @@ function expandResumeArgs(template: string[] | undefined, sessionId: string): st
     return template.map((part) => part === '{{id}}' ? sessionId : part);
 }
 
-function readCodexResumeSessionId(args: string[]): string | undefined {
-    const resumeIndex = args.findIndex((arg) => arg === 'resume' || arg === 'fork');
+function readSubcommandSessionId(args: string[], subcommands: string[]): string | undefined {
+    const resumeIndex = args.findIndex((arg) => subcommands.includes(arg));
     if (resumeIndex < 0) return undefined;
     const candidate = args[resumeIndex + 1];
     if (!candidate || candidate.startsWith('-')) return undefined;
@@ -140,9 +140,11 @@ function readCodexResumeSessionId(args: string[]): string | undefined {
 }
 
 function detectExplicitProviderSessionId(
-    normalizedType: string,
+    provider: ProviderModule | undefined,
     args: string[],
 ): { providerSessionId?: string; launchMode: CliLaunchMode } {
+    const resume = provider?.resume;
+
     const explicitResumeId = readArgValue(args, ['--resume', '-r']);
     if (explicitResumeId) {
         return { providerSessionId: explicitResumeId, launchMode: 'resume' };
@@ -158,10 +160,10 @@ function detectExplicitProviderSessionId(
 
     const explicitSessionId = readArgValue(args, ['--session-id']);
     if (explicitSessionId) {
-        if (normalizedType === 'goose-cli' && !hasArg(args, ['--resume', '-r'])) {
+        if (resume?.sessionIdIsNewByDefault && !hasArg(args, ['--resume', '-r'])) {
             return { launchMode: 'manual' };
         }
-        const isResume = normalizedType === 'goose-cli'
+        const isResume = resume?.sessionIdIsNewByDefault
             ? hasArg(args, ['--resume', '-r'])
             : (hasArg(args, ['--continue']) || hasArg(args, ['--resume', '-r']));
         return {
@@ -170,10 +172,11 @@ function detectExplicitProviderSessionId(
         };
     }
 
-    if (normalizedType === 'codex-cli') {
-        const codexSessionId = readCodexResumeSessionId(args);
-        if (codexSessionId) {
-            return { providerSessionId: codexSessionId, launchMode: 'resume' };
+    const subcommands = resume?.sessionIdFromSubcommand;
+    if (Array.isArray(subcommands) && subcommands.length > 0) {
+        const subcommandSessionId = readSubcommandSessionId(args, subcommands);
+        if (subcommandSessionId) {
+            return { providerSessionId: subcommandSessionId, launchMode: 'resume' };
         }
     }
 
@@ -200,7 +203,7 @@ export function resolveCliSessionBinding(
         return { cliArgs: baseArgs, launchMode: 'manual' };
     }
 
-    const explicit = detectExplicitProviderSessionId(normalizedType, baseArgs || []);
+    const explicit = detectExplicitProviderSessionId(provider, baseArgs || []);
     if (explicit.providerSessionId) {
         return {
             cliArgs: baseArgs,
@@ -208,6 +211,12 @@ export function resolveCliSessionBinding(
             launchMode: explicit.launchMode,
         };
     }
+    if (explicit.launchMode === 'manual' && hasArg(baseArgs || [], ['--session-id'])) {
+        return {
+            cliArgs: baseArgs,
+            launchMode: 'manual',
+        };
+    }
 
     if (requestedResumeSessionId) {
         if (resume.sessionIdFormat === 'uuid' && !isUuid(requestedResumeSessionId)) {

package/src/commands/stream-commands.ts

@@ -382,9 +382,8 @@ async function executeProviderScript(h: CommandHelpers, args: any, scriptName: s
             const targetSessionId = managed?.cdpSessionId || null;
 
             // IDE-level scripts (model/mode) — try session frame first, fallback to main page
-            const IDE_LEVEL_SCRIPTS = provider.type === 'claude-code-vscode'
-                ? ['listModes', 'setMode', 'listModels', 'setModel', 'setModelGui']
-                : ['listModes', 'setMode', 'listModels', 'setModel'];
+            const DEFAULT_IDE_LEVEL_SCRIPTS = ['listModes', 'setMode', 'listModels', 'setModel'];
+            const IDE_LEVEL_SCRIPTS = provider.ideLevelScripts ?? DEFAULT_IDE_LEVEL_SCRIPTS;
             if (IDE_LEVEL_SCRIPTS.includes(scriptName)) {
                 // Try session frame first (some extensions embed mode selector in their webview)
                 if (targetSessionId) {

package/src/config/chat-history.ts

@@ -13,7 +13,7 @@ import * as fs from 'fs';
 import * as path from 'path';
 import * as os from 'os';
 import { buildRuntimeSystemChatMessage } from '../providers/chat-message-normalization.js';
-import { normalizeProviderSessionId } from '../providers/provider-session-id.js';
+import type { ProviderHistoryBehavior } from '../providers/contracts.js';
 
 const HISTORY_DIR = path.join(os.homedir(), '.adhdev', 'history');
 const RETAIN_DAYS = 30;
@@ -72,24 +72,27 @@ interface HistoryMessage {
     workspace?: string;   // Working directory at session start (kind: 'session_start' only)
 }
 
-const CODEX_STARTER_PROMPT_RE = /^(?:[›❯]\s*)?(?:Find and fix a bug in @filename|Improve documentation in @filename|Write tests for @filename|Explain this codebase|Summarize recent commits|Implement \{feature\}|Use \/skills(?: to list available skills)?|Run \/review on my current changes)$/i;
-
 function normalizeHistoryComparable(text: string): string {
     return String(text || '').replace(/\s+/g, ' ').trim();
 }
 
-function cleanupHistoryContent(agentType: string, role: HistoryMessage['role'], content: string): string {
+function cleanupHistoryContent(agentType: string, role: HistoryMessage['role'], content: string, historyBehavior?: ProviderHistoryBehavior): string {
     let value = String(content || '').replace(/\r\n/g, '\n').trim();
     if (!value) return '';
 
-    if (agentType === 'codex-cli' && role === 'assistant') {
-        const filtered = value
-            .split('\n')
-            .filter((line) => !CODEX_STARTER_PROMPT_RE.test(line.trim()))
-            .join('\n')
-            .replace(/\n{3,}/g, '\n\n')
-            .trim();
-        value = filtered;
+    if (role === 'assistant' && historyBehavior?.filterAssistantPatterns?.length) {
+        const filters = historyBehavior.filterAssistantPatterns.map((p) => {
+            try { return new RegExp(p, 'i'); } catch { return null; }
+        }).filter(Boolean) as RegExp[];
+        if (filters.length > 0) {
+            const filtered = value
+                .split('\n')
+                .filter((line) => !filters.some((re) => re.test(line.trim())))
+                .join('\n')
+                .replace(/\n{3,}/g, '\n\n')
+                .trim();
+            value = filtered;
+        }
     }
 
     return value;
@@ -121,8 +124,8 @@ function isAdjacentHistoryDuplicate(
     return buildHistoryMessageSignature(agentType, previous) === buildHistoryMessageSignature(agentType, next);
 }
 
-function collapseReplayAssistantTurns(agentType: string, messages: HistoryMessage[]): HistoryMessage[] {
-    if (agentType !== 'codex-cli') return messages;
+function collapseReplayAssistantTurns(messages: HistoryMessage[], historyBehavior?: ProviderHistoryBehavior): HistoryMessage[] {
+    if (!historyBehavior?.collapseConsecutiveAssistantTurns) return messages;
 
     const collapsed: HistoryMessage[] = [];
     let sawAssistantSinceLastUser = false;
@@ -257,17 +260,13 @@ function listHistoryFiles(dir: string, historySessionId?: string): string[] {
         .reverse();
 }
 
-function normalizeSavedHistorySessionId(agentType: string, historySessionId: string): string {
-    const normalizedId = String(historySessionId || '').trim();
-    if (!normalizedId) return '';
-    const strictProviderId = normalizeProviderSessionId(agentType, normalizedId);
-    if (strictProviderId) return strictProviderId;
-    return agentType === 'hermes-cli' ? '' : normalizedId;
+function normalizeSavedHistorySessionId(historySessionId: string): string {
+    return String(historySessionId || '').trim();
 }
 
-function extractSavedHistorySessionIdFromFile(agentType: string, file: string): string {
+function extractSavedHistorySessionIdFromFile(file: string): string {
     const match = file.match(/^([A-Za-z0-9_-]+)_\d{4}-\d{2}-\d{2}\.jsonl$/);
-    return normalizeSavedHistorySessionId(agentType, match?.[1] || '');
+    return normalizeSavedHistorySessionId(match?.[1] || '');
 }
 
 function buildSavedHistoryFileSignatureMap(dir: string, files: string[]): Map<string, string> {
@@ -484,7 +483,7 @@ function persistSavedHistoryFileSummaryEntry(agentType: string, dir: string, fil
 }
 
 function updateSavedHistoryIndexForSessionStart(agentType: string, dir: string, file: string, historySessionId: string, workspace: string): void {
-    const normalizedSessionId = normalizeSavedHistorySessionId(agentType, historySessionId);
+    const normalizedSessionId = normalizeSavedHistorySessionId(historySessionId);
     const normalizedWorkspace = String(workspace || '').trim();
     if (!normalizedSessionId || !normalizedWorkspace) return;
     persistSavedHistoryFileSummaryEntry(agentType, dir, file, (currentSummary) => ({
@@ -506,7 +505,7 @@ function updateSavedHistoryIndexForAppendedMessages(
     historySessionId: string | undefined,
     messages: HistoryMessage[],
 ): void {
-    const normalizedSessionId = normalizeSavedHistorySessionId(agentType, historySessionId || '');
+    const normalizedSessionId = normalizeSavedHistorySessionId(historySessionId || '');
     if (!normalizedSessionId || messages.length === 0) return;
     persistSavedHistoryFileSummaryEntry(agentType, dir, file, (currentSummary) => {
         const nextSummary: SavedHistoryFileSummary = {
@@ -546,8 +545,8 @@ function updateSavedHistoryIndexForAppendedMessages(
     });
 }
 
-function computeSavedHistoryFileSummary(agentType: string, dir: string, file: string): SavedHistoryFileSummary | null {
-    const historySessionId = extractSavedHistorySessionIdFromFile(agentType, file);
+function computeSavedHistoryFileSummary(dir: string, file: string): SavedHistoryFileSummary | null {
+    const historySessionId = extractSavedHistorySessionIdFromFile(file);
     if (!historySessionId) return null;
 
     const filePath = path.join(dir, file);
@@ -660,7 +659,7 @@ function computeSavedHistorySessionSummaries(
             : persisted?.signature === signature
                 ? persisted
                 : null;
-        const fileSummary = reusableEntry?.summary || computeSavedHistoryFileSummary(agentType, dir, file);
+        const fileSummary = reusableEntry?.summary || computeSavedHistoryFileSummary(dir, file);
         const nextEntry: SavedHistoryFileSummaryCacheEntry = reusableEntry || {
             signature,
             summary: fileSummary,
@@ -1027,7 +1026,7 @@ export class ChatHistoryWriter {
         }
     }
 
-    compactHistorySession(agentType: string, historySessionId: string): void {
+    compactHistorySession(agentType: string, historySessionId: string, historyBehavior?: ProviderHistoryBehavior): void {
         const sessionId = String(historySessionId || '').trim();
         if (!sessionId) return;
 
@@ -1072,7 +1071,7 @@ export class ChatHistoryWriter {
                     dedupedAdjacent.push(entry);
                     if (entry.role !== 'system') lastTurn = entry;
                 }
-                const collapsed = collapseReplayAssistantTurns(agentType, dedupedAdjacent);
+                const collapsed = collapseReplayAssistantTurns(dedupedAdjacent, historyBehavior);
                 if (collapsed.length === 0) {
                     fs.unlinkSync(filePath);
                     continue;
@@ -1145,6 +1144,7 @@ export function readChatHistory(
     limit: number = 30,
     historySessionId?: string,
     excludeRecentCount: number = 0,
+    historyBehavior?: ProviderHistoryBehavior,
 ): { messages: HistoryMessage[]; hasMore: boolean } {
     try {
         const sanitized = agentType.replace(/[^a-zA-Z0-9_-]/g, '_');
@@ -1185,7 +1185,7 @@ export function readChatHistory(
             chronological.push(message);
             if (message.role !== 'system') lastTurn = message;
         }
-        const collapsed = collapseReplayAssistantTurns(agentType, chronological);
+        const collapsed = collapseReplayAssistantTurns(chronological, historyBehavior);
 
  // Page backwards from the newest saved messages while keeping the returned
  // slice in chronological order for prepend-based UI rendering.
@@ -1206,6 +1206,7 @@ export function readChatHistory(
 export function listSavedHistorySessions(
     agentType: string,
     options: { offset?: number; limit?: number } = {},
+    historyBehavior?: ProviderHistoryBehavior,
 ): { sessions: SavedHistorySessionSummary[]; hasMore: boolean } {
     try {
         const sanitized = agentType.replace(/[^a-zA-Z0-9_-]/g, '_');
@@ -1351,7 +1352,7 @@ function rewriteCanonicalSavedHistory(agentType: string, historySessionId: strin
 }
 
 export function rebuildHermesSavedHistoryFromCanonicalSession(historySessionId: string): boolean {
-    const normalizedSessionId = normalizeSavedHistorySessionId('hermes-cli', historySessionId);
+    const normalizedSessionId = normalizeSavedHistorySessionId(historySessionId);
     if (!normalizedSessionId) return false;
 
     try {
@@ -1523,7 +1524,7 @@ function extractClaudeUserContentParts(content: unknown): Array<{ role: 'user' |
 }
 
 export function rebuildClaudeSavedHistoryFromNativeProject(historySessionId: string, workspace?: string): boolean {
-    const normalizedSessionId = normalizeSavedHistorySessionId('claude-cli', historySessionId);
+    const normalizedSessionId = normalizeSavedHistorySessionId(historySessionId);
     if (!normalizedSessionId) return false;
 
     try {

package/src/config/state-store.ts

@@ -12,7 +12,6 @@ import { join } from 'path';
 import { getConfigDir } from './config.js';
 import type { RecentActivityEntry } from './recent-activity.js';
 import type { SavedProviderSessionEntry } from './saved-sessions.js';
-import { isLegacyVolatileSessionReadKey, normalizeProviderSessionId } from '../providers/provider-session-id.js';
 
 export interface DaemonState {
     /** Unified recent activity across IDE / CLI / ACP launch flows */
@@ -52,38 +51,31 @@ function normalizeState(raw: unknown): DaemonState {
     const recentActivity = (Array.isArray(parsed.recentActivity) ? parsed.recentActivity : [])
         .filter((entry): entry is RecentActivityEntry => {
             if (!isPlainObject(entry)) return false;
-            const normalizedId = normalizeProviderSessionId(
-                typeof entry.providerType === 'string' ? entry.providerType : '',
-                typeof entry.providerSessionId === 'string' ? entry.providerSessionId : '',
-            );
-            if (typeof entry.providerSessionId === 'string' && !normalizedId) return false;
+            if (typeof entry.providerSessionId === 'string' && !entry.providerSessionId.trim()) return false;
             return true;
         });
 
     const savedProviderSessions = (Array.isArray(parsed.savedProviderSessions) ? parsed.savedProviderSessions : [])
         .filter((entry): entry is SavedProviderSessionEntry => {
             if (!isPlainObject(entry)) return false;
-            return !!normalizeProviderSessionId(
-                typeof entry.providerType === 'string' ? entry.providerType : '',
-                typeof entry.providerSessionId === 'string' ? entry.providerSessionId : '',
-            );
+            return typeof entry.providerSessionId === 'string' && !!entry.providerSessionId.trim();
         });
 
     const sessionReads = Object.fromEntries(
         Object.entries(isPlainObject(parsed.sessionReads) ? parsed.sessionReads : {})
-            .filter(([key, value]) => !isLegacyVolatileSessionReadKey(key) && typeof value === 'number' && Number.isFinite(value as number))
+            .filter(([, value]) => typeof value === 'number' && Number.isFinite(value as number))
     );
     const sessionReadMarkers = Object.fromEntries(
         Object.entries(isPlainObject(parsed.sessionReadMarkers) ? parsed.sessionReadMarkers : {})
-            .filter(([key, value]) => !isLegacyVolatileSessionReadKey(key) && typeof value === 'string')
+            .filter(([, value]) => typeof value === 'string')
     );
     const sessionNotificationDismissals = Object.fromEntries(
         Object.entries(isPlainObject(parsed.sessionNotificationDismissals) ? parsed.sessionNotificationDismissals : {})
-            .filter(([key, value]) => !isLegacyVolatileSessionReadKey(key) && typeof value === 'string' && value.length > 0)
+            .filter(([, value]) => typeof value === 'string' && value.length > 0)
     );
     const sessionNotificationUnreadOverrides = Object.fromEntries(
         Object.entries(isPlainObject(parsed.sessionNotificationUnreadOverrides) ? parsed.sessionNotificationUnreadOverrides : {})
-            .filter(([key, value]) => !isLegacyVolatileSessionReadKey(key) && typeof value === 'string' && value.length > 0)
+            .filter(([, value]) => typeof value === 'string' && value.length > 0)
     );
 
     return {

package/src/daemon/dev-auto-implement.ts

@@ -67,20 +67,18 @@ function tryKillAutoImplProcess(processRef: ChildProcess | null, signal: NodeJS.
   }
 }
 
+export function shouldScheduleAutoStopOnQuiet(options: {
+  verification?: unknown;
+  autoImpl?: { autoStopOnQuiet?: boolean } | null;
+}): boolean {
+  return !!options.verification && options.autoImpl?.autoStopOnQuiet === true;
+}
+
 export function getDefaultAutoImplReference(ctx: DevServerContext, category: string, type: string): string {
-  if (category === 'cli') {
-    return type === 'codex-cli' ? 'claude-cli' : 'codex-cli';
-  }
-  if (category === 'extension') {
-    const preferred = ['claude-code-vscode', 'codex', 'cline', 'roo-code'];
-    for (const ref of preferred) {
-      if (ref === type) continue;
-      if (ctx.providerLoader.resolve(ref) || ctx.providerLoader.getMeta(ref)) return ref;
-    }
-    const all = ctx.providerLoader.getAll();
-    const fb = all.find((p: any) => p.category === 'extension' && p.type !== type);
-    if (fb?.type) return fb.type;
-  }
+  const all = ctx.providerLoader.getAll();
+  // Pick any other provider in the same category as a reference
+  const sameCategoryOther = all.find((p: any) => p.category === category && p.type !== type);
+  if (sameCategoryOther?.type) return sameCategoryOther.type;
   return 'antigravity';
 }
 
@@ -424,49 +422,43 @@ export async function handleAutoImplement(ctx: DevServerContext, type: string, r
       return;
     }
 
-    // ─── CLI Agent: stdin pipe approach ───
+    // ─── CLI Agent: declarative autoImpl config from provider.json ───
     const command: string = spawn.command;
+    const autoImpl = spawn.autoImpl;
     // Strip interactive-only flags for auto-implement (non-interactive mode)
     const interactiveFlags = ['--yolo', '--interactive', '-i'];
     const baseArgs: string[] = [...(spawn.args || [])].filter((a: string) => !interactiveFlags.includes(a));
 
-    // 6. Construct the complete shell command per-agent
+    // 6. Construct the complete shell command from provider.json autoImpl config
     let shellCmd: string;
     const isWin = os.platform() === 'win32';
     const escapeArg = (a: string) => isWin ? `"${a.replace(/"/g, '""')}"` : `'${a.replace(/'/g, "'\\''")}'`;
 
-    if (command === 'claude') {
-      // Claude Code: autonomous agent mode (no --print), skip permissions, prompt via meta-prompt
-      const args = [...baseArgs, '--dangerously-skip-permissions'];
+    const promptMode = autoImpl?.promptMode ?? 'stdin';
+    const extraArgs = autoImpl?.extraArgs ?? [];
+    const rawMetaPrompt = autoImpl?.metaPrompt
+      ? autoImpl.metaPrompt.replace('{{promptFile}}', promptFile)
+      : `Read the file at ${promptFile} and follow ALL the instructions in it exactly. Do not ask questions, just execute.`;
+
+    if (promptMode === 'flag') {
+      const flag = autoImpl?.promptFlag ?? '-p';
+      const args = [...baseArgs, ...extraArgs];
       if (model) args.push('--model', model);
       const escapedArgs = args.map(escapeArg).join(' ');
-      const metaPrompt = `Read the file at ${promptFile} and follow ALL the instructions. Implement the specific function requested, then test it via CDP curl targeting 127.0.0.1:19280, wait for confirmation of success, and then close. DO NOT start working on other features not listed in the prompt constraint.`;
-      shellCmd = `${command} ${escapedArgs} -p ${escapeArg(metaPrompt)}`;
-    } else if (command === 'gemini') {
-      // Gemini CLI: non-interactive prompt mode
-      // We can't use @file syntax (causes Parts object parsing bug) or $(cat) (arg too long).
-      // Solution: meta-prompt that tells Gemini to read the instructions file itself.
-      const args = [...baseArgs, '-y', '-s', 'false'];
-      if (model) args.push('-m', model);
-      const escapedArgs = args.map(escapeArg).join(' ');
-      const metaPrompt = `Read the file at ${promptFile} and follow ALL the instructions in it exactly. Do not ask questions, just execute.`;
-      shellCmd = `${command} ${escapedArgs} -p ${escapeArg(metaPrompt)}`;
-
-    } else if (command === 'codex') {
-      const args = ['exec', ...baseArgs];
-      if (!args.includes('--dangerously-bypass-approvals-and-sandbox')) {
-        args.push('--dangerously-bypass-approvals-and-sandbox');
-      }
-      if (!args.includes('--skip-git-repo-check')) {
-        args.push('--skip-git-repo-check');
+      shellCmd = `${command} ${escapedArgs} ${flag} ${escapeArg(rawMetaPrompt)}`;
+    } else if (promptMode === 'subcommand') {
+      const subcommand = autoImpl?.subcommand ?? '';
+      const args = subcommand ? [subcommand, ...baseArgs] : [...baseArgs];
+      for (const extra of extraArgs) {
+        if (!args.includes(extra)) args.push(extra);
       }
       if (model) args.push('--model', model);
       const escapedArgs = args.map(escapeArg).join(' ');
-      const metaPrompt = `Read the file at ${promptFile} and follow ALL instructions strictly. DO NOT spend time exploring the filesystem or other providers. You have full authority to implement ALL required script files and independently test them against 127.0.0.1:19280 via CDP CURL. Upon complete validation of ALL assigned files, print exactly "_PIPELINE_COMPLETE_SIGNAL_" to gracefully close the pipeline. DO NOT WAIT FOR APPROVAL, execute completely autonomously.`;
-      shellCmd = `${command} ${escapedArgs} ${escapeArg(metaPrompt)}`;
+      shellCmd = `${command} ${escapedArgs} ${escapeArg(rawMetaPrompt)}`;
     } else {
-      // Generic fallback: pipe prompt via stdin
-      const escapedArgs = baseArgs.map(escapeArg).join(' ');
+      // stdin fallback (generic)
+      const args = [...baseArgs, ...extraArgs];
+      const escapedArgs = args.map(escapeArg).join(' ');
       if (isWin) {
         shellCmd = `type "${promptFile}" | ${command} ${escapedArgs}`;
       } else {
@@ -503,10 +495,9 @@ export async function handleAutoImplement(ctx: DevServerContext, type: string, r
         shell: false,
         timeout: 900000,
         stdio: ['pipe', 'pipe', 'pipe'],
-        env: { 
-          ...process.env, 
+        env: {
+          ...process.env,
           ...(spawn.env || {}),
-          ...(command === 'gemini' ? { SANDBOX: '1', GEMINI_CLI_NO_RELAUNCH: '1' } : {}),
         },
       });
       child.on('error', (err: Error) => {
@@ -582,7 +573,7 @@ export async function handleAutoImplement(ctx: DevServerContext, type: string, r
     };
 
     const scheduleAutoStopForVerification = () => {
-      if (!verification || command !== 'codex' || completionSignalSeen || autoStopIssued) return;
+      if (!shouldScheduleAutoStopOnQuiet({ verification, autoImpl }) || completionSignalSeen || autoStopIssued) return;
       const elapsed = Date.now() - spawnedAt;
       if (elapsed < 30000) return;
       clearAutoStopTimer();