mainflow 0.44.0-alpha.2 → 0.44.0-alpha.4

package/dist/cli.js

@@ -1,18 +1,46 @@
 #!/usr/bin/env node
-import { P as UNTIL_FORMS, X as parseUntil, Y as parseRef, Z as refExample, ct as stampMs, it as untilProblem, n as CLOSED_STATUS } from "./dist-CXrUfRQp.js";
-import { $t as realPath, Bt as notRegisteredMessage, Ft as requireSlug, Gt as resolveHub, Ht as registerHub, It as hubAtRoot, Jt as nodeStorage, Kt as unregisterHub, Lt as hubHoldingFile, Mt as MAINLINE_FILE, O as loadSessions, Pt as TASK_FILE, Q as HubError, S as sessionBriefing, Ut as registeredName, Vt as readRegistry, Wt as registryFile, X as applyOperation, Xt as dataFile, Z as checkHubName, b as untilState, d as migrateHubData, f as migrateHub, ft as nowMinute, g as RETRY_RULES, gt as BLOB_HASH, h as receiverFromEnv, k as readSession, lt as remoteMembers, m as retroReportFromReceiver, nn as DATA_DIR, p as retroReport, qt as userDataDir, rn as WriteError, rt as sectionText, st as memberOfGroup, tt as loadHub, u as groupPlan, ut as unavailableHubs, vt as MAX_CHANGE_PAGE, x as duplicateClaimLines, y as initHub, yt as MAX_FILE_BYTES, zt as listHubs } from "./host-C74j2Qox.js";
-import { t as listProgress } from "./progress-1BfPg2zN.js";
-import { A as hubName, C as readRemote, D as Unreachable, E as ServerError, F as syncPaths, M as SETTINGS_FILE, O as ENV, T as ServerApi, _ as DaemonUnavailable, a as versionGate, b as readDaemon, c as oversizedFiles, d as planAnnounce, f as planFetch, g as DaemonRunning, h as startDaemon, i as requireWritableVersion, j as syncSettings, k as earlierToken, l as fetchDenial, m as toolCallOf, n as hubWriter, o as queuedCount, p as planFlush, r as writtenLines, s as remoteMode, t as CONFIRM_MS, u as hookAnswer, v as callDaemon, w as HubRewritingError, x as silentHint, y as probeDaemon } from "./operation-CUeOFEaf.js";
+import { D as SESSION_ID, P as UNTIL_FORMS, X as parseUntil, Y as parseRef, Z as refExample, ct as stampMs, it as untilProblem, n as CLOSED_STATUS } from "./dist-CXrUfRQp.js";
+import { $t as unregisterHub, At as requestTime, Bt as endedSessionFileIn, C as untilState, Ct as MAX_FILE_BYTES, Ht as sessionFileIn, Jt as readRegistry, Kt as listHubs, Lt as MAINLINE_FILE, M as loadSessions, N as readSession, Nt as hubFormatVersion, Qt as resolveHub, S as initHub, St as MAX_CHANGE_PAGE, T as sessionBriefing, Ut as hubAtRoot, Vt as requireSlug, Wt as hubHoldingFile, Xt as registeredName, Yt as registerHub, Zt as registryFile, _ as retroReportFromReceiver, at as loadHub, bt as BLOB_HASH, d as groupPlan, dt as memberOfGroup, en as userDataDir, et as applyOperation, f as listProgress, g as retroReport, gt as nowMinute, h as relocateSessions, i as hostName, j as unhandledNotices, ln as DATA_DIR, m as migrateHub, mt as unavailableHubs, nt as HubError, on as realPath, p as migrateHubData, pt as remoteMembers, qt as notRegisteredMessage, rn as dataFile, st as sectionText, tn as nodeStorage, tt as checkHubName, u as sessionView, un as WriteError, v as receiverFromEnv, w as duplicateClaimLines, y as RETRY_RULES, zt as TASK_FILE } from "./host-CfBcUcg2.js";
+import { A as hubName, C as readRemote, D as Unreachable, E as ServerError, F as syncPaths, M as SETTINGS_FILE, O as ENV, T as ServerApi, _ as DaemonUnavailable, a as versionGate, b as readDaemon, c as oversizedFiles, d as planAnnounce, f as planFetch, g as DaemonRunning, h as startDaemon, i as requireWritableVersion, j as syncSettings, k as earlierToken, l as fetchDenial, m as toolCallOf, n as hubWriter, o as queuedCount, p as planFlush, r as writtenLines, s as remoteMode, t as CONFIRM_MS, u as hookAnswer, v as callDaemon, w as HubRewritingError, x as silentHint, y as probeDaemon } from "./operation-BmNzQC-L.js";
 import { COMMAND_SPECS, OPTIONS } from "./facts.js";
 import { t as CLI_VERSION } from "./version-Dvv4jwF1.js";
