mainflow 0.24.0 → 0.26.0

package/dist/cli.js

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
-import { $ as reopenIssue, A as addAction, C as setCriterionText, D as updateTask, E as supersedeDecision, F as setSessionArchived, J as appendOps, L as setSessionStatus, M as handoffSession, O as sessionBriefing, P as readSession, Q as planIssue, S as setCriterion, V as updateAction, X as createFinding, Y as closeIssue, Z as createIssue, _ as createTask, b as setArchived, et as setFindingArchived, f as acceptDecision, ft as WriteError, g as createMainline, gt as findHubRoot, h as createDecision, it as loadHub, l as migrateHub, lt as MAINLINE_FILE, m as addRepo, nt as setIssueArchived, p as addHub, rt as HubError, tt as setFindingStatus, ut as TASK_FILE, v as dropChecklistItem, w as setMainlineStatus, x as setChecklistItem, y as initHub, z as startSession } from "./host-2a_9-kKv.js";
-import { I as parseRef, L as refExample } from "./dist-Dy45myuN.js";
+import { $ as createIssue, A as sessionBriefing, C as setCriterionText, D as updateTask, E as supersedeDecision, F as loadSessions, I as readSession, L as setSessionArchived, M as addAction, O as untilState, P as handoffSession, Q as createFinding, S as setCriterion, U as updateAction, V as startSession, X as appendOps, Z as closeIssue, _ as createTask, at as HubError, b as setArchived, dt as MAINLINE_FILE, et as planIssue, f as acceptDecision, ft as TASK_FILE, g as createMainline, h as createDecision, it as setIssueArchived, k as duplicateClaimLines, l as migrateHub, m as addRepo, mt as WriteError, nt as setFindingArchived, ot as loadHub, p as addHub, rt as setFindingStatus, tt as reopenIssue, v as dropChecklistItem, vt as findHubRoot, w as setMainlineStatus, x as setChecklistItem, y as initHub, z as setSessionStatus } from "./host-Dr0bCHd8.js";
+import { B as parseUntil, O as UNTIL_FORMS, V as refExample, z as parseRef } from "./dist-DlmecRLf.js";
 import { t as listProgress } from "./progress-1BfPg2zN.js";
 import { COMMAND_SPECS, OPTIONS } from "./facts.js";
 import { hookFallback, parsePayload, runHook } from "./hooks.js";
-import { l as CLI_VERSION, r as launchUi, s as startUiInBackground } from "./launch-Bk3UgS-o.js";
+import { l as CLI_VERSION, r as launchUi, s as startUiInBackground } from "./launch-lnD-Z3hb.js";
 import { readFileSync, realpathSync } from "node:fs";
 import { join, relative } from "node:path";
 import { fileURLToPath } from "node:url";
