toolstile 0.2.0 → 0.2.1

package/README.md

@@ -118,7 +118,9 @@ npx toolstile mcp setup
 ```
 
 `auth login` prints a link and a code. Open the link on any device with a
-browser (your laptop or phone), sign in and approve the code. Nothing has to
+browser (your laptop or phone) and sign in. The page fills in the code and this
+machine's name; edit the name if you like, check the code matches and approve.
+The machine appears under that name in the Toolstile dashboard. Nothing has to
 reach the machine you are signing in, so it works over SSH, in containers and on
 servers without a browser.
 

package/dist/api.d.ts

@@ -15,6 +15,11 @@ export interface Account {
     name: string;
     expiresAt: string;
     workspaces: Workspace[];
+    /** The device named when this sign-in was approved. */
+    device?: {
+        id: string;
+        label: string;
+    } | null;
 }
 export interface DeviceCode {
     device_code: string;

package/dist/commands.d.ts

@@ -15,6 +15,7 @@ export interface Context {
     stderr: NodeJS.WritableStream;
     style: Style;
     sleep?: (ms: number) => Promise<void>;
+    hostname?: () => string;
     openBrowser?: (url: string) => void;
 }
 /** A failure explained to the user; exits 1 without a stack trace. */

package/dist/commands.js

@@ -41,6 +41,8 @@ function defaultOpenBrowser(ctx) {
         catch { }
     };
 }
+/** The name this machine suggests for itself: its hostname, without macOS's `.local`. */
+const machineName = (ctx) => (ctx.hostname ?? hostname)().replace(/\.local$/i, "");
 const formatCode = (code) => (code.length === 8 ? `${code.slice(0, 4)}-${code.slice(4)}` : code);
 export async function login(ctx, options) {
     const s = ctx.style;
@@ -48,14 +50,18 @@ export async function login(ctx, options) {
     const server = normalizeServer(options.server ?? ctx.env.TOOLSTILE_URL ?? state.server);
     const api = ctx.api(server);
     const code = await api.deviceCode();
-    print(ctx, `Open this page on any device with a browser, sign in to Toolstile and enter the code:`);
+    // The page fills in the code and this machine's name; the name can be edited there and
+    // becomes the device this machine's agents are listed under.
+    const link = new URL(code.verification_uri_complete);
+    link.searchParams.set("device_name", machineName(ctx));
+    print(ctx, `Open this link on any device with a browser and approve the sign-in:`);
     print(ctx);
-    print(ctx, `  ${s.bold(code.verification_uri)}`);
-    print(ctx, `  ${s.bold(formatCode(code.user_code))}`);
+    print(ctx, `  ${s.bold(link.href)}`);
     print(ctx);
+    print(ctx, `Check that the page shows this code: ${s.bold(formatCode(code.user_code))}`);
     print(ctx, s.dim(`Waiting for approval. The code expires in ${Math.round(code.expires_in / 60)} minutes.`));
     if (options.browser)
-        (ctx.openBrowser ?? defaultOpenBrowser(ctx))(code.verification_uri);
+        (ctx.openBrowser ?? defaultOpenBrowser(ctx))(link.href);
     const sleep = ctx.sleep ?? ((ms) => new Promise((r) => setTimeout(r, ms)));
     let interval = Math.max(code.interval, 1) * 1000;
     const deadline = Date.now() + code.expires_in * 1000;
@@ -95,9 +101,13 @@ export async function login(ctx, options) {
     }
     state.server = server;
     state.session = { token, email: account.email, expiresAt: account.expiresAt, server };
+    // The device named on the approval page. Agents still on an older device move to it at
+    // the next `mcp setup`.
+    if (account.device)
+        state.device = account.device;
     saveState(state, stateEnv(ctx));
     print(ctx);
-    print(ctx, `Signed in as ${s.bold(account.email)}. Next: ${s.bold("toolstile mcp setup")}`);
+    print(ctx, `Signed in as ${s.bold(account.email)}${account.device ? ` on ${s.bold(account.device.label)}` : ""}. Next: ${s.bold("toolstile mcp setup")}`);
     return 0;
 }
 export async function logout(ctx) {
@@ -179,7 +189,7 @@ export async function setup(ctx, options) {
         device ??= await api.device(session.token, {
             workspaceId: workspace.id,
             id: state.device?.id,
-            label: options.deviceName ?? state.device?.label ?? hostname().replace(/\.local$/, ""),
+            label: options.deviceName ?? state.device?.label ?? machineName(ctx),
             rename: options.deviceName !== undefined,
         });
         state.device = device;
@@ -201,7 +211,7 @@ export async function setup(ctx, options) {
                 throw error;
         })
         : Promise.resolve();
-    const deviceLabel = state.device?.label ?? hostname().replace(/\.local$/, "");
+    const deviceLabel = state.device?.label ?? machineName(ctx);
     const all = targets(ctx);
     const shown = all.filter((t) => t.detected || live(t.client) || state.agents[t.client] || enable.includes(t.client));
     if (!shown.length) {

package/dist/prompt.d.ts

@@ -4,7 +4,11 @@ export interface Choice {
     hint?: string;
     checked: boolean;
 }
-/** Terminal checklist: arrows (or j/k) move, space toggles, a toggles all, enter saves. */
+/**
+ * Terminal checklist: arrows (or j/k) move, space toggles, a toggles all, enter saves.
+ * Every line is fitted to the terminal width: a wrapped line takes two rows, and the redraw
+ * would then move up too few rows and leave copies of the title behind.
+ */
 export declare function checklist(title: string, choices: Choice[], input: ReadStream, output: WriteStream, options?: {
     single?: boolean;
 }): Promise<boolean[] | null>;

package/dist/prompt.js

@@ -1,5 +1,14 @@
 import { emitKeypressEvents } from "node:readline";
-/** Terminal checklist: arrows (or j/k) move, space toggles, a toggles all, enter saves. */
+/** Shortens text to `width` columns, keeping its end (the file name of a path). */
+function fitStart(text, width) {
+    return text.length <= width ? text : width < 2 ? "" : `…${text.slice(text.length - width + 1)}`;
+}
+const fitEnd = (text, width) => text.length <= width ? text : `${text.slice(0, Math.max(0, width - 1))}…`;
+/**
+ * Terminal checklist: arrows (or j/k) move, space toggles, a toggles all, enter saves.
+ * Every line is fitted to the terminal width: a wrapped line takes two rows, and the redraw
+ * would then move up too few rows and leave copies of the title behind.
+ */
 export function checklist(title, choices, input, output, options = {}) {
     const state = choices.map((c) => c.checked);
     let cursor = Math.max(0, options.single ? state.indexOf(true) : 0);
@@ -8,14 +17,19 @@ export function checklist(title, choices, input, output, options = {}) {
     const render = () => {
         if (drawn)
             output.write(`\x1b[${drawn}A\x1b[0J`);
+        // A spare column for glyphs some terminals draw double-width.
+        const width = Math.max(20, (output.columns || 80) - 2);
         const lines = [
-            title,
+            fitEnd(title, width),
             ...choices.map((c, i) => {
                 const mark = options.single ? (i === cursor ? "●" : "○") : state[i] ? "◉" : "○";
                 const pointer = i === cursor ? "›" : " ";
-                return `${pointer} ${mark} ${c.label}${c.hint ? `  \x1b[2m${c.hint}\x1b[22m` : ""}`;
+                const text = fitEnd(`${pointer} ${mark} ${c.label}`, width);
+                const room = width - text.length - 2;
+                const hint = c.hint && room >= 8 ? `  \x1b[2m${fitStart(c.hint, room)}\x1b[22m` : "";
+                return `${text}${hint}`;
             }),
-            `\x1b[2m${help}\x1b[22m`,
+            `\x1b[2m${fitEnd(help, width)}\x1b[22m`,
         ];
         output.write(`${lines.join("\n")}\n`);
         drawn = lines.length;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "toolstile",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Audit the MCP server configs your AI agents use for plaintext secrets, unpinned packages, auto-approved tools and duplicated setups, and connect those agents to Toolstile without putting tokens in their configs.",
   "keywords": [
     "mcp",