@adhdev/daemon-core 1.0.2 → 1.0.3-rc.2

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

@@ -63,6 +63,14 @@ export declare class SpecCliAdapter implements CliAdapter {
      *  MCP config), so this routing keeps the dashboard honest until
      *  hermes ships a runtime MCP override. */
     private spawnedEnv;
+    /** Wall clock at the moment an approval modal was last resolved (auto-approve,
+     *  dashboard, or mesh_approve) via a successful button press. Powers
+     *  isApprovalRecentlyResolved() — the second suppression signal the mesh event
+     *  forwarder uses to drop a duplicate agent:waiting_approval re-emitted across
+     *  the approval↔busy TUI flap window (AUTOAPPROVE-FLAP). Mirrors the
+     *  cli-state-engine's lastApprovalResolvedAt for the spec-driven adapter path
+     *  (claude-cli specs/4.0.json), which previously stubbed the method to false. */
+    private lastApprovalResolvedAt;
     constructor(specPath: string, workingDir: string, cliArgs: string[], extraEnv: Record<string, string>, transportFactory?: PtyTransportFactory);
     spawn(): Promise<void>;
     sendMessage(text: string): Promise<void>;
@@ -78,6 +86,11 @@ export declare class SpecCliAdapter implements CliAdapter {
     isAlive(): boolean;
     private static readonly TERMINAL_SNAPSHOT_DEFAULT_MAX_BYTES;
     private static readonly TERMINAL_SNAPSHOT_ABSOLUTE_MAX_BYTES;
+    /** Window during which isApprovalRecentlyResolved() reports a just-resolved
+     *  approval. Matches CliProviderInstance.APPROVAL_LOCAL_RESOLUTION_COOLDOWN_MS
+     *  (8000) — the same auto-approve suppression window signal1 uses — so a modal
+     *  re-emitted within the approval↔busy flap is suppressed by signal2 too. */
+    private static readonly APPROVAL_RESOLVED_COOLDOWN_MS;
     /**
      * MESH-READ-TERMINAL (feature 2: RAW terminal read). Least-privilege read
      * of the CURRENT rendered viewport for mesh_read_terminal on the spec path

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/daemon-core",
-  "version": "1.0.2",
+  "version": "1.0.3-rc.2",
   "description": "ADHDev daemon core — CDP, IDE detection, providers, command execution",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -47,8 +47,8 @@
   "author": "vilmire",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@adhdev/mesh-shared": "0.9.82-rc.373",
-    "@adhdev/session-host-core": "*",
+    "@adhdev/mesh-shared": "1.0.3-rc.2",
+    "@adhdev/session-host-core": "1.0.3-rc.2",
     "@agentclientprotocol/sdk": "^0.16.1",
     "ajv": "^8.20.0",
     "ajv-formats": "^3.0.1",

package/src/cli-adapters/terminal-backends/ghostty-vt-backend.ts

@@ -157,6 +157,7 @@ export class GhosttyVtTerminalBackend implements TerminalViewportBackend {
 
     getCursorPosition(): { col: number; row: number } {
         if (this.disposed) return { col: 0, row: 0 };
+        if (typeof this.terminal.getCursorPosition !== 'function') return { col: 0, row: 0 };
         return this.terminal.getCursorPosition();
     }
 

package/src/cli-adapters/terminal-screen.ts

@@ -53,6 +53,7 @@ export class TerminalScreen {
     }
 
     getCursorPosition(): { col: number; row: number } {
+        if (typeof this.terminal.getCursorPosition !== 'function') return { col: 0, row: 0 };
         return this.terminal.getCursorPosition();
     }
 

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

@@ -127,6 +127,14 @@ export class SpecCliAdapter implements CliAdapter {
      *  MCP config), so this routing keeps the dashboard honest until
      *  hermes ships a runtime MCP override. */
     private spawnedEnv: Record<string, string> = {};
+    /** Wall clock at the moment an approval modal was last resolved (auto-approve,
+     *  dashboard, or mesh_approve) via a successful button press. Powers
+     *  isApprovalRecentlyResolved() — the second suppression signal the mesh event
+     *  forwarder uses to drop a duplicate agent:waiting_approval re-emitted across
+     *  the approval↔busy TUI flap window (AUTOAPPROVE-FLAP). Mirrors the
+     *  cli-state-engine's lastApprovalResolvedAt for the spec-driven adapter path
+     *  (claude-cli specs/4.0.json), which previously stubbed the method to false. */
+    private lastApprovalResolvedAt = 0;
 
     constructor(
         specPath: string,
@@ -312,6 +320,11 @@ export class SpecCliAdapter implements CliAdapter {
     // the char count still looks safe.
     private static readonly TERMINAL_SNAPSHOT_DEFAULT_MAX_BYTES = 32 * 1024;
     private static readonly TERMINAL_SNAPSHOT_ABSOLUTE_MAX_BYTES = 64 * 1024;
+    /** Window during which isApprovalRecentlyResolved() reports a just-resolved
+     *  approval. Matches CliProviderInstance.APPROVAL_LOCAL_RESOLUTION_COOLDOWN_MS
+     *  (8000) — the same auto-approve suppression window signal1 uses — so a modal
+     *  re-emitted within the approval↔busy flap is suppressed by signal2 too. */
+    private static readonly APPROVAL_RESOLVED_COOLDOWN_MS = 8000;
 
     /**
      * MESH-READ-TERMINAL (feature 2: RAW terminal read). Least-privilege read
@@ -455,7 +468,18 @@ export class SpecCliAdapter implements CliAdapter {
         // clickModalButton returns whether the FSM actually found a button for `target`
         // and dispatched its confirm keys — surfaced so mesh_approve can distinguish a
         // real press from a silent miss (the exact false-success the mis-map produced).
-        return this.driver.clickModalButton(target);
+        const pressed = this.driver.clickModalButton(target);
+        // AUTOAPPROVE-FLAP (signal2): stamp the resolve time ONLY on a real press of an
+        // approval-class modal. This is the resolution path for auto-approve, dashboard,
+        // and mesh_approve alike, so isApprovalRecentlyResolved() then suppresses a
+        // duplicate agent:waiting_approval re-emitted across the approval↔busy flap.
+        // Gate on the authoritative FSM status (approval) — a picker/confirm press must
+        // NOT arm the approval cooldown. A silent miss (pressed=false) leaves the modal
+        // unresolved, so it must not stamp either.
+        if (pressed && this.latestState?.status === 'approval') {
+            this.lastApprovalResolvedAt = Date.now();
+        }
+        return pressed;
     }
 
     async resolveAction(data: unknown): Promise<void> {
@@ -494,7 +518,10 @@ export class SpecCliAdapter implements CliAdapter {
         this.statusCallback?.();
     }
 
-    isApprovalRecentlyResolved(): boolean { return false; }
+    isApprovalRecentlyResolved(): boolean {
+        return !!(this.lastApprovalResolvedAt
+            && (Date.now() - this.lastApprovalResolvedAt) < SpecCliAdapter.APPROVAL_RESOLVED_COOLDOWN_MS);
+    }
     clearHistory(): void { /* no transcript buffer yet */ }
     updateRuntimeSettings(): void { /* no runtime settings in spec model yet */ }
     setServerConn(): void { /* server conn unused by SpecDriver */ }