@phren/cli 0.3.53 → 0.3.55
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/dist/bridge/account-add.d.ts +7 -0
- package/dist/bridge/account-add.js +39 -0
- package/dist/bridge/claude-accounts.js +1 -1
- package/dist/bridge/client.js +1 -1
- package/dist/bridge/command.js +2 -0
- package/dist/bridge/computers.js +3 -2
- package/dist/bridge/conductor-role.d.ts +162 -2
- package/dist/bridge/conductor-role.js +56 -23
- package/dist/bridge/conductor-succession.d.ts +100 -0
- package/dist/bridge/conductor-succession.js +649 -0
- package/dist/bridge/continuation-launch.d.ts +54 -0
- package/dist/bridge/continuation-launch.js +106 -0
- package/dist/bridge/dispatch-command.js +11 -4
- package/dist/bridge/dispatch-hosts.d.ts +3 -0
- package/dist/bridge/dispatch-hosts.js +6 -1
- package/dist/bridge/dispatch-returns.d.ts +21 -3
- package/dist/bridge/dispatch-returns.js +169 -39
- package/dist/bridge/dispatch.d.ts +11 -0
- package/dist/bridge/dispatch.js +70 -5
- package/dist/bridge/git.js +82 -8
- package/dist/bridge/hand-off-queue.d.ts +3 -0
- package/dist/bridge/hand-off-queue.js +8 -0
- package/dist/bridge/hand-off.d.ts +13 -0
- package/dist/bridge/hand-off.js +20 -1
- package/dist/bridge/install.js +0 -6
- package/dist/bridge/launch-brief.d.ts +2 -0
- package/dist/bridge/launch-brief.js +19 -8
- package/dist/bridge/move-computers.d.ts +47 -0
- package/dist/bridge/move-computers.js +118 -0
- package/dist/bridge/peer-handoff.d.ts +5 -0
- package/dist/bridge/peer-handoff.js +52 -0
- package/dist/bridge/projects.js +13 -8
- package/dist/bridge/request-origin.d.ts +6 -0
- package/dist/bridge/request-origin.js +20 -0
- package/dist/bridge/scoped-gateway.d.ts +2 -1
- package/dist/bridge/scoped-gateway.js +16 -3
- package/dist/bridge/server-launch.d.ts +2 -0
- package/dist/bridge/server-launch.js +2 -0
- package/dist/bridge/server-routes.d.ts +6 -0
- package/dist/bridge/server-routes.js +228 -15
- package/dist/bridge/server.js +46 -24
- package/dist/bridge/session-move.d.ts +28 -1
- package/dist/bridge/session-move.js +266 -25
- package/dist/bridge/socket-budget.d.ts +29 -0
- package/dist/bridge/socket-budget.js +62 -0
- package/dist/bridge/terminal-herdr.js +14 -0
- package/dist/bridge/terminal-tmux.js +1 -0
- package/dist/bridge/terminal.d.ts +2 -0
- package/dist/bridge/terminal.js +6 -0
- package/dist/bridge/worker-relocation.d.ts +5 -0
- package/dist/bridge/worker-relocation.js +33 -0
- package/dist/bridge-hook.mjs +16480 -14296
- package/dist/modules/registry.js +8 -8
- package/dist/tools/dispatch.js +2 -1
- package/package.json +1 -1
|
@@ -0,0 +1,62 @@
|
|
|
1
|
+
import { requestPeer } from "./request-origin.js";
|
|
2
|
+
/** Sockets one identity may hold per client kind, and in all. */
|
|
3
|
+
export const SOCKETS_PER_KIND = 16;
|
|
4
|
+
export const SOCKETS_PER_IDENTITY = 32;
|
|
5
|
+
/** Every identity together; the backstop if identities themselves multiply. */
|
|
6
|
+
export const SOCKETS_TOTAL = 128;
|
|
7
|
+
/**
|
|
8
|
+
* Who a WebSocket belongs to, from what the Hook itself trusts rather than a
|
|
9
|
+
* client hint: a peer key's gateway rebuilds its request with `x-phren-origin:
|
|
10
|
+
* peer` and the peer's fingerprint, so that is its own identity; everything
|
|
11
|
+
* else arrives on the owner's local socket or the owner's SSH pipe and is the
|
|
12
|
+
* owner. `x-phren-client` only picks a sub-pool inside the identity.
|
|
13
|
+
*/
|
|
14
|
+
export function socketIdentity(request) {
|
|
15
|
+
const peer = requestPeer(request);
|
|
16
|
+
return peer ? `peer:${peer.fingerprint}` : "owner";
|
|
17
|
+
}
|
|
18
|
+
export const socketKind = (request) => request.headers["x-phren-client"] === "desktop" ? "desktop" : "default";
|
|
19
|
+
/** Admits sockets oldest-first under the per-kind, per-identity and total caps. */
|
|
20
|
+
export class SocketBudget {
|
|
21
|
+
limits;
|
|
22
|
+
entries = new Set();
|
|
23
|
+
constructor(limits = { kind: SOCKETS_PER_KIND, identity: SOCKETS_PER_IDENTITY, total: SOCKETS_TOTAL }) {
|
|
24
|
+
this.limits = limits;
|
|
25
|
+
}
|
|
26
|
+
/** Register a socket; returns the sockets to close to stay inside the caps. */
|
|
27
|
+
add(socket, identity, kind) {
|
|
28
|
+
const entry = { socket, identity, kind };
|
|
29
|
+
this.entries.add(entry);
|
|
30
|
+
const evicted = [];
|
|
31
|
+
const drop = (match) => {
|
|
32
|
+
const oldest = [...this.entries].find(match);
|
|
33
|
+
if (!oldest)
|
|
34
|
+
return;
|
|
35
|
+
this.entries.delete(oldest);
|
|
36
|
+
evicted.push(oldest.socket);
|
|
37
|
+
};
|
|
38
|
+
while ([...this.entries].filter(e => e.identity === identity && e.kind === kind).length > this.limits.kind)
|
|
39
|
+
drop(e => e.identity === identity && e.kind === kind);
|
|
40
|
+
while ([...this.entries].filter(e => e.identity === identity).length > this.limits.identity)
|
|
41
|
+
drop(e => e.identity === identity);
|
|
42
|
+
while (this.entries.size > this.limits.total) {
|
|
43
|
+
const counts = new Map();
|
|
44
|
+
for (const e of this.entries)
|
|
45
|
+
counts.set(e.identity, (counts.get(e.identity) ?? 0) + 1);
|
|
46
|
+
// Ties go against a peer identity, so forged peer budgets never push out the owner's own devices first.
|
|
47
|
+
const [heaviest] = [...counts].sort((a, b) => b[1] - a[1] || Number(a[0] === "owner") - Number(b[0] === "owner"))[0];
|
|
48
|
+
drop(e => e.identity === heaviest);
|
|
49
|
+
}
|
|
50
|
+
return evicted;
|
|
51
|
+
}
|
|
52
|
+
remove(socket) {
|
|
53
|
+
for (const e of this.entries)
|
|
54
|
+
if (e.socket === socket) {
|
|
55
|
+
this.entries.delete(e);
|
|
56
|
+
return;
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
count(identity) {
|
|
60
|
+
return identity === undefined ? this.entries.size : [...this.entries].filter(e => e.identity === identity).length;
|
|
61
|
+
}
|
|
62
|
+
}
|
|
@@ -93,6 +93,20 @@ export const herdrTerminal = {
|
|
|
93
93
|
await rpc(server, "pane.send_keys", { pane_id: pane, keys });
|
|
94
94
|
}
|
|
95
95
|
},
|
|
96
|
+
async shellCommand(server, pane, command) {
|
|
97
|
+
const deadline = Date.now() + 15_000;
|
|
98
|
+
for (;;) {
|
|
99
|
+
const info = object((await rpc(server, "pane.process_info", { pane_id: pane })).process_info);
|
|
100
|
+
if (Number.isSafeInteger(info.shell_pid) && info.foreground_process_group_id === info.shell_pid)
|
|
101
|
+
break;
|
|
102
|
+
if (Date.now() >= deadline)
|
|
103
|
+
throw new BridgeError(409, "The new pane did not become ready at its shell prompt.");
|
|
104
|
+
await new Promise(resolve => setTimeout(resolve, 200));
|
|
105
|
+
}
|
|
106
|
+
// An empty shell is not a named agent: agent.prompt cannot address it.
|
|
107
|
+
await rpc(server, "pane.send_text", { pane_id: pane, text: command });
|
|
108
|
+
await rpc(server, "pane.send_keys", { pane_id: pane, keys: ["Enter"] });
|
|
109
|
+
},
|
|
96
110
|
async prompt(server, pane, text, signal) {
|
|
97
111
|
try {
|
|
98
112
|
if (signal)
|
|
@@ -417,6 +417,7 @@ export const tmuxTerminal = {
|
|
|
417
417
|
for (const call of sendKeysCalls(target, keys))
|
|
418
418
|
await tmux(server, call);
|
|
419
419
|
},
|
|
420
|
+
async shellCommand(server, pane, command) { await tmuxTerminal.prompt(server, pane, command); },
|
|
420
421
|
async prompt(server, pane, text, signal) {
|
|
421
422
|
const target = toTmuxId(pane, "p"), buffer = `phren-${process.pid}-${Date.now().toString(36)}`;
|
|
422
423
|
// The text reaches tmux on stdin and the pane as one bracketed paste
|
|
@@ -98,6 +98,8 @@ export interface TerminalProvider {
|
|
|
98
98
|
/** Types `text` and sends the submit key. Success acknowledges transport,
|
|
99
99
|
* not a submitted turn; the harness must confirm that separately. */
|
|
100
100
|
prompt(server: string, pane: string, text: string, signal?: AbortSignal): Promise<void>;
|
|
101
|
+
/** Run an owner-selected command at an empty pane's shell prompt. */
|
|
102
|
+
shellCommand?(server: string, pane: string, command: string): Promise<void>;
|
|
101
103
|
/** Opens a pane; the caller finds it in the next `listPanes`. */
|
|
102
104
|
create(server: string, placement: PanePlacement): Promise<void>;
|
|
103
105
|
startAgent(server: string, pane: string, agent: AgentStart): Promise<void>;
|
package/dist/bridge/terminal.js
CHANGED
|
@@ -49,6 +49,12 @@ export const routedTerminal = {
|
|
|
49
49
|
readScreen: (server, pane, read) => route(server).readScreen(server, pane, read),
|
|
50
50
|
sendKeys: (server, pane, keys) => route(server).sendKeys(server, pane, keys),
|
|
51
51
|
prompt: (server, pane, text, signal) => route(server).prompt(server, pane, text, signal),
|
|
52
|
+
shellCommand: async (server, pane, command) => {
|
|
53
|
+
const provider = route(server);
|
|
54
|
+
if (!provider.shellCommand)
|
|
55
|
+
throw new BridgeError(503, "This terminal cannot open an interactive account login.");
|
|
56
|
+
await provider.shellCommand(server, pane, command);
|
|
57
|
+
},
|
|
52
58
|
create: (server, placement) => route(server).create(server, placement),
|
|
53
59
|
startAgent: (server, pane, agent) => route(server).startAgent(server, pane, agent),
|
|
54
60
|
paneEnv: (server, place) => route(server).paneEnv?.(server, place),
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import { type Json, type Target } from "./protocol.js";
|
|
2
|
+
/** Carry the original receipt id so its dispatcher can prove compatibility
|
|
3
|
+
* even before its next poll observes the new session. Aliases have no authority. */
|
|
4
|
+
export declare function preflightWorkerRelocation(dispatch: string, target: Target): Promise<string>;
|
|
5
|
+
export declare function relocationSupport(id: string, session: string): Promise<Json>;
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
import { continuationPlacement } from "./continuation-launch.js";
|
|
2
|
+
import { hookRequest } from "./client.js";
|
|
3
|
+
import { dispatchStatus } from "./dispatch.js";
|
|
4
|
+
import { optionalHookPeers, peerRequest } from "./peers.js";
|
|
5
|
+
import { BridgeError, object } from "./protocol.js";
|
|
6
|
+
/** Carry the original receipt id so its dispatcher can prove compatibility
|
|
7
|
+
* even before its next poll observes the new session. Aliases have no authority. */
|
|
8
|
+
export async function preflightWorkerRelocation(dispatch, target) {
|
|
9
|
+
const original = (await continuationPlacement(dispatch))?.workerDispatch ?? dispatch;
|
|
10
|
+
const query = `/v1/dispatch/relocation?id=${encodeURIComponent(original)}&session=${encodeURIComponent(target.session)}`;
|
|
11
|
+
const { peers } = await optionalHookPeers();
|
|
12
|
+
const probes = [
|
|
13
|
+
async () => ({ health: await hookRequest("/v1/health", undefined, undefined, 5_000), known: await hookRequest(query, undefined, undefined, 5_000) }),
|
|
14
|
+
...peers.map(peer => async () => ({ health: await peerRequest(peer, "/v1/health", undefined, 5_000), known: await peerRequest(peer, query, undefined, 5_000) })),
|
|
15
|
+
];
|
|
16
|
+
const answers = await Promise.all(probes.map(probe => probe().catch(() => undefined)));
|
|
17
|
+
const ownsReceipt = (answer) => answer.known.known === true || answer.known.knownDispatch === true;
|
|
18
|
+
const dispatchers = answers.filter(answer => answer && ownsReceipt(answer) && object(answer.health.capabilities).workerRelocation === 1);
|
|
19
|
+
const incompatibleDispatcher = answers.some(answer => answer && ownsReceipt(answer) && object(answer.health.capabilities).workerRelocation !== 1);
|
|
20
|
+
if (dispatchers.length !== 1 || incompatibleDispatcher)
|
|
21
|
+
throw new BridgeError(409, "Update the dispatching computer's Phren Hook first");
|
|
22
|
+
return original;
|
|
23
|
+
}
|
|
24
|
+
export async function relocationSupport(id, session) {
|
|
25
|
+
const receipts = await dispatchStatus();
|
|
26
|
+
const matched = receipts.filter(receipt => receipt.id === id || receipt.moves?.some(move => move.id === id));
|
|
27
|
+
const known = matched.some(receipt => receipt.target && "session" in receipt.target && receipt.target.session === session);
|
|
28
|
+
// A source move is durable before a worker's receiving Hook may use its id.
|
|
29
|
+
// This also repairs moves launched before workerDispatch was serialized.
|
|
30
|
+
const moved = matched.length ? undefined : await (await import("./session-move.js")).readMove(id).catch(() => undefined);
|
|
31
|
+
const knownDispatch = matched.length > 0 || !!moved?.dispatch && receipts.some(receipt => receipt.id === moved.dispatch) && moved.target && "session" in moved.target && moved.target.session === session;
|
|
32
|
+
return { known, knownDispatch: !!knownDispatch, workerRelocation: 1 };
|
|
33
|
+
}
|