-import { hookFallback, parsePayload, runHook } from "./hooks.js";
+import { claudeCodeSessionId, hookFallback, openLink, parsePayload, runHook } from "./hooks.js";
 import { runGrantCheck } from "./grant-check.js";
 import { exitCodeFor, launchUi, networkProbe, readUiRecord, startUiInBackground, watchHubGone } from "./launch.js";
-import { randomBytes } from "node:crypto";
+import { randomBytes, randomUUID } from "node:crypto";
 import { existsSync, readFileSync, readdirSync, realpathSync, rmSync, statSync } from "node:fs";
 import { basename, isAbsolute, join, relative, resolve, sep } from "node:path";
 import { fileURLToPath } from "node:url";
 import { parseArgs } from "node:util";
+//#region src/session-json.ts
+/** The mainflow session a host's session id stands for: the id itself when such a session exists, else Claude Code's. */
+function sessionIdOf(dirs, raw) {
+	return SESSION_ID.test(raw) && readSession(dirs, raw) ? raw : claudeCodeSessionId(raw);
+}
+/** The sync client's state; null when the hub is not synced, that is no client runs and writes go to the files. */
+async function syncState(dirs) {
+	const probe = await probeDaemon(dirs);
+	if (!probe && !remoteMode(dirs)) return null;
+	const running = probe?.state === "running";
+	return {
+		running,
+		caughtUp: running && probe.status?.caughtUp === true,
+		queued: queuedCount(dirs),
+		notices: unhandledNotices(dirs).length
+	};
+}
+/** What `session show --json` prints for a mainflow or host session id; a missing session gives `session: null`. */
+async function sessionJson(dirs, raw) {
+	const hub = loadHub(dirs, { remotes: false });
+	return sessionView({
+		hub,
+		session: readSession(dirs, sessionIdOf(dirs, raw)),
+		url: `https://${hostName(hub.config.hub)}`,
+		link: openLink(hub.config.hub),
+		sync: await syncState(dirs)
+	});
+}
+//#endregion
 //#region src/migration.ts
 /**
 * What `mainflow migrate` prints of a migration's report, the same whether the hub's files are here or on the sync
@@ -26,6 +54,19 @@ function migrationLines(report, dryRun) {
 		...report.missingDefinitions.length ? [`${report.missingDefinitions.length} open entries still need a definition of done; fill them in the files:`, ...report.missingDefinitions.map((entry) => `  ${entry}`)] : []
 	];
 }
+/**
+* What `mainflow migrate` prints of moving the session files: each session moved to local/sessions/ended/, as one that
+* ended or was handed off, and each moved back, as one under way; one line when every file is where it belongs.
+*/
+function relocationLines(moved, dryRun) {
+	if (moved.ended.length === 0 && moved.resumed.length === 0) return [`sessions: every session file is in place already${dryRun ? " (dry run)" : ""}`];
+	const line = (from, to) => `  ${dryRun ? "would move" : "moved"}   ${DATA_DIR}/${from} → ${DATA_DIR}/${to}`;
+	return [
+		`sessions: ${moved.ended.length} to ${DATA_DIR}/local/sessions/ended/, ${moved.resumed.length} back to ${DATA_DIR}/local/sessions/${dryRun ? " (dry run, nothing moved)" : ""}`,
+		...moved.ended.map((id) => line(sessionFileIn(id), endedSessionFileIn(id))),
+		...moved.resumed.map((id) => line(endedSessionFileIn(id), sessionFileIn(id)))
+	];
+}
 //#endregion
 //#region src/remote/sync.ts
 /**
@@ -699,6 +740,50 @@ async function syncMigrate(dirs, opts) {
 	if (!readDaemon(dirs)) console.log("! mainflow sync is not running for this hub; this copy takes the migration in once it runs");
 	return 0;
 }
+/**
+* Move the session files of a hub the sync server keeps to the directory each belongs in (session.relocate), a batch a
+* request until none is left, straight on the server as `mainflow migrate` converts the data format there. The sync
+* client takes the moves in as it takes any write; one that does not run takes them once it runs. A dry run lists the
+* moves of this machine's copy, which the sync client keeps as the server has it, since the server refuses any
+* operation on a hub whose data format a dry run of the conversion left as it was.
+*/
+async function syncRelocate(dirs, opts) {
+	if (opts.dryRun) {
+		for (const line of relocationLines(relocateSessions(dirs, { dryRun: true }), true)) console.log(line);
+		console.log("  (listed from this machine's copy of the hub)");
+		return 0;
+	}
+	const settings = serverOf(dirs);
+	if (!settings) return 1;
+	const outcome = await onServer(settings, async (api) => {
+		const moved = {
+			ended: [],
+			resumed: []
+		};
+		for (;;) {
+			const request = {
+				protocol: 3,
+				op: "session.relocate",
+				input: { limit: 500 },
+				now: requestTime(),
+				requestId: randomUUID()
+			};
+			const answer = await api.send(request);
+			if (!answer.ok) return { refused: answer.reason === "unknown-operation" ? `${answer.message}; deploy the sync server of this mainflow version (apps/sync-server)` : answer.message };
+			moved.ended.push(...answer.value.ended);
+			moved.resumed.push(...answer.value.resumed);
+			if (!answer.value.more) return moved;
+		}
+	}, "operation route");
+	if (!outcome) return 1;
+	if ("refused" in outcome) {
+		console.error(`✗ the sync server refused moving the session files: ${outcome.refused}`);
+		return 1;
+	}
+	for (const line of relocationLines(outcome, false)) console.log(line);
+	if (outcome.ended.length + outcome.resumed.length > 0 && !readDaemon(dirs)) console.log("! mainflow sync is not running for this hub; this copy takes the moves in once it runs");
+	return 0;
+}
 //#endregion
 //#region src/retro.ts
 const int = (n) => Math.round(n).toLocaleString("en-US");
