@agentproto/apps 0.20.3 → 0.21.1

package/session-steward/.agentproto/workflows/session-steward/entry.mjs

@@ -57,6 +57,11 @@ import {
 
 const DEFAULT_IDLE_MINUTES = 30
 const DEFAULT_MIN_CONFIDENCE = 0.8
+/** Recurring (scheduled) runs only: a keepAlive session must have been idle
+ *  this long before it may be asked, so a session its owner meant to pick up
+ *  tomorrow is not closed overnight. 0 turns the recurring keepAlive ask off.
+ *  An on-demand run (`recurring: false`) has no such delay. */
+const DEFAULT_KEEPALIVE_ASK_AFTER_MINUTES = 1440
 /** Terminal sessions older than this (hours since they ended) are not listed
  *  as relabel candidates. */
 const DEFAULT_RELABEL_WINDOW_HOURS = 24
@@ -118,6 +123,8 @@ export function resolveSettings(input, modelRoles) {
     jevModel: typeof i.jevModel === "string" && i.jevModel.trim() ? i.jevModel.trim() : DEFAULT_JEV_MODEL,
     maxJudged: Math.floor(num(i.maxJudged, DEFAULT_MAX_JUDGED)),
     askSessions: i.askSessions === true,
+    recurring: i.recurring === true,
+    keepAliveAskAfterMinutes: num(i.keepAliveAskAfterMinutes, DEFAULT_KEEPALIVE_ASK_AFTER_MINUTES, { min: 0 }),
     callerSessionId: typeof i.callerSessionId === "string" && i.callerSessionId ? i.callerSessionId : null,
     callerOrigin: typeof i.callerOrigin === "string" && i.callerOrigin ? i.callerOrigin : null,
     appId: typeof i.appId === "string" ? i.appId.trim() : DEFAULT_APP_ID,
@@ -427,8 +434,33 @@ export function collectVerdicts(evidenceResult, judgeQueue, jevResult, jevQueue,
 
 // ── ask (opt-in) ─────────────────────────────────────────────────────────
 
-/** Sessions to ask directly: judged below `minConfidence`, and idle, not
- *  keepAlive, not awaitingInput — only when `askSessions`. */
+/** Nothing to lose in the session's worktree: it is merged (the plan's signal
+ *  or the PR state), or it is a linked worktree with no uncommitted changes
+ *  and no commits beyond the base. No worktree info at all is unknown, not
+ *  clean — a session in a plain checkout stays out. */
+export function worktreeHasNothingToLose(evidence) {
+  if (evidence?.signals?.worktreeMerged === true) return true
+  const wt = evidence?.worktree
+  if (!wt) return false
+  if (wt.pr?.state === "merged") return true
+  return wt.dirty === false && wt.ahead === 0
+}
+
+/** keepAlive is the restart-relight flag; closing is a separate, active
+ *  decision. A keepAlive session whose worktree holds nothing to lose may be
+ *  asked. An on-demand run (a human asked for it) applies no idle delay beyond
+ *  the plan's own `idleMinutes`. A `recurring` run closes things nobody asked
+ *  about, so it also waits `keepAliveAskAfterMinutes` of idleness (0 = never). */
+export function keepAliveAskEligible(evidence, settings) {
+  if (evidence?.keepAlive !== true || !worktreeHasNothingToLose(evidence)) return false
+  if (settings.recurring !== true) return true
+  const after = settings.keepAliveAskAfterMinutes
+  return after > 0 && typeof evidence.idleMinutes === "number" && evidence.idleMinutes >= after
+}
+
+/** Sessions to ask directly: judged below `minConfidence`, not awaitingInput
+ *  or busy, and either not keepAlive or a keepAlive passing
+ *  {@link keepAliveAskEligible} — only when `askSessions`. */
 export function buildAskQueue(verdicts, settings) {
   if (!settings?.askSessions) return []
   return (verdicts ?? [])
@@ -436,7 +468,7 @@ export function buildAskQueue(verdicts, settings) {
       r =>
         r.evidence &&
         r.confidence < settings.minConfidence &&
-        r.evidence.keepAlive !== true &&
+        (r.evidence.keepAlive !== true || keepAliveAskEligible(r.evidence, settings)) &&
         r.evidence.awaitingInput !== true &&
         r.evidence.busy !== true,
     )
@@ -995,12 +1027,14 @@ export default {
     judgeModel: { type: "string", description: `Model for the agent judge. Default: the \`${ROLE_JUDGE_SESSION}\` model role (repo agentproto.json \`models\` > daemon config \`models\` > built-in).` },
     maxJudged: { type: "number", description: `Most \`judge\` sessions judged per run, most RAM first. Default ${DEFAULT_MAX_JUDGED}.`, default: DEFAULT_MAX_JUDGED },
     askSessions: { type: "boolean", description: "Ask low-confidence idle sessions directly whether they're done. Default false — it spends a turn in someone else's conversation.", default: false },
+    recurring: { type: "boolean", description: "Set by scheduled runs (the hourly routine). A recurring run closes sessions nobody asked about, so a keepAlive session must also have been idle `keepAliveAskAfterMinutes`. Default false = an on-demand run, which applies no such delay.", default: false },
+    keepAliveAskAfterMinutes: { type: "number", description: `With \`askSessions\`, for \`recurring\` runs only: a keepAlive session whose worktree is merged or clean (nothing uncommitted, nothing ahead of base) is asked only once idle this many minutes; 0 disables the recurring keepAlive ask. On-demand runs ignore it. keepAlive only re-lights a session after a daemon restart; it does not stop a declared DONE from closing it. Default ${DEFAULT_KEEPALIVE_ASK_AFTER_MINUTES}.`, default: DEFAULT_KEEPALIVE_ASK_AFTER_MINUTES },
     callerSessionId: { type: "string", description: "The calling session's id — never a candidate. The CLI passes AGENTPROTO_SESSION_ID." },
     callerOrigin: { type: "string", description: "The calling session's origin (`cron:<jobId>`) — an older run of the SAME cron job is never judged as user work." },
     appId: { type: "string", description: `Installed app whose \`app_state\` ledger holds the verdict memory. Default ${DEFAULT_APP_ID}.` },
     stableVerdictPasses: { type: "number", description: `Consecutive passes on an unchanged evidence fingerprint before the judge cache stops re-judging. Default ${DEFAULT_STABLE_VERDICT_PASSES}.`, default: DEFAULT_STABLE_VERDICT_PASSES },
     userOrigins: { type: "array", description: `Origins that are ALWAYS flag-only, never closed (a human is in the loop). Trailing \`*\` is a prefix wildcard. Default ${JSON.stringify(DEFAULT_USER_ORIGINS)}.`, items: { type: "string" }, default: DEFAULT_USER_ORIGINS },
-    closableOrigins: { type: "array", description: `Origins that may be closed under the current rules (cron jobs, gates). Trailing \`*\` is a prefix wildcard. Executors (a session with a parentSessionId) are closable regardless. Default ${JSON.stringify(DEFAULT_CLOSABLE_ORIGINS)}.`, items: { type: "string" }, default: DEFAULT_CLOSABLE_ORIGINS },
+    closableOrigins: { type: "array", description: `Origins that may be closed under the current rules (cron jobs, gates, workflow steps, reviewer lanes). Trailing \`*\` is a prefix wildcard. Executors (a session with a parentSessionId) are closable regardless. Default ${JSON.stringify(DEFAULT_CLOSABLE_ORIGINS)}.`, items: { type: "string" }, default: DEFAULT_CLOSABLE_ORIGINS },
   },
   outputs: {},
   steps: [
@@ -1038,7 +1072,10 @@ export default {
           id: "autoApplyOne",
           kind: "tool",
           tool: "session_wrapup_apply",
-          inputs: { sessionIds: ["$item.sessionId"], verdict: "$item.verdict", note: "$item.note" },
+          // `wait: true` — past its 25 s default `waitMs` the tool returns a
+          // bare `{ jobId, status: "running" }` and the report would show no
+          // outcome for a session that did get closed.
+          inputs: { sessionIds: ["$item.sessionId"], verdict: "$item.verdict", note: "$item.note", wait: true },
         },
       ],
     },
@@ -1229,7 +1266,8 @@ export default {
           id: "judgedApplyOne",
           kind: "tool",
           tool: "session_wrapup_apply",
-          inputs: { sessionIds: ["$item.sessionId"], verdict: "$item.verdict", judgedBy: "$item.judgedBy", note: "$item.note" },
+          // `wait: true`: same as autoApplyOne.
+          inputs: { sessionIds: ["$item.sessionId"], verdict: "$item.verdict", judgedBy: "$item.judgedBy", note: "$item.note", wait: true },
         },
       ],
     },

package/session-steward/.agentproto/workflows/session-steward/origin-policy.mjs

@@ -12,7 +12,7 @@ export const DEFAULT_USER_ORIGINS = ["chat-starter", "vscode"]
 /** Origins the steward MAY close under the current rules. `cron:*` matches
  *  every cron-spawned job (`origin: "cron:<jobId>"`); `gate` matches
  *  supervision-gate sessions. */
-export const DEFAULT_CLOSABLE_ORIGINS = ["cron:*", "gate"]
+export const DEFAULT_CLOSABLE_ORIGINS = ["cron:*", "gate", "workflow", "review"]
 
 /** The reason shown (and recorded) when a would-be close is bounded by origin. */
 export const USER_ORIGIN_REASON = "flag (origine utilisateur)"
@@ -46,7 +46,7 @@ export function resolveOriginPolicy(policy) {
 /** The origin class of a candidate:
  *  - `"user"` — human-launched: a `userOrigins` match, OR a root with no
  *    origin and no parent. FLAG ONLY, never close.
- *  - `"closable"` — a `closableOrigins` match (cron:*, gate) or an executor
+ *  - `"closable"` — a `closableOrigins` match (cron:*, gate, workflow, review) or an executor
  *    (has a `parentSessionId`). Close allowed under the current rules.
  *  `userOrigins` wins over both `closableOrigins` and the executor rule, so a
  *  `vscode` executor is still user-origin. An unrecognized root origin is

package/session-steward/README.md

@@ -33,10 +33,18 @@ loader path can carry.
      judge session is released (killed + archived) when its item settles.
    Verdicts: `done|abandoned|blocked|needs-input|active`. A judge error never
    closes anything.
-5. `ask` (only with `askSessions`) — low-confidence, idle, non-keepAlive,
-   not-awaiting-input sessions get ONE prompt asking them to reply
+5. `ask` (only with `askSessions`) — low-confidence, idle, not-awaiting-input
+   sessions get ONE prompt asking them to reply
    `STEWARD: DONE …` / `STEWARD: NOT-DONE …`; a ~3 min bounded wait; the
-   answer becomes a `declared` verdict.
+   answer becomes a `declared` verdict. `keepAlive` only re-lights a session
+   after a daemon restart, so it does not exempt one from the ask: a keepAlive
+   session whose worktree is merged or clean (nothing uncommitted, nothing
+   ahead of base; no worktree info counts as not clean) is asked too. Closing
+   is an active act: an on-demand run (`agentproto steward --ask-sessions`)
+   adds no idle delay beyond `--idle`. Only a scheduled run (`recurring: true`,
+   as the hourly routine sets) waits `keepAliveAskAfterMinutes` (default 1440,
+   24 h; 0 turns it off), so a session you meant to resume is not closed
+   overnight.
 6. `judgedApply` (only with `apply`) — confident `done`/`abandoned` close
    (resumable, with a recorded outcome); confident `blocked`/`needs-input`
    only flag. Everything else is left alone and reported.
@@ -53,7 +61,7 @@ the `userOrigins` / `closableOrigins` inputs:
   `origin` and no `parentSessionId` (a human launched it). A would-be close —
   even a rule-certain `close`/`stuck`, even a confident `done` — is recorded
   as a `needs-input` flag with reason `flag (origine utilisateur)`.
-- **Close allowed:** `cron:*`, `gate`, and executors (a session with a
+- **Close allowed:** `cron:*`, `gate`, `workflow` (step sessions), `review` (reviewer lanes), and executors (a session with a
   `parentSessionId`).
 
 A trailing `*` in either list is a prefix wildcard. The report carries the

package/session-steward/routines/session-steward-hourly/ROUTINE.md

@@ -21,12 +21,15 @@ target:
   inputs:
     apply: true
     askSessions: false
+    # Scheduled run: if askSessions is ever turned on here, a keepAlive session
+    # is asked only after keepAliveAskAfterMinutes idle (default 1440, 0 = never).
+    recurring: true
     # Origin policy (the committed default): never close a human's session.
     # `chat-starter`/`vscode` (and any root with no origin and no parent) are
-    # FLAG-ONLY; `cron:*` jobs, `gate` sessions, and executors (a session with
+    # FLAG-ONLY; `cron:*` jobs, `gate`, `workflow` and `review` sessions, and executors (a session with
     # a parentSessionId) stay closeable. A trailing `*` is a prefix wildcard.
     userOrigins: ["chat-starter", "vscode"]
-    closableOrigins: ["cron:*", "gate"]
+    closableOrigins: ["cron:*", "gate", "workflow", "review"]
 retry:
   max_attempts: 1
   backoff: fixed
@@ -68,7 +71,7 @@ The steward bounds every action by the candidate's `origin` (pure
   `origin` and no `parentSessionId` (a human launched it). A would-be close —
   even a rule-certain `close`/`stuck`, even a confident `done` — becomes a
   `needs-input` flag with reason `flag (origine utilisateur)`.
-- **Close allowed:** `cron:*` (any cron job), `gate`, and executors (a
+- **Close allowed:** `cron:*` (any cron job), `gate`, `workflow` (workflow-step sessions), `review` (reviewer lanes), and executors (a
   session with a `parentSessionId`).
 
 Both lists are workflow inputs (`userOrigins`, `closableOrigins`); the values