@phren/cli 0.3.10 → 0.3.12

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.
Files changed (184) hide show
  1. package/dist/bridge/agent-hook-stores.d.ts +3 -0
  2. package/dist/bridge/agent-hook-stores.js +5 -0
  3. package/dist/bridge/agent-hooks.d.ts +159 -5
  4. package/dist/bridge/agent-hooks.js +663 -49
  5. package/dist/bridge/approval-summary.d.ts +16 -0
  6. package/dist/bridge/approval-summary.js +133 -0
  7. package/dist/bridge/authority-command.d.ts +20 -0
  8. package/dist/bridge/authority-command.js +120 -0
  9. package/dist/bridge/authority.d.ts +223 -0
  10. package/dist/bridge/authority.js +231 -0
  11. package/dist/bridge/claude-account-setup.d.ts +14 -0
  12. package/dist/bridge/claude-account-setup.js +69 -0
  13. package/dist/bridge/claude-accounts.d.ts +49 -0
  14. package/dist/bridge/claude-accounts.js +195 -0
  15. package/dist/bridge/code-routes.js +2 -2
  16. package/dist/bridge/codex-app-server.d.ts +144 -0
  17. package/dist/bridge/codex-app-server.js +319 -0
  18. package/dist/bridge/codex-auth-refresh.d.ts +33 -0
  19. package/dist/bridge/codex-auth-refresh.js +71 -0
  20. package/dist/bridge/codex-question-reply.d.ts +16 -0
  21. package/dist/bridge/codex-question-reply.js +57 -0
  22. package/dist/bridge/codex-review-mode.d.ts +10 -0
  23. package/dist/bridge/codex-review-mode.js +74 -0
  24. package/dist/bridge/codex-servers.d.ts +217 -0
  25. package/dist/bridge/codex-servers.js +636 -0
  26. package/dist/bridge/command.js +94 -4
  27. package/dist/bridge/computer-identity.d.ts +75 -0
  28. package/dist/bridge/computer-identity.js +166 -0
  29. package/dist/bridge/conductor-group.d.ts +91 -8
  30. package/dist/bridge/conductor-group.js +105 -9
  31. package/dist/bridge/conductor-role.d.ts +94 -0
  32. package/dist/bridge/conductor-role.js +176 -0
  33. package/dist/bridge/conductor-sets.d.ts +20 -0
  34. package/dist/bridge/conductor-sets.js +59 -0
  35. package/dist/bridge/dispatch-command.d.ts +3 -0
  36. package/dist/bridge/dispatch-command.js +75 -11
  37. package/dist/bridge/dispatch-returns.d.ts +123 -19
  38. package/dist/bridge/dispatch-returns.js +357 -50
  39. package/dist/bridge/dispatch.d.ts +103 -2
  40. package/dist/bridge/dispatch.js +272 -40
  41. package/dist/bridge/fanout-messages.js +2 -2
  42. package/dist/bridge/fanouts.d.ts +7 -1
  43. package/dist/bridge/fanouts.js +40 -5
  44. package/dist/bridge/folder-trust.d.ts +56 -0
  45. package/dist/bridge/folder-trust.js +195 -0
  46. package/dist/bridge/grants.d.ts +22 -1
  47. package/dist/bridge/grants.js +57 -9
  48. package/dist/bridge/hand-off.d.ts +21 -9
  49. package/dist/bridge/hand-off.js +58 -45
  50. package/dist/bridge/harness-status.d.ts +11 -0
  51. package/dist/bridge/harness-status.js +32 -0
  52. package/dist/bridge/harnesses.d.ts +39 -0
  53. package/dist/bridge/harnesses.js +65 -0
  54. package/dist/bridge/health.d.ts +2 -0
  55. package/dist/bridge/health.js +1 -1
  56. package/dist/bridge/herdr.d.ts +11 -2
  57. package/dist/bridge/herdr.js +98 -23
  58. package/dist/bridge/hook-fast.d.ts +4 -0
  59. package/dist/bridge/hook-fast.js +68 -0
  60. package/dist/bridge/install.d.ts +16 -1
  61. package/dist/bridge/install.js +88 -21
  62. package/dist/bridge/launch-brief.d.ts +96 -0
  63. package/dist/bridge/launch-brief.js +164 -0
  64. package/dist/bridge/model-switch.d.ts +3 -0
  65. package/dist/bridge/model-switch.js +17 -1
  66. package/dist/bridge/models.d.ts +8 -4
  67. package/dist/bridge/models.js +24 -8
  68. package/dist/bridge/mux-wire.d.ts +9 -0
  69. package/dist/bridge/mux-wire.js +19 -0
  70. package/dist/bridge/opencode-pane-server.d.ts +113 -0
  71. package/dist/bridge/opencode-pane-server.js +332 -0
  72. package/dist/bridge/opencode-panes.d.ts +111 -0
  73. package/dist/bridge/opencode-panes.js +295 -0
  74. package/dist/bridge/pane-accounts.d.ts +8 -0
  75. package/dist/bridge/pane-accounts.js +46 -0
  76. package/dist/bridge/prompt-startup.d.ts +5 -0
  77. package/dist/bridge/prompt-startup.js +24 -0
  78. package/dist/bridge/protocol.d.ts +5 -0
  79. package/dist/bridge/protocol.js +4 -0
  80. package/dist/bridge/push.d.ts +5 -4
  81. package/dist/bridge/push.js +6 -4
  82. package/dist/bridge/questions.d.ts +37 -2
  83. package/dist/bridge/questions.js +158 -15
  84. package/dist/bridge/resources.d.ts +125 -0
  85. package/dist/bridge/resources.js +314 -0
  86. package/dist/bridge/schedule-format.d.ts +2 -0
  87. package/dist/bridge/schedule-format.js +3 -0
  88. package/dist/bridge/schedule-launch.d.ts +2 -1
  89. package/dist/bridge/schedule-launch.js +23 -53
  90. package/dist/bridge/schedule-watch.d.ts +10 -1
  91. package/dist/bridge/schedule-watch.js +54 -2
  92. package/dist/bridge/server-launch.d.ts +22 -5
  93. package/dist/bridge/server-launch.js +225 -29
  94. package/dist/bridge/server-overview.d.ts +8 -2
  95. package/dist/bridge/server-overview.js +26 -5
  96. package/dist/bridge/server-pane-routes.d.ts +2 -0
  97. package/dist/bridge/server-pane-routes.js +145 -15
  98. package/dist/bridge/server-routes.d.ts +11 -1
  99. package/dist/bridge/server-routes.js +195 -36
  100. package/dist/bridge/server-stream.d.ts +2 -0
  101. package/dist/bridge/server-stream.js +22 -8
  102. package/dist/bridge/server.d.ts +6 -1
  103. package/dist/bridge/server.js +47 -12
  104. package/dist/bridge/session-activity.d.ts +81 -0
  105. package/dist/bridge/session-activity.js +117 -0
  106. package/dist/bridge/session-rename.d.ts +48 -0
  107. package/dist/bridge/session-rename.js +190 -0
  108. package/dist/bridge/session-servers.js +2 -2
  109. package/dist/bridge/settings-switch.d.ts +60 -0
  110. package/dist/bridge/settings-switch.js +287 -0
  111. package/dist/bridge/speech-voice.d.ts +55 -0
  112. package/dist/bridge/speech-voice.js +132 -0
  113. package/dist/bridge/speech.d.ts +70 -11
  114. package/dist/bridge/speech.js +169 -41
  115. package/dist/bridge/terminal-herdr.js +9 -3
  116. package/dist/bridge/terminal-tmux.d.ts +3 -3
  117. package/dist/bridge/terminal-tmux.js +24 -9
  118. package/dist/bridge/terminal.d.ts +27 -4
  119. package/dist/bridge/terminal.js +8 -1
  120. package/dist/bridge/transcript-claude.js +62 -12
  121. package/dist/bridge/transcript-codex.d.ts +0 -2
  122. package/dist/bridge/transcript-codex.js +29 -4
  123. package/dist/bridge/transcript-preview.d.ts +1 -0
  124. package/dist/bridge/transcript-preview.js +24 -4
  125. package/dist/bridge/transcripts.d.ts +15 -2
  126. package/dist/bridge/transcripts.js +47 -16
  127. package/dist/bridge/turn-records.d.ts +85 -0
  128. package/dist/bridge/turn-records.js +143 -0
  129. package/dist/bridge/uploads.d.ts +3 -0
  130. package/dist/bridge/uploads.js +14 -0
  131. package/dist/bridge/usage.d.ts +73 -28
  132. package/dist/bridge/usage.js +313 -340
  133. package/dist/bridge-hook.mjs +24624 -18450
  134. package/dist/cli/claude-unmanaged.d.ts +12 -0
  135. package/dist/cli/claude-unmanaged.js +105 -0
  136. package/dist/cli/schedules.js +2 -1
  137. package/dist/cli/session-start.js +10 -1
  138. package/dist/cli/session-stop.js +9 -1
  139. package/dist/cli-registry.d.ts +2 -0
  140. package/dist/cli-registry.js +37 -5
  141. package/dist/computers/command.d.ts +6 -0
  142. package/dist/computers/command.js +152 -0
  143. package/dist/computers/mcp.d.ts +1 -0
  144. package/dist/computers/mcp.js +97 -0
  145. package/dist/computers/read.d.ts +85 -0
  146. package/dist/computers/read.js +177 -0
  147. package/dist/data/task-receipts.d.ts +19 -0
  148. package/dist/data/task-receipts.js +68 -0
  149. package/dist/data/tasks.js +4 -1
  150. package/dist/entrypoint.js +10 -0
  151. package/dist/fanout/adapters/claude.js +15 -2
  152. package/dist/fanout/adapters/types.d.ts +6 -0
  153. package/dist/fanout/launcher.d.ts +5 -1
  154. package/dist/fanout/launcher.js +34 -3
  155. package/dist/fanout/picker.js +3 -2
  156. package/dist/fanout/usage.js +1 -1
  157. package/dist/generated/memory-ui-graph.browser.js +63 -63
  158. package/dist/graph-core/model.js +24 -3
  159. package/dist/graph-core/types.d.ts +4 -1
  160. package/dist/graph-core/types.js +1 -0
  161. package/dist/init/init-preset.js +7 -3
  162. package/dist/init/init-uninstall.js +2 -11
  163. package/dist/init/teardown.d.ts +3 -0
  164. package/dist/init/teardown.js +47 -0
  165. package/dist/link/context.js +21 -9
  166. package/dist/mcp/plugin-mode.js +1 -1
  167. package/dist/memory-ui-graph.runtime.js +63 -63
  168. package/dist/modules/code-package.d.ts +1 -0
  169. package/dist/modules/code-package.js +36 -7
  170. package/dist/modules/registry.js +14 -13
  171. package/dist/profile-store.d.ts +6 -0
  172. package/dist/profile-store.js +25 -1
  173. package/dist/shell/graph/glyphs.js +4 -0
  174. package/dist/shell/graph/graph-view.js +2 -0
  175. package/dist/status.js +7 -1
  176. package/dist/sync/task-claim.js +3 -2
  177. package/dist/task/lifecycle.js +25 -4
  178. package/dist/test-global-setup.js +5 -0
  179. package/dist/tools/dispatch.js +35 -2
  180. package/dist/tools/tasks.js +10 -1
  181. package/package.json +1 -1
  182. package/plugins/opencode/phren-transcript.js +87 -4
  183. package/starter/global/skills/conductor/SKILL.md +17 -2
  184. package/starter/global/skills/fanout/SKILL.md +3 -0
