pi-open-deskos 0.3.0 → 0.4.0

package/src/index.ts

@@ -1,15 +1,17 @@
-import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { open } from "node:fs/promises";
-import { readDeskLinkConfig } from "./config.ts";
+import { readOdkLinkConfigs } from "./config.ts";
 import { registerConsoleExtension } from "./console-extension.ts";
 import { createControlTcpTransport } from "./control-transport.ts";
+import { aggregateDeskSnapshots, selectConsoleDesk } from "./desk-set.ts";
 import { eventsFromMessage, promptFromMessage } from "./events.ts";
 import { scanDirectorySessions, SessionDiscovery } from "./discovery.ts";
-import { DeskReporter } from "./reporter.ts";
+import { DeskReporter, type OdkLinkSnapshot } from "./reporter.ts";
+import { SessionHost } from "./session-host.ts";
 import { CurrentSessionReplay } from "./session-replay.ts";
 import { createTcpTransport } from "./transport.ts";
 
-const CONFIG_HINT = "set ODK_DESK_LINK_ADDRESS and ODK_DESK_LINK_TOKEN to report this machine";
+const CONFIG_HINT = "set ODK_LINK_ADDRESS and ODK_LINK_TOKEN, or list desks in ~/.config/odk/desks.json, to report this machine";
 /** Read only a bounded tail before it enters the reporter's own 300-event/1MiB retention pipeline. */
 const MAX_DURABLE_SESSION_BYTES = 4 * 1024 * 1024;
 
@@ -18,6 +20,21 @@ function workspaceName(cwd: string): string {
   return parts.length > 0 ? (parts[parts.length - 1] ?? cwd) : cwd;
 }
 