@@ -15,9 +15,10 @@ const RUNS = {
 	status: ({ root, opts }) => printStatus(loadHub(root), opts.all ?? false),
 	check: ({ root }) => {
 		const hub = loadHub(root);
+		const problems = [...hub.problems, ...loadSessions(root).problems];
 		printProblems(hub.warnings, "!");
-		if (hub.problems.length === 0) return done(`✓ ${hub.mainlines.length} mainlines, no problems${hub.warnings.length ? `, ${hub.warnings.length} ${hub.warnings.length === 1 ? "warning" : "warnings"}` : ""}`);
-		printProblems(hub.problems);
+		if (problems.length === 0) return done(`✓ ${hub.mainlines.length} mainlines, no problems${hub.warnings.length ? `, ${hub.warnings.length} ${hub.warnings.length === 1 ? "warning" : "warnings"}` : ""}`);
+		printProblems(problems);
 		return 1;
 	},
 	migrate: ({ root, opts }) => {
@@ -69,21 +70,34 @@ const RUNS = {
 	"session end": ({ root, args, opts }) => done(`ended ${setSessionStatus(root, sessionOf(opts, args[0]), "ended").id}`),
 	"session archive": ({ root, args }) => done(`archived ${setSessionArchived(root, args[0], true).id}`),
 	"session unarchive": ({ root, args }) => done(`unarchived ${setSessionArchived(root, args[0], false).id}`),
-	"action add": ({ root, args, opts }) => done(`created ${addAction(root, sessionOf(opts), {
-		do: args[0],
-		serves: list(opts.serves),
-		before: opts.before
-	})}`),
+	"action add": ({ root, args, opts }) => {
+		const ref = addAction(root, sessionOf(opts), {
+			do: args[0],
+			serves: list(opts.serves),
+			before: opts.before
+		});
+		done(`created ${ref}`);
+		return remindDuplicates(root, ref);
+	},
 	"action set": ({ root, args, opts }) => {
-		const ref = /^a\d{3}$/.test(args[0]) ? `${sessionOf(opts)}#${args[0]}` : args[0];
-		return done(`updated ${ref} (${updateAction(root, ref, {
+		const ref = actionRef(opts, args[0]);
+		const blockedBy = opts.reason ? {
+			reason: opts.reason,
+			...opts["waiting-for"] ? { waitingFor: opts["waiting-for"] } : {},
+			...opts.until ? { until: opts.until } : {}
+		} : void 0;
+		if (!blockedBy && (opts["waiting-for"] || opts.until)) throw new WriteError("--waiting-for and --until need --reason, e.g. --status blocked --reason \"等 schema 定案\"");
+		done(`updated ${ref} (${updateAction(root, ref, {
 			status: opts.status,
 			do: opts.text,
 			serves: opts.serves === void 0 ? void 0 : list(opts.serves),
 			before: opts.before,
-			note: opts.note
+			note: opts.note,
+			blockedBy
 		}).status})`);
+		return opts.status === "doing" ? remindDuplicates(root, ref) : 0;
 	},
+	wait: ({ root, args, opts }) => waitUntil(root, args[0], opts),
 	hook: ({ args }) => {
 		let input = "";
 		try {
@@ -341,6 +355,98 @@ function sessionOf(opts, arg) {
 	if (!id) throw new WriteError("no session given; pass --session <id> or set MAINFLOW_SESSION (the SessionStart hook sets it)");
 	return id;
 }
+/** An action named as a{NNN} in the current session, or as {session}#a{NNN}. */
+const actionRef = (opts, arg) => /^a\d{3}$/.test(arg) ? `${sessionOf(opts)}#${arg}` : arg;
+/** Print a line for each running session already doing what this action serves; a reminder, so the exit code stays 0. */
+function remindDuplicates(root, ref) {
+	const hash = ref.lastIndexOf("#");
+	for (const line of duplicateClaimLines(root, ref.slice(0, hash), ref.slice(hash + 1))) console.log(line);
+	return 0;
+}
+/** Exit codes of `wait`: the condition holds, the time ran out, or there is no condition to wait for. */
+const WAIT_EXIT = {
+	met: 0,
+	timedOut: 1,
+	unusable: 2
+};
+const WAIT_DEFAULTS = {
+	timeout: 1800,
+	interval: 10
+};
+const UNTIL_HINT = UNTIL_FORMS.map((f) => f.format).join(", ");
+/** Block the process for a while; wait runs synchronously like every other command. */
+const sleep = (ms) => Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms);
+function seconds(value, fallback, name, zero) {
+	if (value === void 0) return fallback;
+	const n = Number(value);
+	if (value.trim() === "" || !Number.isFinite(n) || n < 0 || !zero && n === 0) throw new WriteError(`--${name} takes ${zero ? "zero or more" : "more than zero"} seconds, got "${value}"`);
+	return n;
+}
+/**
+* Poll a condition until it holds or the time runs out. Given an action, its `until` is read again on each
+* round, so a condition changed while waiting is the one checked; once the action leaves blocked or loses its
+* `until`, there is nothing left to wait for. A condition that can no longer come true ends the wait at once.
+*/
+function waitUntil(root, arg, opts) {
+	let timeout;
+	let interval;
+	let ref;
+	let text;
+	let condition;
+	const unusable = (message) => {
+		console.error(`✗ ${message}`);
+		return WAIT_EXIT.unusable;
+	};
+	/** The action's current `until`, or the reason it has none. */
+	const untilOf = (actionRef) => {
+		const hash = actionRef.lastIndexOf("#");
+		let session;
+		try {
+			session = readSession(root, actionRef.slice(0, hash));
+		} catch (error) {
+			return { error: error.message };
+		}
+		const action = session?.actions.find((a) => a.id === actionRef.slice(hash + 1));
+		if (!action) return { error: `action ${actionRef} not found` };
+		return action.blockedBy?.until ?? { error: `${actionRef} has no until condition (it is ${action.status}); give it one with action set ${arg} --status blocked --reason <reason> --until <condition>, where the condition is one of ${UNTIL_HINT}` };
+	};
+	try {
+		timeout = seconds(opts.timeout, WAIT_DEFAULTS.timeout, "timeout", true);
+		interval = seconds(opts.interval, WAIT_DEFAULTS.interval, "interval", false);
+		if (arg && opts.until) return unusable("give an action or --until, not both");
+		if (!arg && !opts.until) return unusable(`name the action to wait for, e.g. wait a002, or pass --until <condition>, one of ${UNTIL_HINT}`);
+		if (arg) {
+			ref = actionRef(opts, arg);
+			if (!/^[^#]+#a\d{3}$/.test(ref)) return unusable(`expected an action like a002 or claude-code-1a2b3c4d#a002, got "${arg}"`);
+			const until = untilOf(ref);
+			if (typeof until !== "string") return unusable(until.error);
+			text = until;
+		} else text = opts.until;
+		const parsed = parseUntil(text);
+		if (!parsed) return unusable(`"${text}" is not a condition; use one of ${UNTIL_HINT}`);
+		condition = parsed;
+	} catch (error) {
+		if (error instanceof WriteError) return unusable(error.message);
+		throw error;
+	}
+	const deadline = Date.now() + timeout * 1e3;
+	for (;;) {
+		const state = untilState(root, condition);
+		if (state.met) return done(`✓ ${text}: ${state.detail}`);
+		if (state.unreachable) return unusable(`${text} can no longer hold: ${state.detail}`);
+		const left = deadline - Date.now();
+		if (left <= 0) {
+			console.error(`✗ still waiting after ${timeout}s for ${text}: ${state.detail}`);
+			return WAIT_EXIT.timedOut;
+		}
+		sleep(Math.min(interval * 1e3, left));
+		if (!ref) continue;
+		const next = untilOf(ref);
+		if (typeof next !== "string") return unusable(`stopped waiting: ${next.error}`);
+		text = next;
+		condition = parseUntil(next);
+	}
+}
 const list = (value) => (value ?? "").split(",").map((v) => v.trim()).filter(Boolean);
 /** The mainline a reference names; throws with the same message resolve.ts gives when it is missing. */
 function findMainline(hub, id) {

package/dist/{dist-Dy45myuN.js → dist-DlmecRLf.js}

@@ -43,7 +43,7 @@ const GRANT_TARGET_FORMS = {
 };
 const KEBAB = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
 /** A git branch name, `*` standing for any run of characters. */
-const BRANCH = /^(?!\/)(?!.*\/\/)(?!.*\.\.)[A-Za-z0-9._/*-]+(?<!\/)$/;
+const BRANCH$1 = /^(?!\/)(?!.*\/\/)(?!.*\.\.)[A-Za-z0-9._/*-]+(?<!\/)$/;
 /** npm package names: lowercase, optionally scoped. */
 const PACKAGE_NAME = /^(?:@[a-z0-9][a-z0-9._~-]*\/)?[a-z0-9][a-z0-9._~-]*$/;
 /** A tag pattern: no whitespace, `*` and `?` as in a shell glob. */
@@ -62,7 +62,7 @@ function parseGrantTarget(action, target) {
 			const repo = colon < 0 ? target : target.slice(0, colon);
 			const branch = colon < 0 ? void 0 : target.slice(colon + 1);
 			if (!repo) return fail(action, "the repo name is missing");
-			if (branch !== void 0 && !BRANCH.test(branch)) return fail(action, `"${branch}" is not a branch name`);
+			if (branch !== void 0 && !BRANCH$1.test(branch)) return fail(action, `"${branch}" is not a branch name`);
 			return {
 				ok: true,
 				target: {
@@ -805,16 +805,122 @@ const taskSchema = z.object({
 		message: "a task cannot depend on itself"
 	});
 });
+/** A session id: lowercase letters, digits and hyphens, e.g. claude-code-1a2b3c4d. */
+const SESSION_ID = /^[a-z0-9][a-z0-9-]*$/;
+/** An action in some session, `{sessionId}#a{NNN}`. */
+const ACTION_REF = /^([a-z0-9][a-z0-9-]*)#(a\d{3})$/;
+/** Split an action reference into its session and action ids, or return null when the text is not one. */
+function parseActionRef(input) {
+	const m = ACTION_REF.exec(input);
+	return m ? {
+		session: m[1],
+		action: m[2]
+	} : null;
+}
+/** The action a blocked action waits for, when its whole `waitingFor` text is an action reference; otherwise undefined. */
+const waitingForAction = (waitingFor) => waitingFor && parseActionRef(waitingFor) ? waitingFor : void 0;
+/** The condition forms, one example each; facts and error messages read them from here. */
+const UNTIL_FORMS = [
+	{
+		kind: "commit",
+		format: "commit:{branch}:{text}",
+		example: "commit:main:feat(core): 行動阻塞"
+	},
+	{
+		kind: "action-done",
+		format: "action-done:{sessionId}#a{NNN}",
+		example: "action-done:claude-code-1a2b3c4d#a003"
+	},
+	{
+		kind: "file",
+		format: "file:{relative path}",
+		example: "file:packages/cli/dist/cli.js"
+	}
+];
+const UNTIL_EXAMPLES = UNTIL_FORMS.map((f) => f.format).join(", ");
+/** A branch name git log can take as a revision; a leading hyphen would read as an option. */
+const BRANCH = /^[^\s:~^?*[\\-][^\s:~^?*[\\]*$/;
+/** Parse a wait condition, or return null when it matches none of the forms. */
+function parseUntil(input) {
+	const colon = input.indexOf(":");
+	if (colon < 0) return null;
+	const kind = input.slice(0, colon);
+	const argument = input.slice(colon + 1);
+	switch (kind) {
+		case "commit": {
+			const split = argument.indexOf(":");
+			const branch = argument.slice(0, split);
+			const text = argument.slice(split + 1);
+			return split > 0 && BRANCH.test(branch) && !branch.includes("..") && text.length > 0 ? {
+				kind,
+				branch,
+				text
+			} : null;
+		}
+		case "action-done": {
+			const ref = parseActionRef(argument);
+			return ref ? {
+				kind,
+				...ref
+			} : null;
+		}
+		case "file": return argument.length > 0 && !argument.startsWith("/") ? {
+			kind,
+			path: argument
+		} : null;
+		default: return null;
+	}
+}
+/**
+* Why a blocked action cannot move, what it waits for, and the condition a program checks to end the wait.
+* `waitingFor` is free text, another session's action such as claude-code-1a2b3c4d#a003, or a hub reference
+* such as m031/t002 when the whole text is one.
+*/
+const actionBlockSchema = z.object({
+	reason: text,
+	waitingFor: text.optional(),
+	until: z.string().refine((s) => parseUntil(s) !== null, `expected a condition like ${UNTIL_EXAMPLES}`).optional()
+});
 const actionSchema = z.object({
 	id: id("action"),
 	do: z.string().min(1),
 	status: z.enum(WORK_STATUS),
 	serves: z.array(z.string().regex(CHECKLIST_REF)),
 	note: text.optional(),
+	/** Required while blocked, absent otherwise */
+	blockedBy: actionBlockSchema.optional(),
 	/** Set when the action turns doing and done; the transcript trace attributes tool use by these */
 	startedAt: datetime.optional(),
 	doneAt: datetime.optional()
+}).superRefine((a, ctx) => {
+	if (a.status === "blocked" && !a.blockedBy) ctx.addIssue({
+		code: "custom",
+		path: ["blockedBy"],
+		message: "a blocked action must say what blocks it"
+	});
+	if (a.status !== "blocked" && a.blockedBy) ctx.addIssue({
+		code: "custom",
+		path: ["blockedBy"],
+		message: `only a blocked action carries blockedBy; this one is ${a.status}`
+	});
 });
+/** The reason a blocked action written before `blockedBy` existed is given when it carries no note either. */
+const LEGACY_BLOCK_REASON = "（舊資料未寫原因）";
+/**
+* Session files written before `blockedBy` existed hold blocked actions without one. Reading fills it from the
+* action's note, so those files stay readable and the next write stores the filled form. `actionSchema` itself
+* stays strict, so a new block still has to say what blocks it.
+*/
+function withLegacyBlock(input) {
+	if (typeof input !== "object" || input === null) return input;
+	const action = input;
+	if (action.status !== "blocked" || action.blockedBy !== void 0) return input;
+	const reason = typeof action.note === "string" && action.note.length > 0 ? action.note : LEGACY_BLOCK_REASON;
+	return {
+		...action,
+		blockedBy: { reason }
+	};
+}
 const sessionSchema = z.object({
 	id: z.string().min(1),
 	agent: z.string().min(1),
@@ -823,7 +929,7 @@ const sessionSchema = z.object({
 	delegatedFrom: z.string().min(1).nullable(),
 	handoffFrom: z.string().min(1).nullable(),
 	cwd: z.string().min(1),
-	actions: z.array(actionSchema),
+	actions: z.array(z.preprocess(withLegacyBlock, actionSchema)),
 	/** Where the platform keeps the conversation, for tracing and for opening it */
 	transcript: text.optional(),
 	worktree: text.optional(),
@@ -904,4 +1010,4 @@ function parseOpsLine(line) {
 	return parsed.success ? parsed.data : null;
 }
 //#endregion
-export { findingSchema as A, taskSchema as B, SURVEY_LINES as C, WORK_STATUS as D, TASK_SECTIONS as E, parseOpsLine as F, describeRequest as G, GRANT_ACTIONS as H, parseRef as I, grantRepo as J, grantCovers as K, refExample as L, issueSchema as M, mainlineSchema as N, configSchema as O, opsEntrySchema as P, refMainline as R, SLUG as S, TASK_REQUIRED_SECTIONS as T, GRANT_FORMS as U, waitingForRef as V, GRANT_TARGET_FORMS as W, parseGrantTarget as Y, MERGE_STATES as _, DECISION_SECTIONS as a, RESERVED_HUB_NAMES as b, FINDING_SECTIONS as c, ID_PATTERNS as d, ISSUE_SECTIONS as f, MAINLINE_STATUS as g, MAINLINE_SECTIONS as h, DECISION_BASES as i, formatOpsEntry as j, decisionSchema as k, FINDING_STATUS as l, LINK_RELS as m, CLOSED_STATUS as n, DECISION_STATUS as o, ISSUE_STATUS as p, grantForm as q, DECIDERS as r, DEFAULT_CATEGORIES as s, CHECKLIST_REF as t, FORMAT_VERSION as u, PRIORITIES as v, SURVEY_SECTION as w, SESSION_STATUS as x, REF_EXAMPLES as y, sessionSchema as z };
+export { grantRepo as $, configSchema as A, parseUntil as B, SLUG as C, TASK_SECTIONS as D, TASK_REQUIRED_SECTIONS as E, mainlineSchema as F, waitingForAction as G, refMainline as H, opsEntrySchema as I, GRANT_FORMS as J, waitingForRef as K, parseActionRef as L, findingSchema as M, formatOpsEntry as N, UNTIL_FORMS as O, issueSchema as P, grantForm as Q, parseOpsLine as R, SESSION_STATUS as S, SURVEY_SECTION as T, sessionSchema as U, refExample as V, taskSchema as W, describeRequest as X, GRANT_TARGET_FORMS as Y, grantCovers as Z, MERGE_STATES as _, DECISION_SECTIONS as a, RESERVED_HUB_NAMES as b, FINDING_SECTIONS as c, ID_PATTERNS as d, parseGrantTarget as et, ISSUE_SECTIONS as f, MAINLINE_STATUS as g, MAINLINE_SECTIONS as h, DECISION_BASES as i, decisionSchema as j, WORK_STATUS as k, FINDING_STATUS as l, LINK_RELS as m, CLOSED_STATUS as n, DECISION_STATUS as o, ISSUE_STATUS as p, GRANT_ACTIONS as q, DECIDERS as r, DEFAULT_CATEGORIES as s, CHECKLIST_REF as t, FORMAT_VERSION as u, PRIORITIES as v, SURVEY_LINES as w, SESSION_ID as x, REF_EXAMPLES as y, parseRef as z };

package/dist/facts.d.ts

@@ -1,4 +1,4 @@
-import { a as SurveyLine, i as SLUG, n as FORMAT_VERSION, r as ID_PATTERNS, t as CHECKLIST_REF } from "./index-CV30LkNZ.js";
+import { a as SurveyLine, i as SLUG, n as FORMAT_VERSION, o as Until, r as ID_PATTERNS, t as CHECKLIST_REF } from "./index-D4IIwDGE.js";
 //#region src/facts.d.ts
 export interface CommandSpec {
   usage: string;
@@ -98,16 +98,23 @@ export declare const COMMAND_SPECS: {
   };
   readonly 'action add': {
     readonly usage: 'action add <text> --serves <m/t#c>[,<m/t#c>] [--before <a>] [--session <session>]';
-    readonly summary: 'Add an action to the session queue';
+    readonly summary: 'Add an action to the session queue; prints a reminder when another session active in the last 15 minutes is doing an item it serves';
     readonly args: 1;
     readonly needsHub: true;
   };
   readonly 'action set': {
-    readonly usage: 'action set <a|session#a> [--status] [--text] [--serves] [--before <a>] [--note <text>] [--session <session>]';
-    readonly summary: 'Change, reorder or finish an action';
+    readonly usage: 'action set <a|session#a> [--status] [--reason --waiting-for --until] [--text] [--serves] [--before <a>] [--note <text>] [--session <session>]';
+    readonly summary: 'Change, reorder or finish an action; --status blocked needs --reason, and leaving blocked clears it. --status doing reminds like action add. A handed-off action keeps its note';
     readonly args: 1;
     readonly needsHub: true;
   };
+  readonly wait: {
+    readonly usage: 'wait [a|session#a] [--until <condition>] [--timeout <seconds>] [--interval <seconds>] [--session <session>]';
+    readonly summary: 'Wait until an action\'s until condition, or the --until one, holds: exits 0 when it does, 1 when the timeout (1800 s) runs out, 2 when there is no usable condition, the action leaves blocked, or the condition can no longer hold; checks every 10 s';
+    readonly args: 0;
+    readonly optionalArgs: 1;
+    readonly needsHub: true;
+  };
   readonly hook: {
     readonly usage: 'hook <platform> <event>';
     readonly summary: 'Handle a host hook event read from stdin, e.g. hook claude-code session-start';
@@ -373,6 +380,15 @@ export declare const OPTIONS: {
   readonly signal: {
     readonly type: 'string';
   };
+  readonly until: {
+    readonly type: 'string';
+  };
+  readonly timeout: {
+    readonly type: 'string';
+  };
+  readonly interval: {
+    readonly type: 'string';
+  };
   readonly branch: {
     readonly type: 'string';
   };
@@ -476,6 +492,15 @@ export declare const REFERENCES: readonly [{
   readonly format: '{sessionId}#a{NNN}';
   readonly example: 'claude-code-1a2b3c4d#a003';
 }];
+/**
+ * Conditions a blocked action's `until` takes and `wait` checks, one example each: a commit on a branch whose
+ * message contains the text (git log runs at the hub root), an action that is done, a path relative to the hub root that exists (`..` reaches sibling repositories).
+ */
+export declare const UNTIL: readonly {
+  kind: Until['kind'];
+  format: string;
+  example: string;
+}[];
 /** Relation types a document's links take; readers derive the reverse direction. */
 export declare const LINKS: {
   readonly rels: readonly ["depends-on", "relates", "split-from"];
@@ -557,6 +582,7 @@ export declare const FIELDS: {
   readonly criterion: FieldSpec[];
   readonly checklistItem: readonly [...FieldSpec[], FieldSpec];
   readonly grant: readonly [FieldSpec, FieldSpec, FieldSpec, FieldSpec];
+  readonly action: readonly [FieldSpec, FieldSpec, FieldSpec, FieldSpec, FieldSpec, FieldSpec, FieldSpec, FieldSpec];
   readonly link: readonly [FieldSpec, FieldSpec, FieldSpec];
 };
 //#endregion

package/dist/facts.js

@@ -1,4 +1,4 @@
-import { C as SURVEY_LINES, D as WORK_STATUS, E as TASK_SECTIONS, H as GRANT_ACTIONS, S as SLUG, T as TASK_REQUIRED_SECTIONS, U as GRANT_FORMS, W as GRANT_TARGET_FORMS, _ as MERGE_STATES, a as DECISION_SECTIONS, c as FINDING_SECTIONS, d as ID_PATTERNS, f as ISSUE_SECTIONS, g as MAINLINE_STATUS, h as MAINLINE_SECTIONS, i as DECISION_BASES, l as FINDING_STATUS, m as LINK_RELS, n as CLOSED_STATUS, o as DECISION_STATUS, p as ISSUE_STATUS, r as DECIDERS, s as DEFAULT_CATEGORIES, t as CHECKLIST_REF, u as FORMAT_VERSION, v as PRIORITIES, w as SURVEY_SECTION, x as SESSION_STATUS } from "./dist-Dy45myuN.js";
+import { C as SLUG, D as TASK_SECTIONS, E as TASK_REQUIRED_SECTIONS, J as GRANT_FORMS, O as UNTIL_FORMS, S as SESSION_STATUS, T as SURVEY_SECTION, Y as GRANT_TARGET_FORMS, _ as MERGE_STATES, a as DECISION_SECTIONS, c as FINDING_SECTIONS, d as ID_PATTERNS, f as ISSUE_SECTIONS, g as MAINLINE_STATUS, h as MAINLINE_SECTIONS, i as DECISION_BASES, k as WORK_STATUS, l as FINDING_STATUS, m as LINK_RELS, n as CLOSED_STATUS, o as DECISION_STATUS, p as ISSUE_STATUS, q as GRANT_ACTIONS, r as DECIDERS, s as DEFAULT_CATEGORIES, t as CHECKLIST_REF, u as FORMAT_VERSION, v as PRIORITIES, w as SURVEY_LINES } from "./dist-DlmecRLf.js";
 //#region src/facts.ts
 const COMMAND_SPECS = {
 	init: {
@@ -89,16 +89,23 @@ const COMMAND_SPECS = {
 	},
 	"action add": {
 		usage: "action add <text> --serves <m/t#c>[,<m/t#c>] [--before <a>] [--session <session>]",
-		summary: "Add an action to the session queue",
+		summary: "Add an action to the session queue; prints a reminder when another session active in the last 15 minutes is doing an item it serves",
 		args: 1,
 		needsHub: true
 	},
 	"action set": {
-		usage: "action set <a|session#a> [--status] [--text] [--serves] [--before <a>] [--note <text>] [--session <session>]",
-		summary: "Change, reorder or finish an action",
+		usage: "action set <a|session#a> [--status] [--reason --waiting-for --until] [--text] [--serves] [--before <a>] [--note <text>] [--session <session>]",
+		summary: "Change, reorder or finish an action; --status blocked needs --reason, and leaving blocked clears it. --status doing reminds like action add. A handed-off action keeps its note",
 		args: 1,
 		needsHub: true
 	},
+	wait: {
+		usage: "wait [a|session#a] [--until <condition>] [--timeout <seconds>] [--interval <seconds>] [--session <session>]",
+		summary: "Wait until an action's until condition, or the --until one, holds: exits 0 when it does, 1 when the timeout (1800 s) runs out, 2 when there is no usable condition, the action leaves blocked, or the condition can no longer hold; checks every 10 s",
+		args: 0,
+		optionalArgs: 1,
+		needsHub: true
+	},
 	hook: {
 		usage: "hook <platform> <event>",
 		summary: "Handle a host hook event read from stdin, e.g. hook claude-code session-start",
@@ -319,6 +326,9 @@ const OPTIONS = {
 	reason: { type: "string" },
 	"waiting-for": { type: "string" },
 	signal: { type: "string" },
+	until: { type: "string" },
+	timeout: { type: "string" },
+	interval: { type: "string" },
 	branch: { type: "string" },
 	worktree: { type: "string" },
 	base: { type: "string" },
@@ -408,6 +418,11 @@ const REFERENCES = [
 		example: "claude-code-1a2b3c4d#a003"
 	}
 ];
+/**
+* Conditions a blocked action's `until` takes and `wait` checks, one example each: a commit on a branch whose
+* message contains the text (git log runs at the hub root), an action that is done, a path relative to the hub root that exists (`..` reaches sibling repositories).
+*/
+const UNTIL = UNTIL_FORMS;
 /** Relation types a document's links take; readers derive the reverse direction. */
 const LINKS = { rels: LINK_RELS };
 /**
@@ -562,6 +577,16 @@ const FIELDS = {
 		field("target", true, "授權的目標，格式依動作而定，見 GRANTS.targets；倉庫名稱需在 config.yaml 登記"),
 		field("note", false, "一句話說明")
 	],
+	action: [
+		field("id", true, "會話內不重複的編號 a{NNN}，由 action add 配發"),
+		field("do", true, "要做的事，一句話"),
+		field("status", true, "狀態值見 STATUSES，用 action set 改"),
+		field("serves", true, "推進的 checklist 項目參照清單，可以是空的"),
+		field("note", false, "一句備註"),
+		field("blockedBy", false, "卡住時的原因 reason、等待對象 waitingFor 與程式可判斷的條件 until，blocked 時必填，其他狀態不得有；等待對象整串是其他會話的行動（例如 claude-code-1a2b3c4d#a003）時，對方的簡報會列出有人在等它；條件格式見 UNTIL"),
+		field("startedAt", false, "轉為 doing 時由 CLI 寫入"),
+		field("doneAt", false, "轉為 done 或 dropped 時由 CLI 寫入")
+	],
 	link: [
 		field("rel", true, "關係類型：depends-on、relates、split-from，反向由讀者推出"),
 		field("to", true, "對方的參照，不能在同一條主脈絡內；其他 hub 的加 {hub}: 前綴"),
@@ -569,4 +594,4 @@ const FIELDS = {
 	]
 };
 //#endregion
-export { CHECKLIST_REF, CLASSIFICATION, CLOSED_STATUSES, COMMAND_SPECS, FIELDS, FORMAT_VERSION, GRANTS, ID_PATTERNS, LAYOUT, LINKS, OPTIONS, REFERENCES, SECTIONS, SLUG, STATUSES, SURVEY };
+export { CHECKLIST_REF, CLASSIFICATION, CLOSED_STATUSES, COMMAND_SPECS, FIELDS, FORMAT_VERSION, GRANTS, ID_PATTERNS, LAYOUT, LINKS, OPTIONS, REFERENCES, SECTIONS, SLUG, STATUSES, SURVEY, UNTIL };

package/dist/grant-commands.d.ts

@@ -1,4 +1,4 @@
-import "./index-CV30LkNZ.js";
+import "./index-D4IIwDGE.js";
 //#region ../schema/dist/grants.d.ts
 /** An operation about to run, resolved to what a grant is written against. */
 type GrantRequest = {

package/dist/grant-commands.js

@@ -1,4 +1,4 @@
-import { U as GRANT_FORMS } from "./dist-Dy45myuN.js";
+import { J as GRANT_FORMS } from "./dist-DlmecRLf.js";
 import { closeSync, constants, fstatSync, openSync, readFileSync, realpathSync } from "node:fs";
 import { isAbsolute, join, relative, resolve } from "node:path";
 import { spawnSync } from "node:child_process";

package/dist/hooks.js

@@ -1,5 +1,5 @@
-import { G as endsWithMarker, H as grantScope, I as setSessionInfo, J as appendOps, K as headerLine, L as setSessionStatus, O as sessionBriefing, P as readSession, R as settleSession, U as matchGrants, W as decorateReply, _t as worktreesOf, gt as findHubRoot, ht as currentBranch, i as hostName, it as loadHub, j as ensureSession, k as turnReminder, mt as DATA_DIR, pt as readYaml, q as mayDecorate, rt as HubError } from "./host-2a_9-kKv.js";
-import { G as describeRequest, O as configSchema } from "./dist-Dy45myuN.js";
+import { A as sessionBriefing, B as settleSession, F as loadSessions, G as matchGrants, I as readSession, J as headerLine, K as decorateReply, N as ensureSession, R as setSessionInfo, W as grantScope, X as appendOps, Y as mayDecorate, _t as currentBranch, at as HubError, gt as DATA_DIR, ht as readYaml, i as hostName, j as turnReminder, ot as loadHub, q as endsWithMarker, vt as findHubRoot, yt as worktreesOf, z as setSessionStatus } from "./host-Dr0bCHd8.js";
+import { A as configSchema, X as describeRequest } from "./dist-DlmecRLf.js";
 import { resolveFixed, scanCommand, scopedCwd } from "./grant-commands.js";
 import { appendFileSync, existsSync, readFileSync } from "node:fs";
 import { basename, dirname, isAbsolute, join, relative, resolve } from "node:path";
@@ -320,7 +320,7 @@ function checkAfterWrite(root, { payload, cli }) {
 	}
 	let problems;
 	try {
-		problems = loadHub(hub).problems;
+		problems = [...loadHub(hub).problems, ...loadSessions(hub).problems];
 	} catch (error) {
 		problems = error instanceof HubError ? [...error.problems, {
 			file: `${DATA_DIR}/config.yaml`,