@adhdev/daemon-core 0.9.77-rc.34 → 0.9.77-rc.35

package/package.json

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

package/src/cli-adapters/provider-cli-adapter.ts

@@ -1456,6 +1456,14 @@ export class ProviderCliAdapter implements CliAdapter {
 
  // ─── Script Execution ──────────────────────────
 
+    private invokeCliScript<T>(script: Function, input: any): T {
+        const hasStateFactory = typeof this.cliScripts?.createState === 'function';
+        const expectsStateArgument = hasStateFactory || this.scriptState !== null || script.length >= 2;
+        return expectsStateArgument
+            ? script(this.scriptState, input)
+            : script(input);
+    }
+
     private runParseSession(): ParsedSession | null {
         if (typeof this.cliScripts?.parseSession !== 'function') {
             this.parseErrorMessage = `${this.cliType} parseSession unavailable`;
@@ -1476,7 +1484,10 @@ export class ProviderCliAdapter implements CliAdapter {
                 scope: this.currentTurnScope,
                 runtimeSettings: this.runtimeSettings,
             });
-            const session = this.cliScripts.parseSession(this.scriptState, { ...input, tail, tailScreen: buildCliScreenSnapshot(tail) });
+            const session = this.invokeCliScript<ParsedSession | null>(
+                this.cliScripts.parseSession,
+                { ...input, tail, tailScreen: buildCliScreenSnapshot(tail) },
+            );
             this.parseErrorMessage = null;
             return session && typeof session === 'object' ? session : null;
         } catch (e: any) {
@@ -1491,7 +1502,7 @@ export class ProviderCliAdapter implements CliAdapter {
         if (!this.cliScripts?.detectStatus) return null;
         try {
             const screenText = this.terminalScreen.getText();
-            const status = this.cliScripts.detectStatus(this.scriptState, {
+            const status = this.invokeCliScript<string | null>(this.cliScripts.detectStatus, {
                 tail: text.slice(-500),
                 screenText,
                 rawBuffer: this.accumulatedRawBuffer,
@@ -1511,7 +1522,7 @@ export class ProviderCliAdapter implements CliAdapter {
         try {
             const screenText = this.terminalScreen.getText();
             const buffer = screenText || this.accumulatedBuffer;
-            return this.cliScripts.parseApproval(this.scriptState, {
+            return this.invokeCliScript<{ message: string; buttons: string[] } | null>(this.cliScripts.parseApproval, {
                 buffer,
                 screenText,
                 rawBuffer: this.accumulatedRawBuffer,

package/src/commands/router.ts

@@ -1569,7 +1569,13 @@ export class DaemonCommandRouter {
                             appendLedgerEntry(meshId, {
                                 kind: 'node_removed',
                                 nodeId,
-                                payload: { worktree: !!node?.isLocalWorktree, sessionCleanupMode },
+                                payload: {
+                                    worktree: !!node?.isLocalWorktree,
+                                    sessionCleanupMode,
+                                    workspace: typeof node?.workspace === 'string' ? node.workspace : undefined,
+                                    daemonId: typeof node?.daemonId === 'string' ? node.daemonId : undefined,
+                                    worktreeBranch: typeof node?.worktreeBranch === 'string' ? node.worktreeBranch : undefined,
+                                },
                             });
                         } catch { /* ledger append is best-effort */ }
                     }

package/src/mesh/mesh-events.ts

@@ -240,13 +240,15 @@ function injectMeshSystemMessage(components: DaemonComponents, args: {
     metadataEvent: Record<string, unknown>;
 }) {
     // ── Task Queue & Ledger ──
+    let completedTaskForLedger: { id?: string } | null = null;
     if (args.event === 'agent:generating_completed') {
         const sessionId = resolveEventSessionId(args.metadataEvent, args.sourceInstanceId);
         const nodeId = readNonEmptyString(args.nodeId) || readNonEmptyString(args.metadataEvent.meshNodeId);
         const providerType = readNonEmptyString(args.metadataEvent.providerType);
         
         if (sessionId) {
-            updateSessionTaskStatus(args.meshId, sessionId, 'completed');
+            const completedTask = updateSessionTaskStatus(args.meshId, sessionId, 'completed');
+            completedTaskForLedger = completedTask ? { id: completedTask.id } : null;
             if (nodeId && providerType) {
                 // Short delay to allow completion event to propagate before pulling next
                 setTimeout(() => {
@@ -262,6 +264,7 @@ function injectMeshSystemMessage(components: DaemonComponents, args: {
             ? updateSessionTaskStatus(args.meshId, sessionId, 'completed')
             : null;
         if (completedTask) {
+            completedTaskForLedger = { id: completedTask.id };
             try {
                 appendLedgerEntry(args.meshId, {
                     kind: 'task_completed',
@@ -274,6 +277,7 @@ function injectMeshSystemMessage(components: DaemonComponents, args: {
                         taskId: completedTask.id,
                         completedViaReady: true,
                         providerSessionId: readNonEmptyString(args.metadataEvent.providerSessionId) || undefined,
+                        finalSummary: readNonEmptyString(args.metadataEvent.finalSummary) || undefined,
                     },
                 });
             } catch (e: any) {
@@ -318,7 +322,9 @@ function injectMeshSystemMessage(components: DaemonComponents, args: {
                 payload: {
                     event: args.event,
                     nodeLabel: args.nodeLabel,
+                    taskId: completedTaskForLedger?.id || undefined,
                     providerSessionId: readNonEmptyString(args.metadataEvent.providerSessionId) || undefined,
+                    finalSummary: readNonEmptyString(args.metadataEvent.finalSummary) || undefined,
                 },
             });
         } catch (e: any) {
@@ -451,6 +457,7 @@ export function handleMeshForwardEvent(components: DaemonComponents, payload: Re
             targetSessionId: readNonEmptyString(payload.targetSessionId) || readNonEmptyString(payload.sessionId) || readNonEmptyString(payload.instanceId),
             providerType: readNonEmptyString(payload.providerType),
             providerSessionId: readNonEmptyString(payload.providerSessionId),
+            finalSummary: readNonEmptyString(payload.finalSummary) || readNonEmptyString(payload.summary),
         },
     });
 }