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

package/dist/index.mjs

@@ -4926,14 +4926,15 @@ var init_provider_schema = __esm({
           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",
@@ -10527,9 +10528,17 @@ function expandPath2(template, input) {
   });
   if (out.startsWith("~/")) out = path24.join(os17.homedir(), out.slice(2));
   const now = /* @__PURE__ */ new Date();
+  const workspaceRaw = input.workspace ?? "";
+  let workspaceResolved = workspaceRaw;
+  if (workspaceRaw) {
+    try {
+      workspaceResolved = fs12.realpathSync(workspaceRaw);
+    } catch {
+    }
+  }
   const vars = {
-    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"),
@@ -26875,6 +26884,15 @@ var SpecCliAdapter = class {
   cliType;
   cliName;
   workingDir;
+  /**
+   * 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.
+   */
+  chatMessagesOwnedExternally = true;
   driver;
   spec;
   lastEvent = null;
@@ -27858,7 +27876,10 @@ var CliProviderInstance = class {
       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" };
+    const adapterOwnsMessagesElsewhere = this.adapter?.chatMessagesOwnedExternally === true;
+    if (!adapterOwnsMessagesElsewhere && !this.completionHasFinalAssistantMessage(parsed?.messages)) {
+      return { reason: "missing_final_assistant" };
+    }
     try {
       const screenText = typeof this.adapter.getScreenText === "function" ? String(this.adapter.getScreenText() || "") : "";
       if (screenText) {
@@ -31920,16 +31941,20 @@ var ProviderLoader = class _ProviderLoader {
         let matched = false;
         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} \u2192 ${entry.scriptDir}`);
-              resolved._resolvedScriptDir = entry.scriptDir;
-              resolved._resolvedScriptsSource = `compatibility:${entry.ideVersion}`;
-              if (providerDir) {
-                const fullDir = path30.join(providerDir, entry.scriptDir);
-                resolved._resolvedScriptsPath = fs18.existsSync(path30.join(fullDir, "scripts.js")) ? path30.join(fullDir, "scripts.js") : fullDir;
+            if (entry.scriptDir) {
+              const loaded = this.loadScriptsFromDir(type, entry.scriptDir);
+              if (loaded) {
+                resolved.scripts = loaded;
+                this.debugLog(`  [compatibility] ${type} v${currentVersion} \u2192 ${entry.scriptDir}`);
+                resolved._resolvedScriptDir = entry.scriptDir;
+                resolved._resolvedScriptsSource = `compatibility:${entry.ideVersion}`;
+                if (providerDir) {
+                  const fullDir = path30.join(providerDir, entry.scriptDir);
+                  resolved._resolvedScriptsPath = fs18.existsSync(path30.join(fullDir, "scripts.js")) ? path30.join(fullDir, "scripts.js") : fullDir;
+                }
+                matched = true;
               }
+            } else {
               matched = true;
             }
             break;
@@ -37593,21 +37618,22 @@ var DaemonCommandRouter = class {
         const sessionId = typeof args?.targetSessionId === "string" ? args.targetSessionId.trim() : typeof args?.sessionId === "string" ? args.sessionId.trim() : "";
         if (!sessionId) return { success: false, error: "targetSessionId required" };
         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 runtimeMeta = adapter && typeof adapter.getRuntimeMetadata === "function" ? adapter.getRuntimeMetadata() : void 0;
         const coord = getCoordinatorForSession(sessionId);
-        const providerMetaForSession = this.deps.providerLoader.resolve?.(target.providerType) || this.deps.providerLoader.getMeta(target.providerType);
+        if (!target && !coord) return { success: false, error: "Session not found", sessionId };
+        const adapter = target ? this.deps.cliManager.findAdapter(target.providerType, { instanceKey: sessionId })?.adapter : void 0;
+        const runtimeMeta = adapter && typeof adapter.getRuntimeMetadata === "function" ? adapter.getRuntimeMetadata() : void 0;
+        const providerType = target?.providerType || coord?.cliType || "";
+        const providerMetaForSession = providerType ? this.deps.providerLoader.resolve?.(providerType) || this.deps.providerLoader.getMeta(providerType) : void 0;
         return {
           success: true,
           session: {
             sessionId,
-            providerType: target.providerType,
+            providerType,
             providerName: providerMetaForSession?.name,
-            transport: target.transport,
-            workspace: target.workspace,
-            spawnedAtMs: target.spawnedAtMs,
-            providerSessionId: target.providerSessionId,
+            transport: target?.transport,
+            workspace: target?.workspace || coord?.workspace,
+            spawnedAtMs: target?.spawnedAtMs || coord?.startedAt,
+            providerSessionId: target?.providerSessionId,
             runtimeMetadata: runtimeMeta
           },
           coordinator: coord ? {