agent-lyceum 0.13.1 → 0.15.0

package/dist/status.js

@@ -2,7 +2,7 @@ import fs from "node:fs";
 import path from "node:path";
 import { askReplyPath, readAskReply } from "./ask-reply.js";
 import { RESULT_FILE } from "./dispatcher.js";
-import { bindRunProject, loadRunState, outcomeOf } from "./run-store.js";
+import { bindRunProject, loadRunState, outcomeOf, runLabel } from "./run-store.js";
 import { briefOf, digestOf } from "./format.js";
 import { listUnread } from "./mailbox.js";
 import { tidyAdvice } from "./memory-tidy.js";
@@ -33,6 +33,10 @@ export function latestRun(project) {
 export function latestUnfinishedRun(project) {
     return listRuns(project, Infinity).find((r) => r.state.end_reason !== "done" && (r.state.end_reason || !runIsAlive(r.state, project)));
 }
+/** Runs a follow-up text can reopen: the finished ones (end_reason "done"). Newest first. */
+export function reopenCandidates(project) {
+    return listRuns(project, Infinity).filter((r) => r.state.end_reason === "done");
+}
 export function listRuns(project, limit) {
     const root = project.paths.runs;
     if (!fs.existsSync(root))
@@ -182,6 +186,7 @@ export function buildRunReport(run, project, opts = {}) {
     }
     return {
         run_id: s.run_id,
+        name: s.name,
         dir: run.dir,
         state: s.end_reason === "waiting" ? "waiting" : s.end_reason ? "ended" : live ? "running" : "interrupted",
         live,
@@ -279,7 +284,7 @@ function summaryBlock(run, now, c) {
     const s = run;
     const live = s.live;
     const lines = [
-        `${c.bold("執行 " + s.run_id)}  [${stateColor(c, reportLabel(s))}]  第 ${s.rounds}/${s.max_rounds} 輪`,
+        `${c.bold("執行 " + runLabel(s))}  [${stateColor(c, reportLabel(s))}]  第 ${s.rounds}/${s.max_rounds} 輪`,
         `${L("任務：")}${taskText(s)}`,
     ];
     const steps = stepsLine(s.steps, c, s.end_reason === "done");
@@ -317,7 +322,7 @@ function summaryBlock(run, now, c) {
 /** What a run is doing / did, one line per wake. */
 function describeRun(s, now, c, limit = Infinity) {
     const lines = [
-        `${c.bold("執行 " + s.run_id)}  [${stateColor(c, reportLabel(s))}]  輪次 ${s.rounds}/${s.max_rounds}  輸出 tokens ${tokens(s.output_tokens)}`,
+        `${c.bold("執行 " + runLabel(s))}  [${stateColor(c, reportLabel(s))}]  輪次 ${s.rounds}/${s.max_rounds}  輸出 tokens ${tokens(s.output_tokens)}`,
         `  任務：${taskText(s)}`,
     ];
     const steps = stepsLine(s.steps, c);
@@ -383,10 +388,12 @@ export function formatTaskListReport(report, color = false) {
     const head = `${c.bold("專案：")}${report.project.name}  ${c.dim(`（共 ${runs.length} 個任務）`)}`;
     if (!runs.length)
         return `${head}\n\n無執行紀錄。`;
-    const header = ["ID", "狀態", "輪次", "目前步驟", "任務"];
+    const named = runs.some((s) => s.name);
+    const header = [...(named ? ["名稱"] : []), "ID", "狀態", "輪次", "目前步驟", "任務"];
     const rows = [header];
     for (const s of runs) {
         rows.push([
+            ...(named ? [s.name ?? ""] : []),
             s.run_id,
             reportLabel(s),
             `${s.rounds}/${s.max_rounds}`,
@@ -398,7 +405,7 @@ export function formatTaskListReport(report, color = false) {
     const line = (r, ri) => r
         .map((t, i) => {
         const p = i === r.length - 1 ? t : padCols(t, w[i] ?? 0);
-        return ri === 0 ? c.bold(p) : i === 1 ? stateColor(c, t) + " ".repeat(Math.max(0, (w[i] ?? 0) - cols(t))) : p;
+        return ri === 0 ? c.bold(p) : i === (named ? 2 : 1) ? stateColor(c, t) + " ".repeat(Math.max(0, (w[i] ?? 0) - cols(t))) : p;
     })
         .join("  ")
         .trimEnd();

package/dist/validate.js

@@ -100,8 +100,8 @@ export function validateProject(project) {
     const enforcement = Object.values(project.agents).map((a) => enforcementFor(project, a));
     if (project.dispatcher.strict) {
         for (const e of enforcement) {
-            for (const k of ["memory", "agentMd", "otherContext"]) {
-                if (e[k] !== "os")
+            for (const k of ["memory", "agentMd", "otherContext", "shared"]) {
+                if (e[k] !== "os" && !(k === "shared" && e[k] === "n/a"))
                     err(`strict: agent "${e.agent}" ${k} protection is "${e[k]}", not OS-enforced.`);
             }
         }
@@ -109,10 +109,10 @@ export function validateProject(project) {
     return { issues, enforcement, ok: !issues.some((i) => i.level === "error") };
 }
 export function formatEnforcement(list) {
-    const header = ["agent", "runtime", "memory", "AGENT.md", "others' ctx", "repo CLAUDE/AGENTS", "owns"];
+    const header = ["agent", "runtime", "memory", "AGENT.md", "others' ctx", "handoff", "repo CLAUDE/AGENTS", "owns"];
     const rows = [header];
     for (const e of list)
-        rows.push([e.agent, e.runtime, e.memory, e.agentMd, e.otherContext, e.repoInstructions, e.owns]);
+        rows.push([e.agent, e.runtime, e.memory, e.agentMd, e.otherContext, e.shared, e.repoInstructions, e.owns]);
     const w = header.map((_, i) => Math.max(...rows.map((r) => (r[i] ?? "").length)));
     const lines = rows.map((r) => r.map((c, i) => c.padEnd(w[i] ?? 0)).join("  ").trimEnd());
     lines.splice(1, 0, w.map((n) => "-".repeat(n)).join("  "));

package/dist/worktree.d.ts

@@ -162,6 +162,16 @@ export interface ResultBranch {
 }
 /** Commit the lead's checkout on its branch (once, at the end of a run) and write what changed as a patch. Never touches your repo's working tree. */
 export declare function finishLeadBranch(ws: AgentWorkspace, message: string, patchFile: string): ResultBranch;
+/**
+ * A reopened run whose lead branch was already merged into your HEAD starts its next segment on a fresh branch cut from HEAD,
+ * so the merged work is not offered again. Only when nothing would be lost: the branch's last committed head (`resultHead`) is
+ * in HEAD, the worktree is still at that head, and it holds no uncommitted work and nothing whose state is unknown.
+ * Otherwise the worktree and branch are returned unchanged. Your working tree, index and HEAD are never touched.
+ */
+export declare function recutLeadWorkspace(project: ResolvedProject, runId: string, agent: string, ws: AgentWorkspace, resultHead: string | undefined): {
+    ws: AgentWorkspace;
+    recut: boolean;
+};
 /** Names of the agents that have a worktree for this run. */
 export declare function listWorkspaceAgents(project: ResolvedProject, runId: string): string[];
 /** The snapshot refs (`refs/agent-lyceum/<run>/...`) of a run. */

package/dist/worktree.js

@@ -686,6 +686,31 @@ export function finishLeadBranch(ws, message, patchFile) {
         fs.writeFileSync(patchFile, agentGit(ws, ["diff", "--binary", "--full-index", ws.base, head]) + "\n");
     return { branch: ws.branch, head, base: ws.base, files: files.length, patch: files.length ? patchFile : undefined };
 }
+/**
+ * A reopened run whose lead branch was already merged into your HEAD starts its next segment on a fresh branch cut from HEAD,
+ * so the merged work is not offered again. Only when nothing would be lost: the branch's last committed head (`resultHead`) is
+ * in HEAD, the worktree is still at that head, and it holds no uncommitted work and nothing whose state is unknown.
+ * Otherwise the worktree and branch are returned unchanged. Your working tree, index and HEAD are never touched.
+ */
+export function recutLeadWorkspace(project, runId, agent, ws, resultHead) {
+    const keep = { ws, recut: false };
+    if (!resultHead)
+        return keep;
+    if (tryGit(toplevel(project.dir), ["merge-base", "--is-ancestor", resultHead, "HEAD"]) === undefined)
+        return keep;
+    const work = inspectWorkspace(project, runId, agent, ws);
+    if (!work || work.unknown || work.dirty.length)
+        return keep;
+    try {
+        if (agentGit(ws, ["rev-parse", "HEAD"]) !== resultHead)
+            return keep;
+    }
+    catch {
+        return keep;
+    }
+    removeAgentWorkspace(project, runId, agent);
+    return { ws: prepareAgentWorkspace(project, runId, agent, snapshotHead(project, runId)), recut: true };
+}
 /** Names of the agents that have a worktree for this run. */
 export function listWorkspaceAgents(project, runId) {
     const dir = path.join(project.paths.root, "worktrees", runId);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-lyceum",
-  "version": "0.13.1",
+  "version": "0.15.0",
   "description": "Config + dispatcher for teams of Claude Code / Codex agents with scoped context and file-based mailboxes",
   "keywords": [
     "ai",