@timetotest/cli 0.1.11 → 0.2.0

package/dist/src/commands/ask-ink.js

@@ -0,0 +1,380 @@
+import { Command } from "commander";
+import React from "react";
+import { render } from "ink";
+import { createHttpClient } from "../lib/http.js";
+import { connectForAsk, subscribeAsk, stopSession } from "../lib/socket.js";
+import { registerUnifiedEventLogging, canonicalizeEventType, } from "../lib/events.js";
+import { getAuthToken, getUserLastProject, setUserLastProject, } from "../lib/config.js";
+import { performInteractiveLogin } from "./login.js";
+import { AskApp } from "./ask/AskApp.js";
+import chalk from "chalk";
+export const askInk = new Command("ask")
+    .description("Start interactive chat with TimetoTest AI agent (INK UI)")
+    .option("--project-id <id>", "Project ID to use for the conversation")
+    .option("--conversation-id <id>", "Continue existing conversation")
+    .action(async (opts) => {
+    try {
+        // Check authentication
+        const token = getAuthToken();
+        if (!token) {
+            console.log(chalk.yellow("You are not logged in. Opening browser to authenticate…"));
+            try {
+                await performInteractiveLogin();
+            }
+            catch (e) {
+                console.log(chalk.red(e?.message || "Login failed"));
+                process.exit(1);
+            }
+        }
+        let http = createHttpClient();
+        let conversationId = opts.conversationId;
+        let projectId;
+        if (opts.projectId !== undefined) {
+            const parsedProjectId = Number(opts.projectId);
+            if (!Number.isInteger(parsedProjectId)) {
+                console.log(chalk.red(`❌ Invalid project id '${opts.projectId}'. Please provide a numeric value.`));
+                process.exit(1);
+            }
+            projectId = parsedProjectId;
+        }
+        let lastKnownUser = "Unknown";
+        let lastKnownUserKey;
+        let lastKnownProject = projectId ? `Project ${projectId}` : "Not set";
+        let socket;
+        let userCancelled = false; // Flag to track user cancellation
+        // Load user info and project
+        try {
+            const me = await http.get("/api/v1/auth/me");
+            lastKnownUserKey = me.data?.email || String(me.data?.user_id || "");
+            lastKnownUser = me.data?.email || me.data?.display_name || "Unknown";
+            if (!projectId && lastKnownUserKey) {
+                const remembered = getUserLastProject(lastKnownUserKey);
+                if (remembered) {
+                    projectId = remembered;
+                }
+            }
+            // Fetch user's projects and pick the default if present
+            const projectsResp = await http.get("/api/v1/projects");
+            const projectsRaw = projectsResp.data;
+            const projects = Array.isArray(projectsRaw?.items)
+                ? projectsRaw.items
+                : Array.isArray(projectsRaw)
+                    ? projectsRaw
+                    : [];
+            if (!projectId && projects && projects.length > 0) {
+                const defaultProj = projects.find((p) => p?.is_default === true);
+                const selected = defaultProj || projects[0];
+                if (selected?.id) {
+                    projectId = selected.id;
+                    lastKnownProject = selected.name || `Project ${projectId}`;
+                }
+            }
+            // If we loaded a remembered project, populate the name
+            if (projectId &&
+                (!lastKnownProject || lastKnownProject === "Not set")) {
+                try {
+                    const p = await http.get(`/api/v1/projects/${projectId}`);
+                    lastKnownProject = p.data?.name || `Project ${projectId}`;
+                }
+                catch { }
+            }
+            if (projectId) {
+                const projectResp = await http.get(`/api/v1/projects/${projectId}`);
+                lastKnownProject = projectResp.data.name || `Project ${projectId}`;
+            }
+        }
+        catch (error) {
+            const status = error?.response?.status;
+            if (status === 401 || status === 403) {
+                // Token expired or invalid - re-authenticate
+                console.log(chalk.yellow("Session expired or invalid. Re-authenticating..."));
+                try {
+                    await performInteractiveLogin();
+                    http = createHttpClient();
+                    // Retry fetching user info and projects
+                    const me = await http.get("/api/v1/auth/me");
+                    lastKnownUserKey = me.data?.email || String(me.data?.user_id || "");
+                    lastKnownUser =
+                        me.data?.email || me.data?.display_name || "Unknown";
+                    // Retry fetching projects
+                    const projectsResp = await http.get("/api/v1/projects");
+                    const projectsRaw = projectsResp.data;
+                    const projects = Array.isArray(projectsRaw?.items)
+                        ? projectsRaw.items
+                        : Array.isArray(projectsRaw)
+                            ? projectsRaw
+                            : [];
+                    if (!projectId && projects && projects.length > 0) {
+                        const defaultProj = projects.find((p) => p?.is_default === true);
+                        const selected = defaultProj || projects[0];
+                        if (selected?.id) {
+                            projectId = selected.id;
+                            lastKnownProject = selected.name || `Project ${projectId}`;
+                        }
+                    }
+                    if (projectId) {
+                        const projectResp = await http.get(`/api/v1/projects/${projectId}`);
+                        lastKnownProject =
+                            projectResp.data.name || `Project ${projectId}`;
+                    }
+                }
+                catch (reauthError) {
+                    console.log(chalk.red(`❌ Failed to authenticate: ${reauthError?.message || reauthError}`));
+                    process.exit(1);
+                }
+            }
+            else {
+                console.log(chalk.gray(`ℹ️  Unable to refresh session info: ${error?.message || error}`));
+            }
+        }
+        const workspacePath = process.cwd();
+        // Define slash commands
+        const slashCommands = [];
+        const helpCommand = {
+            name: "help",
+            description: "Show available slash commands",
+            aliases: ["?", "commands", "h"],
+            run: async () => {
+                const helpText = slashCommands
+                    .map((cmd) => {
+                    const aliases = cmd.aliases?.length
+                        ? ` (aliases: ${cmd.aliases.map((a) => `/${a}`).join(", ")})`
+                        : "";
+                    return `  /${cmd.name} - ${cmd.description}${aliases}`;
+                })
+                    .join("\n");
+                getAppInterface()?.addMessage({
+                    id: Date.now().toString(),
+                    type: "system",
+                    content: `Slash commands:\n${helpText}\nPrefix commands with '/' (for example, /switch or /summary).`,
+                });
+                return "continue";
+            },
+        };
+        const exitCommand = {
+            name: "exit",
+            description: "End the conversation",
+            aliases: ["quit", "bye"],
+            run: async () => "exit",
+        };
+        const clearCommand = {
+            name: "clear",
+            description: "Clear the screen",
+            aliases: ["cls"],
+            run: async () => {
+                console.clear();
+                return "continue";
+            },
+        };
+        // Add more slash commands as needed...
+        slashCommands.push(helpCommand, exitCommand, clearCommand);
+        const commandLookup = new Map();
+        slashCommands.forEach((command) => {
+            commandLookup.set(command.name, command);
+            command.aliases?.forEach((alias) => {
+                commandLookup.set(alias, command);
+            });
+        });
+        const executeSlashCommand = async (cmd, args) => {
+            const command = commandLookup.get(cmd.toLowerCase());
+            if (!command) {
+                getAppInterface()?.addMessage({
+                    id: Date.now().toString(),
+                    type: "system",
+                    content: `Unknown command: /${cmd}. Type /help to see available commands.`,
+                });
+                return "continue";
+            }
+            return await command.run(args);
+        };
+        const getAppInterface = () => {
+            return globalThis.__askAppInterface;
+        };
+        const sendAskStop = () => {
+            try {
+                userCancelled = true; // Set cancellation flag
+                const appInterface = getAppInterface();
+                appInterface?.setInputDisabled(false); // Ensure input stays enabled
+                appInterface?.clearStatus(); // Clear any status messages
+                appInterface?.addMessage({
+                    id: Date.now().toString(),
+                    type: "system",
+                    content: "🛑 Cancelled — the assistant has stopped. Type whenever you're ready.",
+                });
+                if (socket && conversationId) {
+                    stopSession(socket, {
+                        session_kind: "ask",
+                        ids: { conversation_id: conversationId },
+                    });
+                }
+            }
+            catch { }
+        };
+        const attachSocketHandlers = (socketInstance) => {
+            registerUnifiedEventLogging(socketInstance, (line) => {
+                // Log to console for debugging
+                // console.log(line);
+            });
+            socketInstance.onAny?.((eventType, data) => {
+                const t = canonicalizeEventType(eventType) || eventType;
+                const appInterface = getAppInterface();
+                // Don't process events if user has cancelled
+                if (userCancelled) {
+                    return;
+                }
+                if (t === "thinking_started") {
+                    appInterface?.setStatus({
+                        text: "Thinking...",
+                        type: "loading",
+                    });
+                }
+                else if (t === "thinking_stopped") {
+                    appInterface?.setStatus({
+                        text: "Waiting for assistant...",
+                        type: "loading",
+                    });
+                }
+                else if (t === "agent_thought") {
+                    const msg = data?.data?.message || data?.data?.content || "Thinking...";
+                    appInterface?.setStatus({
+                        text: msg,
+                        type: "loading",
+                    });
+                }
+                else if (t === "tool_screenshot") {
+                    const url = data?.data?.image_url || data?.data?.screenshot?.image_url;
+                    if (url) {
+                        appInterface?.addMessage({
+                            id: Date.now().toString(),
+                            type: "system",
+                            content: `🖼️  Live screenshot: ${url}`,
+                        });
+                    }
+                }
+                else if (t === "tool_start") {
+                    const message = data.data?.message || `Running ${data.data?.tool || "tool"}...`;
+                    appInterface?.setStatus({
+                        text: message,
+                        type: "loading",
+                    });
+                }
+                else if (t === "tool_result") {
+                    // Tool completion intentionally silent to reduce noise.
+                }
+                else if (t === "session_completed") {
+                    appInterface?.clearStatus();
+                    const summary = data.data?.summary || "No response";
+                    appInterface?.addMessage({
+                        id: Date.now().toString(),
+                        type: "assistant",
+                        content: summary,
+                    });
+                }
+                else if (t === "session_error") {
+                    appInterface?.clearStatus();
+                    const error = data.data?.error || "An unexpected issue occurred";
+                    appInterface?.addMessage({
+                        id: Date.now().toString(),
+                        type: "assistant",
+                        content: `❌ ${error}`,
+                        isError: true,
+                    });
+                }
+            });
+        };
+        const establishSocket = (conversation) => {
+            const newSocket = connectForAsk();
+            attachSocketHandlers(newSocket);
+            subscribeAsk(newSocket, conversation);
+            return newSocket;
+        };
+        if (conversationId) {
+            socket = establishSocket(conversationId);
+        }
+        const handleUserMessage = async (message) => {
+            try {
+                const appInterface = getAppInterface();
+                userCancelled = false; // Reset cancellation flag for new message
+                // Create conversation on first message
+                if (!conversationId) {
+                    appInterface?.setStatus({
+                        text: "Creating conversation...",
+                        type: "loading",
+                    });
+                    const sessionResp = await http.post("/api/v1/ask/sessions", {
+                        question: message,
+                        project_id: projectId,
+                        surface: "cli",
+                    });
+                    conversationId = sessionResp.data.conversation_id;
+                    projectId = sessionResp.data.project_id;
+                    if (lastKnownUserKey && typeof projectId === "number") {
+                        setUserLastProject(lastKnownUserKey, projectId);
+                    }
+                    // Establish socket connection
+                    socket = establishSocket(conversationId);
+                    appInterface?.setStatus({
+                        text: "Waiting for assistant...",
+                        type: "loading",
+                    });
+                }
+                else {
+                    // Send message to existing conversation
+                    appInterface?.setStatus({
+                        text: "Sending...",
+                        type: "loading",
+                    });
+                    await http.post(`/api/v1/ask/sessions/${conversationId}/message`, {
+                        message: message,
+                        project_id: projectId,
+                        surface: "cli",
+                    });
+                    appInterface?.setStatus({
+                        text: "Waiting for assistant...",
+                        type: "loading",
+                    });
+                }
+            }
+            catch (error) {
+                const appInterface = getAppInterface();
+                appInterface?.clearStatus();
+                appInterface?.addMessage({
+                    id: Date.now().toString(),
+                    type: "assistant",
+                    content: `❌ Error: ${error?.message || error}`,
+                    isError: true,
+                });
+            }
+        };
+        const handleExit = () => {
+            if (socket) {
+                socket.disconnect();
+            }
+            process.exit(0);
+        };
+        // Prepare slash commands for the UI
+        const slashCommandsForUI = slashCommands.map((cmd) => ({
+            name: cmd.name,
+            description: cmd.description,
+            value: cmd.name,
+            label: `/${cmd.name}`,
+        }));
+        // Render the INK app
+        const { waitUntilExit } = render(React.createElement(AskApp, {
+            user: lastKnownUser,
+            project: lastKnownProject,
+            workspacePath,
+            slashCommands: slashCommandsForUI,
+            onUserMessage: handleUserMessage,
+            onSlashCommand: executeSlashCommand,
+            onExit: handleExit,
+            onCancel: sendAskStop,
+        }));
+        await waitUntilExit();
+    }
+    catch (error) {
+        console.error(chalk.red(`❌ Error: ${error.message}`));
+        process.exit(1);
+    }
+});
+//# sourceMappingURL=ask-ink.js.map

