whale-code 6.4.0 → 6.5.1

package/dist/cli/services/config-store.js

@@ -1,10 +1,12 @@
 /**
  * Config Store
  *
- * Persistent configuration at ~/.swagmanager/config.json
+ * Unified auth session at ~/.whaletools/session.json
+ * User preferences at ~/.whaletools/preferences.json
  *
  * v2.0: Raw Supabase/Anthropic keys (for MCP server env vars)
  * v2.1: Auth tokens from login flow (for CLI chat/status)
+ * v4.0: Shared auth with Swift apps via ~/.whaletools/session.json
  *
  * Environment variables always override file-based config for MCP server mode.
  */
@@ -14,32 +16,111 @@ import { join } from "path";
 // ============================================================================
 // PATHS
 // ============================================================================
-const CONFIG_DIR = join(homedir(), ".swagmanager");
-const CONFIG_PATH = join(CONFIG_DIR, "config.json");
+const CONFIG_DIR = join(homedir(), ".whaletools");
+const SESSION_PATH = join(CONFIG_DIR, "session.json");
+const PREFS_PATH = join(CONFIG_DIR, "preferences.json");
+// Legacy paths for migration
+const LEGACY_CONFIG_DIR = join(homedir(), ".swagmanager");
+const LEGACY_CONFIG_PATH = join(LEGACY_CONFIG_DIR, "config.json");
 // ============================================================================
