@craftspace/cli 0.3.0 → 0.4.1

package/dist/index.js

@@ -18969,54 +18969,54 @@ var AUDIT_GROUPS = [
 ];
 var AUDIT_LISTED_ACTIONS = AUDIT_GROUPS.flatMap((group) => group.actions);
 var AUDIT_DEFAULT_ACTIONS = AUDIT_LISTED_ACTIONS.filter((action) => AUDIT_TIERS[action] !== AuditTier.Volume);
-var AUDIT_VERBS = {
-  [AuditAction.AccessDenied]: "Was refused",
+var AUDIT_LABELS = {
+  [AuditAction.AccessDenied]: "Denied request",
   [AuditAction.MemberSignedIn]: "Signed in",
-  [AuditAction.MemberInvited]: "Invited",
+  [AuditAction.MemberInvited]: "Invited member",
   [AuditAction.MemberInviteAccepted]: "Joined the organization",
-  [AuditAction.MemberRoleChanged]: "Changed the role of",
-  [AuditAction.MemberRemoved]: "Removed",
+  [AuditAction.MemberRoleChanged]: "Changed member role",
+  [AuditAction.MemberRemoved]: "Removed member",
   [AuditAction.TokenMinted]: "Minted member token",
   [AuditAction.TokenRevoked]: "Revoked member token",
-  [AuditAction.AdminEnteredOrg]: "Opened support view on",
-  [AuditAction.OrganizationRenamed]: "Renamed the organization to",
-  [AuditAction.OrganizationWebsiteChanged]: "Set the organization website to",
-  [AuditAction.OrganizationModelChanged]: "Set the default model to",
+  [AuditAction.AdminEnteredOrg]: "Opened support view",
+  [AuditAction.OrganizationRenamed]: "Renamed the organization",
+  [AuditAction.OrganizationWebsiteChanged]: "Changed the organization website",
+  [AuditAction.OrganizationModelChanged]: "Changed the default model",
   [AuditAction.OrganizationDeleted]: "Deleted the organization",
-  [AuditAction.ConnectionCreated]: "Connected",
-  [AuditAction.ConnectionReconnected]: "Reconnected",
-  [AuditAction.ConnectionDeleted]: "Disconnected",
-  [AuditAction.ConnectionAccessChanged]: "Changed who can use",
+  [AuditAction.ConnectionCreated]: "Connected app",
+  [AuditAction.ConnectionReconnected]: "Reconnected app",
+  [AuditAction.ConnectionDeleted]: "Disconnected app",
+  [AuditAction.ConnectionAccessChanged]: "Changed who can use app",
   [AuditAction.McpConnectionCreated]: "Attached MCP server",
   [AuditAction.McpConnectionDeleted]: "Detached MCP server",
-  [AuditAction.McpConnectionToolsChanged]: "Changed the tools agents may call on",
-  [AuditAction.PageCreated]: "Created",
-  [AuditAction.PageUpdated]: "Wrote",
-  [AuditAction.PageDeleted]: "Deleted",
-  [AuditAction.PageMoved]: "Moved",
-  [AuditAction.PageShared]: "Published a public link for",
-  [AuditAction.PageUnshared]: "Revoked the public link for",
+  [AuditAction.McpConnectionToolsChanged]: "Changed MCP server tools",
+  [AuditAction.PageCreated]: "Created page",
+  [AuditAction.PageUpdated]: "Updated page",
+  [AuditAction.PageDeleted]: "Deleted page",
+  [AuditAction.PageMoved]: "Moved page",
+  [AuditAction.PageShared]: "Published a public link for page",
+  [AuditAction.PageUnshared]: "Revoked the public link for page",
   [AuditAction.SpaceCreated]: "Created space",
-  [AuditAction.SpaceRenamed]: "Renamed space to",
+  [AuditAction.SpaceRenamed]: "Renamed space",
   [AuditAction.SpaceDeleted]: "Deleted space",
   [AuditAction.SpaceAccessChanged]: "Changed who can reach space",
   [AuditAction.TableCreated]: "Created table",
   [AuditAction.TableDeleted]: "Deleted table",
   [AuditAction.AgentCreated]: "Created agent",
   [AuditAction.AgentDeleted]: "Deleted agent",
-  [AuditAction.AgentGrantsChanged]: "Changed what pages are reachable by",
-  [AuditAction.ChannelConnected]: "Connected",
-  [AuditAction.ChannelDisconnected]: "Disconnected",
+  [AuditAction.AgentGrantsChanged]: "Changed what agent can reach",
+  [AuditAction.ChannelConnected]: "Connected channel",
+  [AuditAction.ChannelDisconnected]: "Disconnected channel",
   [AuditAction.KitInstalled]: "Installed kit",
   [AuditAction.KitRemoved]: "Removed kit",
   [AuditAction.WorkflowCreated]: "Created workflow",
   [AuditAction.WorkflowPublished]: "Published workflow",
   [AuditAction.WorkflowDeleted]: "Deleted workflow",
-  [AuditAction.WorkflowSecretRotated]: "Rotated the webhook secret of",
-  [AuditAction.McpRequest]: "Called the MCP endpoint",
-  [AuditAction.McpToolCall]: "Called tool",
-  [AuditAction.PageRead]: "Read",
-  [AuditAction.PageWrite]: "Wrote"
+  [AuditAction.WorkflowSecretRotated]: "Rotated workflow webhook secret",
+  [AuditAction.McpRequest]: "Called MCP method",
+  [AuditAction.McpToolCall]: "Called MCP tool",
+  [AuditAction.PageRead]: "Read page",
+  [AuditAction.PageWrite]: "Wrote page"
 };
 var AuditTargetSchema = external_exports.object({
   type: external_exports.string(),
@@ -19782,7 +19782,7 @@ var SaveWorkstationBodySchema = external_exports.object({
 var WorkstationResponseSchema = external_exports.object({ workstation: WorkstationSchema });
 
 // ../../shared/dist/machines/machine.js
-var CLI_VERSION = "0.3.0";
+var CLI_VERSION = "0.4.1";
 var CLI_PACKAGE = "@craftspace/cli";
 var CLI_INSTALL = `npm i -g ${CLI_PACKAGE}`;
 var MACHINE_BEAT_INTERVAL_MS = 15e3;
@@ -20250,7 +20250,7 @@ var MemberActivityListResponse = external_exports.object({
 });
 
 // dist/machine.js
-import { execFile as execFile4 } from "node:child_process";
+import { execFile as execFile4, spawn as spawn2 } from "node:child_process";
 import { mkdir, readFile as readFile2, readdir, rm, writeFile } from "node:fs/promises";
 import os5 from "node:os";
 import path4 from "node:path";
@@ -23112,10 +23112,13 @@ var machine = {
     };
     return answer.machine;
   },
+  async url() {
+    return (await readConfig())?.url ?? null;
+  },
   async signIn({ url: url2, why, install = false }) {
     const where = url2 ?? (await readConfig())?.url ?? DEFAULT_URL;
     if (!process.stdin.isTTY)
-      throw new Error(`${why} Run: craftspace login --token <token>`);
+      throw new Error(`${why} Run: cs login --token <token>`);
     const page = `${where}/workstations`;
     ui.say(`
 ${ui.attention(why)}
@@ -23193,21 +23196,12 @@ ${ui.ok(`Signed in as ${signed.ownerName}. This machine is ${ui.name(signed.name
       await new Promise((resolve) => setTimeout(resolve, nextDelayMs(failures, busy)));
     }
   },
-  async update() {
-    ui.say(ui.waiting(`checking ${CLI_PACKAGE}`));
-    const moved = await update.latest();
-    if (moved === null) {
-      ui.say(`${ui.clear()}${ui.ok(`craftspace ${ui.name(CLI_VERSION)}, nothing newer on npm`)}`);
-      return;
-    }
-    ui.say(`${ui.clear()}${ui.waiting(`installing ${moved}`)}`);
-    const done = await update.toLatest();
-    ui.say(`${ui.clear()}${done === null ? ui.bad(`could not install ${moved}`, `run it yourself: ${CLI_INSTALL}@latest`) : ui.ok(`craftspace ${ui.name(CLI_VERSION)} -> ${ui.name(done)}`)}`);
-  },
-  async run({ argv, on }) {
-    if (on === void 0)
-      return runHere(argv);
-    return runThere({ argv, on });
+  async run() {
+    const first = await signedInOrAsk();
+    const { auth, value: answer } = await withAuth(first, (live) => call({ ...live, method: "GET", path: "/api/machines", schema: MachinesResponseSchema }));
+    if (answer.machines.length === 0)
+      return nowhereToGo(auth);
+    return openTerminal(await pick2(answer.machines));
   },
   async daemon() {
     if (process.env.CRAFTSPACE_NO_SERVICE === "1")
@@ -23235,122 +23229,61 @@ async function requireSignedIn() {
   const config2 = await readConfig();
   const token = await readToken();
   if (!config2 || !token)
-    throw new Error("This machine is not signed in. Run: craftspace login --token <token>");
+    throw new Error("This machine is not signed in. Run: cs login --token <token>");
   return { url: config2.url, token };
 }
-async function runHere(argv) {
-  const id = `local-${Date.now().toString(36)}`;
-  await writeSession({ id, state: "working", title: argv.join(" ").slice(0, 200) });
-  try {
-    return await runner.attended(argv);
-  } finally {
-    await clearSession(id);
-  }
-}
-async function runThere({ argv, on }) {
-  const first = await signedInOrAsk();
-  const { auth, value: target } = await withAuth(first, (live) => machineNamed({ ...live, name: on }));
-  const { url: url2, token } = auth;
-  let run5 = await call({
-    url: url2,
-    token,
-    method: "POST",
-    path: `/api/machines/${target.id}/runs`,
-    body: { argv },
-    schema: MachineRunSchema
+async function pick2(machines) {
+  return dist_default6({
+    message: "Which workstation?",
+    choices: machines.map((candidate) => ({
+      name: `${candidate.name.padEnd(24)} ${candidate.state.padEnd(12)} ${specs(candidate)}  ${beat(candidate)}`,
+      value: candidate,
+      description: candidate.sshAddress === null ? "No address yet, so nothing to open" : void 0
+    })),
+    pageSize: 12
   });
-  ui.say(`${ui.name(target.name)} ${ui.dim(`\xB7 queued ${run5.id}`)}
-
-`);
-  let printed = 0;
-  for (; ; ) {
-    if (run5.output.length > printed) {
-      process.stdout.write(run5.output.slice(printed));
-      printed = run5.output.length;
-    }
-    if (run5.state === "done")
-      return 0;
-    if (run5.state === "failed")
-      return run5.exitCode ?? 1;
-    if (run5.state === "needs_input") {
-      ui.say(`
-${ui.attention(`${target.name} is asking:`)} ${run5.question ?? "it needs a decision"}
-> `);
-      const reply = await readStdinLine();
-      if (reply === null)
-        return 130;
-      run5 = await call({
-        url: url2,
-        token,
-        method: "POST",
-        path: `/api/machines/runs/${run5.id}/answer`,
-        body: { text: reply },
-        schema: MachineRunSchema
-      });
-      printed = run5.output.length;
-      continue;
-    }
-    await new Promise((resolve) => setTimeout(resolve, POLL_INTERVAL_MS));
-    run5 = await readRun({ url: url2, token, machineId: target.id, runId: run5.id });
-  }
 }
-async function readRun({ url: url2, token, machineId, runId }) {
-  const answer = await call({
-    url: url2,
-    token,
-    method: "GET",
-    path: `/api/machines/${machineId}/runs`,
-    schema: MachineRunsResponseSchema
-  });
-  const found = answer.runs.find((candidate) => candidate.id === runId);
-  if (found === void 0)
-    throw new Error(`Run ${runId} is gone.`);
-  return found;
+function specs({ platform, cores, memoryGb }) {
+  return [platform, cores === null ? null : `${cores} vCPU`, memoryGb === null ? null : `${memoryGb} GB`].filter((part) => part !== null).join(" \xB7 ");
 }
-async function machineNamed({ url: url2, token, name }) {
-  const answer = await call({ url: url2, token, method: "GET", path: "/api/machines", schema: MachinesResponseSchema });
-  const found = answer.machines.find((candidate) => candidate.name === name || candidate.id === name);
-  if (found !== void 0)
-    return found;
-  if (answer.machines.length === 0)
-    throw new Error("This team has no workstations yet. Add one at /workstations.");
-  if (!process.stdin.isTTY) {
-    throw new Error(`No workstation called ${name}. This team has: ${answer.machines.map((m) => m.name).join(", ")}`);
+function beat({ lastBeatAt }) {
+  if (lastBeatAt === null)
+    return "never beat";
+  const seconds = Math.max(0, Math.round((Date.now() - new Date(lastBeatAt).getTime()) / 1e3));
+  if (seconds < 60)
+    return `beat ${seconds}s ago`;
+  if (seconds < 3600)
+    return `beat ${Math.round(seconds / 60)}m ago`;
+  return `beat ${Math.round(seconds / 3600)}h ago`;
+}
+async function openTerminal(target) {
+  if (target.sshAddress === null) {
+    throw new Error(`${target.name} has not told us an address yet. It reports one on its next beat.`);
   }
+  const where = `${target.sshUser ?? "root"}@${target.sshAddress}`;
   ui.say(`
-${ui.attention(`No workstation called ${name}.`)}
+${ui.dim("\u2192")} ${ui.name(target.name)} ${ui.dim(`\xB7 ${where}`)}
 
 `);
-  return dist_default6({
-    message: "Run it on",
-    choices: answer.machines.map((candidate) => ({
-      name: `${candidate.name.padEnd(20)} ${candidate.state}`,
-      value: candidate
-    }))
-  });
-}
-function readStdinLine() {
   return new Promise((resolve) => {
-    let buffer = "";
-    process.stdin.setEncoding("utf8");
-    const done = (line) => {
-      process.stdin.off("data", onData);
-      process.stdin.off("end", onEnd);
-      process.stdin.pause();
-      resolve(line.trim() === "" ? null : line.trim());
-    };
-    const onData = (chunk) => {
-      buffer += chunk;
-      const at = buffer.indexOf("\n");
-      if (at !== -1)
-        done(buffer.slice(0, at));
-    };
-    const onEnd = () => done(buffer);
-    process.stdin.on("data", onData);
-    process.stdin.on("end", onEnd);
-    process.stdin.resume();
+    const session = spawn2("ssh", ["-t", where], { stdio: "inherit" });
+    session.on("error", (error51) => {
+      ui.say(ui.bad(`could not start ssh`, error51.message));
+      resolve(1);
+    });
+    session.on("exit", (code) => resolve(code ?? 0));
   });
 }
+function nowhereToGo({ url: url2 }) {
+  ui.say(`
+${ui.attention("No workstations here yet.")}
+
+`);
+  ui.say(ui.field("Add one", ui.link(`${url2}/workstations`)));
+  ui.say(ui.field("Or sign in", "a Mac or Linux box with: cs login"));
+  ui.say("\n");
+  return 1;
+}
 async function tools() {
   if (probed !== null && Date.now() - probed.at < PROBE_EVERY_MS)
     return probed.tools;
@@ -23475,14 +23408,6 @@ ${KEYS_END}
 function trimEnd(text) {
   return text.replace(/\s+$/, "");
 }
-async function writeSession(session) {
-  const dir = path4.join(machine.home(), "sessions");
-  await mkdir(dir, { recursive: true, mode: 448 });
-  await writeFile(path4.join(dir, `${session.id}.json`), JSON.stringify(session), { mode: 384 });
-}
-async function clearSession(id) {
-  await rm(path4.join(machine.home(), "sessions", `${id}.json`), { force: true });
-}
 async function writeAgentConfigs({ url: url2, token, writes }) {
   const planned = writes.length > 0 ? writes : defaultWrites({ url: url2, token });
   const owned = [];
@@ -23676,7 +23601,6 @@ var MAX_REPORTED_SESSIONS = 50;
 var MAX_BACKOFF_MS = 12e4;
 var KEYS_BEGIN = "# craftspace begin";
 var KEYS_END = "# craftspace end";
-var POLL_INTERVAL_MS = 1e3;
 var UPDATE_EVERY_MS = 6 * 60 * 60 * 1e3;
 var BEATING = "beating every 15s, outbound only, and keeps this set up";
 var LINGER_LINE = `sudo loginctl enable-linger ${os5.userInfo().username}`;
@@ -23689,9 +23613,9 @@ var running = /* @__PURE__ */ new Set();
 // dist/index.js
 setup.widenPath();
 var program2 = new Command();
-program2.enablePositionalOptions().name("craftspace").description("Sign this machine in to your team, so every agent on it reads the same brain.").version(CLI_VERSION).showHelpAfterError();
-program2.command("login").description("sign this machine in").option("--token <token>", "the login token from your team", process.env.CRAFTSPACE_TOKEN).option("--url <url>", "your control plane", process.env.CRAFTSPACE_URL ?? "https://craftspace.app").option("--no-install", "do not install anything this machine is missing").action(async ({ token, url: url2, install }) => {
-  const where = url2.replace(/\/$/, "");
+program2.enablePositionalOptions().name("cs").description("Sign this machine in to your team, so every agent on it reads the same brain.").version(CLI_VERSION).showHelpAfterError();
+program2.command("login").description("sign this machine in").option("--token <token>", "the login token from your team", process.env.CRAFTSPACE_TOKEN).option("--url <url>", "your control plane, remembered after the first login").option("--no-install", "do not install anything this machine is missing").action(async ({ token, url: url2, install }) => {
+  const where = (url2 ?? process.env.CRAFTSPACE_URL ?? await machine.url() ?? DEFAULT_URL2).replace(/\/$/, "");
   const signed = token === void 0 ? (await machine.signIn({ url: where, why: "Signing this machine in.", install })).machine : await machine.login({ token, url: where, install });
   const daemon = await machine.daemon();
   ui.say(ui.heading(`Signed in as ${signed.ownerName}`));
@@ -23702,8 +23626,8 @@ program2.command("login").description("sign this machine in").option("--token <t
 ${ui.note(`Listed at ${ui.link(`${where}/workstations`)}`)}
 `);
 });
-program2.command("run").description("run a command here, or on another workstation with --on").argument("<command...>", "the command line to run").option("--on <machine>", "run it on that workstation instead of this one").allowUnknownOption().passThroughOptions().action(async (command, { on }) => {
-  process.exitCode = await machine.run({ argv: command, ...on === void 0 ? {} : { on } });
+program2.command("run").description("pick a workstation and open a terminal on it").action(async () => {
+  process.exitCode = await machine.run();
 });
 program2.command("status").description("what this machine is and what it is doing").action(async () => {
   const { machine: found } = await machine.status();
@@ -23716,9 +23640,6 @@ program2.command("status").description("what this machine is and what it is doin
     ui.say(ui.field("Session", `${session.state}  ${session.title ?? session.id}`));
   ui.say("\n");
 });
-program2.command("update").description("move this machine to the latest craftspace CLI").action(async () => {
-  await machine.update();
-});
 program2.command("logout").description("leave the team, and undo what login wrote").action(async () => {
   await machine.logout();
   ui.say(ui.ok("Left the team. Nothing of ours is running here."));
@@ -23733,6 +23654,7 @@ try {
 function machineSpecs({ platform, cores, memoryGb }) {
   return [platform, cores === null ? null : `${cores} vCPU`, memoryGb == null ? null : `${memoryGb} GB`].filter((part) => part !== null).join(" \xB7 ");
 }
+var DEFAULT_URL2 = "https://craftspace.app";
 function secondsSince(at) {
   return Math.round((Date.now() - new Date(at).getTime()) / 1e3);
 }

package/dist/machine.d.ts

@@ -6,6 +6,7 @@ export declare const machine: {
         url: string;
         install: boolean;
     }): Promise<Machine>;
+    url(): Promise<string | null>;
     signIn({ url, why, install }: {
         url?: string;
         why: string;
@@ -17,11 +18,7 @@ export declare const machine: {
     }>;
     beatOnce(): Promise<boolean>;
     beatForever(): Promise<void>;
-    update(): Promise<void>;
-    run({ argv, on }: {
-        argv: string[];
-        on?: string;
-    }): Promise<number>;
+    run(): Promise<number>;
     daemon(): Promise<{
         text: string;
         ok: boolean;

package/dist/machine.js

@@ -1,9 +1,9 @@
-import { execFile } from 'node:child_process';
+import { execFile, spawn } from 'node:child_process';
 import { mkdir, readFile, readdir, rm, writeFile } from 'node:fs/promises';
 import os from 'node:os';
 import path from 'node:path';
 import { promisify } from 'node:util';
-import { CLI_INSTALL, CLI_PACKAGE, CLI_VERSION, MACHINE_BEAT_BUSY_INTERVAL_MS, MACHINE_BEAT_INTERVAL_MS, MachineBeatResponseSchema, MachineLoginResponseSchema, MachineRunSchema, MachineRunsResponseSchema, MachineSchema, MachineSessionSchema, MachinesResponseSchema, } from '@craftspace/shared';
+import { CLI_VERSION, MACHINE_BEAT_BUSY_INTERVAL_MS, MACHINE_BEAT_INTERVAL_MS, MachineBeatResponseSchema, MachineLoginResponseSchema, MachineSchema, MachineSessionSchema, MachinesResponseSchema, } from '@craftspace/shared';
 import { confirm, input, select } from '@inquirer/prompts';
 import { z } from 'zod';
 import { runner } from './run.js';
@@ -43,10 +43,13 @@ export const machine = {
         };
         return answer.machine;
     },
+    async url() {
+        return (await readConfig())?.url ?? null;
+    },
     async signIn({ url, why, install = false }) {
         const where = url ?? (await readConfig())?.url ?? DEFAULT_URL;
         if (!process.stdin.isTTY)
-            throw new Error(`${why} Run: craftspace login --token <token>`);
+            throw new Error(`${why} Run: cs login --token <token>`);
         const page = `${where}/workstations`;
         ui.say(`\n${ui.attention(why)}\n\n`);
         if (await confirm({ message: `Open ${page} for a key?`, default: true })) {
@@ -124,23 +127,12 @@ export const machine = {
             await new Promise((resolve) => setTimeout(resolve, nextDelayMs(failures, busy)));
         }
     },
-    async update() {
-        ui.say(ui.waiting(`checking ${CLI_PACKAGE}`));
-        const moved = await update.latest();
-        if (moved === null) {
-            ui.say(`${ui.clear()}${ui.ok(`craftspace ${ui.name(CLI_VERSION)}, nothing newer on npm`)}`);
-            return;
-        }
-        ui.say(`${ui.clear()}${ui.waiting(`installing ${moved}`)}`);
-        const done = await update.toLatest();
-        ui.say(`${ui.clear()}${done === null
-            ? ui.bad(`could not install ${moved}`, `run it yourself: ${CLI_INSTALL}@latest`)
-            : ui.ok(`craftspace ${ui.name(CLI_VERSION)} -> ${ui.name(done)}`)}`);
-    },
-    async run({ argv, on }) {
-        if (on === undefined)
-            return runHere(argv);
-        return runThere({ argv, on });
+    async run() {
+        const first = await signedInOrAsk();
+        const { auth, value: answer } = await withAuth(first, (live) => call({ ...live, method: 'GET', path: '/api/machines', schema: MachinesResponseSchema }));
+        if (answer.machines.length === 0)
+            return nowhereToGo(auth);
+        return openTerminal(await pick(answer.machines));
     },
     async daemon() {
         if (process.env.CRAFTSPACE_NO_SERVICE === '1')
@@ -168,116 +160,57 @@ async function requireSignedIn() {
     const config = await readConfig();
     const token = await readToken();
     if (!config || !token)
-        throw new Error('This machine is not signed in. Run: craftspace login --token <token>');
+        throw new Error('This machine is not signed in. Run: cs login --token <token>');
     return { url: config.url, token };
 }
-async function runHere(argv) {
-    const id = `local-${Date.now().toString(36)}`;
-    await writeSession({ id, state: 'working', title: argv.join(' ').slice(0, 200) });
-    try {
-        return await runner.attended(argv);
-    }
-    finally {
-        await clearSession(id);
-    }
-}
-async function runThere({ argv, on }) {
-    const first = await signedInOrAsk();
-    const { auth, value: target } = await withAuth(first, (live) => machineNamed({ ...live, name: on }));
-    const { url, token } = auth;
-    let run = await call({
-        url,
-        token,
-        method: 'POST',
-        path: `/api/machines/${target.id}/runs`,
-        body: { argv },
-        schema: MachineRunSchema,
-    });
-    ui.say(`${ui.name(target.name)} ${ui.dim(`· queued ${run.id}`)}\n\n`);
-    let printed = 0;
-    for (;;) {
-        if (run.output.length > printed) {
-            process.stdout.write(run.output.slice(printed));
-            printed = run.output.length;
-        }
-        if (run.state === 'done')
-            return 0;
-        if (run.state === 'failed')
-            return run.exitCode ?? 1;
-        if (run.state === 'needs_input') {
-            ui.say(`\n${ui.attention(`${target.name} is asking:`)} ${run.question ?? 'it needs a decision'}\n> `);
-            const reply = await readStdinLine();
-            if (reply === null)
-                return 130;
-            run = await call({
-                url,
-                token,
-                method: 'POST',
-                path: `/api/machines/runs/${run.id}/answer`,
-                body: { text: reply },
-                schema: MachineRunSchema,
-            });
-            printed = run.output.length;
-            continue;
-        }
-        await new Promise((resolve) => setTimeout(resolve, POLL_INTERVAL_MS));
-        run = await readRun({ url, token, machineId: target.id, runId: run.id });
-    }
-}
-async function readRun({ url, token, machineId, runId, }) {
-    const answer = await call({
-        url,
-        token,
-        method: 'GET',
-        path: `/api/machines/${machineId}/runs`,
-        schema: MachineRunsResponseSchema,
-    });
-    const found = answer.runs.find((candidate) => candidate.id === runId);
-    if (found === undefined)
-        throw new Error(`Run ${runId} is gone.`);
-    return found;
-}
-async function machineNamed({ url, token, name, }) {
-    const answer = await call({ url, token, method: 'GET', path: '/api/machines', schema: MachinesResponseSchema });
-    const found = answer.machines.find((candidate) => candidate.name === name || candidate.id === name);
-    if (found !== undefined)
-        return found;
-    if (answer.machines.length === 0)
-        throw new Error('This team has no workstations yet. Add one at /workstations.');
-    if (!process.stdin.isTTY) {
-        throw new Error(`No workstation called ${name}. This team has: ${answer.machines.map((m) => m.name).join(', ')}`);
-    }
-    ui.say(`\n${ui.attention(`No workstation called ${name}.`)}\n\n`);
+async function pick(machines) {
     return select({
-        message: 'Run it on',
-        choices: answer.machines.map((candidate) => ({
-            name: `${candidate.name.padEnd(20)} ${candidate.state}`,
+        message: 'Which workstation?',
+        choices: machines.map((candidate) => ({
+            name: `${candidate.name.padEnd(24)} ${candidate.state.padEnd(12)} ${specs(candidate)}  ${beat(candidate)}`,
             value: candidate,
+            description: candidate.sshAddress === null ? 'No address yet, so nothing to open' : undefined,
         })),
+        pageSize: 12,
     });
 }
-function readStdinLine() {
+function specs({ platform, cores, memoryGb }) {
+    return [platform, cores === null ? null : `${cores} vCPU`, memoryGb === null ? null : `${memoryGb} GB`]
+        .filter((part) => part !== null)
+        .join(' \u00b7 ');
+}
+function beat({ lastBeatAt }) {
+    if (lastBeatAt === null)
+        return 'never beat';
+    const seconds = Math.max(0, Math.round((Date.now() - new Date(lastBeatAt).getTime()) / 1000));
+    if (seconds < 60)
+        return `beat ${seconds}s ago`;
+    if (seconds < 3600)
+        return `beat ${Math.round(seconds / 60)}m ago`;
+    return `beat ${Math.round(seconds / 3600)}h ago`;
+}
+async function openTerminal(target) {
+    if (target.sshAddress === null) {
+        throw new Error(`${target.name} has not told us an address yet. It reports one on its next beat.`);
+    }
+    const where = `${target.sshUser ?? 'root'}@${target.sshAddress}`;
+    ui.say(`\n${ui.dim('\u2192')} ${ui.name(target.name)} ${ui.dim(`\u00b7 ${where}`)}\n\n`);
     return new Promise((resolve) => {
-        let buffer = '';
-        process.stdin.setEncoding('utf8');
-        const done = (line) => {
-            process.stdin.off('data', onData);
-            process.stdin.off('end', onEnd);
-            process.stdin.pause();
-            resolve(line.trim() === '' ? null : line.trim());
-        };
-        const onData = (chunk) => {
-            buffer += chunk;
-            const at = buffer.indexOf('\n');
-            if (at !== -1)
-                done(buffer.slice(0, at));
-        };
-        const onEnd = () => done(buffer);
-        process.stdin.on('data', onData);
-        process.stdin.on('end', onEnd);
-        process.stdin.resume();
+        const session = spawn('ssh', ['-t', where], { stdio: 'inherit' });
+        session.on('error', (error) => {
+            ui.say(ui.bad(`could not start ssh`, error.message));
+            resolve(1);
+        });
+        session.on('exit', (code) => resolve(code ?? 0));
     });
 }
+function nowhereToGo({ url }) {
+    ui.say(`\n${ui.attention('No workstations here yet.')}\n\n`);
+    ui.say(ui.field('Add one', ui.link(`${url}/workstations`)));
+    ui.say(ui.field('Or sign in', 'a Mac or Linux box with: cs login'));
+    ui.say('\n');
+    return 1;
+}
 async function tools() {
     if (probed !== null && Date.now() - probed.at < PROBE_EVERY_MS)
         return probed.tools;
@@ -398,14 +331,6 @@ async function writeAuthorizedKeys(keys) {
 function trimEnd(text) {
     return text.replace(/\s+$/, '');
 }
-async function writeSession(session) {
-    const dir = path.join(machine.home(), 'sessions');
-    await mkdir(dir, { recursive: true, mode: 0o700 });
-    await writeFile(path.join(dir, `${session.id}.json`), JSON.stringify(session), { mode: 0o600 });
-}
-async function clearSession(id) {
-    await rm(path.join(machine.home(), 'sessions', `${id}.json`), { force: true });
-}
 async function writeAgentConfigs({ url, token, writes, }) {
     const planned = writes.length > 0 ? writes : defaultWrites({ url, token });
     const owned = [];
@@ -597,7 +522,6 @@ const MAX_REPORTED_SESSIONS = 50;
 const MAX_BACKOFF_MS = 120_000;
 const KEYS_BEGIN = '# craftspace begin';
 const KEYS_END = '# craftspace end';
-const POLL_INTERVAL_MS = 1_000;
 const UPDATE_EVERY_MS = 6 * 60 * 60 * 1_000;
 const BEATING = 'beating every 15s, outbound only, and keeps this set up';
 const LINGER_LINE = `sudo loginctl enable-linger ${os.userInfo().username}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@craftspace/cli",
-  "version": "0.3.0",
+  "version": "0.4.1",
   "type": "module",
   "description": "Sign a Mac or Linux machine into Craftspace and keep its agent setup in step.",
   "license": "MIT",
@@ -14,6 +14,7 @@
     "node": ">=20"
   },
   "bin": {
+    "cs": "dist/index.js",
     "craftspace": "dist/index.js"
   },
   "files": [