squadrant 0.17.0 → 0.18.0

package/dist/squadrantd.js

@@ -507,7 +507,21 @@ function nextPendingMonitor(current, ev, now) {
 }
 function reduce(rec, ev, now) {
   if (ev.type === "task.reopened") {
-    return { ...rec, state: "working", question: void 0, error: void 0, lastHeartbeat: now, lastEvent: ev.type };
+    return { ...rec, state: "working", question: void 0, error: void 0, lastHeartbeat: now, lastEvent: ev.type, workingStretchStartedAt: now };
+  }
+  if (ev.type === "crew.takeover.started") {
+    if (rec.operatorHold)
+      return { ...rec, lastHeartbeat: now, lastEvent: ev.type };
+    return {
+      ...rec,
+      operatorHold: { since: now, ...ev.note !== void 0 ? { note: ev.note } : {} },
+      lastHeartbeat: now,
+      lastEvent: ev.type
+    };
+  }
+  if (ev.type === "crew.takeover.ended") {
+    const { operatorHold: _dropped, ...rest } = rec;
+    return { ...rest, lastHeartbeat: now, lastEvent: ev.type };
   }
   if (TERMINAL_STATES.has(rec.state))
     return rec;
@@ -523,8 +537,9 @@ function reduce(rec, ev, now) {
         // resuming after a blocked→reply clears the question
         pendingTool: void 0,
         // #354: a new turn closes any prior tool window
-        pendingMonitor: void 0
+        pendingMonitor: void 0,
         // #594a: same reset — a new turn moots any prior watch
+        workingStretchStartedAt: now
       };
     case "task.progress": {
       const pendingTool = nextPendingTool(rec.pendingTool, ev, now);
@@ -693,6 +708,8 @@ function firePush(deps, project, prev, next, event, lastCaptainTurnAt) {
     return;
   if (!ATTENTION_STATES.has(next.state))
     return;
+  if (next.operatorHold)
+    return;
   if (next.state === "awaiting-input" && lastCaptainTurnAt != null && deps.now() - lastCaptainTurnAt <= IDLE_DEBOUNCE_MS) {
     return;
   }
@@ -744,8 +761,11 @@ var KNOWN_EVENT_TYPES = /* @__PURE__ */ new Set([
   "task.reconcile-failed",
   "task.cancelled",
   "task.session.ended",
-  "task.first-turn.confirmed"
+  "task.first-turn.confirmed",
   // #466: delivery confirmation
+  "crew.takeover.started",
+  "crew.takeover.ended"
+  // #649: operator takeover
 ]);
 function createDaemon(deps) {
   const { store, now } = deps;
@@ -927,9 +947,32 @@ function createDaemon(deps) {
           store.delete(r.project, r.id);
           continue;
         }
+        if (r.operatorHold) {
+          const threshold = (deps.takeoverNudgeHours ?? 6) * 36e5;
+          const holdAge = t - r.operatorHold.since;
+          if (holdAge > threshold) {
+            const timeSinceLastNudge = t - (r.operatorHold.lastNudgeAt ?? 0);
+            if (timeSinceLastNudge > threshold) {
+              const hrs = Math.round(holdAge / 36e5);
+              const tag = crewTag(r);
+              const message = `CREW HELD-LONG ${tag} \u2014 held ${hrs}h. Ask the operator whether it is still in use. Do not release it yourself.`;
+              store.put({ ...r, operatorHold: { ...r.operatorHold, lastNudgeAt: t } });
+              if (deps.notify) {
+                try {
+                  const p = deps.notify({ project: r.project, message, record: r, event: { type: "task.progress", id: r.id } });
+                  if (p && typeof p.catch === "function")
+                    p.catch(() => {
+                    });
+                } catch {
+                }
+              }
+            }
+          }
+        }
         if (!TERMINAL_STATES.has(r.state) && !isStickyAttention(r.state)) {
           const ceiling = deps.taskTimeoutMs ?? DEFAULT_TASK_TIMEOUT_MS;
-          if (t - r.createdAt > ceiling) {
+          const refTime = r.workingStretchStartedAt ?? r.createdAt;
+          if (t - refTime > ceiling) {
             const prevState = r.state;
             const tag = crewTag(r);
             const hrs = Math.round(ceiling / 36e5);
@@ -1791,7 +1834,9 @@ function buildContext(opts) {
   const sockPath = opts.sockPath ?? join9(homedir6(), ".config", "squadrant", "squadrant.sock");
   const store = createStore(stateRoot);
   const bootedAt = Date.now();
-  const taskTimeoutMs = loadConfig().defaults.taskTimeoutMs;
+  const config = loadConfig();
+  const taskTimeoutMs = config.defaults.taskTimeoutMs;
+  const takeoverNudgeHours = config.defaults.takeoverNudgeHours;
   const isPidAlive = opts.isPidAlive ?? defaultIsPidAlive;
   const spawn2 = opts.spawn ?? realSpawn;
   const resultsDir = join9(stateRoot, "_results");
@@ -1811,6 +1856,7 @@ function buildContext(opts) {
     bootedAt,
     lastSweepAt: { value: null },
     taskTimeoutMs,
+    takeoverNudgeHours,
     isPidAlive,
     spawn: spawn2,
     resultsDir,
@@ -2605,6 +2651,7 @@ function startDaemon(ctx, opts, pkgVersion) {
     isPidAlive,
     notify,
     taskTimeoutMs,
+    takeoverNudgeHours: ctx.takeoverNudgeHours,
     isSurfaceAlive: surfaceProbe,
     resendFirstTurn: ctx.resendFirstTurn,
     launchHeadless: opts.launchHeadless,