@@ -1587,8 +1672,10 @@ const RUNS = {
 	},
 	migrate: ({ dirs, opts }) => {
 		const dryRun = opts["dry-run"] ?? false;
-		if (remoteMode(dirs)) return syncMigrate(dirs, { dryRun });
-		for (const line of migrationLines(migrateHub(dirs, { dryRun }), dryRun)) console.log(line);
+		if (remoteMode(dirs)) return syncMigrate(dirs, { dryRun }).then((code) => code === 0 ? syncRelocate(dirs, { dryRun }) : code);
+		if (hubFormatVersion(nodeStorage(dirs)) === 3) console.log(`format 3: the data format is current already`);
+		else for (const line of migrationLines(migrateHub(dirs, { dryRun }), dryRun)) console.log(line);
+		for (const line of relocationLines(relocateSessions(dirs, { dryRun }), dryRun)) console.log(line);
 		return 0;
 	},
 	ui: ({ dirs, opts }) => {
@@ -1604,8 +1691,9 @@ const RUNS = {
 		});
 		return 0;
 	},
-	"session show": ({ dirs, args, opts }) => {
+	"session show": async ({ dirs, args, opts }) => {
 		const id = sessionOf(opts, args[0]);
+		if (opts.json) return done(JSON.stringify(await sessionJson(dirs, id)));
 		const session = readSession(dirs, id);
 		if (!session) throw new WriteError(`session ${id} not found; start one with "mainflow session start"`);
 		return done(sessionBriefing(dirs, session, { cli: CLI }));

package/dist/facts.d.ts

@@ -97,8 +97,8 @@ export declare const COMMAND_SPECS: {
     readonly needsHub: true;
   };
   readonly 'session show': {
-    readonly usage: 'session show [session]';
-    readonly summary: 'Print the briefing a hook would give this session';
+    readonly usage: 'session show [session] [--json]';
+    readonly summary: 'Print the briefing a hook would give this session. --json prints one object for a host to read: {"hub","session","focus","tasks","mainlines","sync"}; session is null, and the exit code 0, when the session does not exist. The session is a mainflow session id or the host\'s own (a Claude Code UUID)';
     readonly args: 0;
     readonly optionalArgs: 1;
     readonly needsHub: true;
@@ -741,6 +741,7 @@ export declare const LAYOUT: {
   readonly group: '.mainflow/groups/w{NNN}-{slug}.md';
   readonly ops: '.mainflow/ops/{YYYY-MM}.log';
   readonly sessions: '.mainflow/local/sessions/{sessionId}.yaml';
+  readonly endedSessions: '.mainflow/local/sessions/ended/{sessionId}.yaml';
 };
 /** Statuses that close each kind of document; the CLI stamps closedAt when a document enters one. */
 export declare const CLOSED_STATUSES: {

package/dist/facts.js

@@ -87,8 +87,8 @@ const COMMAND_SPECS = {
 		needsHub: true
 	},
 	"session show": {
-		usage: "session show [session]",
-		summary: "Print the briefing a hook would give this session",
+		usage: "session show [session] [--json]",
+		summary: "Print the briefing a hook would give this session. --json prints one object for a host to read: {\"hub\",\"session\",\"focus\",\"tasks\",\"mainlines\",\"sync\"}; session is null, and the exit code 0, when the session does not exist. The session is a mainflow session id or the host's own (a Claude Code UUID)",
 		args: 0,
 		optionalArgs: 1,
 		needsHub: true
@@ -646,7 +646,8 @@ const LAYOUT = {
 	finding: ".mainflow/findings/f{NNN}-{slug}.md",
 	group: ".mainflow/groups/w{NNN}-{slug}.md",
 	ops: ".mainflow/ops/{YYYY-MM}.log",
-	sessions: ".mainflow/local/sessions/{sessionId}.yaml"
+	sessions: ".mainflow/local/sessions/{sessionId}.yaml",
+	endedSessions: ".mainflow/local/sessions/ended/{sessionId}.yaml"
 };
 /** Statuses that close each kind of document; the CLI stamps closedAt when a document enters one. */
 const CLOSED_STATUSES = CLOSED_STATUS;

package/dist/grant-check.d.ts

@@ -1,5 +1,5 @@
-import { o as HubDirs } from "./index-jq7lN8V8.js";
-import { t as HubWrite } from "./operation-BroV98VB.js";
+import { o as HubDirs } from "./index-lsW80LDU.js";
+import { t as HubWrite } from "./operation-BTQm13OQ.js";
 //#region src/grant-check.d.ts
 /** What grant check prints. `grants` lists every grant used when more than one was, as for an install of several units. */
 export interface GrantVerdict {

package/dist/grant-check.js

@@ -1,6 +1,6 @@
 import { D as SESSION_ID, I as configSchema, ft as describeRequest, gt as hasControl, tt as repoPaths } from "./dist-CXrUfRQp.js";
-import { $t as realPath, Gt as resolveHub, Jt as nodeStorage, M as matchGrants, Ot as formatMismatch, Yt as currentBranch, Zt as gitCheckout, j as grantScope, k as readSession, kt as hubFormatVersion, mt as readYaml } from "./host-C74j2Qox.js";
-import { n as hubWriter, r as writtenLines } from "./operation-CUeOFEaf.js";
+import { F as grantScope, I as matchGrants, Mt as formatMismatch, N as readSession, Nt as hubFormatVersion, Qt as resolveHub, in as gitCheckout, nn as currentBranch, on as realPath, tn as nodeStorage, vt as readYaml } from "./host-CfBcUcg2.js";
+import { n as hubWriter, r as writtenLines } from "./operation-BmNzQC-L.js";
 import { OWNER_REPO, githubOrigin, quote, readManifest, resolveFixed, scanCommand, scopedCwd } from "./grant-commands.js";
 import { claudeCodeSessionId, parsePayload } from "./hooks.js";
 import { readFileSync } from "node:fs";

package/dist/hooks.d.ts

@@ -1,5 +1,5 @@
-import { o as HubDirs } from "./index-jq7lN8V8.js";
-import { t as HubWrite } from "./operation-BroV98VB.js";
+import { o as HubDirs } from "./index-lsW80LDU.js";
+import { t as HubWrite } from "./operation-BTQm13OQ.js";
 //#region src/hooks.d.ts
 /** Fields Claude Code sends on stdin to every command hook, plus the ones specific to the events handled here. */
 export interface ClaudeCodePayload {

package/dist/hooks.js

@@ -1,6 +1,6 @@
 import { I as configSchema, Y as parseRef, ft as describeRequest, rt as taskSchema, tt as repoPaths } from "./dist-CXrUfRQp.js";
-import { $ as isOpenMainline, $t as realPath, Bt as notRegisteredMessage, C as turnReminder, F as headerLine, Gt as resolveHub, I as mayDecorate, Jt as nodeStorage, Lt as hubHoldingFile, M as matchGrants, N as decorateReply, Nt as SESSIONS_DIR, O as loadSessions, Ot as formatMismatch, P as endsWithMarker, Q as HubError, Qt as hubPath, Rt as inRepositoryHubAt, S as sessionBriefing, Xt as dataFile, Yt as currentBranch, dt as taskFile, en as worktreesOf, i as hostName, j as grantScope, k as readSession, kt as hubFormatVersion, mt as readYaml, nn as DATA_DIR, nt as loadMainlines, pt as readFrontMatter, tt as loadHub } from "./host-C74j2Qox.js";
-import { n as hubWriter, r as writtenLines } from "./operation-CUeOFEaf.js";
+import { B as mayDecorate, E as turnReminder, F as grantScope, Gt as inRepositoryHubAt, I as matchGrants, It as ENDED_SESSIONS_DIR, L as decorateReply, M as loadSessions, Mt as formatMismatch, N as readSession, Nt as hubFormatVersion, Qt as resolveHub, R as endsWithMarker, Rt as SESSIONS_DIR, T as sessionBriefing, Wt as hubHoldingFile, _t as readFrontMatter, an as hubPath, at as loadHub, ht as taskFile, i as hostName, ln as DATA_DIR, nn as currentBranch, nt as HubError, on as realPath, ot as loadMainlines, qt as notRegisteredMessage, rn as dataFile, rt as isOpenMainline, sn as worktreesOf, tn as nodeStorage, vt as readYaml, z as headerLine } from "./host-CfBcUcg2.js";
+import { n as hubWriter, r as writtenLines } from "./operation-BmNzQC-L.js";
 import { SCENARIO_LINES, SCENARIO_SKIP_KINDS } from "./facts.js";
 import { resolveFixed, scanCommand, scopedCwd } from "./grant-commands.js";
 import { createHash } from "node:crypto";
@@ -102,13 +102,17 @@ const settleOnEnd = async (_root, { payload, write }) => {
 };
 /** How a hub's interface is linked from a reply: through its /open route, which shows the address in the app. */
 const openLink = (hub) => (path) => `https://${hostName(hub)}/open${path}`;
+/** Whether a host's display mod is loaded, which it says by setting MAINFLOW_DISPLAY_MOD; it then shows the current action itself. */
+const displayModOn = (env = process.env) => !!env.MAINFLOW_DISPLAY_MOD;
 /**
 * MessageDisplay: link the references in the lines about to be shown and expand the trailing header line into
 * the mainline › task › action its ids name, titles included, whatever state that action is in now. Display
 * only, so the model keeps reading what it wrote. Text with nothing to change
-* returns before the hub is loaded, because Claude Code holds every batch until the hook answers.
+* returns before the hub is loaded, because Claude Code holds every batch until the hook answers. With a display
+* mod loaded it returns null at once.
 */
-const displayReply = (dirs, { payload }) => {
+const displayReply = (dirs, { payload, env }) => {
+	if (displayModOn(env)) return null;
 	const text = payload.delta;
 	if (!text || !mayDecorate(text)) return null;
 	const hub = loadHub(dirs, { remotes: false });
@@ -183,18 +187,22 @@ function turnTouchedMainflow(transcript, cli, env) {
 * an action first when the queue is empty, the reply talks about an open mainline and the turn ran a mainflow
 * command or wrote a file of the hub, since the header only names the session's own action in progress. A reply
 * that only mentions a mainline, in a draft or a question, asks for nothing. Null when there is nothing to ask for.
+* With a display mod loaded the mod shows the current action, so no header is asked for, but an empty queue
+* still is: the action is what grants and the hub's tracking hang on.
 */
 function missingHeaderRequest(dirs, { payload, cli, env }) {
 	if (!payload.session_id || payload.stop_hook_active) return null;
+	const displayMod = displayModOn(env);
 	const message = payload.last_assistant_message ?? "";
-	if (endsWithMarker(message)) return null;
+	if (!displayMod && endsWithMarker(message)) return null;
 	const session = readSession(dirs, claudeCodeSessionId(payload.session_id));
 	const header = headerLine(session);
-	if (header) return `[mainflow] 這一輪最後一則回覆的最後一行不是標頭。請只回一則內容為「${header}」的訊息，不加其他文字。`;
+	if (header) return displayMod ? null : `[mainflow] 這一輪最後一則回覆的最後一行不是標頭。請只回一則內容為「${header}」的訊息，不加其他文字。`;
 	if (session && session.actions.length > 0) return null;
 	const mainlines = openMainlinesIn(dirs, message);
 	if (mainlines.length === 0 || !turnTouchedMainflow(payload.transcript_path, cli, env)) return null;
-	return `[mainflow] 這一輪的回覆提到 ${mainlines.join("、")}，也執行了 mainflow 指令或寫入 hub 的資料目錄，但這場會話沒有行動，所以回覆結尾沒有標頭。這一輪若在推進它，先用 ${cli} action add "<做法>" --serves <m/t#c>（還沒拆任務時用解決條件 <m#r>）列出行動並用 ${cli} action set <a編號> --status doing 標為進行中，或用 ${cli} session handoff <會話> 接手上一場沒做完的行動；再只回一則內容為「▸ <m/t> · <a編號>」的訊息，不加其他文字。只是提到、沒有推進時，不必處理。`;
+	const list = `先用 ${cli} action add "<做法>" --serves <m/t#c>（還沒拆任務時用解決條件 <m#r>）列出行動並用 ${cli} action set <a編號> --status doing 標為進行中，或用 ${cli} session handoff <會話> 接手上一場沒做完的行動`;
+	return displayMod ? `[mainflow] 這一輪的回覆提到 ${mainlines.join("、")}，也執行了 mainflow 指令或寫入 hub 的資料目錄，但這場會話沒有行動。這一輪若在推進它，${list}。只是提到、沒有推進時，不必處理。` : `[mainflow] 這一輪的回覆提到 ${mainlines.join("、")}，也執行了 mainflow 指令或寫入 hub 的資料目錄，但這場會話沒有行動，所以回覆結尾沒有標頭。這一輪若在推進它，${list}；再只回一則內容為「▸ <m/t> · <a編號>」的訊息，不加其他文字。只是提到、沒有推進時，不必處理。`;
 }
 /**
 * Stop: ask for what the turn's header needs, then settle the session. Only the model knows which message closes a
@@ -231,12 +239,13 @@ const CLAUDE_CODE_EVENTS = {
 			envNote: envFile ? "已設定環境變數 MAINFLOW_SESSION，指令不必再帶 --session" : `執行指令時帶 --session ${id}`
 		});
 	},
-	"user-prompt-submit": async (dirs, { payload, cli, write }) => {
+	"user-prompt-submit": async (dirs, { payload, cli, write, env }) => {
 		if (!payload.session_id) return null;
 		const session = await recordSession(write, dirs, payload, claudeCodeSessionId(payload.session_id), false);
 		const saved = [];
 		const text = turnReminder(dirs, session, {
 			cli,
+			displayMod: displayModOn(env),
 			saveDigest: (digest) => saved.push(write("session.reminder", {
 				id: session.id,
 				digest
@@ -454,7 +463,7 @@ function inSessionScope(file, session) {
 	const mainlines = `${DATA_DIR}/mainlines/`;
 	const sessions = `${DATA_DIR}/${SESSIONS_DIR}/`;
 	if (file.startsWith(mainlines)) return [...servedMainlines(session)].some((m) => file.startsWith(`${mainlines}${m}-`));
-	if (file.startsWith(sessions)) return file === `${sessions}${session.id}.yaml`;
+	if (file.startsWith(sessions)) return file === `${sessions}${session.id}.yaml` || file === `.mainflow/${ENDED_SESSIONS_DIR}/${session.id}.yaml`;
 	return true;
 }
 /**