@craftspace/cli 0.2.0 → 0.2.1

package/dist/index.js

@@ -19258,6 +19258,12 @@ var CreateConnectionBodySchema = external_exports.object({
   // sent it, and can start a connect for that one kit and nothing else.
   inviteToken: external_exports.string().optional()
 });
+var ReplaceConnectionSecretBodySchema = external_exports.object({
+  mcpUrl: external_exports.url().optional(),
+  authToken: external_exports.string().min(1).optional(),
+  dsn: external_exports.string().min(1).optional(),
+  apiKey: external_exports.string().min(1).optional()
+});
 var ConnectionIdParamsSchema = external_exports.object({ id: external_exports.string() });
 var PendingOAuthSchema = external_exports.object({
   id: external_exports.string(),
@@ -20221,7 +20227,7 @@ var MemberActivityListResponse = external_exports.object({
 // dist/machine.js
 import { execFile as execFile3 } from "node:child_process";
 import { mkdir, readFile as readFile2, readdir, rm, writeFile } from "node:fs/promises";
-import os3 from "node:os";
+import os4 from "node:os";
 import path4 from "node:path";
 import { promisify as promisify3 } from "node:util";
 
@@ -22091,6 +22097,7 @@ var dist_default6 = createPrompt((config2, done) => {
 
 // dist/run.js
 import { spawn } from "node:child_process";
+import os from "node:os";
 var runner = {
   attended(argv) {
     return new Promise((resolve) => {
@@ -22101,6 +22108,7 @@ var runner = {
   },
   async unattended({ work, onProgress }) {
     const argv = headlessArgv(work);
+    const raw = argv[0] === "script";
     let output = "";
     let agentSessionId = work.agentSessionId ?? void 0;
     let lastText = "";
@@ -22126,10 +22134,24 @@ var runner = {
       }
     };
     const code = await new Promise((resolve) => {
-      const child = spawn(argv[0], argv.slice(1), { stdio: ["ignore", "pipe", "pipe"] });
+      const child = spawn(argv[0], argv.slice(1), {
+        stdio: ["ignore", "pipe", "pipe"],
+        cwd: os.homedir(),
+        env: {
+          ...process.env,
+          TERM: process.env.TERM ?? "xterm-256color",
+          COLUMNS: process.env.COLUMNS ?? "120",
+          LINES: process.env.LINES ?? "40"
+        }
+      });
+      append("");
       child.stdout.setEncoding("utf8");
       child.stderr.setEncoding("utf8");
       child.stdout.on("data", (chunk) => {
+        if (raw) {
+          append(chunk);
+          return;
+        }
         pending += chunk;
         const lines = pending.split("\n");
         pending = lines.pop() ?? "";
@@ -22179,8 +22201,11 @@ function headlessArgv(work) {
   return [argv[0], "-p", argv.slice(1).join(" "), ...streaming];
 }
 function underTty(argv) {
-  return process.platform === "linux" ? ["script", "-qec", argv.join(" "), "/dev/null"] : ["script", "-q", "/dev/null", ...argv];
+  const line = `stty rows ${PTY_ROWS} cols ${PTY_COLS} 2>/dev/null; exec ${argv.join(" ")}`;
+  return process.platform === "linux" ? ["script", "-qec", line, "/dev/null"] : ["script", "-q", "/dev/null", "sh", "-c", line];
 }
+var PTY_ROWS = 40;
+var PTY_COLS = 120;
 function isAgent(command) {
   return AGENTS.has((command ?? "").split("/").pop() ?? "");
 }
@@ -22209,7 +22234,7 @@ function parseJson(line) {
 
 // dist/setup.js
 import { execFile as execFile2 } from "node:child_process";
-import os2 from "node:os";
+import os3 from "node:os";
 import path3 from "node:path";
 import { promisify as promisify2 } from "node:util";
 
@@ -22217,12 +22242,12 @@ import { promisify as promisify2 } from "node:util";
 import { execFile } from "node:child_process";
 import net from "node:net";
 import { access, readFile } from "node:fs/promises";
-import os from "node:os";
+import os2 from "node:os";
 import path2 from "node:path";
 import { promisify } from "node:util";
 var run = promisify(execFile);
 var probe = {
-  async tools({ mcpPath = path2.join(os.homedir(), ".mcp.json") } = {}) {
+  async tools({ mcpPath = path2.join(os2.homedir(), ".mcp.json") } = {}) {
     const [brain, claude, codex, git, chrome, ssh] = await Promise.all([
       brainWired(mcpPath),
       version2({ id: "claude", command: "claude" }),
@@ -22268,7 +22293,7 @@ async function gitAndGithub() {
   };
 }
 async function githubAccount() {
-  const raw = await readFile(path2.join(os.homedir(), ".config", "gh", "hosts.yml"), "utf8").catch(() => null);
+  const raw = await readFile(path2.join(os2.homedir(), ".config", "gh", "hosts.yml"), "utf8").catch(() => null);
   return raw === null ? null : githubUser(raw);
 }
 function githubUser(hostsYml) {
@@ -22308,7 +22333,7 @@ async function firstLine(command, args) {
   return line === "" ? { ran: false, why: "broken" } : { ran: true, line: line.slice(0, 200) };
 }
 function short(target) {
-  return target.startsWith(os.homedir()) ? `~${target.slice(os.homedir().length)}` : target;
+  return target.startsWith(os2.homedir()) ? `~${target.slice(os2.homedir().length)}` : target;
 }
 var MAC_CHROME = ["/Applications/Google Chrome.app/Contents/MacOS/Google Chrome"];
 var LINUX_CHROME = ["google-chrome", "google-chrome-stable", "chromium"];
@@ -22363,8 +22388,8 @@ function toolDirs() {
   return [
     path3.dirname(process.execPath),
     ...prefix === void 0 ? [] : [path3.join(prefix, "bin")],
-    path3.join(os2.homedir(), ".local", "bin"),
-    path3.join(os2.homedir(), ".npm-global", "bin"),
+    path3.join(os3.homedir(), ".local", "bin"),
+    path3.join(os3.homedir(), ".npm-global", "bin"),
     "/opt/homebrew/bin",
     "/usr/local/bin"
   ];
@@ -22419,7 +22444,7 @@ var RETRY_AFTER_MS = 216e5;
 var run3 = promisify3(execFile3);
 var machine = {
   home() {
-    return process.env.CRAFTSPACE_CLI_HOME ?? path4.join(os3.homedir(), ".craftspace");
+    return process.env.CRAFTSPACE_CLI_HOME ?? path4.join(os4.homedir(), ".craftspace");
   },
   async login({ token, url: url2, install }) {
     const answer = await call({
@@ -22428,11 +22453,11 @@ var machine = {
       method: "POST",
       path: "/api/machines/login",
       body: {
-        name: os3.hostname().split(".")[0] ?? "machine",
+        name: os4.hostname().split(".")[0] ?? "machine",
         platform: `${process.platform}-${process.arch}`,
-        sshUser: os3.userInfo().username,
-        cores: os3.cpus().length,
-        memoryGb: Math.max(1, Math.round(os3.totalmem() / 1024 ** 3)),
+        sshUser: os4.userInfo().username,
+        cores: os4.cpus().length,
+        memoryGb: Math.max(1, Math.round(os4.totalmem() / 1024 ** 3)),
         cli: CLI_VERSION,
         publicKey: await ensureKey()
       },
@@ -22495,7 +22520,7 @@ Signed in as ${signed.ownerName}. This machine is ${signed.name}.
         sessions: await readSessions(),
         runs: drainReports(),
         tools: await tools(),
-        sshUser: os3.userInfo().username
+        sshUser: os4.userInfo().username
       },
       schema: MachineBeatResponseSchema
     });
@@ -22736,7 +22761,7 @@ async function ensureKey() {
   if (existing !== null)
     return existing.trim();
   await mkdir(machine.home(), { recursive: true, mode: 448 });
-  await run3("ssh-keygen", ["-t", "ed25519", "-N", "", "-q", "-f", priv, "-C", `craftspace-${os3.hostname()}`]);
+  await run3("ssh-keygen", ["-t", "ed25519", "-N", "", "-q", "-f", priv, "-C", `craftspace-${os4.hostname()}`]);
   return (await readFile2(pub, "utf8")).trim();
 }
 async function readConfig() {
@@ -22764,7 +22789,7 @@ async function readSessions() {
   return sessions.slice(0, MAX_REPORTED_SESSIONS);
 }
 async function writeAuthorizedKeys(keys) {
-  const target = path4.join(os3.homedir(), ".ssh", "authorized_keys");
+  const target = path4.join(os4.homedir(), ".ssh", "authorized_keys");
   const current = await readFile2(target, "utf8").catch(() => "");
   const before = current.split(KEYS_BEGIN)[0] ?? "";
   const after = current.includes(KEYS_END) ? current.split(KEYS_END)[1] ?? "" : "";
@@ -22804,6 +22829,31 @@ async function writeAgentConfigs({ url: url2, token, writes }) {
     owned.push(target);
   }
   await writeFile(ownedPath(), JSON.stringify({ paths: owned }, null, 2));
+  await acceptClaudeGates(serversIn(planned));
+}
+function serversIn(writes) {
+  return writes.flatMap((write) => isPlainObject3(write.contents.mcpServers) ? Object.keys(write.contents.mcpServers) : []);
+}
+async function acceptClaudeGates(servers) {
+  const target = path4.join(os4.homedir(), ".claude.json");
+  const raw = await readFile2(target, "utf8").catch(() => null);
+  if (raw === null)
+    return;
+  const parsed = JSON.parse(raw);
+  const projects = isPlainObject3(parsed.projects) ? parsed.projects : {};
+  const found = projects[os4.homedir()];
+  const here = isPlainObject3(found) ? { ...found } : {};
+  const enabled = /* @__PURE__ */ new Set([...Array.isArray(here.enabledMcpjsonServers) ? here.enabledMcpjsonServers : [], ...servers]);
+  if (here.hasTrustDialogAccepted === true && enabled.size === asArray(here.enabledMcpjsonServers).length)
+    return;
+  here.hasTrustDialogAccepted = true;
+  here.enabledMcpjsonServers = [...enabled];
+  const next = { ...parsed, projects: { ...projects, [os4.homedir()]: here } };
+  await writeFile(target, `${JSON.stringify(next, null, 2)}
+`, { mode: 384 });
+}
+function asArray(value) {
+  return Array.isArray(value) ? value : [];
 }
 function mergeInto(current, incoming) {
   const merged = { ...current };
@@ -22851,7 +22901,7 @@ async function installService() {
     return;
   }
   if (process.platform === "linux") {
-    const dir = path4.join(os3.homedir(), ".config", "systemd", "user");
+    const dir = path4.join(os4.homedir(), ".config", "systemd", "user");
     await mkdir(dir, { recursive: true });
     await writeFile(path4.join(dir, `${SERVICE_NAME}.service`), systemdUnit());
     await run3("systemctl", ["--user", "daemon-reload"]).catch(() => void 0);
@@ -22859,7 +22909,7 @@ async function installService() {
     return;
   }
   if (process.platform === "darwin") {
-    const target = path4.join(os3.homedir(), "Library", "LaunchAgents", `${LAUNCH_LABEL}.plist`);
+    const target = path4.join(os4.homedir(), "Library", "LaunchAgents", `${LAUNCH_LABEL}.plist`);
     await mkdir(path4.dirname(target), { recursive: true });
     await writeFile(target, launchdPlist());
     await run3("launchctl", ["unload", target]).catch(() => void 0);
@@ -22869,11 +22919,11 @@ async function installService() {
 async function uninstallService() {
   if (process.platform === "linux") {
     await run3("systemctl", ["--user", "disable", "--now", SERVICE_NAME]).catch(() => void 0);
-    await rm(path4.join(os3.homedir(), ".config", "systemd", "user", `${SERVICE_NAME}.service`), { force: true });
+    await rm(path4.join(os4.homedir(), ".config", "systemd", "user", `${SERVICE_NAME}.service`), { force: true });
     return;
   }
   if (process.platform === "darwin") {
-    const target = path4.join(os3.homedir(), "Library", "LaunchAgents", `${LAUNCH_LABEL}.plist`);
+    const target = path4.join(os4.homedir(), "Library", "LaunchAgents", `${LAUNCH_LABEL}.plist`);
     await run3("launchctl", ["unload", target]).catch(() => void 0);
     await rm(target, { force: true });
   }
@@ -22911,7 +22961,7 @@ function entryPath() {
   return path4.join(path4.dirname(new URL(import.meta.url).pathname), "index.js");
 }
 function expand(target) {
-  return target.startsWith("~/") ? path4.join(os3.homedir(), target.slice(2)) : target;
+  return target.startsWith("~/") ? path4.join(os4.homedir(), target.slice(2)) : target;
 }
 function configPath() {
   return path4.join(machine.home(), "config.json");
@@ -22923,9 +22973,9 @@ function ownedPath() {
   return path4.join(machine.home(), "owned.json");
 }
 function load2() {
-  const cores = Math.max(1, os3.cpus().length);
-  const busy = Math.min(100, (os3.loadavg()[0] ?? 0) / cores * 100);
-  const used = (os3.totalmem() - os3.freemem()) / os3.totalmem() * 100;
+  const cores = Math.max(1, os4.cpus().length);
+  const busy = Math.min(100, (os4.loadavg()[0] ?? 0) / cores * 100);
+  const used = (os4.totalmem() - os4.freemem()) / os4.totalmem() * 100;
   return { cpuPercent: Math.round(busy), memoryPercent: Math.round(used) };
 }
 function nextDelayMs(failures, busy = false) {

package/dist/machine.js

@@ -348,8 +348,6 @@ async function readSessions() {
     }
     return sessions.slice(0, MAX_REPORTED_SESSIONS);
 }
-// Only the block between our markers is ours. Everything a person put in this file by hand is left exactly
-// where it was, because the fastest way to lock a team out of its own box is to rewrite this file wholesale.
 async function writeAuthorizedKeys(keys) {
     const target = path.join(os.homedir(), '.ssh', 'authorized_keys');
     const current = await readFile(target, 'utf8').catch(() => '');
@@ -387,6 +385,30 @@ async function writeAgentConfigs({ url, token, writes, }) {
         owned.push(target);
     }
     await writeFile(ownedPath(), JSON.stringify({ paths: owned }, null, 2));
+    await acceptClaudeGates(serversIn(planned));
+}
+function serversIn(writes) {
+    return writes.flatMap((write) => isPlainObject(write.contents.mcpServers) ? Object.keys(write.contents.mcpServers) : []);
+}
+async function acceptClaudeGates(servers) {
+    const target = path.join(os.homedir(), '.claude.json');
+    const raw = await readFile(target, 'utf8').catch(() => null);
+    if (raw === null)
+        return;
+    const parsed = JSON.parse(raw);
+    const projects = isPlainObject(parsed.projects) ? parsed.projects : {};
+    const found = projects[os.homedir()];
+    const here = isPlainObject(found) ? { ...found } : {};
+    const enabled = new Set([...(Array.isArray(here.enabledMcpjsonServers) ? here.enabledMcpjsonServers : []), ...servers]);
+    if (here.hasTrustDialogAccepted === true && enabled.size === asArray(here.enabledMcpjsonServers).length)
+        return;
+    here.hasTrustDialogAccepted = true;
+    here.enabledMcpjsonServers = [...enabled];
+    const next = { ...parsed, projects: { ...projects, [os.homedir()]: here } };
+    await writeFile(target, `${JSON.stringify(next, null, 2)}\n`, { mode: 0o600 });
+}
+function asArray(value) {
+    return Array.isArray(value) ? value : [];
 }
 function mergeInto(current, incoming) {
     const merged = { ...current };

package/dist/run.js

@@ -1,4 +1,5 @@
 import { spawn } from 'node:child_process';
+import os from 'node:os';
 import { MACHINE_RUN_OUTPUT_MAX, spreadIfDefined } from '@craftspace/shared';
 export const runner = {
     attended(argv) {
@@ -10,6 +11,7 @@ export const runner = {
     },
     async unattended({ work, onProgress, }) {
         const argv = headlessArgv(work);
+        const raw = argv[0] === 'script';
         let output = '';
         let agentSessionId = work.agentSessionId ?? undefined;
         let lastText = '';
@@ -33,10 +35,24 @@ export const runner = {
             }
         };
         const code = await new Promise((resolve) => {
-            const child = spawn(argv[0], argv.slice(1), { stdio: ['ignore', 'pipe', 'pipe'] });
+            const child = spawn(argv[0], argv.slice(1), {
+                stdio: ['ignore', 'pipe', 'pipe'],
+                cwd: os.homedir(),
+                env: {
+                    ...process.env,
+                    TERM: process.env.TERM ?? 'xterm-256color',
+                    COLUMNS: process.env.COLUMNS ?? '120',
+                    LINES: process.env.LINES ?? '40',
+                },
+            });
+            append('');
             child.stdout.setEncoding('utf8');
             child.stderr.setEncoding('utf8');
             child.stdout.on('data', (chunk) => {
+                if (raw) {
+                    append(chunk);
+                    return;
+                }
                 pending += chunk;
                 const lines = pending.split('\n');
                 pending = lines.pop() ?? '';
@@ -85,10 +101,13 @@ export function headlessArgv(work) {
     return [argv[0], '-p', argv.slice(1).join(' '), ...streaming];
 }
 function underTty(argv) {
+    const line = `stty rows ${PTY_ROWS} cols ${PTY_COLS} 2>/dev/null; exec ${argv.join(' ')}`;
     return process.platform === 'linux'
-        ? ['script', '-qec', argv.join(' '), '/dev/null']
-        : ['script', '-q', '/dev/null', ...argv];
+        ? ['script', '-qec', line, '/dev/null']
+        : ['script', '-q', '/dev/null', 'sh', '-c', line];
 }
+const PTY_ROWS = 40;
+const PTY_COLS = 120;
 function isAgent(command) {
     return AGENTS.has((command ?? '').split('/').pop() ?? '');
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@craftspace/cli",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "type": "module",
   "description": "Sign a Mac or Linux machine into Craftspace and keep its agent setup in step.",
   "license": "MIT",