package/dist/src/commands/ask-ink.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ask-ink.js","sourceRoot":"","sources":["../../../src/commands/ask-ink.ts"],"names":[],"mappings":"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"}

package/dist/src/commands/ask.js

@@ -3,7 +3,8 @@ import chalk from "chalk";
 import ora from "ora";
 import os from "node:os";
 import { createHttpClient } from "../lib/http.js";
-import { connectForAsk } from "../lib/socket.js";
+import { connectForAsk, subscribeAsk, stopSession } from "../lib/socket.js";
+import { registerUnifiedEventLogging, canonicalizeEventType, } from "../lib/events.js";
 import { promptInBox, printDivider, formatStatusSegments, accentText, highlightText, printBanner, printUserBubble, printStatusBanner, } from "../lib/tui.js";
 import { getAuthToken, getUserLastProject, setUserLastProject, } from "../lib/config.js";
 import { clearAuthToken } from "../lib/config.js";
@@ -123,12 +124,22 @@ export const ask = new Command("ask")
         let spinner = null;
         let messageCount = 1;
         let socket;
+        let userCancelled = false;
         const sendAskStop = () => {
+            if (userCancelled)
+                return;
+            userCancelled = true;
             try {
+                if (spinner) {
+                    spinner.stop();
+                    spinner = null;
+                }
+                console.log(chalk.yellow("🛑 Cancelled — the assistant has stopped. Type whenever you're ready."));
                 if (socket && conversationId) {
-                    socket.emit("ASK_STOP_SESSION", { conversation_id: conversationId });
-                    if (spinner)
-                        spinner.text = chalk.yellow("Stopping…");
+                    stopSession(socket, {
+                        session_kind: "ask",
+                        ids: { conversation_id: conversationId },
+                    });
                 }
             }
             catch { }
@@ -512,7 +523,7 @@ export const ask = new Command("ask")
                     console.log();
                     printDivider("Conversations");
                     items.forEach((c, i) => {
-                        const id = c.conversation_id || c.execution_id || c.id;
+                        const id = c.conversation_id || c.id;
                         const created = c.created_at || "";
                         const status = c.status || "";
                         const title = c.goal || c.title || "";
@@ -628,64 +639,65 @@ export const ask = new Command("ask")
         summarySpinner.stop();
         printStatusBanner("Assistant ready. Type /help to see available commands.", "success");
         const attachSocketHandlers = (socketInstance) => {
-            socketInstance.on("ASK_THINKING_STARTED", () => {
-                if (spinner) {
-                    spinner.text = chalk.cyan("🤔 Thinking...");
+            registerUnifiedEventLogging(socketInstance, (line) => console.log(line));
+            socketInstance.onAny?.((eventType, data) => {
+                const t = canonicalizeEventType(eventType) || eventType;
+                if (userCancelled)
+                    return;
+                if (t === "thinking_started") {
+                    if (spinner)
+                        spinner.text = chalk.cyan("🤔 Thinking...");
                 }
-            });
-            socketInstance.on("ASK_THINKING_STOPPED", () => {
-                // Thinking stopped, ready for next input
-                if (spinner && spinner.text?.includes("Thinking")) {
-                    spinner.text = "Waiting for assistant...";
+                else if (t === "thinking_stopped") {
+                    if (spinner && spinner.text?.includes("Thinking"))
+                        spinner.text = "Waiting for assistant...";
                 }
-            });
-            socketInstance.on("ASK_AGENT_THOUGHT", (data) => {
-                const msg = data?.data?.message || data?.data?.content || "Thinking...";
-                if (spinner)
-                    spinner.text = chalk.cyan(`💭 ${msg}`);
-            });
-            socketInstance.on("ASK_TOOL_SCREENSHOT", (data) => {
-                const url = data?.data?.image_url || data?.data?.screenshot?.image_url;
-                if (url)
-                    console.log(chalk.gray(`🖼️  Live screenshot: ${url}`));
-            });
-            socketInstance.on("ASK_TOOL_START", (data) => {
-                const message = data.data?.message || `Running ${data.data?.tool || "tool"}...`;
-                if (spinner) {
-                    spinner.text = chalk.blue(`⚙️  ${message}`);
+                else if (t === "agent_thought") {
+                    const msg = data?.data?.message || data?.data?.content || "Thinking...";
+                    if (spinner)
+                        spinner.text = chalk.cyan(`💭 ${msg}`);
                 }
-            });
-            socketInstance.on("ASK_TOOL_RESULT", (data) => {
-                const message = data.data?.message || `Completed ${data.data?.tool || "tool"}`;
-                console.log(chalk.green(`✅ ${message}`));
-            });
-            // Note: ASK_AGENT_ANSWER is handled by ASK_SESSION_COMPLETED to avoid duplicates
-            socketInstance.on("ASK_SESSION_COMPLETED", (data) => {
-                if (spinner) {
-                    spinner.stop();
-                    spinner = null;
+                else if (t === "tool_screenshot") {
+                    const url = data?.data?.image_url || data?.data?.screenshot?.image_url;
+                    if (url)
+                        console.log(chalk.gray(`🖼️  Live screenshot: ${url}`));
                 }
-                console.log();
-                printDivider("Assistant");
-                const summary = data.data?.summary || "No response";
-                console.log(formatResponseText(summary));
-                printDivider();
-                console.log();
-            });
-            socketInstance.on("ASK_SESSION_ERROR", (data) => {
-                if (spinner) {
-                    spinner.fail("An error occurred");
-                    spinner = null;
+                else if (t === "tool_start") {
+                    const message = data.data?.message || `Running ${data.data?.tool || "tool"}...`;
+                    if (spinner)
+                        spinner.text = chalk.blue(`⚙️  ${message}`);
+                }
+                else if (t === "tool_result") {
+                    // Tool completion intentionally silent to reduce noise.
+                }
+                else if (t === "session_completed") {
+                    if (spinner) {
+                        spinner.stop();
+                        spinner = null;
+                    }
+                    console.log();
+                    printDivider("Assistant");
+                    const summary = data.data?.summary || "No response";
+                    console.log(formatResponseText(summary));
+                    printDivider();
+                    console.log();
+                }
+                else if (t === "session_error") {
+                    if (spinner) {
+                        spinner.fail("Something went wrong");
+                        spinner = null;
+                    }
+                    printDivider("Assistant Error");
+                    console.log(chalk.red(`❌ ${data.data?.error || "An unexpected issue occurred"}`));
+                    printDivider();
+                    console.log();
                 }
-                printDivider("Assistant Error");
-                console.log(chalk.red(`❌ ${data.data?.error || "Unknown error"}`));
-                printDivider();
-                console.log();
             });
         };
         const establishSocket = (conversation) => {
             const newSocket = connectForAsk();
             attachSocketHandlers(newSocket);
+            subscribeAsk(newSocket, conversation);
             return newSocket;
         };
         if (conversationId) {
@@ -784,6 +796,7 @@ export const ask = new Command("ask")
                 }
                 continue;
             }
+            userCancelled = false;
             // Create conversation and establish socket on first message
             if (!conversationId) {
                 spinner = ora("Creating conversation...").start();
@@ -824,7 +837,7 @@ export const ask = new Command("ask")
                         spinner.text = "Waiting for assistant...";
                     }
                     else {
-                        spinner.fail("Failed to create conversation");
+                        spinner.fail("Unable to create conversation");
                         throw e;
                     }
                 }
@@ -863,21 +876,21 @@ export const ask = new Command("ask")
             const waitForResponse = new Promise((resolve) => {
                 const responseHandler = (data) => {
                     // Remove the listener once we get a response
-                    socket.off("ASK_SESSION_COMPLETED", responseHandler);
-                    socket.off("ASK_SESSION_ERROR", errorHandler);
+                    socket.off("session_completed", responseHandler);
+                    socket.off("session_error", errorHandler);
                     cleanupEsc();
                     resolve();
                 };
                 const errorHandler = (data) => {
                     // Remove the listener once we get an error
-                    socket.off("ASK_SESSION_COMPLETED", responseHandler);
-                    socket.off("ASK_SESSION_ERROR", errorHandler);
+                    socket.off("session_completed", responseHandler);
+                    socket.off("session_error", errorHandler);
                     cleanupEsc();
                     resolve();
                 };
                 // Listen for agent response
-                socket.on("ASK_SESSION_COMPLETED", responseHandler);
-                socket.on("ASK_SESSION_ERROR", errorHandler);
+                socket.on("session_completed", responseHandler);
+                socket.on("session_error", errorHandler);
                 // Also allow ESC to stop the ask session
                 let escArmed = true;
                 const onKeypress = (_str, key) => {