@xfey/tutti 0.1.7 → 0.1.8

package/dist/server-shell/cli/args.d.ts

@@ -18,10 +18,6 @@ export type CliCommand = {
 } | {
     kind: "stop";
     workspacePath?: string;
-} | {
-    kind: "restart";
-    workspacePath?: string;
-    yes: boolean;
 } | {
     kind: "invite";
     workspacePath?: string;

package/dist/server-shell/cli/args.js

@@ -134,23 +134,6 @@ export function parseCliArgs(argv, cwd = process.cwd()) {
         const workspacePath = readOptionalWorkspace(args, cwd);
         return { kind: "stop", ...(workspacePath === undefined ? {} : { workspacePath }) };
     }
-    if (command === "restart") {
-        if (hasHelpArg(args)) {
-            return { kind: "help", topic: "restart" };
-        }
-        let yes = false;
-        const positional = [];
-        for (const arg of args) {
-            if (arg === "--yes") {
-                yes = true;
-            }
-            else {
-                positional.push(arg);
-            }
-        }
-        const workspacePath = readOptionalWorkspace(positional, cwd);
-        return { kind: "restart", yes, ...(workspacePath === undefined ? {} : { workspacePath }) };
-    }
     if (command === "invite") {
         if (hasHelpArg(args)) {
             return { kind: "help", topic: "invite" };

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

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { formatCliError } from "./errors.js";
 import { parseCliArgs } from "./args.js";
-import { runBackgroundLaunchCommand, runForegroundLaunchCommand, runInternalHostRunCommand, runRestartCommand, } from "./launch-command.js";
+import { runBackgroundLaunchCommand, runForegroundLaunchCommand, runInternalHostRunCommand, } from "./launch-command.js";
 import { resolveExistingProjectContext } from "./project-resolver.js";
 import { runProviderSetupTui } from "./provider-tui.js";
 import { runInviteCommand, runLogsCommand, runProviderStatusCommand, runPsManageCommand, runPsCommand, runStopCommand, } from "./runtime-commands.js";
@@ -11,7 +11,6 @@ const HELP_TEXT = `Usage:
   tutti ps [--manage]
   tutti invite [workspace_path]
   tutti stop [workspace_path]
-  tutti restart [workspace_path] [--yes]
   tutti logs [workspace_path] [--tail 120]
   tutti provider setup [workspace_path]
   tutti provider status [workspace_path]
@@ -58,11 +57,6 @@ const STOP_HELP_TEXT = `Usage:
 
 Stops the background Tutti host for a project.
 `;
-const RESTART_HELP_TEXT = `Usage:
-  tutti restart [workspace_path] [--yes]
-
-Stops and relaunches the background Tutti host for a project.
-`;
 const LOGS_HELP_TEXT = `Usage:
   tutti logs [workspace_path] [--tail 120]
 
@@ -89,9 +83,6 @@ function helpForTopic(topic) {
     if (topic === "stop") {
         return STOP_HELP_TEXT;
     }
-    if (topic === "restart") {
-        return RESTART_HELP_TEXT;
-    }
     if (topic === "logs") {
         return LOGS_HELP_TEXT;
     }
@@ -169,9 +160,6 @@ try {
         case "stop":
             process.stdout.write(`${await runStopCommand(command.workspacePath)}\n`);
             break;
-        case "restart":
-            await runRestartCommand(command);
-            break;
         case "invite":
             process.stdout.write(`${await runInviteCommand(command.workspacePath)}\n`);
             break;

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

@@ -12,8 +12,4 @@ export declare function runBackgroundLaunchCommand(options: {
     workspacePath: string;
     yes: boolean;
 }): Promise<void>;
-export declare function runRestartCommand(options: {
-    workspacePath?: string;
-    yes: boolean;
-}): Promise<void>;
 //# sourceMappingURL=launch-command.d.ts.map

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

@@ -1,13 +1,12 @@
 import { createInterface } from "node:readline/promises";
 import { basename } from "node:path";
-import { redactText } from "@tutti/shared/utils";
 import { formatLaunchLifecycleResult, startLaunchProject, waitForForegroundHostShutdown } from "./host-lifecycle.js";
 import { prepareLaunchProject } from "./launch.js";
 import { spawnDetachedHost, waitForManagedHostReady } from "./managed-host.js";
 import { renderTerminalQr } from "./terminal-qr.js";
+import { renderTuttiTerminalLogo } from "./terminal-logo.js";
 import { runProviderSetupTui } from "./provider-tui.js";
 import { LaunchError } from "./errors.js";
-import { runStopCommand } from "./runtime-commands.js";
 const CLEAR = "\u001B[2J\u001B[H";
 export async function confirmFromTty(request) {
     if (!process.stdin.isTTY || !process.stdout.isTTY) {
@@ -44,18 +43,18 @@ async function waitForEnter() {
     }
 }
 function renderCompletionPage(options) {
+    const isTty = process.stdout.isTTY === true;
     return [
-        ...(process.stdout.isTTY ? [CLEAR] : []),
+        ...(isTty ? [CLEAR, renderTuttiTerminalLogo({ tty: true }), ""] : []),
         "Tutti is running in the background.",
         "",
         `Project: ${options.projectName}`,
-        `Workspace: ${redactText(options.workspaceRoot)}`,
         "",
         `Join URL: ${options.joinUrl}`,
         "",
         renderTerminalQr(options.joinUrl),
         "",
-        "按下回车关闭页面，Host 会继续在后台运行。",
+        "Press Enter to close this page. The host will keep running in the background.",
     ].join("\n");
 }
 async function ensureProviderConfigured(preparation) {
@@ -112,16 +111,8 @@ export async function runBackgroundLaunchCommand(options) {
     }
     process.stdout.write(`${renderCompletionPage({
         projectName: projectName(preparation),
-        workspaceRoot: preparation.workspace_root,
         joinUrl: ready.join_url,
     })}\n`);
     await waitForEnter();
 }
-export async function runRestartCommand(options) {
-    await runStopCommand(options.workspacePath).catch(() => undefined);
-    await runBackgroundLaunchCommand({
-        workspacePath: options.workspacePath ?? process.cwd(),
-        yes: options.yes,
-    });
-}
 //# sourceMappingURL=launch-command.js.map

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

@@ -1,34 +1,37 @@
 import { emitKeypressEvents } from "node:readline";
 import { redactError } from "@tutti/shared/utils";
 import { configureProjectOpenAiProvider, DEFAULT_OPENAI_MODEL, } from "../../providers/openai/index.js";
+import { renderTuttiTerminalLogo } from "./terminal-logo.js";
 const DEFAULT_BASE_URL = "https://api.openai.com/v1";
 const HIDE_CURSOR = "\u001B[?25l";
 const SHOW_CURSOR = "\u001B[?25h";
 const CLEAR = "\u001B[2J\u001B[H";
 function fieldLine(options) {
-    const active = options.index === options.selected;
-    const marker = active ? ">" : " ";
+    const marker = options.active ? ">" : " ";
     const value = options.secret && options.value.length > 0 ? "*".repeat(options.value.length) : options.value;
-    return `${marker} ${options.label.padEnd(10)} ${value}${active ? " _" : ""}`;
+    return `${marker} ${options.label.padEnd(10)} ${value}${options.active ? " _" : ""}`;
 }
 function renderProviderForm(options) {
+    const instruction = options.state.step === "base-url"
+        ? "Enter the provider base URL, then press Enter."
+        : "Enter the API key, then press Enter to validate. Press Esc to edit the base URL.";
     const lines = [
         CLEAR,
         HIDE_CURSOR,
-        "Tutti Provider Setup",
+        renderTuttiTerminalLogo({ tty: options.tty === true }),
+        "",
+        "Provider setup",
         "",
         `Project: ${options.projectName}`,
-        "Use Up/Down to move, type to edit, Enter to validate, Ctrl-C to cancel.",
+        `${instruction} Press Ctrl-C to cancel.`,
         "",
         fieldLine({
-            index: 0,
-            selected: options.state.selected,
+            active: options.state.step === "base-url",
             label: "Base URL",
             value: options.state.baseUrl,
         }),
         fieldLine({
-            index: 1,
-            selected: options.state.selected,
+            active: options.state.step === "api-key",
             label: "API Key",
             value: options.state.apiKey,
             secret: true,
@@ -74,14 +77,18 @@ function waitForKeypress(stdin) {
 }
 async function readProviderForm(options) {
     const state = {
-        selected: 0,
+        step: options.initialStep ?? "base-url",
         baseUrl: options.initialBaseUrl ?? DEFAULT_BASE_URL,
-        apiKey: "",
+        apiKey: options.initialApiKey ?? "",
         error: undefined,
     };
     return await new Promise((resolve, reject) => {
         const render = () => {
-            options.stdout.write(renderProviderForm({ projectName: options.projectName, state }));
+            options.stdout.write(renderProviderForm({
+                projectName: options.projectName,
+                state,
+                tty: options.stdout.isTTY === true,
+            }));
         };
         const cleanup = () => {
             options.stdin.off("keypress", onKeypress);
@@ -97,25 +104,36 @@ async function readProviderForm(options) {
                 return;
             }
             if (key.name === "escape") {
+                if (state.step === "api-key") {
+                    state.step = "base-url";
+                    state.error = undefined;
+                    render();
+                    return;
+                }
                 cleanup();
                 reject(new Error("Provider setup cancelled"));
                 return;
             }
-            if (key.name === "up") {
-                state.selected = state.selected === 0 ? 1 : 0;
-                state.error = undefined;
-                render();
-                return;
-            }
-            if (key.name === "down" || key.name === "tab") {
-                state.selected = state.selected === 0 ? 1 : 0;
+            if (key.name === "tab") {
+                state.step = state.step === "base-url" ? "api-key" : "base-url";
                 state.error = undefined;
                 render();
                 return;
             }
             if (key.name === "return") {
-                if (state.baseUrl.trim() === "" || state.apiKey.trim() === "") {
-                    state.error = "Base URL and API key are required.";
+                if (state.step === "base-url") {
+                    if (state.baseUrl.trim() === "") {
+                        state.error = "Base URL is required.";
+                        render();
+                        return;
+                    }
+                    state.step = "api-key";
+                    state.error = undefined;
+                    render();
+                    return;
+                }
+                if (state.apiKey.trim() === "") {
+                    state.error = "API key is required.";
                     render();
                     return;
                 }
@@ -124,7 +142,7 @@ async function readProviderForm(options) {
                 return;
             }
             if (key.name === "backspace") {
-                if (state.selected === 0) {
+                if (state.step === "base-url") {
                     state.baseUrl = state.baseUrl.slice(0, -1);
                 }
                 else {
@@ -135,7 +153,7 @@ async function readProviderForm(options) {
                 return;
             }
             if (character !== undefined && character >= " " && character !== "\u007F") {
-                if (state.selected === 0) {
+                if (state.step === "base-url") {
                     state.baseUrl += character;
                 }
                 else {
@@ -153,13 +171,15 @@ async function readProviderForm(options) {
         render();
     });
 }
-function renderChecking(projectName, frame) {
+function renderChecking(projectName, frame, tty) {
     const frames = ["|", "/", "-", "\\"];
     const indicator = frames[frame % frames.length] ?? "|";
     return [
         CLEAR,
         HIDE_CURSOR,
-        "Tutti Provider Setup",
+        renderTuttiTerminalLogo({ tty }),
+        "",
+        "Provider setup",
         "",
         `Project: ${projectName}`,
         "",
@@ -173,21 +193,27 @@ export async function runProviderSetupTui(options) {
         throw new Error("Provider setup requires an interactive terminal.");
     }
     let initialBaseUrl = options.initialBaseUrl;
+    let initialApiKey = "";
+    let initialStep = "base-url";
     while (true) {
         const input = await readProviderForm({
             projectName: options.projectName,
             ...(initialBaseUrl === undefined ? {} : { initialBaseUrl }),
+            ...(initialApiKey === "" ? {} : { initialApiKey }),
+            initialStep,
             stdin,
             stdout,
         });
         initialBaseUrl = input.baseUrl;
+        initialApiKey = input.apiKey;
+        initialStep = "api-key";
         let frame = 0;
         const interval = setInterval(() => {
-            stdout.write(renderChecking(options.projectName, frame));
+            stdout.write(renderChecking(options.projectName, frame, stdout.isTTY === true));
             frame += 1;
         }, 120);
         try {
-            stdout.write(renderChecking(options.projectName, frame));
+            stdout.write(renderChecking(options.projectName, frame, stdout.isTTY === true));
             const result = await configureProjectOpenAiProvider({
                 tuttiHome: options.tuttiHome,
                 projectId: options.projectId,
@@ -207,12 +233,13 @@ export async function runProviderSetupTui(options) {
             stdout.write(renderProviderForm({
                 projectName: options.projectName,
                 state: {
-                    selected: 1,
+                    step: "api-key",
                     baseUrl: input.baseUrl,
                     apiKey: input.apiKey,
                     error: validationFailureMessage(result),
                 },
                 footer: "Press any key to edit and try again.",
+                tty: stdout.isTTY === true,
             }));
             await waitForKeypress(stdin);
         }

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

@@ -0,0 +1,5 @@
+export declare function renderTuttiTerminalLogo(options?: {
+    tty?: boolean;
+    color?: boolean;
+}): string;
+//# sourceMappingURL=terminal-logo.d.ts.map

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

@@ -0,0 +1,27 @@
+const RESET = "\u001B[0m";
+const ACTION_STRONG = "\u001B[38;2;8;121;95m";
+// Static Braille rendering of docs/design/Tutti.png, generated from the alpha mask.
+const TUTTI_BRAILLE_LOGO = [
+    "    ⣀⣤⣶⣶⣾⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣶⡄      ⣠⣶⣶⣦  ⢀⣤⣶⣶⣄",
+    "  ⢀⣾⣿⣿⠿⠛⠛⠛⢉⣿⣿⣿⠏⠉⠉⠛⠛⠛⠛⠛⠁    ⢀⣾⣿⠏⣿⣿⡇⣠⣿⡿⠙⣿⣿",
+    "  ⢸⣿⣿⡇    ⢸⣿⣿⣿             ⣾⣿⡏⢀⣿⣿⢡⣿⣿⠃⣸⣿⡟ ⢀⣴⣶⣤",
+    "  ⠈⠿⣿⠟    ⣿⣿⣿⡇            ⢸⣿⣿⣡⣾⡿⠃⣾⣿⣟⣰⣿⠟⠁ ⠘⠿⠿⠛",
+    "         ⢰⣿⣿⣿⠁  ⣤⣶⡦  ⣴⣶⡆⣾⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠆⣤⣶⣦",
+    "         ⣸⣿⣿⡿  ⢰⣿⣿⠇ ⢰⣿⣿⠇⠈⠉⣿⣿⡏⠉⠉⠉⢹⣿⣿⡏⠉⠉⠁ ⢠⣿⣿⡟",
+    "         ⣿⣿⣿⡇  ⣾⣿⣿ ⢠⣿⣿⡿  ⢀⣿⣿⣇   ⢸⣿⣿⡇    ⣸⣿⣿⠇",
+    "        ⢰⣿⣿⣿⠃  ⣿⣿⣿⣴⣿⣿⣿⣇⣀⣴⣿⣿⣿⣿⣄⣀⣠⣾⣿⣿⣧⣀⣀⣀⣴⣿⣿⣿",
+    "        ⠸⣿⣿⡿   ⠹⣿⣿⡿⠃⠻⣿⣿⣿⠟⠋⠈⠻⣿⣿⣿⡿⠛⠙⠿⣿⣿⣿⣿⠟⣿⣿⡿",
+].join("\n");
+function supportsColor(options) {
+    return options.color !== false && process.env.NO_COLOR === undefined;
+}
+export function renderTuttiTerminalLogo(options = {}) {
+    if (options.tty !== true) {
+        return "Tutti";
+    }
+    if (!supportsColor(options)) {
+        return TUTTI_BRAILLE_LOGO;
+    }
+    return `${ACTION_STRONG}${TUTTI_BRAILLE_LOGO}${RESET}`;
+}
+//# sourceMappingURL=terminal-logo.js.map

package/package.json

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