@phren/cli 0.3.14 → 0.3.15
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/dist/bridge/account-usage.d.ts +2 -1
- package/dist/bridge/account-usage.js +8 -1
- package/dist/bridge/claude-accounts.d.ts +3 -0
- package/dist/bridge/claude-accounts.js +13 -1
- package/dist/bridge/conductor-group.d.ts +2 -0
- package/dist/bridge/conductor-group.js +17 -5
- package/dist/bridge/conductor-sets.js +23 -3
- package/dist/bridge/dispatch-command.d.ts +1 -0
- package/dist/bridge/dispatch-command.js +40 -2
- package/dist/bridge/dispatch-returns.d.ts +21 -1
- package/dist/bridge/dispatch-returns.js +120 -12
- package/dist/bridge/dispatch.d.ts +76 -0
- package/dist/bridge/dispatch.js +7 -0
- package/dist/bridge/hand-off-queue.d.ts +3 -0
- package/dist/bridge/hand-off-queue.js +9 -0
- package/dist/bridge/owner-inbox-view.d.ts +6 -0
- package/dist/bridge/owner-inbox-view.js +32 -0
- package/dist/bridge/owner-inbox.d.ts +117 -0
- package/dist/bridge/owner-inbox.js +120 -0
- package/dist/bridge/return-contract.d.ts +35 -0
- package/dist/bridge/return-contract.js +10 -0
- package/dist/bridge/server-launch.js +12 -1
- package/dist/bridge/server-routes.d.ts +5 -0
- package/dist/bridge/server-routes.js +22 -1
- package/dist/bridge/server.js +37 -1
- package/dist/bridge/subscription.d.ts +13 -0
- package/dist/bridge/subscription.js +24 -0
- package/dist/bridge/terminal-herdr.js +1 -0
- package/dist/bridge/terminal-tmux.js +1 -0
- package/dist/bridge/terminal.d.ts +1 -0
- package/dist/bridge/terminal.js +1 -0
- package/dist/bridge/usage.d.ts +6 -0
- package/dist/bridge/usage.js +57 -10
- package/dist/bridge/worker-close.d.ts +10 -0
- package/dist/bridge/worker-close.js +77 -0
- package/dist/bridge/worker-reports.d.ts +10 -0
- package/dist/bridge/worker-reports.js +63 -0
- package/dist/bridge-hook.mjs +5087 -4487
- package/dist/cli-registry.js +9 -2
- package/dist/modules/registry.js +5 -5
- package/dist/tools/dispatch.js +33 -1
- package/package.json +1 -1
- package/starter/global/skills/conductor/SKILL.md +35 -0
|
@@ -0,0 +1,77 @@
|
|
|
1
|
+
import { createHash } from "node:crypto";
|
|
2
|
+
import { lstat, readFile, rm } from "node:fs/promises";
|
|
3
|
+
import path from "node:path";
|
|
4
|
+
import { z } from "zod";
|
|
5
|
+
import { atomicInPrivateDir, BridgeError, bridgeRoot, targetSchema, startingTargetSchema } from "./protocol.js";
|
|
6
|
+
import { validateTarget, paneChatState } from "./herdr.js";
|
|
7
|
+
import { terminalProvider } from "./terminal.js";
|
|
8
|
+
import { paneTurn, workerStates, workerTurnKey } from "./dispatch-returns.js";
|
|
9
|
+
const closedTargetSchema = z.union([targetSchema, startingTargetSchema]);
|
|
10
|
+
const file = (target) => path.join(bridgeRoot(), "closed-workers", `${createHash("sha256").update(JSON.stringify([target.server, target.workspace, target.tab, target.pane, target.source, "session" in target ? target.session : target.startingToken])).digest("hex")}.json`);
|
|
11
|
+
export async function markWorkerClosed(target, terminal) {
|
|
12
|
+
await atomicInPrivateDir(file(target), { target, terminal, at: new Date().toISOString() });
|
|
13
|
+
}
|
|
14
|
+
export async function intentionallyClosed(target) {
|
|
15
|
+
try {
|
|
16
|
+
const info = await lstat(file(target));
|
|
17
|
+
if (!info.isFile() || info.isSymbolicLink() || info.size > 4096)
|
|
18
|
+
return false;
|
|
19
|
+
const row = JSON.parse(await readFile(file(target), "utf8"));
|
|
20
|
+
return closedTargetSchema.safeParse(row.target).success;
|
|
21
|
+
}
|
|
22
|
+
catch (error) {
|
|
23
|
+
if (error.code !== "ENOENT")
|
|
24
|
+
throw error;
|
|
25
|
+
return false;
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
export async function markPaneClosed(server, pane) {
|
|
29
|
+
const chat = await paneChatState(server, pane);
|
|
30
|
+
const target = closedTargetSchema.safeParse({ server, workspace: pane.workspace_id, tab: pane.tab_id, pane: pane.pane_id, source: pane.agent,
|
|
31
|
+
...(chat.sessionId ? { session: chat.sessionId } : { starting: true, startingToken: chat.startingToken }) });
|
|
32
|
+
if (target.success)
|
|
33
|
+
await markWorkerClosed(target.data, String(pane.terminal_id));
|
|
34
|
+
// A dispatch may still hold the launch token before its first identity poll.
|
|
35
|
+
const starting = startingTargetSchema.safeParse({ server, workspace: pane.workspace_id, tab: pane.tab_id, pane: pane.pane_id,
|
|
36
|
+
source: pane.agent, starting: true, startingToken: chat.startingToken });
|
|
37
|
+
if (starting.success)
|
|
38
|
+
await markWorkerClosed(starting.data, String(pane.terminal_id));
|
|
39
|
+
}
|
|
40
|
+
/** Called on the worker's computer only after the sender read the done return.
|
|
41
|
+
* Recheck this exact ended turn and skip any new work, background work or inbox. */
|
|
42
|
+
export async function closeFinishedWorker(input, queue) {
|
|
43
|
+
const data = z.object({ target: targetSchema, turn: z.string().regex(/^[a-f0-9]{16}$/), dispatch: z.string().uuid() }).strict().parse(input);
|
|
44
|
+
if (queue)
|
|
45
|
+
return queue.whenNoPending(data.target, () => closeFinishedWorker(input));
|
|
46
|
+
const { snapshot, findPane } = await import("./herdr.js");
|
|
47
|
+
if (await intentionallyClosed(data.target) && !findPane(await snapshot(data.target.server), data.target))
|
|
48
|
+
return { ok: true, closed: true, replayed: true };
|
|
49
|
+
const pane = await validateTarget(data.target, false, true);
|
|
50
|
+
if (!["idle", "done"].includes(String(pane.agent_status)))
|
|
51
|
+
return { ok: true, closed: false };
|
|
52
|
+
const seen = (await workerStates({ targets: [{ ...data.target, dispatch: data.dispatch }] })).workers[0];
|
|
53
|
+
const turn = workerTurnKey(seen);
|
|
54
|
+
if (!seen.completed || seen.background || seen.error || turn !== data.turn)
|
|
55
|
+
return { ok: true, closed: false };
|
|
56
|
+
// One final fresh binding before the terminal mutation.
|
|
57
|
+
const current = await validateTarget(data.target, false, true);
|
|
58
|
+
if (current.terminal_id !== pane.terminal_id || !["idle", "done"].includes(String(current.agent_status)))
|
|
59
|
+
throw new BridgeError(409, "The worker resumed before it could close.");
|
|
60
|
+
const record = await paneTurn(data.target.server, current, data.target.source);
|
|
61
|
+
if (record?.prompt && (!record.stop || record.stop.seq <= record.prompt.seq || record.terminal !== current.terminal_id
|
|
62
|
+
|| record.session !== data.target.session || workerTurnKey({ endedAt: record.stop.at, stopSeq: record.stop.seq }) !== data.turn))
|
|
63
|
+
return { ok: true, closed: false };
|
|
64
|
+
await markWorkerClosed(data.target, String(pane.terminal_id));
|
|
65
|
+
try {
|
|
66
|
+
await terminalProvider().closePane(data.target.server, data.target.pane);
|
|
67
|
+
}
|
|
68
|
+
catch (error) {
|
|
69
|
+
// A refused close must not suppress a later genuine disappearance. Keep
|
|
70
|
+
// the marker on an ambiguous transport failure if the pane is now gone.
|
|
71
|
+
const remaining = await snapshot(data.target.server).catch(() => undefined);
|
|
72
|
+
if (remaining && findPane(remaining, data.target)?.terminal_id === pane.terminal_id)
|
|
73
|
+
await rm(file(data.target), { force: true });
|
|
74
|
+
throw error;
|
|
75
|
+
}
|
|
76
|
+
return { ok: true, closed: true };
|
|
77
|
+
}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { type Json, type Target } from "./protocol.js";
|
|
2
|
+
import type { TurnRecord } from "./turn-records.js";
|
|
3
|
+
import { type Integrator, type PullRequest } from "./return-contract.js";
|
|
4
|
+
export { integratorSchema, prsSchema, pullRequestSchema } from "./return-contract.js";
|
|
5
|
+
/** The worker reports PR evidence to its own Hook, without direct messaging or
|
|
6
|
+
* GitHub comments. Bound to this terminal and submitted turn, not the next one. */
|
|
7
|
+
export declare function reportWorker(input: unknown): Promise<Json>;
|
|
8
|
+
export declare function workerPrs(target: Target, record: TurnRecord): Promise<PullRequest[] | undefined>;
|
|
9
|
+
export declare function readIntegrator(): Promise<Integrator | undefined>;
|
|
10
|
+
export declare function setIntegrator(input: unknown): Promise<Json>;
|
|
@@ -0,0 +1,63 @@
|
|
|
1
|
+
import { createHash } from "node:crypto";
|
|
2
|
+
import { lstat, readFile } from "node:fs/promises";
|
|
3
|
+
import path from "node:path";
|
|
4
|
+
import { z } from "zod";
|
|
5
|
+
import { atomicInPrivateDir, BridgeError, bridgeRoot, targetSchema } from "./protocol.js";
|
|
6
|
+
import { paneIdentity, findPane, snapshot, validateTarget } from "./herdr.js";
|
|
7
|
+
import { originPaneSchema } from "./dispatch.js";
|
|
8
|
+
import { paneTurn } from "./dispatch-returns.js";
|
|
9
|
+
import { integratorSchema, prsSchema, reportText as text } from "./return-contract.js";
|
|
10
|
+
export { integratorSchema, prsSchema, pullRequestSchema } from "./return-contract.js";
|
|
11
|
+
const reportSchema = z.object({ target: targetSchema, terminal: text(200), promptSeq: z.number().int(), prs: prsSchema, at: z.string().datetime() }).strict();
|
|
12
|
+
const key = (target) => createHash("sha256").update(JSON.stringify([target.server, target.workspace, target.tab, target.pane, target.source, target.session])).digest("hex");
|
|
13
|
+
const reportFile = (target) => path.join(bridgeRoot(), "worker-reports", `${key(target)}.json`);
|
|
14
|
+
/** The worker reports PR evidence to its own Hook, without direct messaging or
|
|
15
|
+
* GitHub comments. Bound to this terminal and submitted turn, not the next one. */
|
|
16
|
+
export async function reportWorker(input) {
|
|
17
|
+
const data = z.object({ origin: originPaneSchema, prs: prsSchema }).strict().parse(input);
|
|
18
|
+
const pane = findPane(await snapshot(data.origin.server), data.origin);
|
|
19
|
+
if (!pane)
|
|
20
|
+
throw new BridgeError(409, "The worker pane changed.");
|
|
21
|
+
const session = await paneIdentity(data.origin.server, pane, true);
|
|
22
|
+
const target = targetSchema.parse({ ...data.origin, source: pane.agent, session });
|
|
23
|
+
await validateTarget(target, false, true);
|
|
24
|
+
const record = await paneTurn(target.server, pane, target.source);
|
|
25
|
+
if (!record?.prompt || record.session !== session || record.terminal !== pane.terminal_id)
|
|
26
|
+
throw new BridgeError(409, "The Hook has not recorded this worker's submitted turn yet.");
|
|
27
|
+
await atomicInPrivateDir(reportFile(target), reportSchema.parse({ target, terminal: record.terminal, promptSeq: record.prompt.seq, prs: data.prs, at: new Date().toISOString() }));
|
|
28
|
+
return { ok: true, target, prs: data.prs };
|
|
29
|
+
}
|
|
30
|
+
export async function workerPrs(target, record) {
|
|
31
|
+
try {
|
|
32
|
+
const file = reportFile(target), info = await lstat(file);
|
|
33
|
+
if (!info.isFile() || info.isSymbolicLink() || info.size > 131072)
|
|
34
|
+
return undefined;
|
|
35
|
+
const report = reportSchema.parse(JSON.parse(await readFile(file, "utf8")));
|
|
36
|
+
return report.terminal === record.terminal && report.promptSeq === record.prompt?.seq ? report.prs : undefined;
|
|
37
|
+
}
|
|
38
|
+
catch (error) {
|
|
39
|
+
if (error.code !== "ENOENT")
|
|
40
|
+
throw error;
|
|
41
|
+
return undefined;
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
export async function readIntegrator() {
|
|
45
|
+
try {
|
|
46
|
+
return integratorSchema.parse(JSON.parse(await readFile(path.join(bridgeRoot(), "integrator.json"), "utf8")));
|
|
47
|
+
}
|
|
48
|
+
catch (error) {
|
|
49
|
+
if (error.code !== "ENOENT")
|
|
50
|
+
throw error;
|
|
51
|
+
return undefined;
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
export async function setIntegrator(input) {
|
|
55
|
+
if (input === null) {
|
|
56
|
+
const { rm } = await import("node:fs/promises");
|
|
57
|
+
await rm(path.join(bridgeRoot(), "integrator.json"), { force: true });
|
|
58
|
+
return { ok: true, integrator: null };
|
|
59
|
+
}
|
|
60
|
+
const data = integratorSchema.parse(input);
|
|
61
|
+
await atomicInPrivateDir(path.join(bridgeRoot(), "integrator.json"), data);
|
|
62
|
+
return { ok: true, integrator: data };
|
|
63
|
+
}
|