@standardagents/code 0.9.2 → 0.9.4

package/dist/index.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import os9, { homedir } from 'os';
+import os10, { homedir } from 'os';
 import path3 from 'path';
 import readline2 from 'readline/promises';
 import { stdout, stdin } from 'process';
@@ -1112,7 +1112,7 @@ function detailSuffix(tool, result) {
   const lines = result.split("\n").length;
   return ` (${lines} line${lines === 1 ? "" : "s"})`;
 }
-var LOG_DIR = path3.join(os9.homedir(), ".standardagents", "process-logs");
+var LOG_DIR = path3.join(os10.homedir(), ".standardagents", "process-logs");
 var KEY2 = "bg_processes";
 function isAlive(pid) {
   try {
@@ -1189,7 +1189,7 @@ var ProcessRegistry = class {
   }
 };
 function configFile() {
-  return process.env.STANDARDAGENTS_MCP_CONFIG || path3.join(os9.homedir(), ".standardagents", "mcp.json");
+  return process.env.STANDARDAGENTS_MCP_CONFIG || path3.join(os10.homedir(), ".standardagents", "mcp.json");
 }
 function loadMcpConfig() {
   try {
@@ -1491,7 +1491,7 @@ var HostTools = class {
       }
     }
     const hash = crypto.createHash("sha256").update(JSON.stringify(files)).digest("hex").slice(0, 12);
-    const skillDir = path3.join(os9.tmpdir(), "standardcode-skills", `${skill}-${hash}`);
+    const skillDir = path3.join(os10.tmpdir(), "standardcode-skills", `${skill}-${hash}`);
     for (const f of files) {
       const dest = path3.resolve(skillDir, f.path);
       if (path3.relative(skillDir, dest).startsWith("..")) {
@@ -2816,7 +2816,7 @@ function fromFile(filePath) {
   }
 }
 async function readDarwin() {
-  const tmp = path3.join(os9.tmpdir(), `sc-clip-${process.pid}-${Date.now()}.png`);
+  const tmp = path3.join(os10.tmpdir(), `sc-clip-${process.pid}-${Date.now()}.png`);
   const script = [
     `set d to the clipboard as \xABclass PNGf\xBB`,
     `set f to open for access POSIX file "${tmp}" with write permission`,
@@ -2853,7 +2853,7 @@ async function readLinux() {
   return null;
 }
 async function readWindows() {
-  const tmp = path3.join(os9.tmpdir(), `sc-clip-${process.pid}-${Date.now()}.png`);
+  const tmp = path3.join(os10.tmpdir(), `sc-clip-${process.pid}-${Date.now()}.png`);
   const ps = [
     "Add-Type -AssemblyName System.Windows.Forms;",
     "$img = [System.Windows.Forms.Clipboard]::GetImage();",
@@ -4920,7 +4920,7 @@ function renderMarkdown(src, cols2 = 80) {
   }
   return out;
 }
-var DIR = path3.join(os9.homedir(), ".standardagents");
+var DIR = path3.join(os10.homedir(), ".standardagents");
 var FILE = path3.join(DIR, "credentials");
 function normalizeEndpoint(endpoint) {
   let e = endpoint.trim();
@@ -5054,13 +5054,13 @@ function relaxTlsForLocalEndpoint(endpoint) {
   process.env.NODE_TLS_REJECT_UNAUTHORIZED = "0";
   return true;
 }
-var dir = () => path3.join(os9.homedir(), ".standardagents");
+var dir = () => path3.join(os10.homedir(), ".standardagents");
 var file = () => path3.join(dir(), "machine.json");
 function loadMachineIdentity() {
   try {
     const parsed = JSON.parse(fs4.readFileSync(file(), "utf8"));
     if (typeof parsed.machine_id === "string" && parsed.machine_id.length > 0) {
-      return parsed;
+      return { machine_id: parsed.machine_id, created_at: parsed.created_at ?? Date.now() };
     }
   } catch {
   }
@@ -5075,15 +5075,6 @@ function saveMachineIdentity(identity) {
   fs4.mkdirSync(dir(), { recursive: true });
   fs4.writeFileSync(file(), JSON.stringify(identity, null, 2), { mode: 384 });
 }
-function setMachineName(name) {
-  const identity = loadMachineIdentity();
-  identity.name = name.trim() || void 0;
-  saveMachineIdentity(identity);
-  return identity;
-}
-function machineDisplayName(identity) {
-  return identity.name?.trim() || os9.hostname();
-}
 function daemonClientId(identity) {
   return `daemon:${identity.machine_id}`;
 }
@@ -5096,6 +5087,9 @@ function machineIdFromDaemonClientId(clientId) {
 }
 var KEY_PREFIX = "standardcode.machine.";
 var CMD_SUFFIX = ".cmd";
+var NAME_SUFFIX = ".name";
+var FSREQ_SUFFIX = ".fsreq";
+var FSRES_SUFFIX = ".fsres";
 var DAEMON_ONLINE_WINDOW_MS = 90 * 1e3;
 function machineKey(machineId) {
   return `${KEY_PREFIX}${machineId}`;
@@ -5103,6 +5097,44 @@ function machineKey(machineId) {
 function commandKey(machineId) {
   return `${KEY_PREFIX}${machineId}${CMD_SUFFIX}`;
 }
+function nameKey(machineId) {
+  return `${KEY_PREFIX}${machineId}${NAME_SUFFIX}`;
+}
+function fsRequestKey(machineId) {
+  return `${KEY_PREFIX}${machineId}${FSREQ_SUFFIX}`;
+}
+function fsResponseKey(machineId) {
+  return `${KEY_PREFIX}${machineId}${FSRES_SUFFIX}`;
+}
+function parseFsRequest(value) {
+  if (!value || typeof value !== "object") return null;
+  const r = value;
+  if (typeof r.nonce !== "string" || r.op !== "list" || typeof r.path !== "string") return null;
+  return {
+    nonce: r.nonce,
+    op: "list",
+    path: r.path,
+    show_hidden: r.show_hidden === true,
+    requested_at: typeof r.requested_at === "number" ? r.requested_at : Date.now()
+  };
+}
+async function readFsRequest(api, machineId) {
+  return parseFsRequest(await api.userKvGet(fsRequestKey(machineId)));
+}
+async function writeFsResponse(api, machineId, res) {
+  await api.userKvSet(fsResponseKey(machineId), { ...res, responded_at: Date.now() });
+}
+function machineDisplayName(record) {
+  return record.name?.trim() || "" || (record.hostname || "") || (record.id || "") || "machine";
+}
+async function getMachineName(api, machineId) {
+  const v = await api.userKvGet(nameKey(machineId));
+  return typeof v === "string" && v.trim() ? v.trim() : null;
+}
+async function setMachineName(api, machineId, name) {
+  const trimmed = name.trim();
+  await api.userKvSet(nameKey(machineId), trimmed || null);
+}
 function parseMachineRecord(value) {
   if (!value || typeof value !== "object" || Array.isArray(value)) return null;
   const r = value;
@@ -5120,12 +5152,36 @@ function parseMachineRecord(value) {
     updated_at: typeof r.updated_at === "number" ? r.updated_at : 0
   };
 }
+async function loadRawMachine(api, machineId) {
+  return parseMachineRecord(await api.userKvGet(machineKey(machineId)));
+}
 async function loadMachines(api) {
   const entries = await api.userKvList(KEY_PREFIX);
-  return entries.map((e) => parseMachineRecord(e.value)).filter((m) => m !== null);
+  const records = [];
+  const names = /* @__PURE__ */ new Map();
+  for (const e of entries) {
+    const rest = e.key.slice(KEY_PREFIX.length);
+    if (rest.endsWith(CMD_SUFFIX)) continue;
+    if (rest.endsWith(NAME_SUFFIX)) {
+      const id = rest.slice(0, -NAME_SUFFIX.length);
+      if (typeof e.value === "string" && e.value.trim()) names.set(id, e.value.trim());
+      continue;
+    }
+    const rec = parseMachineRecord(e.value);
+    if (rec) records.push(rec);
+  }
+  for (const rec of records) {
+    const override = names.get(rec.id);
+    if (override) rec.name = override;
+  }
+  return records;
 }
 async function loadMachine(api, machineId) {
-  return parseMachineRecord(await api.userKvGet(machineKey(machineId)));
+  const rec = await loadRawMachine(api, machineId);
+  if (!rec) return null;
+  const override = await getMachineName(api, machineId);
+  if (override) rec.name = override;
+  return rec;
 }
 function daemonOnline(record, now = Date.now()) {
   return !!record.daemon && now - record.daemon.last_seen_at < DAEMON_ONLINE_WINDOW_MS;
@@ -5134,8 +5190,8 @@ function newRecord(identity) {
   const now = Date.now();
   return {
     id: identity.machine_id,
-    name: machineDisplayName(identity),
-    hostname: os9.hostname(),
+    name: os10.hostname(),
+    hostname: os10.hostname(),
     platform: process.platform,
     arch: process.arch,
     version: readVersion() || void 0,
@@ -5146,10 +5202,9 @@ function newRecord(identity) {
   };
 }
 async function updateOwnMachineRecord(api, identity, mutate) {
-  const existing = await loadMachine(api, identity.machine_id);
+  const existing = await loadRawMachine(api, identity.machine_id);
   const record = existing ?? newRecord(identity);
-  record.name = machineDisplayName(loadMachineIdentity());
-  record.hostname = os9.hostname();
+  record.hostname = os10.hostname();
   record.platform = process.platform;
   record.arch = process.arch;
   record.version = readVersion() || record.version;
@@ -5233,24 +5288,17 @@ async function clearMachineCommands(api, machineId, appliedIds) {
 }
 async function applyMachineCommand(api, identity, cmd) {
   switch (cmd.kind) {
-    case "rename": {
-      const name = typeof cmd.args?.name === "string" ? cmd.args.name.trim() : "";
-      if (!name) return "rename: ignored (empty name)";
-      setMachineName(name);
-      await updateOwnMachineRecord(api, identity);
-      return `renamed to "${name}"`;
-    }
     case "add_project": {
-      const path12 = typeof cmd.args?.path === "string" ? cmd.args.path : "";
-      if (!path12) return "add_project: ignored (no path)";
-      await registerProject(api, identity, path12);
-      return `added project ${path12}`;
+      const path13 = typeof cmd.args?.path === "string" ? cmd.args.path : "";
+      if (!path13) return "add_project: ignored (no path)";
+      await registerProject(api, identity, path13);
+      return `added project ${path13}`;
     }
     case "remove_project": {
-      const path12 = typeof cmd.args?.path === "string" ? cmd.args.path : "";
-      if (!path12) return "remove_project: ignored (no path)";
-      await unregisterProject(api, identity, path12);
-      return `removed project ${path12}`;
+      const path13 = typeof cmd.args?.path === "string" ? cmd.args.path : "";
+      if (!path13) return "remove_project: ignored (no path)";
+      await unregisterProject(api, identity, path13);
+      return `removed project ${path13}`;
     }
     case "update":
       return "update requested";
@@ -5312,6 +5360,94 @@ async function awaitApprovalViaRelay(api, threadId, request, options = {}) {
     });
   }
 }
+var PROJECT_MARKERS = [
+  ".git",
+  "package.json",
+  "pyproject.toml",
+  "Cargo.toml",
+  "go.mod",
+  "pom.xml",
+  "build.gradle",
+  "Gemfile",
+  "composer.json",
+  "requirements.txt",
+  ".standardagents"
+];
+var MAX_ENTRIES2 = 500;
+function resolveBrowsePath(input3) {
+  const home = os10.homedir();
+  let p = (input3 ?? "").trim();
+  if (!p) return home;
+  if (p === "~") return home;
+  if (p.startsWith("~/")) p = path3.join(home, p.slice(2));
+  return path3.resolve(p);
+}
+function markers(dirPath) {
+  let repo = false;
+  let project = false;
+  for (const marker of PROJECT_MARKERS) {
+    let hit = false;
+    try {
+      hit = fs4.existsSync(path3.join(dirPath, marker));
+    } catch {
+      hit = false;
+    }
+    if (!hit) continue;
+    project = true;
+    if (marker === ".git") repo = true;
+    if (repo) break;
+  }
+  return { project, repo };
+}
+function browseDirectory(input3, opts = {}) {
+  const home = os10.homedir();
+  const abs = resolveBrowsePath(input3);
+  const parent = path3.dirname(abs);
+  const base = {
+    path: abs,
+    parent: parent === abs ? null : parent,
+    home
+  };
+  let dirents;
+  try {
+    const stat = fs4.statSync(abs);
+    if (!stat.isDirectory()) {
+      return { ...base, entries: [], truncated: false, error: "Not a directory" };
+    }
+    dirents = fs4.readdirSync(abs, { withFileTypes: true });
+  } catch (err) {
+    const code = err?.code;
+    const message = code === "EACCES" || code === "EPERM" ? "Permission denied" : code === "ENOENT" ? "Folder not found" : "Could not read this folder";
+    return { ...base, entries: [], truncated: false, error: message };
+  }
+  const showHidden = !!opts.showHidden;
+  const rawDirs = [];
+  const rawFiles = [];
+  for (const d of dirents) {
+    const name = d.name;
+    if (!showHidden && name.startsWith(".")) continue;
+    let isDir = d.isDirectory();
+    if (d.isSymbolicLink()) {
+      try {
+        isDir = fs4.statSync(path3.join(abs, name)).isDirectory();
+      } catch {
+        isDir = false;
+      }
+    }
+    if (isDir) {
+      const { project, repo } = markers(path3.join(abs, name));
+      rawDirs.push({ name, dir: true, project: project || void 0, repo: repo || void 0 });
+    } else {
+      rawFiles.push({ name, dir: false });
+    }
+  }
+  const cmp = (a, b) => a.name.toLowerCase().localeCompare(b.name.toLowerCase());
+  rawDirs.sort(cmp);
+  rawFiles.sort(cmp);
+  const all = [...rawDirs, ...rawFiles];
+  const truncated = all.length > MAX_ENTRIES2;
+  return { ...base, entries: truncated ? all.slice(0, MAX_ENTRIES2) : all, truncated };
+}
 var PKG_NAME = "@standardagents/code";
 var REGISTRY_URL = `https://registry.npmjs.org/${encodeURIComponent(PKG_NAME)}`;
 var CACHE_REL_DIR = ".config/standardagents-cli";
@@ -5492,12 +5628,13 @@ function runUpdate(pm) {
 // src/daemon.ts
 var HEARTBEAT_MS = 3e4;
 var COMMAND_POLL_MS = 8e3;
+var FS_POLL_MS = 1e3;
 var RECLAIM_PROBE_MS = 2 * 6e4;
 var UPDATE_CHECK_MS = 6 * 60 * 6e4;
 var SWEEP_MS = 10 * 6e4;
 var MAX_WORKERS = 30;
 var LOG_MAX_BYTES = 1e6;
-var LOG_FILE = path3.join(os9.homedir(), ".standardagents", "daemon.log");
+var LOG_FILE = path3.join(os10.homedir(), ".standardagents", "daemon.log");
 function daemonLog(line) {
   try {
     fs4.mkdirSync(path3.dirname(LOG_FILE), { recursive: true });
@@ -5516,14 +5653,13 @@ function pathFromTags(tags) {
   const tag = tags.find((t) => t.startsWith("path:"));
   if (!tag) return null;
   const raw = tag.slice("path:".length);
-  return raw.replace(/^~(?=\/|$)/, os9.homedir());
+  return raw.replace(/^~(?=\/|$)/, os10.homedir());
 }
 var ThreadWorker = class {
-  constructor(api, identity, threadId, projectDir, createdAt) {
+  constructor(api, identity, machineName, threadId, projectDir, createdAt) {
     this.threadId = threadId;
     this.projectDir = projectDir;
     this.createdAt = createdAt;
-    const machineName = machineDisplayName(identity);
     this.perm = { level: 1, alwaysAllow: /* @__PURE__ */ new Set(), allowRisk: /* @__PURE__ */ new Set() };
     this.session = new ExecutionSession({
       api,
@@ -5648,9 +5784,13 @@ Run \`standardcode daemon install\` (or plain \`standardcode\`) once to sign in.
 `);
     process.exit(1);
   }
+  let displayName = machineDisplayName(await loadMachine(api, identity.machine_id).catch(() => null) ?? {
+    hostname: os10.hostname(),
+    id: identity.machine_id
+  });
   const applied = consumeAppliedUpdate(version);
   daemonLog(
-    `daemon starting \u2014 v${version}${applied ? " (freshly auto-updated)" : ""}, machine ${identity.machine_id} (${machineDisplayName(identity)}), endpoint ${endpoint}`
+    `daemon starting \u2014 v${version}${applied ? " (freshly auto-updated)" : ""}, machine ${identity.machine_id} (${displayName}), endpoint ${endpoint}`
   );
   process.on("uncaughtException", (err) => {
     daemonLog(`FATAL uncaughtException: ${err?.stack || err}`);
@@ -5677,7 +5817,7 @@ Run \`standardcode daemon install\` (or plain \`standardcode\`) once to sign in.
       daemonLog(`cannot prepare project dir ${projectDir}: ${e instanceof Error ? e.message : String(e)}`);
       return;
     }
-    const worker = new ThreadWorker(api, identity, threadId, projectDir, createdAt || Date.now());
+    const worker = new ThreadWorker(api, identity, displayName, threadId, projectDir, createdAt || Date.now());
     worker.onEvicted = (id) => detach(id);
     workers.set(threadId, worker);
     daemonLog(`attached ${threadId.slice(0, 8)} \u2192 ${projectDir}`);
@@ -5722,6 +5862,10 @@ Run \`standardcode daemon install\` (or plain \`standardcode\`) once to sign in.
   const heartbeat = setInterval(() => {
     void touchDaemon(api, identity, version).catch(() => {
     });
+    void getMachineName(api, identity.machine_id).then((n) => {
+      if (n) displayName = n;
+    }).catch(() => {
+    });
   }, HEARTBEAT_MS);
   const reclaim = setInterval(() => {
     for (const worker of workers.values()) {
@@ -5803,6 +5947,31 @@ Run \`standardcode daemon install\` (or plain \`standardcode\`) once to sign in.
   };
   void drainCommands();
   const commandTimer = setInterval(() => void drainCommands(), COMMAND_POLL_MS);
+  let lastFsNonce = null;
+  let fsBusy = false;
+  const drainFsRequests = async () => {
+    if (fsBusy) return;
+    fsBusy = true;
+    try {
+      const req = await readFsRequest(api, identity.machine_id).catch(() => null);
+      if (!req || req.nonce === lastFsNonce) return;
+      lastFsNonce = req.nonce;
+      let ok = true;
+      let result;
+      let error;
+      try {
+        result = browseDirectory(req.path, { showHidden: req.show_hidden });
+      } catch (err) {
+        ok = false;
+        error = err instanceof Error ? err.message : "browse failed";
+      }
+      await writeFsResponse(api, identity.machine_id, { nonce: req.nonce, ok, result, error }).catch(() => {
+      });
+    } finally {
+      fsBusy = false;
+    }
+  };
+  const fsTimer = setInterval(() => void drainFsRequests(), FS_POLL_MS);
   const sweeper = setInterval(() => {
     if (updateReady && ![...workers.values()].some((w) => w.busy)) {
       daemonLog("restarting to apply the installed update");
@@ -5816,6 +5985,7 @@ Run \`standardcode daemon install\` (or plain \`standardcode\`) once to sign in.
     clearInterval(reclaim);
     clearInterval(updateTimer);
     clearInterval(commandTimer);
+    clearInterval(fsTimer);
     clearInterval(sweeper);
     for (const worker of workers.values()) worker.stop();
     events.close();
@@ -5873,8 +6043,8 @@ function run2(cmd, args) {
   const output4 = `${res.stdout ?? ""}${res.stderr ?? ""}`.trim();
   return { ok: res.status === 0, output: output4 };
 }
-var plistPath = () => path3.join(os9.homedir(), "Library", "LaunchAgents", `${SERVICE_LABEL}.plist`);
-var unitPath = () => path3.join(os9.homedir(), ".config", "systemd", "user", SYSTEMD_UNIT);
+var plistPath = () => path3.join(os10.homedir(), "Library", "LaunchAgents", `${SERVICE_LABEL}.plist`);
+var unitPath = () => path3.join(os10.homedir(), ".config", "systemd", "user", SYSTEMD_UNIT);
 var xmlEscape = (s) => s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
 function installService(command, endpoint) {
   if (process.platform === "darwin") return installLaunchd(command, endpoint);
@@ -5886,7 +6056,7 @@ function installService(command, endpoint) {
   };
 }
 function installLaunchd(command, endpoint) {
-  const logDir = path3.join(os9.homedir(), ".standardagents");
+  const logDir = path3.join(os10.homedir(), ".standardagents");
   fs4.mkdirSync(logDir, { recursive: true });
   fs4.mkdirSync(path3.dirname(plistPath()), { recursive: true });
   const envEntries = [
@@ -5959,10 +6129,10 @@ WantedBy=default.target
   if (!enable.ok) {
     return { ok: false, detail: `systemctl enable failed: ${enable.output}` };
   }
-  const linger = run2("loginctl", ["enable-linger", os9.userInfo().username]);
+  const linger = run2("loginctl", ["enable-linger", os10.userInfo().username]);
   return {
     ok: true,
-    detail: `systemd user unit installed (${unitPath()})` + (linger.ok ? ", lingering enabled" : ` \u2014 enable lingering manually: sudo loginctl enable-linger ${os9.userInfo().username}`)
+    detail: `systemd user unit installed (${unitPath()})` + (linger.ok ? ", lingering enabled" : ` \u2014 enable lingering manually: sudo loginctl enable-linger ${os10.userInfo().username}`)
   };
 }
 function uninstallService() {
@@ -6089,15 +6259,16 @@ async function installCommand(endpointFlag) {
   const endpoint = resolveEndpoint(endpointFlag);
   const api = await ensureSignedIn(endpoint);
   const identity = loadMachineIdentity();
+  const existing = await loadMachine(api, identity.machine_id).catch(() => null);
+  const suggested = machineDisplayName(existing ?? { hostname: os10.hostname(), id: identity.machine_id });
   const rl = readline2.createInterface({ input: stdin, output: stdout });
-  const suggested = machineDisplayName(identity);
   const answer = (await rl.question(
     `${c2.bold}Machine name${c2.reset} ${c2.dim}(shown in the session picker)${c2.reset} [${suggested}]: `
   )).trim();
   rl.close();
-  if (answer) setMachineName(answer);
-  const named = loadMachineIdentity();
-  await updateOwnMachineRecord(api, named);
+  if (answer) await setMachineName(api, identity.machine_id, answer);
+  await updateOwnMachineRecord(api, identity);
+  const displayName = answer || suggested;
   stdout.write(`${c2.dim}Installing the always-on service\u2026${c2.reset}
 `);
   const extra = endpointFlag ? ["--endpoint", endpoint] : [];
@@ -6117,7 +6288,7 @@ async function installCommand(endpointFlag) {
   let alive = false;
   while (Date.now() < deadline) {
     await new Promise((r) => setTimeout(r, 2e3));
-    const record = await loadMachine(api, named.machine_id);
+    const record = await loadMachine(api, identity.machine_id);
     if (record && daemonOnline(record)) {
       alive = true;
       break;
@@ -6125,7 +6296,7 @@ async function installCommand(endpointFlag) {
   }
   if (alive) {
     stdout.write(
-      `${c2.green}\u2713${c2.reset} ${c2.bold}${machineDisplayName(named)}${c2.reset} is online.
+      `${c2.green}\u2713${c2.reset} ${c2.bold}${displayName}${c2.reset} is online.
 
 Sessions started elsewhere can now run on this machine.
 ${c2.dim}Projects register automatically when you run standardcode in a directory here,
@@ -6144,12 +6315,14 @@ async function statusCommand() {
   const status = serviceStatus();
   const identity = loadMachineIdentity();
   stdout.write(`${c2.bold}Service:${c2.reset}  ${status.detail}
-`);
-  stdout.write(`${c2.bold}Machine:${c2.reset}  ${machineDisplayName(identity)} ${c2.dim}(${identity.machine_id})${c2.reset}
 `);
   const endpoint = resolveEndpoint();
   const cred = getCredential(endpoint);
   if (!cred) {
+    stdout.write(
+      `${c2.bold}Machine:${c2.reset}  ${os10.hostname()} ${c2.dim}(${identity.machine_id})${c2.reset}
+`
+    );
     stdout.write(`${c2.bold}Account:${c2.reset}  ${c2.yellow}not signed in to ${endpoint}${c2.reset}
 `);
     return;
@@ -6157,6 +6330,10 @@ async function statusCommand() {
   relaxTlsForLocalEndpoint(endpoint);
   const api = new ApiClient(endpoint, cred.access_token);
   const record = await loadMachine(api, identity.machine_id).catch(() => null);
+  stdout.write(
+    `${c2.bold}Machine:${c2.reset}  ${machineDisplayName(record ?? { hostname: os10.hostname(), id: identity.machine_id })} ${c2.dim}(${identity.machine_id})${c2.reset}
+`
+  );
   if (!record) {
     stdout.write(`${c2.bold}Registry:${c2.reset} not registered yet
 `);
@@ -6187,9 +6364,11 @@ async function projectCommand(action, target) {
   const endpoint = resolveEndpoint();
   const api = await ensureSignedIn(endpoint);
   const identity = loadMachineIdentity();
+  const record = await loadMachine(api, identity.machine_id).catch(() => null);
+  const displayName = machineDisplayName(record ?? { hostname: os10.hostname(), id: identity.machine_id });
   if (action === "add") {
     await registerProject(api, identity, dir2);
-    stdout.write(`${c2.green}\u2713${c2.reset} Registered ${dir2} for remote sessions on ${machineDisplayName(identity)}.
+    stdout.write(`${c2.green}\u2713${c2.reset} Registered ${dir2} for remote sessions on ${displayName}.
 `);
   } else {
     await unregisterProject(api, identity, dir2);
@@ -6386,7 +6565,7 @@ ${c3.teal}\u25C7${c3.reset} ${c3.dim}Standard Code \u2014 see you soon.${c3.rese
 `);
 }
 function printWelcome(endpoint, projectDir) {
-  const home = os9.homedir();
+  const home = os10.homedir();
   const dir2 = projectDir.startsWith(home) ? "~" + projectDir.slice(home.length) : projectDir;
   const host = endpoint.replace(/^https?:\/\//, "").replace(/\/$/, "");
   const version = readVersion();
@@ -6454,7 +6633,7 @@ async function main() {
   const endpointOverride = cliArgs.promptEndpoint || typeof endpointArg === "string" && endpointArg.trim() !== "";
   const dirArg = cliArgs.dir;
   const projectDir = path3.resolve(dirArg || process.cwd());
-  const machine = os9.hostname();
+  const machine = os10.hostname();
   const reader = { rl: null };
   let handoffClosing = false;
   let preflightArmed = false;
@@ -6639,7 +6818,7 @@ ${c3.dim}Press Control-C again to exit${c3.reset}
   void registerProject(api, identity, projectDir).catch(() => {
   });
   const tui = new Tui(1);
-  const home = os9.homedir();
+  const home = os10.homedir();
   const tildeDir = projectDir.startsWith(home) ? "~" + projectDir.slice(home.length) : projectDir;
   const shortDir = tildeDir.length > 38 ? "\u2026" + tildeDir.slice(-37) : tildeDir;
   const session = { mode: "local", identity };
@@ -6907,6 +7086,12 @@ async function runInteractive(tui, api, threadId, projectDir, machine, resumed,
     if (ownerDaemonMachine === session.identity.machine_id) claim = "takeover";
   }
   if (!remote) {
+    const localDisplayName = machineDisplayName(
+      await loadMachine(api, session.identity.machine_id).catch(() => null) ?? {
+        hostname: machine,
+        id: session.identity.machine_id
+      }
+    );
     exec = new ExecutionSession({
       api,
       threadId,
@@ -6915,7 +7100,7 @@ async function runInteractive(tui, api, threadId, projectDir, machine, resumed,
       perm,
       identity: {
         clientId: interactiveClientId(session.identity),
-        clientName: `${machineDisplayName(session.identity)} (terminal)`,
+        clientName: `${localDisplayName} (terminal)`,
         clientKind: "interactive",
         claim
       },
@@ -7726,24 +7911,27 @@ async function runMachinesMenu(tui, api, self) {
 async function manageMachine(tui, api, self, machine) {
   const isSelf = machine.id === self.machine_id;
   const online = daemonOnline(machine);
-  const remoteReachable = !isSelf && !!machine.daemon;
+  const canRunCommands = isSelf || !!machine.daemon;
+  const options = [
+    { label: "Rename", value: "rename" }
+  ];
+  if (canRunCommands) {
+    options.push(
+      { label: "Update standardcode", hint: `v${machine.version ?? "?"} \u2192 latest`, value: "update" },
+      { label: "Manage projects", hint: `${Object.keys(machine.projects).length}`, value: "projects" }
+    );
+  }
+  options.push({ label: "Back", value: "back" });
   if (!isSelf && !machine.daemon) {
     tui.print(
-      `${c3.yellow}${machine.name} has no daemon${c3.reset} ${c3.gray}\u2014 it only runs the interactive CLI, so it can't be managed remotely. Manage it from that machine, or install its daemon.${c3.reset}`
+      `${c3.dim}${machine.name} has no daemon \u2014 you can rename it here; update and project changes need its daemon installed.${c3.reset}`
     );
-    return;
-  }
-  if (remoteReachable && !online) {
+  } else if (!isSelf && machine.daemon && !online) {
     tui.print(
       `${c3.dim}${machine.name}'s daemon is offline \u2014 queued changes apply when it next comes online.${c3.reset}`
     );
   }
-  const action = await tui.select(`${c3.bold}${machine.name}${c3.reset}`, [
-    { label: "Rename", value: "rename" },
-    { label: "Update standardcode", hint: `v${machine.version ?? "?"} \u2192 latest`, value: "update" },
-    { label: "Manage projects", hint: `${Object.keys(machine.projects).length}`, value: "projects" },
-    { label: "Back", value: "back" }
-  ]);
+  const action = await tui.select(`${c3.bold}${machine.name}${c3.reset}`, options);
   if (!action || action === "back") return;
   const dispatch = async (kind, args) => {
     if (isSelf) {
@@ -7755,9 +7943,9 @@ async function manageMachine(tui, api, self, machine) {
   const applyNote = isSelf ? "applied" : `queued \u2014 ${machine.name}'s daemon will apply it within ~10s`;
   if (action === "rename") {
     const name = await tui.prompt(`New name for ${machine.name}`, machine.name);
-    if (!name || !name.trim()) return;
-    await dispatch("rename", { name: name.trim() });
-    tui.print(`${c3.green}\u2713${c3.reset} Rename to "${name.trim()}" ${c3.gray}${applyNote}.${c3.reset}`);
+    if (name === null || !name.trim()) return;
+    await setMachineName(api, machine.id, name.trim());
+    tui.print(`${c3.green}\u2713${c3.reset} Renamed ${c3.bold}${machine.name}${c3.reset} \u2192 ${c3.bold}${name.trim()}${c3.reset}.`);
   } else if (action === "update") {
     if (isSelf) {
       await runUpdateCommand(tui);
@@ -7786,12 +7974,12 @@ async function manageMachineProjects(tui, api, self, machine, dispatch, applyNot
   );
   if (!picked) return;
   if (picked === ADD) {
-    const path12 = await tui.prompt(
+    const path13 = await tui.prompt(
       `Absolute project path on ${machine.name}`,
       machine.id === self.machine_id ? process.cwd() : "/home/you/project"
     );
-    if (!path12 || !path12.trim()) return;
-    const trimmed = path12.trim();
+    if (!path13 || !path13.trim()) return;
+    const trimmed = path13.trim();
     if (!trimmed.startsWith("/") && !trimmed.startsWith("~")) {
       tui.print(`${c3.yellow}Use an absolute path (starting with / or ~).${c3.reset}`);
       return;