@kenkaiiii/ggcoder 5.70.0 → 5.72.0

package/dist/app-sidecar.js

@@ -37,7 +37,7 @@ import { isWorkflowCommandText, countAssistantMessages, shouldStartAutopilotCycl
 import { driveAutopilotCycle, frameAutopilotInjection } from "./core/autopilot-cycle.js";
 import { describeRunVerification, describeTurnVerification } from "./core/run-status.js";
 import { validateKenModelPref, effectiveKenModel } from "./core/ken-model.js";
-import { normalizeAutopilotMarkersForHistory, normalizeAppMarkersForHistory, normalizeKenTurnsForHistory, getHistoryMessageVisibility, replayMessagesInOrder, restoreUserRow, restoreAssistantTexts, resolveRestoredCommand, autopilotMarkerCopySeed, } from "./core/session-history.js";
+import { normalizeAutopilotMarkersForHistory, normalizeAppMarkersForHistory, normalizeKenTurnsForHistory, getHistoryMessageVisibility, replayMessagesInOrder, restoreUserRow, restoreAssistantTexts, resolveRestoredCommand, autopilotMarkerCopySeed, extractToolImagePaths, } from "./core/session-history.js";
 import { sessionToMarkdown, defaultExportFilename, } from "./core/session-export.js";
 import { AuthStorage } from "./core/auth-storage.js";
 import { advancesPhase, explainPullFailure, isGgufShard, isValidHfRepoId, parseOllamaPullLine, pickGgufQuant, SHARDED_MESSAGE, toHfSearchRow, } from "./hf-pull.js";
@@ -62,6 +62,7 @@ import { getGitHubOpenCounts, getGitHubRepoSlug } from "./utils/github.js";
 import { startGitHubCIPoll } from "./utils/github-ci.js";
 import { extractPlanSteps } from "./utils/plan-steps.js";
 import { getNextThinkingLevel, getSupportedThinkingLevels, isThinkingLevelSupported, } from "./core/thinking-level.js";
+import { parseThinkingLevel } from "./cli/thinking-arg.js";
 import { PROMPT_COMMANDS } from "./core/prompt-commands.js";
 import { loadCustomCommands } from "./core/custom-commands.js";
 import { discoverProjects } from "./core/project-discovery.js";
@@ -72,7 +73,8 @@ import { installTerminationHandlers } from "./core/shutdown.js";
 import { KeepAwake } from "./core/keep-awake.js";
 import { RADIO_STATIONS, getCurrentStation, getRadioVolume, playRadio, setRadioVolume, stopRadio, } from "./core/radio.js";
 import { enrichProcessPath } from "./core/shell-path.js";
-import { downscaleForPreview, shrinkToFit, validateVisionImage } from "./utils/image.js";
+import { downscaleForPreview, IMAGE_MEDIA_TYPES, shrinkToFit, validateVisionImage, } from "./utils/image.js";
+import { readFileBounded } from "./tools/operations.js";
 import { startServeMode } from "./modes/serve-mode.js";
 import { installSteroids, probeSteroids } from "./core/steroids.js";
 import { loadTelegramConfig, saveTelegramConfig, verifyBotToken } from "./core/telegram-config.js";
@@ -491,6 +493,7 @@ async function runJsonModeIfRequested() {
             tools: { type: "string" },
             "mcp-servers": { type: "string" },
             "prompt-cache-key": { type: "string" },
+            thinking: { type: "string" },
         },
         allowPositionals: true,
         strict: true,
@@ -527,6 +530,7 @@ async function runJsonModeIfRequested() {
         allowedTools,
         allowedMcpServers,
         promptCacheKey: values["prompt-cache-key"],
+        thinkingLevel: parseThinkingLevel(values.thinking),
     }).catch(async (err) => {
         process.stderr.write((err instanceof Error ? err.message : String(err)) + "\n");
         process.exit(1);
@@ -1993,7 +1997,7 @@ async function createSession(deps, opts) {
     session.eventBus.on("hook", (d) => broadcast("hook", d));
     session.eventBus.on("diagnostics", (d) => broadcast("diagnostics", d));
     // Fires BEFORE the candidate final answer streams. The webview holds assistant
-    // text back while armed, so an Ideal review supersedes a draft that was never
+    // text back while armed, so an injected follow-up supersedes a draft that was never
     // painted instead of deleting one the user already started reading.
     session.eventBus.on("hook_armed", (d) => broadcast("hook_armed", d));
     session.eventBus.on("subagent_state", (d) => broadcast("subagent_state", d));
@@ -2065,10 +2069,8 @@ async function createSession(deps, opts) {
     // Autopilot (auto-review) toggle for THIS window's project. Loaded from
     // gg-app.json on boot; flipped via POST /autopilot. When on, POST /prompt runs
     // runAutopilotCycle after the user's turn settles — Ken auto-reviews the work
-    // and drives the review→prompt→review loop. Ken is the sole verification
-    // owner in this mode, so suppress the build session's redundant Ideal hook.
+    // and drives the review→prompt→review loop.
     let autopilot = mode === "code" && (await loadAutopilot(cwd));
-    session.setIdealReviewSuppressed(autopilot);
     // True while an autopilot review is in flight (used to defer kenAuto model
     // switches, like kenRunning does for chat Ken, and to drive the spinner).
     let autopilotReviewing = false;
@@ -2274,9 +2276,6 @@ async function createSession(deps, opts) {
             // (often >5 min) regardless of the user's global speedProfile pick.
             forceLongCacheRetention: true,
         });
-        // Ken is already the independent autopilot reviewer; recursively running
-        // his own Ideal self-review adds latency and can corrupt the verdict shape.
-        ken.setIdealReviewSuppressed(true);
         await ken.initialize();
         // Keep review text/tools silent; report usage only for whole-task accounting.
         ken.eventBus.on("turn_end", (d) => {
@@ -2541,7 +2540,6 @@ async function createSession(deps, opts) {
         const generation = runLifecycle.begin(abortOwnedWork).generation;
         pendingCancelDrain = null;
         autopilotActive = true;
-        session.setIdealReviewSuppressed(true);
         // Generation captured by the last plan review; acceptPlan re-checks it so
         // a user Accept/Reject landing mid-review always wins.
         let planGenAtReview = -1;
@@ -2659,7 +2657,6 @@ async function createSession(deps, opts) {
         }
         finally {
             autopilotActive = false;
-            session.setIdealReviewSuppressed(autopilot);
             finishOwnedGeneration(generation, true, session.getVerificationProblem() ? "unverified" : "completed");
             queueMicrotask(() => void runStrandedQueue());
         }
@@ -3294,7 +3291,16 @@ async function createSession(deps, opts) {
                 // Pre-index tool results by toolCallId so we can pair tool calls with
                 // their results (for sub-agent status + image extraction).
                 const toolResultMap = new Map();
+                // Tool name per call, so restore only trusts generate_image's own text
+                // when it reads extra images from disk (an MCP server could fake it).
+                const toolNameById = new Map();
                 for (const msg of messages) {
+                    if (msg.role === "assistant" && typeof msg.content !== "string") {
+                        for (const c of msg.content) {
+                            if (c.type === "tool_call")
+                                toolNameById.set(c.id, c.name);
+                        }
+                    }
                     if (msg.role !== "tool")
                         continue;
                     for (const tr of msg.content) {
@@ -3454,31 +3460,43 @@ async function createSession(deps, opts) {
                             const imageBlocks = tr.content.filter((c) => c.type === "image");
                             if (imageBlocks.length === 0)
                                 continue;
-                            // Extract the path from the text block (e.g. "Generated image → /path").
+                            // Extract the path from the text block so the restored image
+                            // stays clickable (read / screenshot / generate_image formats).
                             const textBlock = tr.content.find((c) => c.type === "text" && "text" in c && typeof c.text === "string");
                             const textContent = textBlock && textBlock.type === "text" ? textBlock.text : "";
-                            const pathMatch = textContent.match(/→\s*(\S+)/);
-                            const imgPath = pathMatch?.[1];
-                            // Downscale each image for the webview preview.
+                            const imgPaths = extractToolImagePaths(textContent);
+                            // Downscale each image for the webview preview. Paths pair with
+                            // image blocks in order (a tool saves one file per image).
                             const toolImages = [];
+                            let blockIndex = 0;
                             for (const block of imageBlocks) {
                                 if (block.type !== "image")
                                     continue;
-                                try {
-                                    const rawBuf = Buffer.from(block.data, "base64");
-                                    const previewBuf = await downscaleForPreview(rawBuf);
-                                    toolImages.push({
-                                        src: `data:${block.mediaType};base64,${previewBuf.toString("base64")}`,
-                                        path: imgPath,
-                                    });
-                                }
-                                catch {
-                                    // Downscale failed — use the raw data.
-                                    toolImages.push({
-                                        src: `data:${block.mediaType};base64,${block.data}`,
-                                        path: imgPath,
-                                    });
-                                }
+                                const imgPath = imgPaths[blockIndex++];
+                                const previewBuf = await downscaleForPreview(Buffer.from(block.data, "base64"));
+                                toolImages.push({
+                                    src: `data:${block.mediaType};base64,${previewBuf.toString("base64")}`,
+                                    path: imgPath,
+                                });
+                            }
+                            // generate_image persists only its first image's pixels; the
+                            // rest exist only on disk, so preview them from their files.
+                            // Skip silently if a file was moved or deleted since.
+                            const extraPaths = toolNameById.get(tr.toolCallId) === "generate_image"
+                                ? imgPaths.slice(blockIndex)
+                                : [];
+                            for (const extraPath of extraPaths) {
+                                const mediaType = IMAGE_MEDIA_TYPES[path.extname(extraPath).toLowerCase()];
+                                if (!mediaType)
+                                    continue;
+                                const raw = await readFileBounded(extraPath).catch(() => null);
+                                if (!raw)
+                                    continue;
+                                const previewBuf = await downscaleForPreview(raw);
+                                toolImages.push({
+                                    src: `data:${mediaType};base64,${previewBuf.toString("base64")}`,
+                                    path: extraPath,
+                                });
                             }
                             if (toolImages.length > 0) {
                                 history.push({
@@ -3909,9 +3927,6 @@ async function createSession(deps, opts) {
                     return;
                 }
                 autopilot = enabled;
-                // A toggle-off during an active cycle takes effect after Ken finishes;
-                // until then, injected build runs must not re-enable Ideal self-review.
-                session.setIdealReviewSuppressed(enabled || autopilotActive);
                 await saveAutopilot(cwd, enabled);
                 log("INFO", "app-sidecar", "autopilot toggled", { enabled: String(enabled) });
                 broadcast("autopilot", { autopilot: enabled });