@@ -8,10 +8,15 @@ import { agentHook } from "./agent-hooks.js";
8
8
  import { object, provider } from "./protocol.js";
9
9
  import { apnsSetupSteps } from "./push.js";
10
10
  import { speechKeyFile, speechKeyStatus, writeSpeechKey } from "./speech-key.js";
11
+ import { clearSpeechModel, clearSpeechVoice, DEFAULT_SPEECH_MODEL, FALLBACK_SPEECH_MODEL, resolveSpeechModel, resolveSpeechVoice, speechModelId, speechVoiceFile, voiceId, writeSpeechModel, writeSpeechVoice } from "./speech-voice.js";
11
12
  import { AccountUsageReader, captureClaudeUsage } from "./usage.js";
12
13
  import { acceptComputer, enrollComputer } from "./computers.js";
13
14
  import { addPeerFromLink, discoverComputers, linkComputer } from "./link.js";
14
15
  import { ARCHIVE_MAX_FOLDERS, archiveFinishedFanouts, FANOUTS_ARCHIVE_USAGE, parseFanoutArchiveFlags } from "./fanouts.js";
16
+ import { harnessInventory } from "./harnesses.js";
17
+ import { addClaudeAccount } from "./claude-account-setup.js";
18
+ import { setAccountLabel } from "./claude-accounts.js";
19
+ import { ModelCatalog } from "./models.js";
15
20
  const LINK_USAGE = "Usage: phren bridge link <ssh-host> [--name <its name here>] [--as <this computer's name there>] [--back-address <address it dials>] [--yes]";
