mainflow 0.44.0-alpha.3 → 0.44.0-alpha.4

package/dist/cli.js

@@ -1,13 +1,13 @@
 #!/usr/bin/env node
 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 { $ as applyOperation, $t as dataFile, A as unhandledNotices, Bt as hubHoldingFile, C as duplicateClaimLines, Ft as MAINLINE_FILE, Gt as registerHub, Ht as listHubs, Jt as resolveHub, Kt as registeredName, Lt as TASK_FILE, M as readSession, Rt as requireSlug, S as untilState, St as MAX_FILE_BYTES, Ut as notRegisteredMessage, Wt as readRegistry, Xt as userDataDir, Yt as unregisterHub, Zt as nodeStorage, _ as receiverFromEnv, an as DATA_DIR, d as groupPlan, et as checkHubName, f as listProgress, ft as remoteMembers, g as retroReportFromReceiver, h as retroReport, ht as nowMinute, i as hostName, it as loadHub, j as loadSessions, m as migrateHub, nn as realPath, on as WriteError, ot as sectionText, p as migrateHubData, pt as unavailableHubs, qt as registryFile, tt as HubError, u as sessionView, ut as memberOfGroup, v as RETRY_RULES, w as sessionBriefing, x as initHub, xt as MAX_CHANGE_PAGE, yt as BLOB_HASH, zt as hubAtRoot } from "./host-CsZY5trM.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-MKNwQkAY.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 { 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";
@@ -54,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
 /**
@@ -727,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");
@@ -1615,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 }) => {

package/dist/facts.d.ts

@@ -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

@@ -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 { F as matchGrants, Jt as resolveHub, M as readSession, Mt as hubFormatVersion, P as grantScope, Qt as currentBranch, Zt as nodeStorage, _t as readYaml, en as gitCheckout, jt as formatMismatch, nn as realPath } from "./host-CsZY5trM.js";
-import { n as hubWriter, r as writtenLines } from "./operation-MKNwQkAY.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 { $t as dataFile, Bt as hubHoldingFile, F as matchGrants, I as decorateReply, It as SESSIONS_DIR, Jt as resolveHub, L as endsWithMarker, M as readSession, Mt as hubFormatVersion, P as grantScope, Qt as currentBranch, R as headerLine, T as turnReminder, Ut as notRegisteredMessage, Vt as inRepositoryHubAt, Zt as nodeStorage, _t as readYaml, an as DATA_DIR, at as loadMainlines, gt as readFrontMatter, i as hostName, it as loadHub, j as loadSessions, jt as formatMismatch, mt as taskFile, nn as realPath, nt as isOpenMainline, rn as worktreesOf, tn as hubPath, tt as HubError, w as sessionBriefing, z as mayDecorate } from "./host-CsZY5trM.js";
-import { n as hubWriter, r as writtenLines } from "./operation-MKNwQkAY.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";
@@ -463,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;
 }
 /**