@craftspace/cli 0.4.1 → 0.4.3

package/dist/index.js

@@ -19259,7 +19259,8 @@ var ConnectionToolSchema = external_exports.object({
 });
 var ListConnectionToolsResponseSchema = external_exports.object({
   tools: external_exports.array(ConnectionToolSchema),
-  reachable: external_exports.boolean()
+  reachable: external_exports.boolean(),
+  error: external_exports.string().optional()
 });
 var CreateConnectionBodySchema = external_exports.object({
   kind: external_exports.enum(ConnectionKind),
@@ -19782,7 +19783,7 @@ var SaveWorkstationBodySchema = external_exports.object({
 var WorkstationResponseSchema = external_exports.object({ workstation: WorkstationSchema });
 
 // ../../shared/dist/machines/machine.js
-var CLI_VERSION = "0.4.1";
+var CLI_VERSION = "0.4.3";
 var CLI_PACKAGE = "@craftspace/cli";
 var CLI_INSTALL = `npm i -g ${CLI_PACKAGE}`;
 var MACHINE_BEAT_INTERVAL_MS = 15e3;
@@ -23112,8 +23113,9 @@ var machine = {
     };
     return answer.machine;
   },
-  async url() {
-    return (await readConfig())?.url ?? null;
+  async controlPlane(override) {
+    const where = override ?? process.env.CRAFTSPACE_URL ?? (await readConfig())?.url ?? DEFAULT_URL;
+    return where.replace(/\/$/, "");
   },
   async signIn({ url: url2, why, install = false }) {
     const where = url2 ?? (await readConfig())?.url ?? DEFAULT_URL;
@@ -23266,7 +23268,10 @@ ${ui.dim("\u2192")} ${ui.name(target.name)} ${ui.dim(`\xB7 ${where}`)}
 
 `);
   return new Promise((resolve) => {
-    const session = spawn2("ssh", ["-t", where], { stdio: "inherit" });
+    const session = spawn2("ssh", ["-t", where], {
+      stdio: "inherit",
+      env: { ...process.env, TERM: portableTerm(process.env.TERM) }
+    });
     session.on("error", (error51) => {
       ui.say(ui.bad(`could not start ssh`, error51.message));
       resolve(1);
@@ -23274,6 +23279,9 @@ ${ui.dim("\u2192")} ${ui.name(target.name)} ${ui.dim(`\xB7 ${where}`)}
     session.on("exit", (code) => resolve(code ?? 0));
   });
 }
+function portableTerm(local) {
+  return local !== void 0 && PORTABLE_TERMS.has(local) ? local : "xterm-256color";
+}
 function nowhereToGo({ url: url2 }) {
   ui.say(`
 ${ui.attention("No workstations here yet.")}
@@ -23603,6 +23611,21 @@ var KEYS_BEGIN = "# craftspace begin";
 var KEYS_END = "# craftspace end";
 var UPDATE_EVERY_MS = 6 * 60 * 60 * 1e3;
 var BEATING = "beating every 15s, outbound only, and keeps this set up";
+var PORTABLE_TERMS = /* @__PURE__ */ new Set([
+  "ansi",
+  "dumb",
+  "linux",
+  "rxvt",
+  "rxvt-unicode",
+  "rxvt-unicode-256color",
+  "screen",
+  "screen-256color",
+  "vt100",
+  "vt220",
+  "xterm",
+  "xterm-color",
+  "xterm-256color"
+]);
 var LINGER_LINE = `sudo loginctl enable-linger ${os5.userInfo().username}`;
 var DEFAULT_URL = process.env.CRAFTSPACE_URL ?? "https://craftspace.app";
 var PROBE_EVERY_MS = 3e5;
@@ -23615,7 +23638,7 @@ setup.widenPath();
 var program2 = new Command();
 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 where = await machine.controlPlane(url2);
   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}`));
@@ -23654,7 +23677,6 @@ 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,7 +6,7 @@ export declare const machine: {
         url: string;
         install: boolean;
     }): Promise<Machine>;
-    url(): Promise<string | null>;
+    controlPlane(override?: string): Promise<string>;
     signIn({ url, why, install }: {
         url?: string;
         why: string;
@@ -25,6 +25,7 @@ export declare const machine: {
     }>;
     logout(): Promise<void>;
 };
+export declare function portableTerm(local: string | undefined): string;
 export declare function tokenIn(line: string): string | undefined;
 export declare function nextDelayMs(failures: number, busy?: boolean): number;
 interface Auth {

package/dist/machine.js

@@ -43,8 +43,9 @@ export const machine = {
         };
         return answer.machine;
     },
-    async url() {
-        return (await readConfig())?.url ?? null;
+    async controlPlane(override) {
+        const where = override ?? process.env.CRAFTSPACE_URL ?? (await readConfig())?.url ?? DEFAULT_URL;
+        return where.replace(/\/$/, '');
     },
     async signIn({ url, why, install = false }) {
         const where = url ?? (await readConfig())?.url ?? DEFAULT_URL;
@@ -196,7 +197,10 @@ async function openTerminal(target) {
     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) => {
-        const session = spawn('ssh', ['-t', where], { stdio: 'inherit' });
+        const session = spawn('ssh', ['-t', where], {
+            stdio: 'inherit',
+            env: { ...process.env, TERM: portableTerm(process.env.TERM) },
+        });
         session.on('error', (error) => {
             ui.say(ui.bad(`could not start ssh`, error.message));
             resolve(1);
@@ -204,6 +208,9 @@ async function openTerminal(target) {
         session.on('exit', (code) => resolve(code ?? 0));
     });
 }
+export function portableTerm(local) {
+    return local !== undefined && PORTABLE_TERMS.has(local) ? local : 'xterm-256color';
+}
 function nowhereToGo({ url }) {
     ui.say(`\n${ui.attention('No workstations here yet.')}\n\n`);
     ui.say(ui.field('Add one', ui.link(`${url}/workstations`)));
@@ -524,6 +531,21 @@ const KEYS_BEGIN = '# craftspace begin';
 const KEYS_END = '# craftspace end';
 const UPDATE_EVERY_MS = 6 * 60 * 60 * 1_000;
 const BEATING = 'beating every 15s, outbound only, and keeps this set up';
+const PORTABLE_TERMS = new Set([
+    'ansi',
+    'dumb',
+    'linux',
+    'rxvt',
+    'rxvt-unicode',
+    'rxvt-unicode-256color',
+    'screen',
+    'screen-256color',
+    'vt100',
+    'vt220',
+    'xterm',
+    'xterm-color',
+    'xterm-256color',
+]);
 const LINGER_LINE = `sudo loginctl enable-linger ${os.userInfo().username}`;
 const DEFAULT_URL = process.env.CRAFTSPACE_URL ?? 'https://craftspace.app';
 const PROBE_EVERY_MS = 300_000;

package/package.json

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