@adhdev/daemon-core 0.9.82-rc.163 → 0.9.82-rc.165

package/dist/providers/spec/cli-adapter.d.ts

@@ -4,6 +4,15 @@ export declare class SpecCliAdapter implements CliAdapter {
     readonly cliType: string;
     readonly cliName: string;
     readonly workingDir: string;
+    /**
+     * Marker the daemon's finalization gate checks: `getStatus()` returns
+     * `messages: []` by design here (chat history lives in the daemon's
+     * native-history pipeline, not the adapter). Without this flag,
+     * cli-provider-instance's `missing_final_assistant` gate would stall
+     * every turn until the 30s safety timeout because it expects the
+     * adapter to surface the final assistant message.
+     */
+    readonly chatMessagesOwnedExternally: true;
     private driver;
     private spec;
     private lastEvent;

package/package.json

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

package/src/commands/router.ts

@@ -4088,24 +4088,36 @@ export class DaemonCommandRouter {
                 const sessionId = typeof args?.targetSessionId === 'string' ? args.targetSessionId.trim()
                     : typeof args?.sessionId === 'string' ? args.sessionId.trim() : '';
                 if (!sessionId) return { success: false, error: 'targetSessionId required' };
+                // Fetch both lookups up front. We used to bail with "Session not
+                // found" when sessionRegistry forgot the SID (auto-cleanup,
+                // daemon restart with the session not yet restored, etc), which
+                // hid the coordinator-side metadata even though the
+                // coordinator-registry still has it. Now we return whichever
+                // side we have. The dashboard renders "no coordinator-specific
+                // prompt" only when *neither* side knows the session.
                 const target = this.deps.sessionRegistry.get(sessionId);
-                if (!target) return { success: false, error: 'Session not found', sessionId };
-                const adapter = this.deps.cliManager.findAdapter(target.providerType, { instanceKey: sessionId })?.adapter;
+                const coord = getCoordinatorForSession(sessionId);
+                if (!target && !coord) return { success: false, error: 'Session not found', sessionId };
+                const adapter = target
+                    ? this.deps.cliManager.findAdapter(target.providerType, { instanceKey: sessionId })?.adapter
+                    : undefined;
                 const runtimeMeta = (adapter && typeof (adapter as any).getRuntimeMetadata === 'function')
                     ? (adapter as any).getRuntimeMetadata()
                     : undefined;
-                const coord = getCoordinatorForSession(sessionId);
-                const providerMetaForSession = this.deps.providerLoader.resolve?.(target.providerType) || this.deps.providerLoader.getMeta(target.providerType);
+                const providerType = target?.providerType || coord?.cliType || '';
+                const providerMetaForSession = providerType
+                    ? this.deps.providerLoader.resolve?.(providerType) || this.deps.providerLoader.getMeta(providerType)
+                    : undefined;
                 return {
                     success: true,
                     session: {
                         sessionId,
-                        providerType: target.providerType,
+                        providerType,
                         providerName: providerMetaForSession?.name,
-                        transport: target.transport,
-                        workspace: (target as any).workspace,
-                        spawnedAtMs: (target as any).spawnedAtMs,
-                        providerSessionId: (target as any).providerSessionId,
+                        transport: target?.transport,
+                        workspace: (target as any)?.workspace || coord?.workspace,
+                        spawnedAtMs: (target as any)?.spawnedAtMs || coord?.startedAt,
+                        providerSessionId: (target as any)?.providerSessionId,
                         runtimeMetadata: runtimeMeta,
                     },
                     coordinator: coord ? {

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

@@ -966,7 +966,15 @@ export class CliProviderInstance implements ProviderInstance {
             return { reason: `parsed_status:${parsedStatus}`, terminal: isCliGeneratingLikeStatus(parsedStatus) };
         }
         if (parsed?.activeModal || parsed?.modal) return { reason: 'parsed_modal_active', terminal: true };
-        if (!this.completionHasFinalAssistantMessage(parsed?.messages)) return { reason: 'missing_final_assistant' };
+        // SpecCliAdapter never populates parsed.messages — chat history flows
+        // through the daemon's native-history pipeline, not the status hook.
+        // Skipping the final-assistant gate avoids a 30s stall on every turn
+        // for spec-routed providers (agy / codex / claude / hermes).
+        const adapterOwnsMessagesElsewhere = (this.adapter as any)?.chatMessagesOwnedExternally === true;
+        if (!adapterOwnsMessagesElsewhere
+            && !this.completionHasFinalAssistantMessage(parsed?.messages)) {
+            return { reason: 'missing_final_assistant' };
+        }
 
         // Guard: if the screen still shows an approval/choice prompt as the last visible text,
         // the turn is not complete even if the parsed status says idle and there is an assistant

package/src/providers/provider-loader.ts

@@ -948,18 +948,28 @@ export class ProviderLoader {
 
         for (const entry of compat) {
           if (this.matchesVersion(currentVersion, entry.ideVersion)) {
-            const loaded = this.loadScriptsFromDir(type, entry.scriptDir);
-            if (loaded) {
-              resolved.scripts = loaded;
-              this.debugLog(`  [compatibility] ${type} v${currentVersion} → ${entry.scriptDir}`);
-              resolved._resolvedScriptDir = entry.scriptDir;
-              resolved._resolvedScriptsSource = `compatibility:${entry.ideVersion}`;
-              if (providerDir) {
-                const fullDir = path.join(providerDir, entry.scriptDir);
-                resolved._resolvedScriptsPath = fs.existsSync(path.join(fullDir, 'scripts.js'))
-                  ? path.join(fullDir, 'scripts.js')
-                  : fullDir;
+            // entry.scriptDir is optional now — spec-driven providers (agy,
+            // codex on >=0.137, claude on >=2.1) only ship `spec` here, so
+            // there's nothing to load from the filesystem. SpecCliAdapter
+            // takes over via the `spec` path later in this method.
+            if (entry.scriptDir) {
+              const loaded = this.loadScriptsFromDir(type, entry.scriptDir);
+              if (loaded) {
+                resolved.scripts = loaded;
+                this.debugLog(`  [compatibility] ${type} v${currentVersion} → ${entry.scriptDir}`);
+                resolved._resolvedScriptDir = entry.scriptDir;
+                resolved._resolvedScriptsSource = `compatibility:${entry.ideVersion}`;
+                if (providerDir) {
+                  const fullDir = path.join(providerDir, entry.scriptDir);
+                  resolved._resolvedScriptsPath = fs.existsSync(path.join(fullDir, 'scripts.js'))
+                    ? path.join(fullDir, 'scripts.js')
+                    : fullDir;
+                }
+                matched = true;
               }
+            } else {
+              // Spec-only entry — still counts as a match so the
+              // defaultScriptDir fallback below doesn't kick in.
               matched = true;
             }
             break; // first match wins

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

@@ -237,14 +237,15 @@
       "minItems": 1,
       "items": {
         "type": "object",
-        "required": ["scriptDir"],
+        "required": ["ideVersion"],
         "additionalProperties": false,
         "properties": {
           "ideVersion": { "type": "string", "description": "SemVer range." },
-          "scriptDir":  { "type": "string", "pattern": "^scripts/[^/]+$" }
+          "scriptDir":  { "type": "string", "pattern": "^scripts/[^/]+$" },
+          "spec":       { "type": "string", "pattern": "^specs/[^/]+\\.json$", "description": "Path to declarative spec.json driving SpecCliAdapter for this version range." }
         }
       },
-      "description": "Maps installed agent versions to script subdirectories."
+      "description": "Maps installed agent versions to script subdirectories and/or declarative specs."
     },
     "defaultScriptDir": {
       "type": "string",

package/src/providers/spec/cli-adapter.ts

@@ -30,6 +30,15 @@ export class SpecCliAdapter implements CliAdapter {
     readonly cliType: string;
     readonly cliName: string;
     readonly workingDir: string;
+    /**
+     * Marker the daemon's finalization gate checks: `getStatus()` returns
+     * `messages: []` by design here (chat history lives in the daemon's
+     * native-history pipeline, not the adapter). Without this flag,
+     * cli-provider-instance's `missing_final_assistant` gate would stall
+     * every turn until the 30s safety timeout because it expects the
+     * adapter to surface the final assistant message.
+     */
+    readonly chatMessagesOwnedExternally = true as const;
 
     private driver: SpecDriver;
     private spec: CliSpec;

package/src/providers/spec/native-history-executor.ts

@@ -256,9 +256,20 @@ function expandPath(template: string, input: NativeHistoryInput): string | null
     // Re-expand ~ in case the fallback used it.
     if (out.startsWith('~/')) out = path.join(os.homedir(), out.slice(2));
     const now = new Date();
+    // claude (and a couple of other Anthropic-CLI–style providers) writes
+    // its per-cwd transcript under the *resolved* path
+    // (/private/tmp/foo, not /tmp/foo on macOS where /tmp -> /private/tmp).
+    // Without realpath, the spec template `~/.claude/projects/{cwd_dashed}/…`
+    // builds `-tmp-foo` and never finds the actual `-private-tmp-foo` dir.
+    const workspaceRaw = input.workspace ?? '';
+    let workspaceResolved = workspaceRaw;
+    if (workspaceRaw) {
+        try { workspaceResolved = fs.realpathSync(workspaceRaw); }
+        catch { /* path may not exist yet — keep the raw value */ }
+    }
     const vars: Record<string, string> = {
-        cwd: input.workspace ?? '',
-        cwd_dashed: (input.workspace ?? '').replace(/\//g, '-'),
+        cwd: workspaceResolved,
+        cwd_dashed: workspaceResolved.replace(/\//g, '-'),
         session_id: input.providerSessionId || input.sessionId || input.historySessionId || '',
         yyyy: String(now.getUTCFullYear()),
         mm: String(now.getUTCMonth() + 1).padStart(2, '0'),