@kenkaiiii/ggcoder 4.3.216 → 4.3.218

package/dist/cli/command-routing.d.ts

@@ -0,0 +1,28 @@
+export type CliSubcommandName = "pixel" | "login" | "logout" | "sessions" | "telegram" | "serve" | "doctor" | "agent-home-login" | "agent-home";
+export type CliCommandRouteResult = {
+    kind: "handled";
+    subcommand: CliSubcommandName;
+} | {
+    kind: "continue";
+} | {
+    kind: "main";
+    subcommand: string | undefined;
+};
+type SubcommandHandler = () => void;
+export interface CliCommandRoutingOptions {
+    argv: string[];
+    printHelp: () => void;
+    exit: (code: number) => never;
+    handlers: Record<CliSubcommandName, SubcommandHandler>;
+}
+/**
+ * Routes the early CLI command layer before parseArgs handles normal flags.
+ *
+ * This intentionally preserves the legacy startup contract:
+ * - any -h/--help anywhere prints top-level help and exits before subcommands;
+ * - selected subcommands remove their command token before their mode parser runs;
+ * - `continue` is not a standalone handler, it only toggles the later TUI resume path.
+ */
+export declare function routeCliCommandInput(options: CliCommandRoutingOptions): CliCommandRouteResult;
+export {};
+//# sourceMappingURL=command-routing.d.ts.map

package/dist/cli/command-routing.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"command-routing.d.ts","sourceRoot":"","sources":["../../src/cli/command-routing.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,iBAAiB,GACzB,OAAO,GACP,OAAO,GACP,QAAQ,GACR,UAAU,GACV,UAAU,GACV,OAAO,GACP,QAAQ,GACR,kBAAkB,GAClB,YAAY,CAAC;AAEjB,MAAM,MAAM,qBAAqB,GAC7B;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,UAAU,EAAE,iBAAiB,CAAA;CAAE,GAClD;IAAE,IAAI,EAAE,UAAU,CAAA;CAAE,GACpB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,CAAC;AAErD,KAAK,iBAAiB,GAAG,MAAM,IAAI,CAAC;AAEpC,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,SAAS,EAAE,MAAM,IAAI,CAAC;IACtB,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,KAAK,CAAC;IAC9B,QAAQ,EAAE,MAAM,CAAC,iBAAiB,EAAE,iBAAiB,CAAC,CAAC;CACxD;AA6BD;;;;;;;GAOG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,wBAAwB,GAAG,qBAAqB,CAwB7F"}

package/dist/cli/command-routing.js

@@ -0,0 +1,51 @@
+const SUBCOMMANDS_THAT_KEEP_ARGV = new Set([
+    "pixel",
+    "login",
+    "logout",
+    "telegram",
+    "doctor",
+    "agent-home-login",
+]);
+function isCliSubcommandName(value) {
+    return (value === "pixel" ||
+        value === "login" ||
+        value === "logout" ||
+        value === "sessions" ||
+        value === "telegram" ||
+        value === "serve" ||
+        value === "doctor" ||
+        value === "agent-home-login" ||
+        value === "agent-home");
+}
+function stripSubcommandArg(argv) {
+    argv.splice(2, 1);
+}
+/**
+ * Routes the early CLI command layer before parseArgs handles normal flags.
+ *
+ * This intentionally preserves the legacy startup contract:
+ * - any -h/--help anywhere prints top-level help and exits before subcommands;
+ * - selected subcommands remove their command token before their mode parser runs;
+ * - `continue` is not a standalone handler, it only toggles the later TUI resume path.
+ */
+export function routeCliCommandInput(options) {
+    const { argv, printHelp, exit, handlers } = options;
+    if (argv.includes("--help") || argv.includes("-h")) {
+        printHelp();
+        exit(0);
+    }
+    const subcommand = argv[2];
+    if (isCliSubcommandName(subcommand)) {
+        if (!SUBCOMMANDS_THAT_KEEP_ARGV.has(subcommand)) {
+            stripSubcommandArg(argv);
+        }
+        handlers[subcommand]();
+        return { kind: "handled", subcommand };
+    }
+    if (subcommand === "continue") {
+        stripSubcommandArg(argv);
+        return { kind: "continue" };
+    }
+    return { kind: "main", subcommand };
+}
+//# sourceMappingURL=command-routing.js.map