+/**
+ * What a running session is doing, in the card's own vocabulary: the tool and the
+ * one argument that says what it is working on, as `read: src/example.js` does.
+ * A tool whose arguments carry no such line is named and nothing more, so no
+ * argument is echoed beyond the summary the desk shows.
+ */
+function toolSummary(event: { toolName?: unknown; args?: unknown }): string {
+  const name = typeof event.toolName === "string" && event.toolName.length > 0 ? event.toolName : "tool";
+  const args = (event.args ?? {}) as Record<string, unknown>;
+  const hint = ["command", "path", "file", "pattern", "url", "query"]
+    .map((key) => args[key])
+    .find((value): value is string => typeof value === "string" && value.trim().length > 0);
+  return hint === undefined ? name : `${name}: ${hint.trim()}`;
+}
+
 /**
  * The current session manager points at its own trusted durable log. Read its
  * bounded tail in chronological order; other sessions never enter this path.
@@ -43,8 +60,8 @@ async function durableSessionEvents(sessionFile: string | undefined): Promise<Re
       return lines.flatMap((line) => {
         if (!line.trim()) return [];
         try {
-          const entry = JSON.parse(line) as { type?: unknown; message?: unknown };
-          return entry.type === "message" && entry.message !== undefined ? eventsFromMessage(entry.message) : [];
+          const entry = JSON.parse(line) as { type?: unknown; id?: unknown; message?: unknown };
+          return entry.type === "message" && entry.message !== undefined ? eventsFromMessage(entry.message, entry.id) : [];
         } catch {
           return [];
         }
@@ -59,42 +76,66 @@ async function durableSessionEvents(sessionFile: string | undefined): Promise<Re
 
 /**
  * Report this machine's Pi sessions and, with an independent credential, drive
- * Hosted Pi sessions over a separate Desk Link v2 control connection.
+ * Hosted Pi sessions over a separate Open DeskOS Link v2 control connection.
  */
 export default function (pi: ExtensionAPI): void {
-  const config = readDeskLinkConfig();
-  const reporter = config === null ? null : new DeskReporter({ config, createTransport: createTcpTransport });
-  const discovery = reporter === null ? null : new SessionDiscovery({
+  const { configs, refusals } = readOdkLinkConfigs();
+  const reporters = configs.map((config) => new DeskReporter({ config, createTransport: createTcpTransport }));
+  const endpoints = configs.map((config) => `${config.host}:${config.port}`);
+  // This is one machine reporting, however many desks listen: discovery runs
+  // once and every desk receives the same session, status, and event updates,
+  // so one desk being unreachable never stops the others.
+  const each = (run: (reporter: DeskReporter) => void): void => {
+    for (const reporter of reporters) run(reporter);
+  };
+  const aggregate = (): OdkLinkSnapshot | null =>
+    aggregateDeskSnapshots(reporters.map((reporter, index) => ({ ...reporter.snapshot(), endpoint: endpoints[index] ?? "desk" })));
+  const discovery = reporters.length === 0 ? null : new SessionDiscovery({
     discover: () => scanDirectorySessions(),
-    onSnapshot: (sessions) => reporter.replaceDiscoveredSessions(sessions),
+    onSnapshot: (sessions) => each((reporter) => reporter.replaceDiscoveredSessions(sessions)),
   });
-  const replay = reporter === null ? null : new CurrentSessionReplay(durableSessionEvents);
+  const replay = reporters.length === 0 ? null : new CurrentSessionReplay(durableSessionEvents);
+  // A desk's voice agent can drive the session this process is, from inside this process: the
+  // same lifecycle events, a private socket, and no new process or credential. It is created
+  // here and bound only from session_start, so loading the extension binds nothing.
+  //
+  // It is opt-in, because an endpoint that lets something else hand this session work is a
+  // capability rather than a default: a machine that wants one names the directory it belongs
+  // in with ODK_SESSION_HOST_SOCKET, and a machine that does not is never reachable.
+  const sessionHost = new SessionHost({ pi });
+  const sessionHostEnabled = (process.env.ODK_SESSION_HOST_SOCKET ?? "").length > 0;
   let currentSessionId = "";
+  let sessionGeneration = 0;
+  let pendingTurn: { generation: number; sessionId: string; previousMessageId: string | undefined } | null = null;
+  const lastMessage = (ctx: ExtensionContext) => ctx.sessionManager.getBranch().filter(entry => entry.type === "message").at(-1);
+  let hostRefusal = "";
 
-  if (reporter && discovery) {
+  if (reporters.length > 0 || sessionHostEnabled) {
     function beginSession(ctx: Parameters<Parameters<ExtensionAPI["on"]>[1]>[1]): string {
       if (currentSessionId.length > 0 && currentSessionId !== ctx.sessionManager.getSessionId()) {
-        reporter?.markStatus(currentSessionId, "exited");
+        each((reporter) => reporter.markStatus(currentSessionId, "exited"));
       }
+      pendingTurn = null;
       currentSessionId = ctx.sessionManager.getSessionId();
       const name = ctx.sessionManager.getSessionName();
       const timestamp = ctx.sessionManager.getHeader()?.timestamp;
       const startedAt = timestamp ? Date.parse(timestamp) : Number.NaN;
-      reporter?.recordSession({
+      each((reporter) => reporter.recordSession({
         sessionId: currentSessionId,
         ...(name === undefined ? {} : { name }),
         cwd: ctx.cwd,
         workspaceName: workspaceName(ctx.cwd),
         status: ctx.isIdle() ? "settled" : "running",
         startedAt: Number.isFinite(startedAt) ? startedAt : Date.now(),
-      });
+      }));
       return currentSessionId;
     }
 
     pi.on("session_start", async (event, ctx) => {
+      const generation = ++sessionGeneration;
       const sessionId = beginSession(ctx);
-      reporter.start();
-      discovery.start();
+      each((reporter) => reporter.start());
+      discovery?.start();
       // A resumed/reloaded Pi can have a durable JSONL history that is longer
       // than its in-memory branch. Start the gate for every session; only the
       // resumed/reloaded/forked cases provide a durable tail. New sessions still
@@ -102,33 +143,80 @@ export default function (pi: ExtensionAPI): void {
       const replayFile = ["resume", "reload", "fork"].includes((event as { reason?: string }).reason ?? "")
         ? ctx.sessionManager.getSessionFile?.()
         : undefined;
-      await replay?.start(sessionId, replayFile, (id, events) => reporter?.recordEvents(id, events));
+      await replay?.start(sessionId, replayFile, (id, events) => each((reporter) => reporter.recordEvents(id, events)));
+      // A reload replaces the previous endpoint cleanly, so a desk never finds a
+      // half-replaced one, and a machine that cannot spare an endpoint still reports.
+      if (generation !== sessionGeneration) return;
+      if (sessionHostEnabled) {
+        const started = await sessionHost.start(ctx);
+        if (generation !== sessionGeneration) return;
+        const previous = refusals.indexOf(hostRefusal);
+        if (previous >= 0) refusals.splice(previous, 1);
+        hostRefusal = started.reason ? `current-session endpoint: ${started.reason}` : "";
+        if (hostRefusal) refusals.push(hostRefusal);
+      }
     });
     pi.on("session_info_changed", (event) => {
-      if (currentSessionId.length > 0) reporter.renameSession(currentSessionId, event.name);
+      if (currentSessionId.length > 0) each((reporter) => reporter.renameSession(currentSessionId, event.name));
+    });
+    pi.on("agent_start", (_event, ctx) => {
+      pendingTurn = { generation: sessionGeneration, sessionId: ctx.sessionManager.getSessionId(), previousMessageId: lastMessage(ctx)?.id };
+      sessionHost.markRunning();
+      each((reporter) => reporter.markStatus(currentSessionId, "running"));
+    });
+    pi.on("agent_settled", (event, ctx) => {
+      const turn = pendingTurn;
+      pendingTurn = null;
+      sessionHost.markSettled();
+      each((reporter) => reporter.markStatus(currentSessionId, "settled"));
+      if (!turn || event.aborted || turn.generation !== sessionGeneration || turn.sessionId !== currentSessionId
+        || ctx.sessionManager.getSessionId() !== currentSessionId) return;
+      // message_end runs before appendMessage. Only settled exposes this turn's
+      // persisted identity, never the preceding leaf or a text-derived surrogate.
+      const entry = lastMessage(ctx);
+      if (!entry || entry.id === turn.previousMessageId || entry.message.role !== "assistant" || entry.message.stopReason !== "stop") return;
+      const completed = eventsFromMessage(entry.message, entry.id).filter(value => value.kind === "assistant");
+      replay?.append(currentSessionId, completed, (id, fresh) => each(reporter => reporter.recordEvents(id, fresh)));
+    });
+    // A turn runs several tools before its message ends, and until that message
+    // the card would keep showing the prompt that started the turn. The tool that
+    // is running now is the newest thing the session is doing, so it is what the
+    // card states.
+    pi.on("tool_execution_start", (event) => {
+      if (currentSessionId.length === 0) return;
+      const activity = toolSummary(event);
+      sessionHost.observeActivity(activity);
+      each((reporter) => reporter.recordActivity(currentSessionId, activity));
     });
-    pi.on("agent_start", () => reporter.markStatus(currentSessionId, "running"));
-    pi.on("agent_settled", () => reporter.markStatus(currentSessionId, "settled"));
     pi.on("message_end", (event) => {
+      sessionHost.observeMessage(event.message);
       if (currentSessionId.length === 0) return;
       const prompt = promptFromMessage(event.message);
-      if (prompt.length > 0) reporter.recordSession({ sessionId: currentSessionId, latestGoal: prompt });
+      if (prompt.length > 0) each((reporter) => reporter.recordSession({ sessionId: currentSessionId, latestGoal: prompt }));
       const events = eventsFromMessage(event.message);
-      replay?.append(currentSessionId, events, (id, fresh) => reporter?.recordEvents(id, fresh));
+      replay?.append(currentSessionId, events, (id, fresh) => each((reporter) => reporter.recordEvents(id, fresh)));
     });
-    pi.on("session_shutdown", () => {
+    pi.on("session_shutdown", async () => {
+      sessionGeneration += 1;
+      pendingTurn = null;
       replay?.invalidate();
-      discovery.stop();
-      reporter.markStatus(currentSessionId, "exited");
-      reporter.disconnect();
+      discovery?.stop();
+      each((reporter) => reporter.markStatus(currentSessionId, "exited"));
+      currentSessionId = "";
+      each((reporter) => reporter.disconnect());
+      await sessionHost.close();
     });
   }
 
   registerConsoleExtension({
     pi,
-    config,
+    // The Console drives one desk: the one that issued a control credential,
+    // unless the operator named the desk they mean.
+    config: selectConsoleDesk(configs, process.env.ODK_LINK_CONSOLE_DESK ?? ""),
+    desks: configs,
+    refusals,
     createControlTransport: createControlTcpTransport,
-    reporterSnapshot: () => reporter?.snapshot() ?? null,
+    reporterSnapshot: aggregate,
     configHint: CONFIG_HINT,
   });
 }

package/src/processes.ts

@@ -1,5 +1,4 @@
 import { execFile } from "node:child_process";
-import { basename } from "node:path";
 
 /** A Pi process identity from one bounded, read-only OS process snapshot. */
 export interface PiProcess {
@@ -9,24 +8,85 @@ export interface PiProcess {
 
 const MAX_PROCESS_BYTES = 1024 * 1024;
 const PROCESS_TIMEOUT_MS = 2000;
+const WINDOWS_PROCESS_SCRIPT = [
+  '$ErrorActionPreference = "Stop";',
+  '[Console]::OutputEncoding = [System.Text.UTF8Encoding]::new($false);',
+  'Get-CimInstance Win32_Process |',
+  'Select-Object ProcessId, Name, CommandLine,',
+  "@{n='startedAtMs'; e={ [int64]([DateTimeOffset]$_.CreationDate).ToUnixTimeMilliseconds() }} |",
+  'ConvertTo-Json -Compress -Depth 3',
+].join(" ");
+
+function executableName(value: string): string {
+  return (value.split(/[/\\]/).at(-1) ?? "").replace(/\.exe$/i, "");
+}
 
 function piExecutable(value: string): boolean {
-  return /^pi(?:-rpc)?(?:\.[cm]?js)?$/i.test(basename(value));
+  return /^pi(?:-rpc)?(?:\.[cm]?js)?$/i.test(executableName(value));
 }
 
-function isPiInvocation(comm: string, args: string): boolean {
+function isPiInvocation(comm: string, args: string, suppliedTokens?: string[]): boolean {
   if (piExecutable(comm)) return true;
-  const tokens = args.trim().split(/\s+/);
+  const tokens = suppliedTokens ?? args.trim().split(/\s+/);
   const executable = tokens[0] ?? "";
   if (piExecutable(executable)) return true;
   // Inspect the executable/script positions only, never arbitrary arguments
   // (a grep or shell command mentioning pi is not evidence of a Pi process).
-  if (!["node", "bun", "deno"].includes(basename(executable))) return false;
+  if (!["node", "bun", "deno"].includes(executableName(executable).toLowerCase())) return false;
   const script = tokens[1] ?? "";
   return piExecutable(script)
     || /[/\\]@earendil-works[/\\]pi-coding-agent[/\\]dist[/\\](?:bundle[/\\])?(?:cli|rpc-entry)\.js$/.test(script);
 }
 
+/** Windows quoting keeps paths with spaces together; backslashes escape quotes only. */
+function windowsCommandTokens(value: string): string[] {
+  const tokens: string[] = [];
+  let token = "", quoted = false, started = false;
+  for (let index = 0; index < value.length;) {
+    const character = value[index]!;
+    if (character === "\\") {
+      let count = 0;
+      while (value[index] === "\\") { count += 1; index += 1; }
+      if (value[index] === '"') {
+        token += "\\".repeat(Math.floor(count / 2));
+        if (count % 2) token += '"';
+        else quoted = !quoted;
+        index += 1;
+      } else token += "\\".repeat(count);
+      started = true;
+      continue;
+    }
+    if (character === '"') { quoted = !quoted; started = true; index += 1; continue; }
+    if (!quoted && /[ \t]/.test(character)) {
+      if (started) tokens.push(token);
+      token = ""; started = false; index += 1; continue;
+    }
+    token += character; started = true; index += 1;
+  }
+  if (quoted) return [];
+  if (started) tokens.push(token);
+  return tokens;
+}
+
+/** Read only the projected WMI identity, never disclose command lines. */
+export function parseWindowsPiProcesses(output: string, now: number): PiProcess[] {
+  if (Buffer.byteLength(output) > MAX_PROCESS_BYTES) return [];
+  let decoded: unknown;
+  try { decoded = JSON.parse(output.replace(/^\uFEFF/, "")); } catch { return []; }
+  const processes: PiProcess[] = [];
+  for (const item of Array.isArray(decoded) ? decoded : [decoded]) {
+    if (!item || typeof item !== "object" || Array.isArray(item)) continue;
+    const row = item as Record<string, unknown>;
+    const pid = row.ProcessId, startedAt = row.startedAtMs;
+    if (typeof pid !== "number" || !Number.isSafeInteger(pid) || pid <= 0 || pid > 0x7fffffff
+      || typeof startedAt !== "number" || !Number.isSafeInteger(startedAt) || startedAt <= 0 || startedAt > now) continue;
+    const command = typeof row.CommandLine === "string" ? row.CommandLine : "";
+    const name = typeof row.Name === "string" ? row.Name : "";
+    if (isPiInvocation(name, command, windowsCommandTokens(command))) processes.push({ pid, startedAt });
+  }
+  return processes;
+}
+
 function elapsedSeconds(value: string): number | null {
   if (/^\d+$/.test(value)) return Number(value);
   const match = value.match(/^(?:(\d+)-)?(?:(\d+):)?(\d+):(\d+)$/);
@@ -48,14 +108,58 @@ export function parsePiProcesses(output: string, now: number): PiProcess[] {
 }
 
 /** Never log command lines; discard the bounded process table after parsing. */
-export function listPiProcesses(): Promise<PiProcess[]> {
-  const now = Date.now();
-  const args = process.platform === "darwin"
+export function readProcessSnapshot(command: string, args: string[], options: {
+  timeoutMs?: number;
+  execute?: typeof execFile;
+} = {}): Promise<string> {
+  const timeoutMs = options.timeoutMs ?? PROCESS_TIMEOUT_MS;
+  return new Promise((resolve, reject) => {
+    let settled = false;
+    let deadline: ReturnType<typeof setTimeout> | undefined;
+    const finish = (error: Error | null, output = ""): void => {
+      if (settled) return;
+      settled = true;
+      if (deadline !== undefined) clearTimeout(deadline);
+      if (error) reject(error);
+      else resolve(output);
+    };
+    // execFile's timeout waits for child close; a stuck OS query may never close.
+    const child = (options.execute ?? execFile)(command, args, {
+      encoding: "utf8", maxBuffer: MAX_PROCESS_BYTES, timeout: timeoutMs, windowsHide: true,
+    }, (error, stdout) => finish(error, stdout));
+    if (settled) return;
+    deadline = setTimeout(() => {
+      if (settled) return;
+      child.kill("SIGKILL");
+      child.stdout?.destroy();
+      child.stderr?.destroy();
+      child.unref();
+      finish(new Error("process snapshot deadline exceeded"));
+    }, timeoutMs);
+    deadline.unref?.();
+  });
+}
+
+/** Return an unavailable inventory on every bounded query failure. */
+export async function listPiProcesses(options: {
+  platform?: NodeJS.Platform;
+  now?: () => number;
+  readSnapshot?: (command: string, args: string[]) => Promise<string>;
+} = {}): Promise<PiProcess[]> {
+  const platform = options.platform ?? process.platform;
+  const now = (options.now ?? Date.now)();
+  const command = platform === "win32" ? "powershell.exe" : "ps";
+  const args = platform === "win32"
+    ? ["-NoProfile", "-NonInteractive", "-Command", WINDOWS_PROCESS_SCRIPT]
+    : platform === "darwin"
     ? ["-axo", "pid=,etime=,stat=,comm=,args="]
     : ["-eo", "pid=,etimes=,stat=,comm=,args="];
-  return new Promise((resolve) => {
-    execFile("ps", args, { encoding: "utf8", maxBuffer: MAX_PROCESS_BYTES, timeout: PROCESS_TIMEOUT_MS }, (error, stdout) => {
-      resolve(error ? [] : parsePiProcesses(stdout, now));
-    });
-  });
+  const read = options.readSnapshot ?? ((executable, arguments_) => readProcessSnapshot(executable, arguments_, {
+    timeoutMs: platform === "win32" ? 5000 : PROCESS_TIMEOUT_MS,
+  }));
+  try {
+    const output = await read(command, args);
+    if (Buffer.byteLength(output) > MAX_PROCESS_BYTES) return [];
+    return platform === "win32" ? parseWindowsPiProcesses(output, now) : parsePiProcesses(output, now);
+  } catch { return []; }
 }