@adhdev/daemon-core 0.9.82-rc.216 → 0.9.82-rc.217

package/dist/index.js

@@ -27948,8 +27948,9 @@ function evaluateCondition(cond, sections, fullScreen, cursor, prevLines, trace,
     const endRow = cursor.row;
     const currentSlice = curLines.slice(startRow, endRow).join("\n");
     const prevSlice = prevLines.slice(startRow, endRow).join("\n");
-    const result = currentSlice !== prevSlice;
-    trace.push({ kind: "section", text: `state[${stateId}] changed cond cursor_above=${cond.cursor_above} rows[${startRow},${endRow}) changed=${result}` });
+    const didChange = currentSlice !== prevSlice;
+    const result = cond.changed ? didChange : !didChange;
+    trace.push({ kind: "section", text: `state[${stateId}] changed cond cursor_above=${cond.cursor_above} rows[${startRow},${endRow}) changed=${didChange} expected=${cond.changed} result=${result}` });
     return result;
   }
   if (isRegexCondition(cond)) {
@@ -28672,7 +28673,8 @@ var SCHEMA_V3 = {
       "required": ["cursor_above", "changed"],
       "properties": {
         "cursor_above": { "type": "integer", "minimum": 1 },
-        "changed": { "type": "boolean", "const": true }
+        "changed": { "type": "boolean" },
+        "stable_ms": { "type": "integer", "minimum": 0 }
       }
     },
     "allCondition": {
@@ -29148,6 +29150,13 @@ init_logger();
 var STARTUP_GRACE_MS = 2500;
 var BUSY_HOLD_MS = 6e3;
 var SUBMIT_DELAY_FLOOR_MS = 200;
+function collectChangedConditions(when) {
+  if (!when) return [];
+  if ("cursor_above" in when && "changed" in when) return [when];
+  if ("all" in when) return when.all.flatMap((c) => collectChangedConditions(c));
+  if ("any" in when) return when.any.flatMap((c) => collectChangedConditions(c));
+  return [];
+}
 function countNewlines(s) {
   let n = 0;
   for (let i = 0; i < s.length; i += 1) if (s.charCodeAt(i) === 10) n += 1;
@@ -29253,6 +29262,9 @@ var SpecDriver = class {
    *  Used by screen_active_hold_ms to suppress idle downshifts while
    *  the terminal is still actively updating. */
   lastScreenChangedAt = 0;
+  /** Per-cursor_above region last-changed timestamps for stable_ms tracking.
+   *  Key: cursor_above value. Value: last time that region changed. */
+  regionLastChangedAt = /* @__PURE__ */ new Map();
   /** Timer that re-runs evaluate() once the hold window expires. Needed
    *  because the PTY stops emitting once the agent finishes; without an
    *  explicit wake-up there's nothing to trigger the busy → idle
@@ -29457,18 +29469,47 @@ var SpecDriver = class {
     const cursor = this.adapter.getCursorPosition();
     const currentLines = screen.split("\n").map((l) => l.endsWith("\r") ? l.slice(0, -1) : l);
     const ev = evaluate(this.spec, screen, cursor, this.prevScreenLines.length > 0 ? this.prevScreenLines : void 0);
+    const now = Date.now();
     if (this.prevScreenLines.length > 0 && currentLines.join("\n") !== this.prevScreenLines.join("\n")) {
-      this.lastScreenChangedAt = Date.now();
+      this.lastScreenChangedAt = now;
+    }
+    if (cursor && this.prevScreenLines.length > 0) {
+      for (const state of this.spec.states) {
+        const conditions = collectChangedConditions(state.when);
+        for (const cond of conditions) {
+          if (cond.stable_ms == null) continue;
+          const startRow = Math.max(0, cursor.row - cond.cursor_above);
+          const endRow = cursor.row;
+          const cur = currentLines.slice(startRow, endRow).join("\n");
+          const prev = this.prevScreenLines.slice(startRow, endRow).join("\n");
+          if (cur !== prev) this.regionLastChangedAt.set(cond.cursor_above, now);
+        }
+      }
     }
     this.prevScreenLines = currentLines;
     let evState = ev.state;
     const busyHoldMs = this.spec.debounce?.busy_hold_ms ?? BUSY_HOLD_MS;
     if (this.currentStateId === "busy" && evState.id === "idle") {
-      const ageMs = Date.now() - this.lastBusyAt;
+      const ageMs = now - this.lastBusyAt;
       if (ageMs < busyHoldMs) {
         evState = this.lastBusyState ?? evState;
       }
     }
+    if (evState.id === (this.spec.default_state ?? "idle") && cursor) {
+      const stableConditions = collectChangedConditions(
+        this.spec.states.find((s) => s.id === evState.id)?.when
+      ).filter((c) => c.changed === false && c.stable_ms != null);
+      for (const cond of stableConditions) {
+        const lastChanged = this.regionLastChangedAt.get(cond.cursor_above) ?? 0;
+        const stableMs = cond.stable_ms;
+        const stableAge = lastChanged > 0 ? now - lastChanged : Infinity;
+        if (stableAge < stableMs) {
+          evState = this.lastBusyState ?? { id: "busy", label: "Generating", title: null };
+          this.scheduleBusyExpiry(stableMs - stableAge + 50);
+          break;
+        }
+      }
+    }
     const idleStateId = this.spec.default_state ?? "idle";
     const isModalState = (id) => id !== null && id !== "busy" && id !== idleStateId;
     if (isModalState(this.currentStateId) && evState.id === "busy") {
@@ -29481,7 +29522,6 @@ var SpecDriver = class {
     const screenActiveHoldMs = this.spec.debounce?.screen_active_hold_ms;
     let busyWakeMs = busyHoldMs;
     const postModalGraceMs = busyHoldMs;
-    const now = Date.now();
     const recentlyInModal = isModalState(this.currentStateId) || this.lastModalAt > 0 && now - this.lastModalAt < postModalGraceMs;
     const recentlyLeftModal = !recentlyInModal && this.lastModalExitAt > 0 && now - this.lastModalExitAt < postModalGraceMs;
     const screenActiveMs = screenActiveHoldMs ?? 0;
@@ -29493,15 +29533,14 @@ var SpecDriver = class {
     if (evState.id === "busy" && completionIdleRule && !recentlyInModal && !recentlyLeftModal && !screenIsActive) {
       const completionKey = matchesCompletionIdleRule(this.spec, ev, screen);
       if (completionKey) {
-        const now2 = Date.now();
         if (completionKey !== this.completionIdleKey) {
           this.completionIdleKey = completionKey;
-          this.completionIdleFirstSeenAt = now2;
+          this.completionIdleFirstSeenAt = now;
           LOG.debug("SpecDriver", `[${this.opts.specPath.split("/").slice(-3).join("/")}] completion_idle_after matched: key="${completionKey}"`);
         }
         const holdMs = Math.max(0, completionIdleRule.hold_ms || 0);
         const forceAfterMs = typeof completionIdleRule.force_after_ms === "number" ? completionIdleRule.force_after_ms : null;
-        const ageMs = now2 - this.completionIdleFirstSeenAt;
+        const ageMs = now - this.completionIdleFirstSeenAt;
         if (ageMs >= holdMs) {
           const targetMatches = matchesCompletionIdleTargetState(this.spec, ev, screen, cursor);
           const forced = !targetMatches && forceAfterMs !== null && ageMs >= holdMs + forceAfterMs;