package/dist/cli/command-routing.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"command-routing.js","sourceRoot":"","sources":["../../src/cli/command-routing.ts"],"names":[],"mappings":"AAyBA,MAAM,0BAA0B,GAAmC,IAAI,GAAG,CAAC;IACzE,OAAO;IACP,OAAO;IACP,QAAQ;IACR,UAAU;IACV,QAAQ;IACR,kBAAkB;CACnB,CAAC,CAAC;AAEH,SAAS,mBAAmB,CAAC,KAAyB;IACpD,OAAO,CACL,KAAK,KAAK,OAAO;QACjB,KAAK,KAAK,OAAO;QACjB,KAAK,KAAK,QAAQ;QAClB,KAAK,KAAK,UAAU;QACpB,KAAK,KAAK,UAAU;QACpB,KAAK,KAAK,OAAO;QACjB,KAAK,KAAK,QAAQ;QAClB,KAAK,KAAK,kBAAkB;QAC5B,KAAK,KAAK,YAAY,CACvB,CAAC;AACJ,CAAC;AAED,SAAS,kBAAkB,CAAC,IAAc;IACxC,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AACpB,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,oBAAoB,CAAC,OAAiC;IACpE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IAEpD,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QACnD,SAAS,EAAE,CAAC;QACZ,IAAI,CAAC,CAAC,CAAC,CAAC;IACV,CAAC;IAED,MAAM,UAAU,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;IAE3B,IAAI,mBAAmB,CAAC,UAAU,CAAC,EAAE,CAAC;QACpC,IAAI,CAAC,0BAA0B,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;YAChD,kBAAkB,CAAC,IAAI,CAAC,CAAC;QAC3B,CAAC;QACD,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;QACvB,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,UAAU,EAAE,CAAC;IACzC,CAAC;IAED,IAAI,UAAU,KAAK,UAAU,EAAE,CAAC;QAC9B,kBAAkB,CAAC,IAAI,CAAC,CAAC;QACzB,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;IAC9B,CAAC;IAED,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC;AACtC,CAAC"}

package/dist/cli/command-routing.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=command-routing.test.d.ts.map

package/dist/cli/command-routing.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"command-routing.test.d.ts","sourceRoot":"","sources":["../../src/cli/command-routing.test.ts"],"names":[],"mappings":""}

package/dist/cli/command-routing.test.js

@@ -0,0 +1,59 @@
+import { describe, expect, it, vi } from "vitest";
+import { routeCliCommandInput } from "./command-routing.js";
+function handlers(calls) {
+    return {
+        pixel: () => calls.push("pixel"),
+        login: () => calls.push("login"),
+        logout: () => calls.push("logout"),
+        sessions: () => calls.push("sessions"),
+        telegram: () => calls.push("telegram"),
+        serve: () => calls.push("serve"),
+        doctor: () => calls.push("doctor"),
+        "agent-home-login": () => calls.push("agent-home-login"),
+        "agent-home": () => calls.push("agent-home"),
+    };
+}
+describe("routeCliCommandInput", () => {
+    it("prints top-level help before dispatching subcommands", () => {
+        const argv = ["node", "ggcoder", "login", "--help"];
+        const printHelp = vi.fn();
+        const exit = vi.fn((code) => {
+            throw new Error(`exit:${code}`);
+        });
+        expect(() => routeCliCommandInput({ argv, printHelp, exit, handlers: handlers([]) })).toThrow("exit:0");
+        expect(printHelp).toHaveBeenCalledOnce();
+    });
+    it("dispatches subcommands and strips command tokens only for modes that parse their own flags", () => {
+        const calls = [];
+        const sessionsArgv = ["node", "ggcoder", "sessions", "--foo"];
+        const loginArgv = ["node", "ggcoder", "login", "--foo"];
+        expect(routeCliCommandInput({
+            argv: sessionsArgv,
+            printHelp: vi.fn(),
+            exit: vi.fn(),
+            handlers: handlers(calls),
+        })).toEqual({ kind: "handled", subcommand: "sessions" });
+        expect(sessionsArgv).toEqual(["node", "ggcoder", "--foo"]);
+        expect(routeCliCommandInput({
+            argv: loginArgv,
+            printHelp: vi.fn(),
+            exit: vi.fn(),
+            handlers: handlers(calls),
+        })).toEqual({ kind: "handled", subcommand: "login" });
+        expect(loginArgv).toEqual(["node", "ggcoder", "login", "--foo"]);
+        expect(calls).toEqual(["sessions", "login"]);
+    });
+    it("converts continue into a later TUI resume route without handling it as a subcommand", () => {
+        const argv = ["node", "ggcoder", "continue", "--model", "x"];
+        const calls = [];
+        expect(routeCliCommandInput({
+            argv,
+            printHelp: vi.fn(),
+            exit: vi.fn(),
+            handlers: handlers(calls),
+        })).toEqual({ kind: "continue" });
+        expect(argv).toEqual(["node", "ggcoder", "--model", "x"]);
+        expect(calls).toEqual([]);
+    });
+});
+//# sourceMappingURL=command-routing.test.js.map