16
21
  export async function runBridge(args, version) {
17
22
  switch (args[0]) {
@@ -26,6 +31,31 @@ export async function runBridge(args, version) {
26
31
  throw new Error("Usage: phren bridge enroll-computer <name> [--accept <public-key-file>]");
27
32
  break;
28
33
  }
34
+ case "accounts": {
35
+ if (args.length === 1) {
36
+ for (const harness of (await harnessInventory()).harnesses) {
37
+ console.log(`${harness.source}: ${harness.installed ? `installed ${harness.version ?? ""}`.trim() : "not installed"}, ${harness.usable ? "usable" : `not usable (${harness.reason ?? "unknown"})`}`);
38
+ for (const account of harness.accounts ?? [])
39
+ console.log(` ${account.id} ${account.label} ${account.signedIn ? "signed in" : "not signed in"} ${account.usable ? "usable" : `not usable (${account.reason ?? "unknown"})`}${account.plan ? ` plan ${account.plan}` : ""}`);
40
+ }
41
+ }
42
+ else if (args[1] === "add" && args[2] && !args[2].startsWith("-")) {
43
+ const at = args.indexOf("--label");
44
+ if (at !== -1 && !args[at + 1])
45
+ throw new Error("Usage: phren bridge accounts add <slug> [--label <name>]");
46
+ const added = await addClaudeAccount(args[2], { label: at === -1 ? undefined : args[at + 1] });
47
+ console.log(`${added.created ? "Created" : "Updated"} ${added.dir}${added.linked.length ? `, linked ${added.linked.join(", ")} from the default home` : ""}.`);
48
+ console.log(`Next: CLAUDE_CONFIG_DIR=${added.dir} claude # finish first-run setup, run /login with this account, then /exit`);
49
+ console.log(`Check: CLAUDE_CONFIG_DIR=${added.dir} claude auth status --text; phren bridge accounts`);
50
+ }
51
+ else if (args[1] === "label" && args.length >= 4) {
52
+ await setAccountLabel(args[2], args.slice(3).join(" "));
53
+ console.log(`Labeled ${args[2]} "${args.slice(3).join(" ").trim()}".`);
54
+ }
55
+ else
56
+ throw new Error("Usage: phren bridge accounts [add <slug> [--label <name>] | label <id> <label>]");
57
+ break;
58
+ }
29
59
  case "discover": {
30
60
  const { reachable, checked } = await discoverComputers();
31
61
  if (!reachable.length)
@@ -85,6 +115,48 @@ export async function runBridge(args, version) {
85
115
  console.log(`Stored the ElevenLabs key in ${speechKeyFile()} (mode 600).`);
86
116
  break;
87
117
  }
118
+ case "speech-voice": {
119
+ // Read on every spoken reply, so a change needs no Hook restart.
120
+ const [, action = "show", id] = args;
121
+ if (action === "set" && id && args.length === 3) {
122
+ if (!voiceId.safeParse(id).success)
123
+ throw new Error(`"${id}" is not an ElevenLabs voice id (10 to 40 letters and digits, e.g. S9EGwlCtMF7VXtENq79v).`);
124
+ console.log(`Talk mode now speaks with ${await writeSpeechVoice(id)} (stored in ${speechVoiceFile()}). Install and update keep it.`);
125
+ }
126
+ else if (action === "clear" && args.length === 2) {
127
+ await clearSpeechVoice();
128
+ const next = await resolveSpeechVoice();
129
+ console.log(`Cleared the stored voice; talk mode uses ${next.voice} (${next.source}).`);
130
+ }
131
+ else if (action === "show" && args.length <= 2) {
132
+ const current = await resolveSpeechVoice();
133
+ console.log(`${current.voice} (${current.source === "setting" ? `stored in ${speechVoiceFile()}` : current.source})`);
134
+ }
135
+ else
136
+ throw new Error(SPEECH_VOICE_USAGE);
137
+ break;
138
+ }
139
+ case "speech-model": {
140
+ const [, action = "show", id] = args;
141
+ if (action === "set" && id && args.length === 3) {
142
+ if (!speechModelId.safeParse(id).success)
143
+ throw new Error(`"${id}" is not an ElevenLabs model id (e.g. ${DEFAULT_SPEECH_MODEL} or ${FALLBACK_SPEECH_MODEL}).`);
144
+ const model = await writeSpeechModel(id);
145
+ const fallback = model === FALLBACK_SPEECH_MODEL ? "" : `, falling back to ${FALLBACK_SPEECH_MODEL} when it fails or is slow`;
146
+ console.log(`Talk mode now speaks with ${model} (stored in ${speechVoiceFile()})${fallback}. Install and update keep it.`);
147
+ }
148
+ else if (action === "clear" && args.length === 2) {
149
+ await clearSpeechModel();
150
+ console.log(`Cleared the stored model; talk mode uses ${DEFAULT_SPEECH_MODEL} (default).`);
151
+ }
152
+ else if (action === "show" && args.length <= 2) {
153
+ const current = await resolveSpeechModel();
154
+ console.log(`${current.model} (${current.source === "setting" ? `stored in ${speechVoiceFile()}` : current.source})`);
155
+ }
156
+ else
157
+ throw new Error(SPEECH_MODEL_USAGE);
158
+ break;
159
+ }
88
160
  case "usage-statusline":
89
161
  await captureClaudeUsage(args[1] || "");
90
162
  break;
@@ -94,9 +166,24 @@ export async function runBridge(args, version) {
94
166
  case "hook":
95
167
  await agentHook(provider.parse(args[1])).catch(() => { });
96
168
  break;
97
- case "serve":
98
- await serve(version);
169
+ case "serve": {
170
+ // The subprocess bridge suite supplies this fixture; no agent binaries or
171
+ // machine-specific catalogue caches should affect its HTTP assertions.
172
+ const fixture = process.env.NODE_ENV === "test" ? process.env.PHREN_TEST_MODEL_CATALOG : undefined;
173
+ if (!fixture) {
174
+ await serve(version);
175
+ break;
176
+ }
177
+ const readModels = async (source) => {
178
+ const rows = JSON.parse(await readFile(fixture, "utf8"));
179
+ return Array.isArray(rows[source]) ? rows[source] : [];
180
+ };
181
+ const emptyUsage = (source) => ({ source, windows: [] });
182
+ const modelCatalog = new ModelCatalog(() => readModels("codex"), () => readModels("claude"), () => readModels("opencode"), 0);
183
+ const accountUsage = new AccountUsageReader(async () => emptyUsage("codex"), Date.now, async () => ({ source: "claude", windows: [{ id: "fixture", name: "Fixture", usedPercent: 0 }] }), async () => emptyUsage("opencode"), async () => undefined, async () => emptyUsage("opencode-go"), async () => emptyUsage("copilot"));
184
+ await serve(version, { modelCatalog, accountUsage });
99
185
  break;
186
+ }
100
187
  case "ssh":
101
188
  await dispatch(process.env.SSH_ORIGINAL_COMMAND || "");
102
189
  break;
@@ -115,7 +202,7 @@ export async function runBridge(args, version) {
115
202
  break;
116
203
  case "doctor": {
117
204
  const helper = await health(), muxes = await servers(), terminal = await terminalHealth();
118
- const push = approvalPushCheck(helper), speech = await speechKeyStatus();
205
+ const push = approvalPushCheck(helper), speech = await speechKeyStatus(), voice = await resolveSpeechVoice().catch(() => undefined), model = await resolveSpeechModel();
119
206
  // Chat needs Herdr or tmux; a plain project shell or agent over SSH does not.
120
207
  console.log(JSON.stringify({ ok: true, helper, herdr: muxes, terminal, checks: {
121
208
  privateSocket: true, protocol: true, independentHelper: true,
@@ -124,12 +211,13 @@ export async function runBridge(args, version) {
124
211
  shell: muxes.length > 0 ? "available" : "Neither Herdr nor tmux is available: chat is unavailable, project shells and agents still open over SSH",
125
212
  approvalPush: push.configured ? "configured" : "not configured",
126
213
  speechKey: speech.configured ? "configured" : "not configured", speechKeyDetail: speech.detail,
214
+ ...(voice ? { speechVoice: `${voice.voice} (${voice.source})` } : {}), speechModel: `${model.model} (${model.source})`,
127
215
  }, ...(push.warning ? { warnings: [push.warning] } : {}) }, null, 2));
128
216
  if (push.warning)
129
217
  console.error(`warning: ${push.warning}`);
130
218
  break;
131
219
  }
132
- default: throw new Error("Usage: phren bridge <install|status|doctor|usage|update|rollback|uninstall|enroll-computer|discover|link|fanouts archive|speech-key set>");
220
+ default: throw new Error("Usage: phren bridge <install|status|doctor|usage|update|rollback|uninstall|enroll-computer|accounts|discover|link|fanouts archive|speech-key set|speech-voice|speech-model>");
133
221
  }
134
222
  return 0;
135
223
  }
@@ -141,6 +229,8 @@ export function approvalPushCheck(helper) {
141
229
  const configured = capability === "direct-apns" || capability === "relay";
142
230
  return configured ? { configured } : { configured, warning: apnsSetupSteps() };
143
231
  }
232
+ const SPEECH_VOICE_USAGE = "Usage: phren bridge speech-voice [show | set <elevenlabs-voice-id> | clear]";
233
+ const SPEECH_MODEL_USAGE = "Usage: phren bridge speech-model [show | set <elevenlabs-model-id> | clear]";
144
234
  const SPEECH_KEY_USAGE = "Usage: phren bridge speech-key set (paste the key when asked, or pipe it on stdin)";
145
235
  /** One line from stdin: piped as is, or typed at a prompt without echo. */
146
236
  async function readSecret(prompt) {
@@ -0,0 +1,75 @@
1
+ /** One real computer. `name` is what dispatch, hand_off and grants accept: the
2
+ * hooks.yaml peer name, or this computer's short hostname. `aliases` are
3
+ * every other name it answers to. */
4
+ export interface Computer {
5
+ /** The Hook's computer id, when its Hook answered. */
6
+ id?: string;
7
+ name: string;
8
+ aliases: string[];
9
+ /** The store profile machines.yaml maps its names to. */
10
+ profile?: string;
11
+ local: boolean;
12
+ /** Reachable through a verified connection (this computer, or a hooks.yaml peer). */
13
+ linked: boolean;
14
+ /** Whether a peer's Hook answered just now; unknown when not probed, absent for unlinked. */
15
+ reachable?: boolean;
16
+ }
17
+ /** `name` and `address` come from hooks.yaml, which the owner writes. `names`
18
+ * is what the peer's own Hook says it is called: display only, never trusted. */
19
+ export interface PeerFacts {
20
+ name: string;
21
+ address: string;
22
+ id?: string;
23
+ names?: readonly string[];
24
+ reachable?: boolean;
25
+ }
26
+ export interface IdentityFacts {
27
+ local: {
28
+ id?: string;
29
+ names: readonly string[];
30
+ };
31
+ peers: readonly PeerFacts[];
32
+ /** machines.yaml: machine name to profile. */
33
+ machines: Readonly<Record<string, string>>;
34
+ }
35
+ /** A computer name's first DNS label, lowercased: `Desk`, `desk.local` and
36
+ * `Desk.example.net` are one computer. DHCP and Bonjour add domains to the
37
+ * same machine's name, so full names do not identify a computer. */
38
+ export declare function computerLabel(name: string): string;
39
+ /** Folds what this Hook knows into one row per real computer. A machines.yaml
40
+ * name joins a computer when its first label matches any name that computer
41
+ * has, or when it shares a profile with names already folded into exactly one
42
+ * computer (a profile two computers claim folds nothing). The rest become
43
+ * unlinked rows: names sharing a label or a profile are one computer. */
44
+ export declare function foldComputers(facts: IdentityFacts, options?: {
45
+ trusted?: boolean;
46
+ }): Computer[];
47
+ /** The computer a name refers to: an exact name or alias, else the same first
48
+ * label (case-insensitive), so `Desk.local` finds `Desk`. `local` is this
49
+ * computer. A name two rows answer to resolves to nothing. */
50
+ export declare function resolveComputer(computers: readonly Computer[], name: string): Computer | undefined;
51
+ export interface ReadOptions {
52
+ /** Ask each peer's Hook for its identity (parallel, short timeout) and report `reachable`. */
53
+ probe?: boolean;
54
+ /** Only names the owner wrote (this computer's, hooks.yaml, machines.yaml): what grants match against. */
55
+ trusted?: boolean;
56
+ local?: {
57
+ id?: string;
58
+ names?: readonly string[];
59
+ };
60
+ store?: string | null;
61
+ root?: string;
62
+ }
63
+ /** Never throws: a missing hooks.yaml or machines.yaml only means fewer rows. */
64
+ export declare function readComputers(options?: ReadOptions): Promise<{
65
+ computers: Computer[];
66
+ peerError?: string;
67
+ }>;
68
+ /** What a dispatch or hand-off's `computer` names, by owner-written names only: an alias,
69
+ * a machines.yaml name or `Desk.local` finds the enrolled peer (by its hooks.yaml name) or
70
+ * this computer. Unknown, ambiguous or unlinked names resolve to nothing. */
71
+ export declare function linkedComputer(name: string, root?: string): Promise<{
72
+ local: true;
73
+ } | {
74
+ peer: string;
75
+ } | undefined>;
@@ -0,0 +1,166 @@
1
+ import { findPhrenPath } from "../phren-paths.js";
2
+ import { listMachines } from "../profile-store.js";
3
+ import { localNames } from "./computer-names.js";
4
+ import { optionalHookPeers, peerRequest } from "./peers.js";
5
+ import { bridgeRoot, object } from "./protocol.js";
6
+ /** A computer name's first DNS label, lowercased: `Desk`, `desk.local` and
7
+ * `Desk.example.net` are one computer. DHCP and Bonjour add domains to the
8
+ * same machine's name, so full names do not identify a computer. */
9
+ export function computerLabel(name) {
10
+ const value = name.trim().toLowerCase();
11
+ // An IPv4 address is one name, not a label and a domain.
12
+ return /^\d+(\.\d+){3}$/.test(value) ? value : value.split(".")[0] ?? "";
13
+ }
14
+ const MAX_ROWS = 64;
15
+ const same = (a, b) => a.trim().toLowerCase() === b.trim().toLowerCase();
16
+ const namesOf = (row) => [row.name, ...row.aliases];
17
+ const shortestFirst = (a, b) => a.length - b.length || a.localeCompare(b);
18
+ /** Adds a name unless the row has it, or it (or its first label) already
19
+ * names another row: one name never points at two computers. */
20
+ function addAlias(row, name, rows = [row]) {
21
+ if (!name.trim() || namesOf(row).some(known => same(known, name)))
22
+ return;
23
+ const label = computerLabel(name);
24
+ if (rows.some(other => other !== row && namesOf(other).some(known => same(known, name) || computerLabel(known) === label)))
25
+ return;
26
+ row.aliases.push(name);
27
+ }
28
+ /** Folds what this Hook knows into one row per real computer. A machines.yaml
29
+ * name joins a computer when its first label matches any name that computer
30
+ * has, or when it shares a profile with names already folded into exactly one
31
+ * computer (a profile two computers claim folds nothing). The rest become
32
+ * unlinked rows: names sharing a label or a profile are one computer. */
33
+ export function foldComputers(facts, options = {}) {
34
+ const localName = facts.local.names.find(name => !name.includes(".")) ?? facts.local.names[0] ?? "local";
35
+ const linked = [{ ...(facts.local.id ? { id: facts.local.id } : {}), name: localName, aliases: [], local: true, linked: true, reachable: true }];
36
+ for (const name of facts.local.names)
37
+ addAlias(linked[0], name);
38
+ const peers = facts.peers.map(peer => {
39
+ const row = { ...(peer.id ? { id: peer.id } : {}), name: peer.name, aliases: [], local: false, linked: true,
40
+ ...(peer.reachable === undefined ? {} : { reachable: peer.reachable }) };
41
+ linked.push(row);
42
+ return { peer, row };
43
+ });
44
+ // Owner-written names first, so a peer's report can never take one of them.
45
+ for (const { peer, row } of peers)
46
+ addAlias(row, peer.address, linked);
47
+ // `trusted` rows (grant matching) leave out what peers say about themselves.
48
+ if (!options.trusted)
49
+ for (const { peer, row } of peers)
50
+ for (const name of peer.names ?? [])
51
+ addAlias(row, name, linked);
52
+ const votes = new Map();
53
+ const claims = new Map();
54
+ const fold = (row, name, profile, claim) => {
55
+ addAlias(row, name, linked);
56
+ votes.set(row, votes.get(row) ?? new Map());
57
+ votes.get(row).set(profile, (votes.get(row).get(profile) ?? 0) + 1);
58
+ if (claim)
59
+ claims.set(profile, (claims.get(profile) ?? new Set()).add(row));
60
+ };
61
+ const rest = [];
62
+ for (const [name, profile] of Object.entries(facts.machines)) {
63
+ const label = computerLabel(name);
64
+ if (!label)
65
+ continue;
66
+ // A label two computers share folds into neither.
67
+ const hits = linked.filter(candidate => namesOf(candidate).some(known => computerLabel(known) === label));
68
+ if (hits.length === 1)
69
+ fold(hits[0], name, profile, true);
70
+ else
71
+ rest.push([name, profile]);
72
+ }
73
+ const unfolded = [];
74
+ for (const [name, profile] of rest) {
75
+ const claimed = claims.get(profile);
76
+ if (claimed?.size === 1)
77
+ fold([...claimed][0], name, profile, false);
78
+ else
79
+ unfolded.push([name, profile]);
80
+ }
81
+ for (const [row, counts] of votes)
82
+ row.profile = [...counts].sort((a, b) => b[1] - a[1] || a[0].localeCompare(b[0]))[0][0];
83
+ const groups = [];
84
+ for (const [name, profile] of unfolded) {
85
+ const label = computerLabel(name);
86
+ const hits = groups.filter(group => group.profiles.has(profile) || group.names.some(known => computerLabel(known) === label));
87
+ const target = hits[0] ?? { names: [], profiles: new Set() };
88
+ if (!hits.length)
89
+ groups.push(target);
90
+ for (const other of hits.slice(1)) {
91
+ target.names.push(...other.names);
92
+ other.profiles.forEach(item => target.profiles.add(item));
93
+ groups.splice(groups.indexOf(other), 1);
94
+ }
95
+ target.names.push(name);
96
+ target.profiles.add(profile);
97
+ }
98
+ const unlinked = groups.map(group => {
99
+ const [name, ...aliases] = [...group.names].sort(shortestFirst);
100
+ const profile = facts.machines[name];
101
+ return { name, aliases, ...(profile ? { profile } : {}), local: false, linked: false };
102
+ });
103
+ const byName = (a, b) => a.name.localeCompare(b.name);
104
+ return [linked[0], ...linked.slice(1).sort(byName), ...unlinked.sort(byName)].slice(0, MAX_ROWS);
105
+ }
106
+ /** The computer a name refers to: an exact name or alias, else the same first
107
+ * label (case-insensitive), so `Desk.local` finds `Desk`. `local` is this
108
+ * computer. A name two rows answer to resolves to nothing. */
109
+ export function resolveComputer(computers, name) {
110
+ const wanted = name.trim().toLowerCase();
111
+ if (!wanted)
112
+ return undefined;
113
+ const only = (rows) => rows.length === 1 ? rows[0] : undefined;
114
+ const exact = computers.filter(row => namesOf(row).some(known => same(known, wanted)));
115
+ if (exact.length)
116
+ return only(exact);
117
+ if (wanted === "local" || wanted === "localhost")
118
+ return computers.find(row => row.local);
119
+ const label = computerLabel(wanted);
120
+ return only(computers.filter(row => namesOf(row).some(known => computerLabel(known) === label)));
121
+ }
122
+ /** What each peer's Hook last said about itself, so grant matching and
123
+ * listings know its hostname without an SSH round trip of their own. */
124
+ const peerHealth = new Map();
125
+ const PROBE_MS = 8_000;
126
+ /** Never throws: a missing hooks.yaml or machines.yaml only means fewer rows. */
127
+ export async function readComputers(options = {}) {
128
+ const { peers, peerError } = await optionalHookPeers(options.root ?? bridgeRoot()).catch(() => ({ peers: [], peerError: undefined }));
129
+ const facts = await Promise.all(peers.map(async (peer) => {
130
+ let reachable;
131
+ if (options.probe) {
132
+ let timer;
133
+ try {
134
+ const health = await Promise.race([peerRequest(peer, "/v1/health", undefined, PROBE_MS),
135
+ new Promise((_, reject) => { timer = setTimeout(() => reject(new Error("timeout")), PROBE_MS); timer.unref(); })]);
136
+ const computer = object(health.computer);
137
+ const names = [computer.name, ...(Array.isArray(computer.aliases) ? computer.aliases : [])].filter((name) => typeof name === "string");
138
+ peerHealth.set(peer.name, { ...(typeof computer.id === "string" ? { id: computer.id } : {}), names });
139
+ reachable = true;
140
+ }
141
+ catch {
142
+ reachable = false;
143
+ }
144
+ finally {
145
+ clearTimeout(timer);
146
+ }
147
+ }
148
+ const seen = peerHealth.get(peer.name);
149
+ return { name: peer.name, address: peer.address, ...(seen?.id ? { id: seen.id } : {}), names: seen?.names ?? [],
150
+ ...(reachable === undefined ? {} : { reachable }) };
151
+ }));
152
+ const store = options.store !== undefined ? options.store : findPhrenPath();
153
+ const machines = store ? listMachines(store) : undefined;
154
+ const computers = foldComputers({ local: { ...(options.local?.id ? { id: options.local.id } : {}), names: options.local?.names ?? localNames() },
155
+ peers: facts, machines: machines?.ok ? machines.data : {} }, { trusted: options.trusted });
156
+ return { computers, ...(peerError ? { peerError } : {}) };
157
+ }
158
+ /** What a dispatch or hand-off's `computer` names, by owner-written names only: an alias,
159
+ * a machines.yaml name or `Desk.local` finds the enrolled peer (by its hooks.yaml name) or
160
+ * this computer. Unknown, ambiguous or unlinked names resolve to nothing. */
161
+ export async function linkedComputer(name, root) {
162
+ const row = resolveComputer((await readComputers({ trusted: true, ...(root ? { root } : {}) })).computers, name);
163
+ if (!row?.linked)
164
+ return undefined;
165
+ return row.local ? { local: true } : { peer: row.name };
166
+ }
@@ -1,24 +1,107 @@
1
+ import { type Computer } from "./computer-identity.js";
1
2
  import { type HookPeer } from "./peers.js";
2
3
  import { type Json } from "./protocol.js";
4
+ import type { SetName } from "./conductor-role.js";
3
5
  /**
4
- * One conductor per connected group. A group is this computer and the peers
5
- * in its hooks.yaml; `phren bridge link` links a new computer with every
6
- * member, so one hop reaches the whole group. Each peer answers
7
- * `GET /v1/conductor` with its own live conductor, if any.
6
+ * Linked computer sets (docs/conductor-sets.md). A link runs both ways when
7
+ * each computer's hooks.yaml lists the other; a set is the computers joined by
8
+ * such links. This Hook sees its set from itself and one hop: each peer
9
+ * answers `GET /v1/conductor` with its live conductor, its own peers, whether
10
+ * it lists the caller back and the set name it holds. A set has one conductor.
8
11
  */
12
+ type Ask = (peer: HookPeer, route: string, data?: Json, timeout?: number) => Promise<Json>;
13
+ /** What this computer tells a peer about itself, so the peer can say whether it links back. */
14
+ export interface Caller {
15
+ name: string;
16
+ hostKey?: string;
17
+ }
18
+ export declare function localCaller(): Promise<Caller>;
19
+ export declare function callerQuery(caller: Caller): string;
20
+ /** One peer's answer to `GET /v1/conductor`, or why it gave none. */
21
+ export type PeerAnswer = {
22
+ peer: HookPeer;
23
+ } & ({
24
+ ok: true;
25
+ id?: string;
26
+ names: string[];
27
+ conductor?: Json;
28
+ /** Its hooks.yaml names; absent from a Hook older than sets. */
29
+ peers?: string[];
30
+ /** Whether it lists this computer back; absent when its Hook cannot say. */
31
+ knowsCaller?: boolean;
32
+ set?: SetName;
33
+ } | {
34
+ ok: false;
35
+ error: string;
36
+ code?: string;
37
+ /** Its conductor module is off, so it cannot run a conductor. */
38
+ disabled?: boolean;
39
+ });
40
+ export declare function askPeers(peers: readonly HookPeer[], caller: Caller, ask?: Ask): Promise<PeerAnswer[]>;
9
41
  export interface GroupConductor {
10
- /** A live conductor on a linked peer. */
42
+ /** A live conductor on a member of this computer's set. */
11
43
  found?: {
12
44
  computer: string;
13
45
  target?: Json;
14
46
  };
15
- /** Peers that could not say, so a conductor there cannot be ruled out. */
47
+ /** Members that could not say, so a conductor there cannot be ruled out. */
16
48
  unchecked: {
17
49
  computer: string;
18
50
  error: string;
19
51
  code?: string;
20
52
  }[];
21
53
  }
22
- type Ask = (peer: HookPeer, route: string, data?: Json, timeout?: number) => Promise<Json>;
23
- export declare function groupConductor(peers: readonly HookPeer[], ask?: Ask): Promise<GroupConductor>;
54
+ /** The names members report that are neither this computer nor one of its
55
+ * peers: computers in the set that this Hook cannot ask directly. */
56
+ export declare function indirectMembers(answers: readonly PeerAnswer[], localNames: readonly string[]): string[];
57
+ export declare const linkHint: (name: string) => string;
58
+ export declare const oneWayHint: (name: string) => string;
59
+ /** One conductor per set: a live conductor on any member, and the members that could not say. */
60
+ export declare function setConductor(answers: readonly PeerAnswer[], localNames: readonly string[]): GroupConductor;
61
+ export declare function groupConductor(peers: readonly HookPeer[], localNames: readonly string[], ask?: Ask, caller?: Caller): Promise<GroupConductor>;
62
+ export interface SetComputer {
63
+ name: string;
64
+ id?: string;
65
+ local?: true;
66
+ /** Whether its Hook answered just now; absent when this Hook cannot ask it. */
67
+ reachable?: boolean;
68
+ link: "self" | "two-way" | "one-way" | "indirect" | "unknown";
69
+ conductor?: Json;
70
+ error?: string;
71
+ code?: string;
72
+ hint?: string;
73
+ }
74
+ export interface ComputerSet {
75
+ id: string;
76
+ name?: string;
77
+ namedAt?: string;
78
+ /** This computer's own set. */
79
+ local: boolean;
80
+ computers: SetComputer[];
81
+ /** The set's conductor; with `conductors` above 1, the first of several. */
82
+ conductor?: {
83
+ computer: string;
84
+ target?: Json;
85
+ };
86
+ conductors: number;
87
+ }
88
+ /**
89
+ * Every set this Hook can see: its own (itself, its two-way and not yet known
90
+ * peers, and computers they link that this Hook does not), then one set per
91
+ * one-way peer. `unlinked` are computers the store knows with no link here.
92
+ */
93
+ export declare function buildSets(input: {
94
+ local: {
95
+ name: string;
96
+ id?: string;
97
+ conductor?: Json;
98
+ set?: SetName;
99
+ names: readonly string[];
100
+ };
101
+ answers: readonly PeerAnswer[];
102
+ computers: readonly Computer[];
103
+ }): {
104
+ sets: ComputerSet[];
105
+ unlinked: Computer[];
106
+ };
24
107
  export {};
@@ -1,26 +1,122 @@
1
+ import { hostname } from "node:os";
1
2
  import { disabledHint } from "../modules/registry.js";
3
+ import { ownHostKey } from "./health.js";
4
+ import { computerLabel } from "./computer-identity.js";
2
5
  import { peerRequest } from "./peers.js";
3
6
  import { BridgeError, errorCode, object } from "./protocol.js";
4
- export async function groupConductor(peers, ask = peerRequest) {
5
- const answers = await Promise.all(peers.map(async (peer) => {
7
+ export async function localCaller() {
8
+ const hostKey = await ownHostKey();
9
+ return { name: hostname(), ...(hostKey ? { hostKey } : {}) };
10
+ }
11
+ export function callerQuery(caller) {
12
+ return new URLSearchParams({ name: caller.name, ...(caller.hostKey ? { hostKey: caller.hostKey } : {}) }).toString();
13
+ }
14
+ export async function askPeers(peers, caller, ask = peerRequest) {
15
+ return Promise.all(peers.map(async (peer) => {
6
16
  try {
7
- const conductor = (await ask(peer, "/v1/conductor", undefined, 8_000)).conductor;
8
- return { peer, conductor: conductor && typeof conductor === "object" ? object(conductor) : undefined };
17
+ const answer = await ask(peer, `/v1/conductor?${callerQuery(caller)}`, undefined, 8_000);
18
+ const computer = object(answer.computer);
19
+ const conductor = answer.conductor && typeof answer.conductor === "object" ? object(answer.conductor) : undefined;
20
+ const set = object(answer.set);
21
+ return { peer, ok: true, ...(typeof computer.id === "string" ? { id: computer.id } : {}),
22
+ names: [computer.name, ...(Array.isArray(computer.aliases) ? computer.aliases : [])].filter((name) => typeof name === "string"),
23
+ ...(conductor ? { conductor } : {}),
24
+ ...(Array.isArray(answer.peers) ? { peers: answer.peers.filter((name) => typeof name === "string").slice(0, 32) } : {}),
25
+ ...(typeof answer.knowsCaller === "boolean" ? { knowsCaller: answer.knowsCaller } : {}),
26
+ ...(typeof set.namedAt === "string" && (typeof set.name === "string" || set.name === null) ? { set: { name: set.name, namedAt: set.namedAt } } : {}) };
9
27
  }
10
28
  catch (error) {
11
29
  // With its conductor module off, a peer cannot run a conductor. An
12
30
  // older Hook has no /v1/conductor and cannot rule one out.
13
31
  if (error instanceof BridgeError && error.status === 404 && error.message === disabledHint("conductor"))
14
- return { peer };
32
+ return { peer, ok: false, error: "Its conductor module is off.", disabled: true };
15
33
  const message = error instanceof BridgeError && error.status === 404 ? "Its Hook is too old to report a conductor."
16
34
  : error instanceof Error ? error.message : "Unreachable.";
17
35
  const code = errorCode(error);
18
- return { peer, error: message, ...(code ? { code } : {}) };
36
+ return { peer, ok: false, error: message, ...(code ? { code } : {}) };
19
37
  }
20
38
  }));
21
- const hit = answers.find(answer => answer.conductor);
39
+ }
40
+ /** A peer outside this computer's set: it answered and does not list this computer. */
41
+ const oneWay = (answer) => answer.ok && answer.knowsCaller === false;
42
+ /** The names members report that are neither this computer nor one of its
43
+ * peers: computers in the set that this Hook cannot ask directly. */
44
+ export function indirectMembers(answers, localNames) {
45
+ const known = new Set([...localNames, ...answers.flatMap(answer => [answer.peer.name, answer.peer.address, ...(answer.ok ? answer.names : [])])].map(computerLabel));
46
+ const found = new Map();
47
+ for (const answer of answers) {
48
+ if (!answer.ok || oneWay(answer))
49
+ continue;
50
+ for (const name of answer.peers ?? [])
51
+ if (!known.has(computerLabel(name)) && !found.has(computerLabel(name)))
52
+ found.set(computerLabel(name), name);
53
+ }
54
+ return [...found.values()].sort((a, b) => a.localeCompare(b));
55
+ }
56
+ export const linkHint = (name) => `Link it with phren bridge link ${name}.`;
57
+ export const oneWayHint = (name) => `${name} does not link back. Run phren bridge link ${name}.`;
58
+ /** One conductor per set: a live conductor on any member, and the members that could not say. */
59
+ export function setConductor(answers, localNames) {
60
+ const members = answers.filter(answer => !oneWay(answer));
61
+ const hit = members.find(answer => answer.ok && answer.conductor);
62
+ const target = hit?.ok ? object(hit.conductor).target : undefined;
22
63
  return {
23
- ...(hit ? { found: { computer: hit.peer.name, ...(hit.conductor.target ? { target: object(hit.conductor.target) } : {}) } } : {}),
24
- unchecked: answers.flatMap(answer => "error" in answer && answer.error ? [{ computer: answer.peer.name, error: answer.error, ...("code" in answer && answer.code ? { code: answer.code } : {}) }] : []),
64
+ ...(hit ? { found: { computer: hit.peer.name, ...(target ? { target: object(target) } : {}) } } : {}),
65
+ unchecked: [
66
+ ...members.flatMap(answer => !answer.ok && !answer.disabled ? [{ computer: answer.peer.name, error: answer.error, ...(answer.code ? { code: answer.code } : {}) }] : []),
67
+ ...indirectMembers(answers, localNames).map(computer => ({ computer, error: `Not linked with this computer, so it could not be asked. ${linkHint(computer)}` })),
68
+ ],
25
69
  };
26
70
  }
71
+ export async function groupConductor(peers, localNames, ask = peerRequest, caller) {
72
+ return setConductor(await askPeers(peers, caller ?? await localCaller(), ask), localNames);
73
+ }
74
+ const newest = (names) => names.filter((name) => !!name)
75
+ .sort((a, b) => Date.parse(b.namedAt) - Date.parse(a.namedAt))[0];
76
+ const setId = (ids, fallback) => {
77
+ const known = ids.filter((value) => !!value).sort();
78
+ return `set:${known[0] ?? fallback.toLowerCase()}`;
79
+ };
80
+ function conductorOf(entries) {
81
+ const running = entries.filter(entry => entry.conductor);
82
+ const first = running[0];
83
+ const target = first ? object(first.conductor).target : undefined;
84
+ return { ...(first ? { conductor: { computer: first.computer, ...(target ? { target: object(target) } : {}) } } : {}), conductors: running.length };
85
+ }
86
+ /**
87
+ * Every set this Hook can see: its own (itself, its two-way and not yet known
88
+ * peers, and computers they link that this Hook does not), then one set per
89
+ * one-way peer. `unlinked` are computers the store knows with no link here.
90
+ */
91
+ export function buildSets(input) {
92
+ const { local, answers } = input;
93
+ const members = answers.filter(answer => !oneWay(answer));
94
+ const computers = [{ name: local.name, ...(local.id ? { id: local.id } : {}), local: true, reachable: true, link: "self",
95
+ ...(local.conductor ? { conductor: local.conductor } : {}) }];
96
+ for (const answer of members) {
97
+ if (answer.ok)
98
+ computers.push({ name: answer.peer.name, ...(answer.id ? { id: answer.id } : {}), reachable: true,
99
+ link: answer.knowsCaller === true ? "two-way" : "unknown", ...(answer.conductor ? { conductor: answer.conductor } : {}),
100
+ ...(answer.knowsCaller === undefined ? { hint: "Its Hook cannot say whether it links back. Update it with phren bridge update." } : {}) });
101
+ else
102
+ computers.push({ name: answer.peer.name, reachable: !!answer.disabled, link: "unknown", error: answer.error, ...(answer.code ? { code: answer.code } : {}) });
103
+ }
104
+ const indirect = indirectMembers(answers, local.names);
105
+ for (const name of indirect)
106
+ computers.push({ name, link: "indirect", hint: linkHint(name) });
107
+ const name = newest([local.set, ...members.map(answer => answer.ok ? answer.set : undefined)]);
108
+ const own = { id: setId([local.id, ...members.map(answer => answer.ok ? answer.id : undefined)], local.name),
109
+ ...(name?.name ? { name: name.name, namedAt: name.namedAt } : {}), local: true, computers,
110
+ ...conductorOf([{ computer: local.name, conductor: local.conductor }, ...members.map(answer => ({ computer: answer.peer.name, conductor: answer.ok ? answer.conductor : undefined }))]) };
111
+ const others = answers.flatMap(answer => {
112
+ if (!answer.ok || !oneWay(answer))
113
+ return [];
114
+ return [{ id: setId([answer.id], answer.peer.name), ...(answer.set?.name ? { name: answer.set.name, namedAt: answer.set.namedAt } : {}), local: false,
115
+ computers: [{ name: answer.peer.name, ...(answer.id ? { id: answer.id } : {}), reachable: true, link: "one-way",
116
+ ...(answer.conductor ? { conductor: answer.conductor } : {}), hint: oneWayHint(answer.peer.name) }],
117
+ ...conductorOf([{ computer: answer.peer.name, conductor: answer.conductor }]) }];
118
+ });
119
+ const indirectLabels = new Set(indirect.map(computerLabel));
120
+ const unlinked = input.computers.filter(row => !row.linked && ![row.name, ...row.aliases].some(known => indirectLabels.has(computerLabel(known))));
121
+ return { sets: [own, ...others], unlinked };
122
+ }