-// READ / WRITE
+// AUTO-MIGRATION from ~/.swagmanager to ~/.whaletools
+// ============================================================================
+let migrationChecked = false;
+function ensureMigration() {
+    if (migrationChecked)
+        return;
+    migrationChecked = true;
+    // Skip if new session already exists
+    if (existsSync(SESSION_PATH))
+        return;
+    // Check for legacy config
+    if (!existsSync(LEGACY_CONFIG_PATH))
+        return;
+    try {
+        const legacy = JSON.parse(readFileSync(LEGACY_CONFIG_PATH, "utf-8"));
+        if (!existsSync(CONFIG_DIR)) {
+            mkdirSync(CONFIG_DIR, { recursive: true, mode: 0o700 });
+        }
+        // Split auth fields into session.json
+        if (legacy.access_token && legacy.refresh_token) {
+            const session = {
+                access_token: legacy.access_token,
+                refresh_token: legacy.refresh_token,
+                user_id: legacy.user_id,
+                email: legacy.email,
+                store_id: legacy.store_id,
+                store_name: legacy.store_name,
+                expires_at: legacy.expires_at,
+            };
+            writeFileSync(SESSION_PATH, JSON.stringify(session, null, 2) + "\n", {
+                encoding: "utf-8",
+                mode: 0o600,
+            });
+        }
+        // Split preference fields into preferences.json
+        const prefs = {};
+        if (legacy.default_model)
+            prefs.default_model = legacy.default_model;
+        if (legacy.thinking_enabled !== undefined)
+            prefs.thinking_enabled = legacy.thinking_enabled;
+        if (legacy.permission_mode)
+            prefs.permission_mode = legacy.permission_mode;
+        if (legacy.platform_url)
+            prefs.platform_url = legacy.platform_url;
+        if (Object.keys(prefs).length > 0) {
+            writeFileSync(PREFS_PATH, JSON.stringify(prefs, null, 2) + "\n", {
+                encoding: "utf-8",
+                mode: 0o600,
+            });
+        }
+    }
+    catch {
+        // Migration failed — not fatal, user can re-login
+    }
+}
+// ============================================================================
+// READ / WRITE — session.json (auth tokens + store)
 // ============================================================================
 export function loadConfig() {
+    ensureMigration();
     try {
-        if (existsSync(CONFIG_PATH)) {
-            return JSON.parse(readFileSync(CONFIG_PATH, "utf-8"));
+        if (existsSync(SESSION_PATH)) {
+            const session = JSON.parse(readFileSync(SESSION_PATH, "utf-8"));
+            // Merge preferences so callers see a unified config
+            const prefs = loadPreferences();
+            return { ...prefs, ...session };
         }
     }
     catch (err) {
-        // Log warning for corrupted config — user may need to re-login
-        console.error(`[config] Warning: Failed to parse ${CONFIG_PATH}: ${err instanceof Error ? err.message : err}`);
+        console.error(`[config] Warning: Failed to parse ${SESSION_PATH}: ${err instanceof Error ? err.message : err}`);
         console.error("[config] Using empty config. You may need to re-login with: whale login");
     }
-    return {};
+    // Even if no session, return preferences
+    return { ...loadPreferences() };
 }
 export function saveConfig(config) {
     if (!existsSync(CONFIG_DIR)) {
         mkdirSync(CONFIG_DIR, { recursive: true, mode: 0o700 });
     }
-    writeFileSync(CONFIG_PATH, JSON.stringify(config, null, 2) + "\n", {
+    // Split: auth fields go to session.json, prefs go to preferences.json
+    const { default_model, thinking_enabled, permission_mode, platform_url, ...authFields } = config;
+    writeFileSync(SESSION_PATH, JSON.stringify(authFields, null, 2) + "\n", {
         encoding: "utf-8",
         mode: 0o600,
     });
+    // Update preferences if any pref fields are present
+    const newPrefs = {};
+    if (default_model !== undefined)
+        newPrefs.default_model = default_model;
+    if (thinking_enabled !== undefined)
+        newPrefs.thinking_enabled = thinking_enabled;
+    if (permission_mode !== undefined)
+        newPrefs.permission_mode = permission_mode;
+    if (platform_url !== undefined)
+        newPrefs.platform_url = platform_url;
+    if (Object.keys(newPrefs).length > 0) {
+        savePreferences({ ...loadPreferences(), ...newPrefs });
+    }
 }
 export function updateConfig(partial) {
     const existing = loadConfig();
@@ -47,10 +128,32 @@ export function updateConfig(partial) {
 }
 export function clearConfig() {
     try {
-        if (existsSync(CONFIG_PATH))
-            unlinkSync(CONFIG_PATH);
+        if (existsSync(SESSION_PATH))
+            unlinkSync(SESSION_PATH);
+    }
+    catch { /* ignore */ }
+    // Preferences are preserved across sign-out
+}
+// ============================================================================
+// READ / WRITE — preferences.json (survives sign-out)
+// ============================================================================
+export function loadPreferences() {
+    try {
+        if (existsSync(PREFS_PATH)) {
+            return JSON.parse(readFileSync(PREFS_PATH, "utf-8"));
+        }
     }
     catch { /* ignore */ }
+    return {};
+}
+export function savePreferences(prefs) {
+    if (!existsSync(CONFIG_DIR)) {
+        mkdirSync(CONFIG_DIR, { recursive: true, mode: 0o700 });
+    }
+    writeFileSync(PREFS_PATH, JSON.stringify(prefs, null, 2) + "\n", {
+        encoding: "utf-8",
+        mode: 0o600,
+    });
 }
 /** Default Fly.io agent server URL */
 export const WHALE_SERVER_URL = "https://whale-agent.fly.dev";
@@ -71,7 +174,7 @@ export function resolveConfig() {
     };
 }
 export function getConfigPath() {
-    return CONFIG_PATH;
+    return SESSION_PATH;
 }
 /** Lazy proxy URL — avoids reading config at import time */
 export function getProxyUrl() {

package/dist/cli/services/format-server-response.js

@@ -18,6 +18,10 @@ const PRIORITY_COLUMNS = {
     supply_chain: ["name", "status", "quantity", "supplier", "location", "expected_delivery_date"],
     workflows: ["name", "status", "trigger_type", "created_at", "last_run"],
     email: ["subject", "to", "status", "sent_at", "category"],
+    locations: ["name", "city", "state", "type", "is_active", "address_line1"],
+    media: ["title", "file_name", "category", "tags", "file_type"],
+    creations: ["name", "creation_type", "status", "visibility", "slug"],
+    api_keys: ["name", "key_type", "is_active", "scopes"],
 };
 // Keys that are always deprioritized (shown last or hidden)
 const LOW_PRIORITY_KEYS = new Set([
@@ -27,9 +31,6 @@ const LOW_PRIORITY_KEYS = new Set([
 // ============================================================================
 // FORMATTERS
 // ============================================================================
-function isNarrow() {
-    return (process.stdout.columns || 80) < 90;
-}
 function truncateUuid(val) {
     // UUID pattern: 8-4-4-4-12 hex chars
     if (/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(val)) {
@@ -149,7 +150,8 @@ function selectColumns(rows, toolName) {
             allKeys.add(key);
     }
     // Find matching priority list
-    const maxCols = isNarrow() ? 4 : 6;
+    const termWidth = process.stdout.columns || 80;
+    const maxCols = termWidth < 90 ? 4 : termWidth < 120 ? 6 : termWidth < 160 ? 8 : 10;
     let priority = [];
     if (toolName) {
         // Match tool name to category
@@ -193,14 +195,18 @@ function buildTable(rows, columns) {
     if (columns.length === 0 || rows.length === 0)
         return "";
     const headers = columns.map(prettifyKey);
-    // Calculate column widths
+    // Calculate column widths — dynamic cap based on terminal width and column count
+    const termW = process.stdout.columns || 80;
+    // Each column gets a fair share of available space (minus separators + borders)
+    const overhead = columns.length * 3 + 4; // " | " between cols + "| " and " |"
+    const cellCap = Math.min(Math.max(Math.floor((termW - overhead) / columns.length), 15), 50);
     const widths = columns.map((col, i) => {
         let max = headers[i].length;
         for (const row of rows) {
             const val = isMoneyKey(col) ? formatMoneyValue(row[col]) : formatValue(row[col], col);
             max = Math.max(max, val.length);
         }
-        return Math.min(max, 30); // Cap individual column width
+        return Math.min(max, cellCap);
     });
     // Header row
     const headerRow = columns.map((_, i) => headers[i].padEnd(widths[i])).join(" | ");

package/dist/cli/services/ink-resize-fix.d.ts

@@ -0,0 +1,18 @@
+/**
+ * Ink Resize Ghost Fix
+ *
+ * Patches Ink 6's resize handler to prevent ghost artifacts from text reflow.
+ *
+ * Problem: Ink's resized() clears the dynamic area using eraseLines(N) where N
+ * is the string line count. But when the terminal shrinks, already-painted text
+ * reflows to more visual lines than N, so eraseLines(N) doesn't erase enough,
+ * leaving "ghost" lines above the new render.
+ *
+ * Fix: After Ink's standard clear, calculate the extra visual lines caused by
+ * reflow at the new width and erase them with cursor-up + erase-to-end-of-screen.
+ */
+/**
+ * Patches the Ink instance's resize handler to account for visual line reflow.
+ * Call this AFTER render() — the Ink instance must exist in the registry.
+ */
+export declare function patchInkResize(): Promise<void>;

package/dist/cli/services/ink-resize-fix.js

@@ -0,0 +1,66 @@
+/**
+ * Ink Resize Ghost Fix
+ *
+ * Patches Ink 6's resize handler to prevent ghost artifacts from text reflow.
+ *
+ * Problem: Ink's resized() clears the dynamic area using eraseLines(N) where N
+ * is the string line count. But when the terminal shrinks, already-painted text
+ * reflows to more visual lines than N, so eraseLines(N) doesn't erase enough,
+ * leaving "ghost" lines above the new render.
+ *
+ * Fix: After Ink's standard clear, calculate the extra visual lines caused by
+ * reflow at the new width and erase them with cursor-up + erase-to-end-of-screen.
+ */
+import { pathToFileURL } from "url";
+import { resolve, dirname } from "path";
+import { fileURLToPath } from "url";
+/**
+ * Patches the Ink instance's resize handler to account for visual line reflow.
+ * Call this AFTER render() — the Ink instance must exist in the registry.
+ */
+export async function patchInkResize() {
+    try {
+        // Dynamically import Ink's internal instance registry and wrap-ansi
+        const __dirname = dirname(fileURLToPath(import.meta.url));
+        const instancesPath = pathToFileURL(resolve(__dirname, "..", "..", "..", "node_modules", "ink", "build", "instances.js")).href;
+        const [{ default: instances }, { default: wrapAnsi }] = await Promise.all([
+            import(/* @vite-ignore */ instancesPath),
+            import("wrap-ansi"),
+        ]);
+        const ink = instances.get(process.stdout);
+        if (!ink)
+            return;
+        // Replace Ink's resized handler with our visual-line-aware version
+        ink.resized = () => {
+            const currentWidth = ink.getTerminalWidth();
+            if (currentWidth < ink.lastTerminalWidth) {
+                // Calculate how many visual lines the old output occupies at the NEW width.
+                // wrapAnsi handles ANSI escape codes, wide chars (CJK), and emoji correctly.
+                const oldOutput = ink.lastOutput || "";
+                const stringLineCount = oldOutput === "" ? 0 : oldOutput.split("\n").length;
+                let visualLineCount = stringLineCount;
+                if (oldOutput && currentWidth > 0) {
+                    const wrapped = wrapAnsi(oldOutput, currentWidth, { trim: false, hard: true });
+                    visualLineCount = wrapped === "" ? 0 : wrapped.split("\n").length;
+                }
+                const extraLines = Math.max(0, visualLineCount - stringLineCount);
+                // Standard clear — erases stringLineCount lines, resets log's internal state
+                ink.log.clear();
+                // Erase additional ghost lines caused by text reflow.
+                // After log.clear(), cursor is stringLineCount lines above bottom.
+                // Ghost lines are above that — move up extraLines more and erase to end of screen.
+                if (extraLines > 0) {
+                    ink.options.stdout.write(`\x1b[${extraLines}A\x1b[J`);
+                }
+                ink.lastOutput = "";
+                ink.lastOutputToRender = "";
+            }
+            ink.calculateLayout();
+            ink.onRender();
+            ink.lastTerminalWidth = currentWidth;
+        };
+    }
+    catch {
+        // Silent fail — resize fix is best-effort, app still works without it
+    }
+}

package/dist/cli/services/interactive-tools.d.ts

@@ -27,6 +27,10 @@ export interface PlanModeState {
     planContent?: string;
     startedAt?: Date;
 }
+export interface PlanApprovalDecision {
+    action: "execute" | "edit" | "cancel" | "feedback";
+    feedback?: string;
+}
 export declare const interactiveEvents: EventEmitter<[never]>;
 export declare function createQuestionRequest(questions: Question[]): QuestionRequest;
 export declare function getPendingQuestion(): QuestionRequest | undefined;
@@ -40,8 +44,18 @@ export declare function exitPlanMode(): {
     success: boolean;
     message: string;
 };
+/**
+ * Wait for user to approve/reject the plan via the UI overlay.
+ * Called by the agent loop after exitPlanMode() returns.
+ */
+export declare function waitForPlanApproval(): Promise<PlanApprovalDecision>;
 export declare function isPlanMode(): boolean;
 export declare function getPlanModeState(): PlanModeState;
+export declare function getPendingPlanApproval(): {
+    planContent: string;
+    planFile: string;
+} | null;
+export declare function resolvePlanApproval(decision: PlanApprovalDecision): boolean;
 export declare const INTERACTIVE_TOOL_DEFINITIONS: ({
     name: string;
     description: string;

package/dist/cli/services/interactive-tools.js

@@ -14,6 +14,8 @@ import { resolve } from "path";
 const pendingQuestions = new Map();
 // Plan mode state
 let planModeState = { active: false };
+// Plan approval state — blocks exit_plan_mode until UI resolves
+let pendingPlanApproval = null;
 // Event emitter for UI coordination
 export const interactiveEvents = new EventEmitter();
 // ============================================================================
@@ -83,8 +85,7 @@ export function exitPlanMode() {
     }
     const planFile = planModeState.planFile || ".whale/plan.md";
     planModeState = { active: false };
-    interactiveEvents.emit("planModeExited", { planFile });
-    // Read the plan file to display its content
+    // Read the plan file content
     const fullPath = resolve(process.cwd(), planFile);
     let planContent = "";
     if (existsSync(fullPath)) {
@@ -93,6 +94,15 @@ export function exitPlanMode() {
         }
         catch { /* ignore read errors */ }
     }
+    // Emit event for UI to show approval overlay
+    interactiveEvents.emit("planModeExited", { planFile, planContent });
+    // Set up pending approval state so UI can resolve it via resolvePlanApproval()
+    pendingPlanApproval = {
+        resolve: () => { },
+        reject: () => { },
+        planContent,
+        planFile,
+    };
     if (planContent) {
         return {
             success: true,
@@ -104,6 +114,25 @@ export function exitPlanMode() {
         message: `Plan mode complete. Plan saved to ${planFile}.`,
     };
 }
+/**
+ * Wait for user to approve/reject the plan via the UI overlay.
+ * Called by the agent loop after exitPlanMode() returns.
+ */
+export async function waitForPlanApproval() {
+    if (!pendingPlanApproval) {
+        return { action: "execute" };
+    }
+    const { planContent, planFile } = pendingPlanApproval;
+    const decision = await new Promise((resolvePromise, rejectPromise) => {
+        pendingPlanApproval = {
+            resolve: resolvePromise,
+            reject: rejectPromise,
+            planContent,
+            planFile,
+        };
+    });
+    return decision;
+}
 export function isPlanMode() {
     return planModeState.active;
 }
@@ -111,6 +140,22 @@ export function getPlanModeState() {
     return { ...planModeState };
 }
 // ============================================================================
+// PLAN APPROVAL — blocking resolution from UI
+// ============================================================================
+export function getPendingPlanApproval() {
+    if (!pendingPlanApproval)
+        return null;
+    return { planContent: pendingPlanApproval.planContent, planFile: pendingPlanApproval.planFile };
+}
+export function resolvePlanApproval(decision) {
+    if (!pendingPlanApproval)
+        return false;
+    const { resolve } = pendingPlanApproval;
+    pendingPlanApproval = null;
+    resolve(decision);
+    return true;
+}
+// ============================================================================
 // TOOL DEFINITIONS
 // ============================================================================
 export const INTERACTIVE_TOOL_DEFINITIONS = [

package/dist/cli/services/keybinding-manager.js

@@ -12,7 +12,7 @@ import { homedir } from "os";
 // ============================================================================
 const DEFAULTS = {
     cancel_stream: "escape",
-    toggle_expand: "ctrl+e",
+    toggle_expand: "ctrl+o",
     toggle_thinking: "ctrl+t",
     exit: "ctrl+c",
     clear_line: "ctrl+u",

package/dist/cli/services/local-tools.js

@@ -14,7 +14,7 @@ import { globSearch, grepSearch } from "./tools/search-tools.js";
 import { runCommand, bashOutput, killShell, listShellsFn } from "./tools/shell-exec.js";
 import { webFetch, webSearch } from "./tools/web-tools.js";
 import { tasksTool } from "./tools/task-manager.js";
-import { taskTool, teamCreateTool, taskOutput, taskStop, configTool, askUser, lspTool, skillTool } from "./tools/agent-tools.js";
+import { taskTool, teamCreateTool, teamAutoTool, taskOutput, taskStop, configTool, askUser, lspTool, skillTool } from "./tools/agent-tools.js";
 // ============================================================================
 // TOOL NAMES
 // ============================================================================
@@ -36,7 +36,8 @@ export const LOCAL_TOOL_NAMES = new Set([
     "tasks", // Replaces todo_write — action-based CRUD with IDs, deps
     "multi_edit", // Multi-edit tool
     "task", // Subagent tool
-    "team_create", // Agent team tool
+    "team_create", // Agent team tool (explicit tasks)
+    "team_auto", // Auto-decompose + parallel team + review
     // Background process tools
     "bash_output",
     "kill_shell",
@@ -421,6 +422,37 @@ export const LOCAL_TOOL_DEFINITIONS = [
             required: ["name", "teammate_count", "tasks"],
         },
     },
+    {
+        name: "team_auto",
+        description: "Auto-decompose a task and run it as a parallel agent team. AI breaks the task into sub-tasks with file ownership, spawns teammates, executes in parallel, and reviews results. Use this for large tasks where you don't want to manually plan the decomposition.",
+        input_schema: {
+            type: "object",
+            properties: {
+                task: {
+                    type: "string",
+                    description: "The task to decompose and execute (e.g., 'Refactor all components to use TypeScript strict mode')",
+                },
+                max_teammates: {
+                    type: "number",
+                    description: "Maximum number of parallel teammates (default: 4, max: 6)",
+                },
+                model: {
+                    type: "string",
+                    enum: ["sonnet", "opus", "haiku"],
+                    description: "Model for teammates (default: sonnet)",
+                },
+                working_directory: {
+                    type: "string",
+                    description: "Project directory to work in (default: cwd)",
+                },
+                review: {
+                    type: "boolean",
+                    description: "Run a review pass after completion (default: true)",
+                },
+            },
+            required: ["task"],
+        },
+    },
     // ------------------------------------------------------------------
     // BACKGROUND PROCESS TOOLS
     // ------------------------------------------------------------------
@@ -682,6 +714,7 @@ export async function executeLocalTool(name, input) {
             // Agent tools (tools/agent-tools.ts)
             case "task": return await taskTool(input);
             case "team_create": return await teamCreateTool(input);
+            case "team_auto": return await teamAutoTool(input);
             case "task_output": return await taskOutput(input);
             case "task_stop": return taskStop(input);
             case "config": return configTool(input);