package/dist/cli/command-routing.test.js.map

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

package/dist/cli.d.ts

@@ -1,5 +1,6 @@
 #!/usr/bin/env -S node --max-old-space-size=8192 --expose-gc
-import type { CompletedItem } from "./ui/App.js";
-import type { Message } from "@kenkaiiii/gg-ai";
+import type { CompletedItem } from "./ui/app-items.js";
+import type { Message, ThinkingLevel } from "@kenkaiiii/gg-ai";
+export declare function parseThinkingLevel(value: string | undefined): ThinkingLevel | undefined;
 export declare function messagesToHistoryItems(msgs: Message[]): CompletedItem[];
 //# sourceMappingURL=cli.d.ts.map

package/dist/cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AA6DA,OAAO,KAAK,EAAE,aAAa,EAAqB,MAAM,aAAa,CAAC;AAGpE,OAAO,KAAK,EAAE,OAAO,EAA2B,MAAM,kBAAkB,CAAC;AAmzDzE,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,aAAa,EAAE,CAgJvE"}
+{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AA6DA,OAAO,KAAK,EAAE,aAAa,EAAqB,MAAM,mBAAmB,CAAC;AAI1E,OAAO,KAAK,EAAE,OAAO,EAAY,aAAa,EAAE,MAAM,kBAAkB,CAAC;AA0CzE,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,aAAa,GAAG,SAAS,CAIvF;AAitDD,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,aAAa,EAAE,CAgJvE"}

package/dist/cli.js

@@ -78,8 +78,17 @@ import { loginGemini } from "./core/oauth/gemini.js";
 import chalk from "chalk";
 import { checkAndAutoUpdate } from "./core/auto-update.js";
 import { parseGoalSyntheticEvent } from "./ui/goal-events.js";
+import { routeCliCommandInput } from "./cli/command-routing.js";
 const _require = createRequire(import.meta.url);
 const CLI_VERSION = _require("../package.json").version;
+const THINKING_LEVELS = new Set(["low", "medium", "high", "xhigh"]);
+export function parseThinkingLevel(value) {
+    if (value === undefined)
+        return undefined;
+    if (THINKING_LEVELS.has(value))
+        return value;
+    throw new Error(`Invalid --thinking value "${value}". Expected low, medium, high, or xhigh.`);
+}
 // ── Logo + gradient (mirrors Banner.tsx) ────────────────────────────
 const LOGO_LINES = [
     " \u2584\u2580\u2580\u2580 \u2584\u2580\u2580\u2580",
@@ -168,6 +177,7 @@ function printHelp() {
         ["--model <name>", "Model to use (e.g. claude-sonnet-4-6, gpt-5.5)"],
         ["--max-turns <n>", "Maximum agent turns per prompt"],
         ["--system-prompt <text>", "Override the system prompt"],
+        ["--thinking <level>", "Enable thinking level (low, medium, high, xhigh)"],
         ["--json", "JSON output mode (for sub-agents)"],
         ["--rpc", "JSON-RPC mode (for IDE integrations)"],
     ];
@@ -205,108 +215,48 @@ function printHelp() {
     }
     console.log();
 }
+function createCliSubcommandHandlers() {
+    const runWithStandardErrorHandling = (operation, logStack = false) => {
+        operation().catch((err) => {
+            log("ERROR", "fatal", err instanceof Error ? (logStack ? (err.stack ?? err.message) : err.message) : String(err));
+            closeLogger();
+            process.stderr.write(formatUserError(err) + "\n");
+            process.exit(1);
+        });
+    };
+    return {
+        pixel: () => runWithStandardErrorHandling(runPixel, true),
+        login: () => runWithStandardErrorHandling(runLogin),
+        logout: () => runWithStandardErrorHandling(runLogout),
+        sessions: () => runWithStandardErrorHandling(runSessions),
+        telegram: () => runWithStandardErrorHandling(runTelegramSetup),
+        serve: () => runWithStandardErrorHandling(runServe),
+        doctor: () => {
+            runDoctor().catch((err) => {
+                process.stderr.write(formatUserError(err) + "\n");
+                process.exit(1);
+            });
+        },
+        "agent-home-login": () => runWithStandardErrorHandling(runAgentHomeLogin),
+        "agent-home": () => runWithStandardErrorHandling(runAgentHome),
+    };
+}
 function main() {
     // Silent auto-update check (throttled, non-blocking on failure)
     const updateMessage = checkAndAutoUpdate(CLI_VERSION);
     if (updateMessage) {
         console.error(chalk.bold.hex("#4ade80")(`✨ ${updateMessage}`));
     }
-    // Intercept --help / -h before anything else so it works with subcommands
-    // (e.g. `ggcoder login --help` or `ggcoder --help`)
-    if (process.argv.includes("--help") || process.argv.includes("-h")) {
-        printHelp();
-        process.exit(0);
-    }
-    // Handle subcommands before parseArgs
-    const subcommand = process.argv[2];
-    if (subcommand === "pixel") {
-        runPixel().catch((err) => {
-            // Log the full stack — `pixel install` failures are usually bugs in our
-            // own AST/wiring code, and the stack is the only useful diagnostic.
-            log("ERROR", "fatal", err instanceof Error ? (err.stack ?? err.message) : String(err));
-            closeLogger();
-            process.stderr.write(formatUserError(err) + "\n");
-            process.exit(1);
-        });
-        return;
-    }
-    if (subcommand === "login") {
-        runLogin().catch((err) => {
-            log("ERROR", "fatal", err instanceof Error ? err.message : String(err));
-            closeLogger();
-            process.stderr.write(formatUserError(err) + "\n");
-            process.exit(1);
-        });
-        return;
-    }
-    if (subcommand === "logout") {
-        runLogout().catch((err) => {
-            log("ERROR", "fatal", err instanceof Error ? err.message : String(err));
-            closeLogger();
-            process.stderr.write(formatUserError(err) + "\n");
-            process.exit(1);
-        });
-        return;
-    }
-    if (subcommand === "sessions") {
-        process.argv.splice(2, 1);
-        runSessions().catch((err) => {
-            log("ERROR", "fatal", err instanceof Error ? err.message : String(err));
-            closeLogger();
-            process.stderr.write(formatUserError(err) + "\n");
-            process.exit(1);
-        });
-        return;
-    }
-    if (subcommand === "telegram") {
-        runTelegramSetup().catch((err) => {
-            log("ERROR", "fatal", err instanceof Error ? err.message : String(err));
-            closeLogger();
-            process.stderr.write(formatUserError(err) + "\n");
-            process.exit(1);
-        });
-        return;
-    }
-    if (subcommand === "serve") {
-        process.argv.splice(2, 1);
-        runServe().catch((err) => {
-            log("ERROR", "fatal", err instanceof Error ? err.message : String(err));
-            closeLogger();
-            process.stderr.write(formatUserError(err) + "\n");
-            process.exit(1);
-        });
-        return;
-    }
-    if (subcommand === "doctor") {
-        runDoctor().catch((err) => {
-            process.stderr.write(formatUserError(err) + "\n");
-            process.exit(1);
-        });
-        return;
-    }
-    if (subcommand === "agent-home-login") {
-        runAgentHomeLogin().catch((err) => {
-            log("ERROR", "fatal", err instanceof Error ? err.message : String(err));
-            closeLogger();
-            process.stderr.write(formatUserError(err) + "\n");
-            process.exit(1);
-        });
-        return;
-    }
-    if (subcommand === "agent-home") {
-        process.argv.splice(2, 1);
-        runAgentHome().catch((err) => {
-            log("ERROR", "fatal", err instanceof Error ? err.message : String(err));
-            closeLogger();
-            process.stderr.write(formatUserError(err) + "\n");
-            process.exit(1);
-        });
+    const commandRoute = routeCliCommandInput({
+        argv: process.argv,
+        printHelp,
+        exit: process.exit,
+        handlers: createCliSubcommandHandlers(),
+    });
+    if (commandRoute.kind === "handled") {
         return;
     }
-    if (subcommand === "continue") {
-        // Remove "continue" so parseArgs handles remaining flags
-        process.argv.splice(2, 1);
-    }
+    const subcommand = commandRoute.kind === "continue" ? "continue" : commandRoute.subcommand;
     const { values, positionals } = parseArgs({
         options: {
             help: { type: "boolean", short: "h" },
@@ -318,6 +268,7 @@ function main() {
             "max-turns": { type: "string" },
             "system-prompt": { type: "string" },
             "prompt-cache-key": { type: "string" },
+            thinking: { type: "string" },
         },
         allowPositionals: true,
         strict: true,
@@ -338,6 +289,7 @@ function main() {
         const maxTurns = values["max-turns"] ? parseInt(values["max-turns"], 10) : undefined;
         const systemPrompt = values["system-prompt"];
         const promptCacheKey = values["prompt-cache-key"];
+        const thinkingLevel = parseThinkingLevel(values.thinking);
         const cwd = process.cwd();
         runJsonMode({
             message,
@@ -347,6 +299,7 @@ function main() {
             systemPrompt,
             maxTurns,
             promptCacheKey,
+            thinkingLevel,
         }).catch((err) => {
             process.stderr.write(formatUserError(err) + "\n");
             process.exit(1);
@@ -393,7 +346,7 @@ function main() {
     }
     const model = saved.model ?? getHardcodedDefault(provider);
     const thinkingLevel = saved.thinkingEnabled
-        ? getMaxThinkingLevel(model)
+        ? (saved.thinkingLevel ?? getMaxThinkingLevel(model))
         : undefined;
     // Interactive mode (Ink TUI)
     const cwd = process.cwd();
@@ -558,16 +511,17 @@ async function runInkTUI(opts) {
         });
         return rebuilt;
     };
-    // Connect MCP servers
+    // MCP startup can involve `npx` installing/booting servers. Do it after the
+    // TUI paints so a slow network or npm cache never looks like "nothing happens".
     const mcpManager = new MCPClientManager();
-    try {
-        const providerApiKey = provider === "glm" ? credentialsByProvider["glm"]?.accessToken : undefined;
-        const mcpTools = await mcpManager.connectAll(getMCPServers(provider, providerApiKey));
-        tools.push(...mcpTools);
-    }
-    catch (err) {
-        log("WARN", "mcp", `MCP initialization failed: ${err instanceof Error ? err.message : String(err)}`);
-    }
+    let initialMcpConnectPromise;
+    const connectInitialMcpTools = async () => {
+        initialMcpConnectPromise ??= (async () => {
+            const providerApiKey = provider === "glm" ? credentialsByProvider["glm"]?.accessToken : undefined;
+            return mcpManager.connectAll(getMCPServers(provider, providerApiKey));
+        })();
+        return initialMcpConnectPromise;
+    };
     const systemPrompt = await buildSystemPrompt(cwd, skills, false, undefined, tools.map((tool) => tool.name), undefined, goalModeRef.current);
     // Kill all background processes on exit (synchronous — catches all exit paths)
     process.on("exit", () => {
@@ -684,6 +638,7 @@ async function runInkTUI(opts) {
         rebuildToolsForCwd,
         repoMapChangedFilesRef,
         repoMapReadFilesRef,
+        connectInitialMcpTools,
     });
     closeLogger();
 }
@@ -1055,7 +1010,7 @@ async function runSessions() {
     }
     const model = saved2.model ?? getDefault(provider);
     const thinkingLevel = saved2.thinkingEnabled
-        ? getMaxThinkingLevel(model)
+        ? (saved2.thinkingLevel ?? getMaxThinkingLevel(model))
         : undefined;
     closeLogger();
     await runInkTUI({
@@ -1240,7 +1195,7 @@ async function runServe() {
     const preferredProvider = serveValues.provider ?? saved3.provider ?? "anthropic";
     const { provider, model } = await resolveActiveProvider(authStorage, preferredProvider, serveValues.model ?? saved3.model);
     const thinkingLevel = saved3.thinkingEnabled
-        ? getMaxThinkingLevel(model)
+        ? (saved3.thinkingLevel ?? getMaxThinkingLevel(model))
         : undefined;
     initLogger(paths.logFile, {
         version: CLI_VERSION,
@@ -1372,7 +1327,7 @@ async function runAgentHome() {
     const preferredProvider = ahValues.provider ?? saved4.provider ?? "anthropic";
     const { provider, model } = await resolveActiveProvider(authStorage, preferredProvider, ahValues.model ?? saved4.model);
     const thinkingLevel = saved4.thinkingEnabled
-        ? getMaxThinkingLevel(model)
+        ? (saved4.thinkingLevel ?? getMaxThinkingLevel(model))
         : undefined;
     initLogger(paths.logFile, {
         version: CLI_VERSION,
@@ -1454,7 +1409,7 @@ async function runPixel() {
         provider,
         model,
         cwd: process.cwd(),
-        thinkingLevel: saved.thinkingEnabled ? "medium" : undefined,
+        thinkingLevel: saved.thinkingEnabled ? (saved.thinkingLevel ?? "medium") : undefined,
         theme: saved.theme,
         initialOverlay: "pixel",
     });