@join-pantheon/cli 0.24.0 → 0.24.4

package/dist/worker.js

@@ -10,6 +10,7 @@ import { applyAnswer, loadPolicy, mayAsk, needsSelfUpgrade, recordAsk, savePolic
 import { agentHookStates, repairHook } from "./notify.js";
 import { fence, assess } from "./untrusted.js";
 import { allowed, recordRun } from "./spend.js";
+import { loadContinued, markContinued } from "./continued.js";
 import { loadProfile, reservedDecisionsNote } from "./profile.js";
 import { clip } from "./brief.js";
 import { composeWorker } from "./notice.js";
@@ -178,6 +179,7 @@ There is no human in this session. Do not ask for approval; you will not get an
 Act, reply if a reply is owed, then finish.`;
 }
 let fleetLock = null;
+const CONTINUATION_HORIZON_MS = 24 * 60 * 60_000;
 export class Worker {
     cfg;
     opts;
@@ -218,6 +220,19 @@ export class Worker {
         this.cfg = cfg;
         this.opts = opts;
     }
+    spaceKey() { return this.cfg.spaceId ?? this.cfg.space; }
+    contLoaded = false;
+    loadContinued() {
+        if (this.contLoaded)
+            return;
+        this.contLoaded = true;
+        for (const id of loadContinued(this.spaceKey(), this.opts.home))
+            this.contDone.add(id);
+    }
+    markDone(id) {
+        this.contDone.add(id);
+        markContinued(this.spaceKey(), id, this.opts.home);
+    }
     async bringMachineAlong() {
         if (this.opts.selfUpgrade?.run)
             return;
@@ -459,7 +474,7 @@ export class Worker {
                         this.requeueContinuation(continuation, 10_000);
                     }
                     else {
-                        this.contDone.add(continuation.id);
+                        this.markDone(continuation.id);
                         if (!this.skipLogged.has(`cont:${continuation.id}`)) {
                             this.skipLogged.add(`cont:${continuation.id}`);
                             this.opts.log(`- not continuing from ${continuation.id}: ${msg.split("\n")[0]}`);
@@ -510,7 +525,7 @@ export class Worker {
         return this.runJob(client, o, persona, policy, (branch) => buildBrief(o, trigger, branch, persona), true);
     }
     async handleContinuation(client, act, persona, policy) {
-        this.contDone.add(act.id);
+        this.markDone(act.id);
         const o = {
             id: `cont:${act.id}`, kind: "CONTINUE", owner: this.cfg.member,
             ref: act.id, goal: act.goal, created_at: act.ts,
@@ -590,19 +605,23 @@ export class Worker {
             at: Date.now(), goal: o.goal, obligation: o.id, ok,
             triggeredBy, summary,
         }, this.opts.home);
-        if (this.opts.notify && (!ok || loadProfile(this.cfg).notifications?.worker_done)) {
+        const sent = client.mineSince(startedAt, o.goal);
+        const quiet = ok && !requireReply && sent.length === 0;
+        if (this.opts.notify && !quiet && (!ok || loadProfile(this.cfg).notifications?.worker_done)) {
             try {
-                const reply = client.mineSince(startedAt, o.goal).pop() ?? null;
+                const reply = sent[sent.length - 1] ?? null;
                 this.opts.notify(composeWorker({ ok, triggeredBy, obligationBody: o.body, goal: o.goal ? client.goals.get(o.goal) : undefined, reply, obligationRef: o.ref }, (() => { const tools = installedTools(); return { tools, preferred: preferredTool(loadProfile(this.cfg), tools, this.opts.home) }; })()));
             }
             catch { }
         }
-        this.opts.log(ok ? `< handled ${o.id} on ${branch}`
-            : !exited ? `! run failed for ${o.id}: ${detail.split("\n")[0]} (see ${runLog})`
-                : `! run exited cleanly but sent no act for ${o.id} — see ${runLog}`);
+        this.opts.log(quiet ? `< read ${o.id} on ${branch} — the thread was already settled, nothing sent`
+            : ok ? `< handled ${o.id} on ${branch}`
+                : !exited ? `! run failed for ${o.id}: ${detail.split("\n")[0]} (see ${runLog})`
+                    : `! run exited cleanly but sent no act for ${o.id} — see ${runLog}`);
         return { obligation: o, branch, worktree, ok, detail };
     }
     enqueueContinuations(client, arrived) {
+        this.loadContinued();
         for (const r of arrived) {
             if (this.contDone.has(r.id) || this.contQueue.some((c) => c.act.id === r.id))
                 continue;
@@ -613,6 +632,11 @@ export class Worker {
                 ...(g ? { goalMembers: g.members, goalState: g.state } : {}),
             }))
                 continue;
+            if (Date.now() - r.ts > CONTINUATION_HORIZON_MS) {
+                this.markDone(r.id);
+                this.opts.log(`- not continuing from ${r.act} ${r.id}: it landed ${Math.round((Date.now() - r.ts) / 3_600_000)}h ago — that thread is for a live session to read`);
+                continue;
+            }
             this.contQueue.push({ act: r, notBefore: Date.now() });
             if (this.contQueue.length > 20)
                 this.contQueue.shift();
@@ -638,7 +662,7 @@ export class Worker {
                 ref: r.id, goal: r.goal, created_at: r.ts, body: r.body.slice(0, 120),
             });
             if (sel.skip) {
-                this.contDone.add(r.id);
+                this.markDone(r.id);
                 if (!this.skipLogged.has(`cont:${r.id}`)) {
                     this.skipLogged.add(`cont:${r.id}`);
                     this.opts.log(`- not continuing from ${r.act} ${r.id}: ${sel.skip}`);
@@ -689,10 +713,10 @@ export class Worker {
                 result = { ok: false, alreadyCurrent: false, from: VERSION, to: relayPkg ?? "?" };
                 this.opts.log(`! self-upgrade failed: ${e.message}`);
             }
-            if (result.ok && !result.alreadyCurrent && result.to === result.from) {
+            if (result.ok && result.to === result.from) {
                 delete policy.attempts.self_upgrade;
                 savePolicy(policy, home);
-                this.opts.log(`* self-upgrade: the registry does not serve ${relayPkg} yet (installed ${result.to}); will check again`);
+                this.opts.log(`* self-upgrade: nothing newer than ${result.to} to install yet (the relay runs ${relayPkg}); will check again`);
                 return;
             }
             if (result.ok && !result.alreadyCurrent) {

package/helper/macos/main.swift

@@ -9,6 +9,7 @@
  *                      (the choice becomes the default), through a .command file
  *                      Terminal runs — no automation permission needed
  *   Show details       prints the act and the decision in Terminal
+ *   Done               (decisions) answers it as handled, silently — the reminders stop
  *   Dismiss / ×        closes
  *
  * It owns no state. Everything it needs arrives as one JSON document:
@@ -25,7 +26,7 @@ import AppKit
 let args = CommandLine.arguments
 
 if args.count == 2, args[1] == "version" {
-  print("2")
+  print("3")
   exit(0)
 }
 
@@ -45,6 +46,8 @@ struct Notice: Decodable {
   let details: Details?
   /** where to write the chosen action and which .command files to open — supplied by the CLI */
   let bin_dir: String
+  /** the pantheon CLI to run silently for one-click actions — supplied by the CLI, since this helper has no PATH worth trusting */
+  let pantheon: String?
 }
 
 var notice: Notice
@@ -138,6 +141,23 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
     act(["action": "details", "act": notice.details?.act as Any, "decision": notice.details?.decision as Any].compactMapValues { $0 is NSNull ? nil : $0 }, command: "pantheon-details.command")
   }
 
+  /// Done: write the action, run the CLI without a Terminal, close. The CLI answers the decision as handled.
+  @objc func markDone(_ sender: Any?) {
+    guard !notice.bin_dir.isEmpty, let decision = notice.details?.decision else { NSApp.terminate(nil); return }
+    let dir = URL(fileURLWithPath: notice.bin_dir)
+    let payload: [String: Any] = ["action": "done", "decision": decision, "act": notice.details?.act as Any].compactMapValues { $0 is NSNull ? nil : $0 }
+    if let data = try? JSONSerialization.data(withJSONObject: payload) {
+      try? data.write(to: dir.appendingPathComponent(".hud-action.json"), options: .atomic)
+    }
+    let bin = (notice.pantheon?.isEmpty == false) ? notice.pantheon! : "pantheon"
+    let quoted = "'" + bin.replacingOccurrences(of: "'", with: "'\\''") + "'"
+    let p = Process()
+    p.executableURL = URL(fileURLWithPath: "/bin/sh")
+    p.arguments = ["-lc", "\(quoted) explain --queued >/dev/null 2>&1"]   // login shell: PATH with node, as the user's own terminal has
+    try? p.run()
+    NSApp.terminate(nil)
+  }
+
   @objc func legacyOpen(_ sender: Any?) {
     if !legacyPrompt.isEmpty { NSPasteboard.general.clearContents(); NSPasteboard.general.setString(legacyPrompt, forType: .string) }
     if let b = legacyBundle, let url = NSWorkspace.shared.urlForApplication(withBundleIdentifier: b) {
@@ -260,6 +280,16 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
         constraints += [d.leadingAnchor.constraint(equalTo: pull.trailingAnchor, constant: 14), d.centerYAnchor.constraint(equalTo: pull.centerYAnchor)]
         trailing = d
       }
+      if notice.details?.decision != nil {
+        // A decision can be settled from the banner itself: one click, no terminal, no more reminders.
+        let done = NSButton(title: "Done", target: self, action: #selector(markDone(_:)))
+        done.isBordered = false; done.font = .systemFont(ofSize: 12, weight: .medium); done.contentTintColor = .controlAccentColor
+        done.setAccessibilityLabel("Mark this decision handled")
+        done.translatesAutoresizingMaskIntoConstraints = false
+        root.addSubview(done)
+        constraints += [done.leadingAnchor.constraint(equalTo: trailing.trailingAnchor, constant: 14), done.centerYAnchor.constraint(equalTo: pull.centerYAnchor)]
+        trailing = done
+      }
       let dis = NSButton(title: "Dismiss", target: self, action: #selector(dismiss(_:)))
       dis.isBordered = false; dis.font = .systemFont(ofSize: 12); dis.contentTintColor = .secondaryLabelColor
       dis.translatesAutoresizingMaskIntoConstraints = false