@xfey/tutti 0.1.22 → 0.1.24

package/dist/server-shell/cli/host-lifecycle.js

@@ -10,28 +10,11 @@ import { HOST_SERVER_VERSION, startForegroundHostServer, } from "./host-server-r
 import { deleteMachineRuntimeEndpoint, readHostRegistrationSecret, readMachineProjectBinding, readMachineRuntimeEndpoint, } from "./machine-local.js";
 import { prepareLaunchProject, resolveLaunchLocalContext, } from "./launch.js";
 import { registerHostWithRelay, relayErrorToLaunchError, } from "./relay-registration.js";
-import { formatJoinLinkValidity } from "./terminal-qr.js";
+import { formatJoinLinkValidity, formatTerminalLink } from "./terminal-qr.js";
 export { createRuntimeEndpointProbe } from "./host-runtime-endpoint.js";
 const DEFAULT_SHUTDOWN_WAIT_MS = 2_000;
-const OSC8_START = "\u001B]8;;";
-const OSC8_END = "\u001B]8;;\u001B\\";
-function isTerminalSafeHttpUrl(value) {
-    if (!value.startsWith("http://") && !value.startsWith("https://")) {
-        return false;
-    }
-    return Array.from(value).every((character) => {
-        const codePoint = character.codePointAt(0);
-        return codePoint !== undefined && codePoint > 0x1f && codePoint !== 0x7f;
-    });
-}
-function terminalLink(value, options) {
-    if (options.hyperlinks !== true || !isTerminalSafeHttpUrl(value)) {
-        return value;
-    }
-    return `${OSC8_START}${value}\u001B\\${value}${OSC8_END}`;
-}
 function urlLine(label, value, options) {
-    return `${label}: ${terminalLink(value, options)}`;
+    return `${label}: ${formatTerminalLink(value, options)}`;
 }
 function endpointWithoutToken(endpoint) {
     return {

package/dist/server-shell/cli/launch-command.d.ts

@@ -1,5 +1,14 @@
 import type { LaunchConfirmationRequest } from "./git-bootstrap.js";
 export declare function confirmFromTty(request: LaunchConfirmationRequest): Promise<boolean>;
+export declare function renderCompletionPage(options: {
+    joinUrl: string;
+    joinTokenExpiresAt?: string;
+    joinTokenReusable?: boolean;
+    projectId: string;
+    workspaceRoot: string;
+    tty?: boolean;
+    hyperlinks?: boolean;
+}): string;
 export declare function runForegroundLaunchCommand(options: {
     target?: string;
     yes: boolean;

package/dist/server-shell/cli/launch-command.js

@@ -1,9 +1,10 @@
 import { createInterface } from "node:readline/promises";
+import { basename } from "node:path";
 import { formatLaunchLifecycleResult, startLaunchProject, waitForForegroundHostShutdown } from "./host-lifecycle.js";
 import { prepareLaunchProject } from "./launch.js";
 import { spawnDetachedHost, waitForManagedHostReady } from "./managed-host.js";
 import { resolveLaunchWorkspacePath } from "./project-resolver.js";
-import { formatJoinLinkValidity, renderTerminalQr } from "./terminal-qr.js";
+import { formatJoinLinkValidity, formatTerminalLink } from "./terminal-qr.js";
 import { renderTuttiTerminalLogo } from "./terminal-logo.js";
 import { runProviderSetupTui } from "./provider-tui.js";
 import { LaunchError } from "./errors.js";
@@ -24,40 +25,69 @@ export async function confirmFromTty(request) {
         readline.close();
     }
 }
-async function waitForEnter() {
-    if (!process.stdin.isTTY || !process.stdout.isTTY) {
-        return;
+function formatProjectLabel(workspaceRoot, projectId) {
+    return basename(workspaceRoot) || projectId;
+}
+function visibleTerminalLength(line) {
+    let stripped = line;
+    while (true) {
+        const start = stripped.indexOf("\u001B]8;;");
+        if (start < 0) {
+            break;
+        }
+        const end = stripped.indexOf("\u001B\\", start);
+        if (end < 0) {
+            break;
+        }
+        stripped = `${stripped.slice(0, start)}${stripped.slice(end + 2)}`;
     }
-    const readline = createInterface({
-        input: process.stdin,
-        output: process.stdout,
-    });
-    try {
-        await readline.question("");
-    }
-    finally {
-        readline.close();
+    while (true) {
+        const start = stripped.indexOf("\u001B[");
+        if (start < 0) {
+            break;
+        }
+        const end = Array.from(stripped.slice(start + 2)).findIndex((character) => {
+            const codePoint = character.codePointAt(0);
+            return (codePoint !== undefined &&
+                ((codePoint >= 0x41 && codePoint <= 0x5a) ||
+                    (codePoint >= 0x61 && codePoint <= 0x7a)));
+        });
+        if (end < 0) {
+            break;
+        }
+        stripped = `${stripped.slice(0, start)}${stripped.slice(start + 3 + end)}`;
     }
+    return stripped.length;
 }
-function renderCompletionPage(options) {
-    const isTty = process.stdout.isTTY === true;
+function borderedBlock(lines) {
+    const width = Math.max(...lines.map(visibleTerminalLength));
+    const top = `╭${"─".repeat(width + 2)}╮`;
+    const bottom = `╰${"─".repeat(width + 2)}╯`;
+    const body = lines.map((line) => `│ ${line}${" ".repeat(width - visibleTerminalLength(line))} │`);
+    return [top, ...body, bottom].join("\n");
+}
+export function renderCompletionPage(options) {
+    const isTty = options.tty ?? process.stdout.isTTY === true;
+    const projectLabel = formatProjectLabel(options.workspaceRoot, options.projectId);
+    const joinUrl = formatTerminalLink(options.joinUrl, { hyperlinks: options.hyperlinks === true });
+    const joinValidity = formatJoinLinkValidity({
+        ...(options.joinTokenExpiresAt === undefined
+            ? {}
+            : { expiresAt: options.joinTokenExpiresAt }),
+        ...(options.joinTokenReusable === undefined
+            ? {}
+            : { reusable: options.joinTokenReusable }),
+        includeRemaining: false,
+    });
+    const summaryLines = [
+        "Tutti is hosting this project.",
+        `Project: ${projectLabel}`,
+        `Join URL: ${joinUrl}`,
+        joinValidity,
+    ];
     return [
         ...(isTty ? [CLEAR, renderTuttiTerminalLogo({ tty: true }), ""] : []),
-        "Tutti is running in the background.",
-        "",
-        `Join URL: ${options.joinUrl}`,
-        formatJoinLinkValidity({
-            ...(options.joinTokenExpiresAt === undefined
-                ? {}
-                : { expiresAt: options.joinTokenExpiresAt }),
-            ...(options.joinTokenReusable === undefined
-                ? {}
-                : { reusable: options.joinTokenReusable }),
-        }),
-        "",
-        renderTerminalQr(options.joinUrl),
-        "",
-        "[Enter] to continue",
+        isTty ? borderedBlock(summaryLines) : summaryLines.join("\n"),
     ].join("\n");
 }
 async function ensureProviderConfigured(preparation) {
@@ -118,6 +148,10 @@ export async function runBackgroundLaunchCommand(options) {
     }
     process.stdout.write(`${renderCompletionPage({
         joinUrl: ready.join_url,
+        projectId: preparation.project_id,
+        workspaceRoot: preparation.workspace_root,
+        tty: process.stdout.isTTY === true,
+        hyperlinks: process.stdout.isTTY === true,
         ...(ready.join_token_expires_at === undefined
             ? {}
             : { joinTokenExpiresAt: ready.join_token_expires_at }),
@@ -125,6 +159,5 @@ export async function runBackgroundLaunchCommand(options) {
             ? {}
             : { joinTokenReusable: ready.join_token_reusable }),
     })}\n`);
-    await waitForEnter();
 }
 //# sourceMappingURL=launch-command.js.map

package/dist/server-shell/cli/provider-tui.js

@@ -9,13 +9,21 @@ const SHOW_CURSOR = "\u001B[?25h";
 const BLINK_ON = "\u001B[5m";
 const BLINK_OFF = "\u001B[25m";
 const CLEAR = "\u001B[2J\u001B[H";
-const FIELD_UNDERLINE = "------------------------------------------------------------";
+const FIELD_BOX_WIDTH = 60;
 function providerSetupCancelled() {
     return new LaunchError("provider_setup_cancelled", "Provider setup cancelled.", "Run the command again when you are ready.");
 }
 function renderFieldInput(options) {
     const value = options.secret && options.value.length > 0 ? "*".repeat(options.value.length) : options.value;
-    return [options.label, `${value}${BLINK_ON}_${BLINK_OFF}`, FIELD_UNDERLINE];
+    const visibleValue = value.length >= FIELD_BOX_WIDTH ? `<${value.slice(-(FIELD_BOX_WIDTH - 2))}` : value;
+    const cursor = `${BLINK_ON}_${BLINK_OFF}`;
+    const plainLength = visibleValue.length + 1;
+    const padding = Math.max(0, FIELD_BOX_WIDTH - plainLength);
+    return [
+        `+${"-".repeat(FIELD_BOX_WIDTH + 2)}+`,
+        `| ${visibleValue}${cursor}${" ".repeat(padding)} |`,
+        `+${"-".repeat(FIELD_BOX_WIDTH + 2)}+`,
+    ];
 }
 function renderProviderField(state) {
     if (state.step === "base-url") {
@@ -24,7 +32,6 @@ function renderProviderField(state) {
             "OpenAI-compatible Responses API base URL; must expose POST /responses.",
             "",
             ...renderFieldInput({
-                label: "Base URL",
                 value: state.baseUrl,
             }),
             "",
@@ -36,7 +43,6 @@ function renderProviderField(state) {
         "Stored only in the machine-local Tutti credential store.",
         "",
         ...renderFieldInput({
-            label: "API Key",
             value: state.apiKey,
             secret: true,
         }),

package/dist/server-shell/cli/terminal-qr.d.ts

@@ -1,7 +1,11 @@
+export declare function formatTerminalLink(value: string, options?: {
+    hyperlinks?: boolean;
+}): string;
 export declare function renderTerminalQr(input: string): string;
 export declare function formatJoinLinkValidity(options: {
     expiresAt?: string;
     reusable?: boolean;
     now?: Date;
+    includeRemaining?: boolean;
 }): string;
 //# sourceMappingURL=terminal-qr.d.ts.map

package/dist/server-shell/cli/terminal-qr.js

@@ -1,5 +1,22 @@
 import { createRequire } from "node:module";
 const require = createRequire(import.meta.url);
+const OSC8_START = "\u001B]8;;";
+const OSC8_END = "\u001B]8;;\u001B\\";
+function isTerminalSafeHttpUrl(value) {
+    if (!value.startsWith("http://") && !value.startsWith("https://")) {
+        return false;
+    }
+    return Array.from(value).every((character) => {
+        const codePoint = character.codePointAt(0);
+        return codePoint !== undefined && codePoint > 0x1f && codePoint !== 0x7f;
+    });
+}
+export function formatTerminalLink(value, options = {}) {
+    if (options.hyperlinks !== true || !isTerminalSafeHttpUrl(value)) {
+        return value;
+    }
+    return `${OSC8_START}${value}\u001B\\${value}${OSC8_END}`;
+}
 export function renderTerminalQr(input) {
     const qrcode = require("qrcode-terminal");
     let output = "";
@@ -12,6 +29,9 @@ export function formatJoinLinkValidity(options) {
     if (options.expiresAt !== undefined) {
         const expiresAt = new Date(options.expiresAt);
         if (!Number.isNaN(expiresAt.getTime())) {
+            if (options.includeRemaining === false) {
+                return `Join link valid until: ${options.expiresAt}`;
+            }
             const now = options.now ?? new Date();
             const remainingMs = expiresAt.getTime() - now.getTime();
             const suffix = remainingMs <= 0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xfey/tutti",
-  "version": "0.1.22",
+  "version": "0.1.24",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",