@kimbho/kimbho-cli 0.1.8 → 0.1.11

package/dist/index.cjs

@@ -3346,7 +3346,7 @@ var {
 // package.json
 var package_default = {
   name: "@kimbho/kimbho-cli",
-  version: "0.1.8",
+  version: "0.1.11",
   description: "Kimbho CLI is a terminal-native coding agent for planning, execution, and verification.",
   type: "module",
   engines: {
@@ -7996,6 +7996,178 @@ var SessionSnapshotSchema = external_exports.object({
   events: external_exports.array(SessionEventSchema).default([])
 });
 
+// ../core/dist/jsonish.js
+function stripCodeFences(raw) {
+  const fenced = raw.match(/```(?:json)?\s*([\s\S]*?)```/i);
+  return (fenced?.[1] ?? raw).trim();
+}
+function normalizeSmartQuotes(value) {
+  return value.replace(/[\u201c\u201d]/g, '"').replace(/[\u2018\u2019]/g, "'");
+}
+function maybeUnwrapQuotedJson(value) {
+  const trimmed = value.trim();
+  if (!trimmed.startsWith('"')) {
+    return trimmed;
+  }
+  try {
+    const parsed = JSON.parse(trimmed);
+    return typeof parsed === "string" ? parsed.trim() : trimmed;
+  } catch {
+    return trimmed;
+  }
+}
+function findBalancedObject(value) {
+  for (let start = 0; start < value.length; start += 1) {
+    if (value[start] !== "{") {
+      continue;
+    }
+    let depth = 0;
+    let inString = false;
+    let escaping = false;
+    for (let index = start; index < value.length; index += 1) {
+      const character = value[index];
+      if (escaping) {
+        escaping = false;
+        continue;
+      }
+      if (character === "\\") {
+        escaping = true;
+        continue;
+      }
+      if (character === '"') {
+        inString = !inString;
+        continue;
+      }
+      if (inString) {
+        continue;
+      }
+      if (character === "{") {
+        depth += 1;
+        continue;
+      }
+      if (character === "}") {
+        depth -= 1;
+        if (depth === 0) {
+          return value.slice(start, index + 1);
+        }
+      }
+    }
+  }
+  return null;
+}
+function removeTrailingCommas(value) {
+  let output = "";
+  let inString = false;
+  let escaping = false;
+  for (let index = 0; index < value.length; index += 1) {
+    const character = value[index];
+    if (escaping) {
+      output += character;
+      escaping = false;
+      continue;
+    }
+    if (character === "\\") {
+      output += character;
+      escaping = true;
+      continue;
+    }
+    if (character === '"') {
+      output += character;
+      inString = !inString;
+      continue;
+    }
+    if (!inString && character === ",") {
+      let lookahead = index + 1;
+      while (lookahead < value.length && /\s/.test(value[lookahead] ?? "")) {
+        lookahead += 1;
+      }
+      if (value[lookahead] === "}" || value[lookahead] === "]") {
+        continue;
+      }
+    }
+    output += character;
+  }
+  return output;
+}
+function escapeControlCharsInStrings(value) {
+  let output = "";
+  let inString = false;
+  let escaping = false;
+  for (const character of value) {
+    if (escaping) {
+      output += character;
+      escaping = false;
+      continue;
+    }
+    if (character === "\\") {
+      output += character;
+      escaping = true;
+      continue;
+    }
+    if (character === '"') {
+      output += character;
+      inString = !inString;
+      continue;
+    }
+    if (inString && character === "\n") {
+      output += "\\n";
+      continue;
+    }
+    if (inString && character === "\r") {
+      output += "\\r";
+      continue;
+    }
+    if (inString && character === "	") {
+      output += "\\t";
+      continue;
+    }
+    output += character;
+  }
+  return output;
+}
+function parseCandidate(candidate) {
+  return JSON.parse(candidate);
+}
+function extractJsonObjectish(raw, context) {
+  const stripped = maybeUnwrapQuotedJson(normalizeSmartQuotes(stripCodeFences(raw)));
+  const extracted = findBalancedObject(stripped) ?? stripped;
+  const candidates = Array.from(new Set([
+    stripped,
+    extracted,
+    removeTrailingCommas(extracted),
+    escapeControlCharsInStrings(removeTrailingCommas(extracted))
+  ].filter((candidate) => candidate.trim().length > 0)));
+  let lastError;
+  for (const candidate of candidates) {
+    try {
+      const parsed = parseCandidate(candidate);
+      if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
+        throw new Error(`Expected a JSON object in the ${context}.`);
+      }
+      return parsed;
+    } catch (error) {
+      lastError = error;
+    }
+  }
+  if (lastError instanceof Error) {
+    throw lastError;
+  }
+  throw new Error(`Expected a JSON object in the ${context}.`);
+}
+function summarizeStructuredOutputError(context, error) {
+  const message = error instanceof Error ? error.message : String(error);
+  if (/Expected a JSON object/i.test(message)) {
+    return `${context} returned non-machine-readable output.`;
+  }
+  if (/Unexpected end of JSON input/i.test(message)) {
+    return `${context} returned truncated JSON.`;
+  }
+  if (/JSON|property|position/i.test(message)) {
+    return `${context} returned malformed JSON.`;
+  }
+  return `${context} returned invalid structured output.`;
+}
+
 // ../core/dist/config/config.js
 var import_promises = require("node:fs/promises");
 var import_node_path = __toESM(require("node:path"), 1);
@@ -8415,6 +8587,10 @@ async function requestJson(url, init, timeoutMs = 3e4) {
   }
   return response.json();
 }
+function isBadRequestError(error) {
+  const message = error instanceof Error ? error.message : String(error);
+  return /Request failed with 400\b/i.test(message);
+}
 function trimTrailingSlash2(value) {
   return value.replace(/\/+$/, "");
 }
@@ -8796,20 +8972,39 @@ var OpenAICompatibleProvider = class {
     }
     const apiKey = resolveApiKey(this.definition);
     const model = requireModel(this.definition, input);
-    const response = await requestJson(`${this.definition.baseUrl}/chat/completions`, {
-      method: "POST",
-      headers: buildProviderHeaders(this.definition, apiKey),
-      body: JSON.stringify({
-        model,
-        messages: toChatMessages(input),
-        ...typeof input.temperature === "number" ? {
-          temperature: input.temperature
-        } : {},
-        ...typeof input.maxTokens === "number" ? {
-          max_tokens: input.maxTokens
-        } : {}
-      })
-    }, GENERATION_TIMEOUT_MS);
+    const requestBody = {
+      model,
+      messages: toChatMessages(input),
+      ...input.responseFormat === "json_object" ? {
+        response_format: {
+          type: "json_object"
+        }
+      } : {},
+      ...typeof input.temperature === "number" ? {
+        temperature: input.temperature
+      } : {},
+      ...typeof input.maxTokens === "number" ? {
+        max_tokens: input.maxTokens
+      } : {}
+    };
+    let response;
+    try {
+      response = await requestJson(`${this.definition.baseUrl}/chat/completions`, {
+        method: "POST",
+        headers: buildProviderHeaders(this.definition, apiKey),
+        body: JSON.stringify(requestBody)
+      }, GENERATION_TIMEOUT_MS);
+    } catch (error) {
+      if (!input.responseFormat || !isBadRequestError(error)) {
+        throw error;
+      }
+      const { response_format: _ignored, ...fallbackBody } = requestBody;
+      response = await requestJson(`${this.definition.baseUrl}/chat/completions`, {
+        method: "POST",
+        headers: buildProviderHeaders(this.definition, apiKey),
+        body: JSON.stringify(fallbackBody)
+      }, GENERATION_TIMEOUT_MS);
+    }
     const choices = Array.isArray(response.choices) ? response.choices : [];
     const firstChoice = choices.length > 0 && typeof choices[0] === "object" && choices[0] !== null ? choices[0] : null;
     const message = firstChoice && typeof firstChoice.message === "object" && firstChoice.message !== null ? firstChoice.message : null;
@@ -8852,26 +9047,46 @@ var OllamaProvider = class {
   async generateText(input) {
     const baseUrl = this.definition.baseUrl ?? "http://localhost:11434";
     const model = requireModel(this.definition, input);
-    const response = await requestJson(`${baseUrl}/api/generate`, {
-      method: "POST",
-      headers: {
-        "content-type": "application/json",
-        ...this.definition.headers
-      },
-      body: JSON.stringify({
-        model,
-        prompt: input.userPrompt ?? toPromptText(input),
-        ...input.systemPrompt ? {
-          system: input.systemPrompt
-        } : {},
-        stream: false,
-        ...typeof input.temperature === "number" ? {
-          options: {
-            temperature: input.temperature
-          }
-        } : {}
-      })
-    }, GENERATION_TIMEOUT_MS);
+    const requestBody = {
+      model,
+      prompt: input.userPrompt ?? toPromptText(input),
+      ...input.systemPrompt ? {
+        system: input.systemPrompt
+      } : {},
+      stream: false,
+      ...input.responseFormat === "json_object" ? {
+        format: "json"
+      } : {},
+      ...typeof input.temperature === "number" ? {
+        options: {
+          temperature: input.temperature
+        }
+      } : {}
+    };
+    let response;
+    try {
+      response = await requestJson(`${baseUrl}/api/generate`, {
+        method: "POST",
+        headers: {
+          "content-type": "application/json",
+          ...this.definition.headers
+        },
+        body: JSON.stringify(requestBody)
+      }, GENERATION_TIMEOUT_MS);
+    } catch (error) {
+      if (!input.responseFormat || !isBadRequestError(error)) {
+        throw error;
+      }
+      const { format: _ignored, ...fallbackBody } = requestBody;
+      response = await requestJson(`${baseUrl}/api/generate`, {
+        method: "POST",
+        headers: {
+          "content-type": "application/json",
+          ...this.definition.headers
+        },
+        body: JSON.stringify(fallbackBody)
+      }, GENERATION_TIMEOUT_MS);
+    }
     const usage = extractUsage(response);
     return usage ? {
       text: typeof response.response === "string" ? response.response : "",
@@ -10475,7 +10690,7 @@ async function generateNextPrisma(cwd, projectName) {
       ]
     }),
     "next-env.d.ts": '/// <reference types="next" />\n/// <reference types="next/image-types/global" />\n',
-    "next.config.js": "/** @type {import('next').NextConfig} */\nconst nextConfig = {};\n\nexport default nextConfig;\n",
+    "next.config.mjs": "/** @type {import('next').NextConfig} */\nconst nextConfig = {};\n\nexport default nextConfig;\n",
     ".env.example": 'DATABASE_URL="postgresql://postgres:postgres@localhost:5432/app"\n',
     "prisma/schema.prisma": [
       "generator client {",
@@ -10507,6 +10722,8 @@ async function generateNextPrisma(cwd, projectName) {
       "}"
     ].join("\n"),
     "src/app/page.tsx": [
+      `const title = "${title}";`,
+      "",
       "export default function HomePage() {",
       "  return (",
       "    <main style={{ fontFamily: 'Georgia, serif', padding: '4rem 1.5rem', maxWidth: 960, margin: '0 auto' }}>",
@@ -10873,6 +11090,29 @@ var READ_ONLY_SHELL_PREFIXES = [
   "pnpm ls",
   "yarn list"
 ];
+var VERIFICATION_SHELL_PREFIXES = [
+  "npm test",
+  "npm run test",
+  "npm run build",
+  "npm run lint",
+  "pnpm test",
+  "pnpm run test",
+  "pnpm build",
+  "pnpm run build",
+  "pnpm lint",
+  "pnpm run lint",
+  "yarn test",
+  "yarn build",
+  "yarn lint",
+  "bun test",
+  "bun run test",
+  "bun run build",
+  "bun run lint",
+  "tsc",
+  "vitest",
+  "jest",
+  "next build"
+];
 var DESTRUCTIVE_SHELL_PATTERNS = [
   /\brm\s+-rf\b/i,
   /\brm\s+-fr\b/i,
@@ -10894,6 +11134,10 @@ function isReadOnlyShellCommand(command) {
   const normalized = command.trim().toLowerCase();
   return READ_ONLY_SHELL_PREFIXES.some((prefix) => normalized === prefix || normalized.startsWith(prefix));
 }
+function isVerificationShellCommand(command) {
+  const normalized = command.trim().toLowerCase();
+  return VERIFICATION_SHELL_PREFIXES.some((prefix) => normalized === prefix || normalized.startsWith(`${prefix} `));
+}
 function isDestructiveShellCommand(command) {
   return DESTRUCTIVE_SHELL_PATTERNS.some((pattern) => pattern.test(command));
 }
@@ -10963,7 +11207,7 @@ function enforceToolPolicy(toolId, input, descriptor, context) {
   const approvalMode = context.approvalMode ?? "manual";
   const command = typeof input.command === "string" ? input.command : "";
   if (sandboxMode === "read-only") {
-    if (toolId === "shell.exec" && isReadOnlyShellCommand(command)) {
+    if (toolId === "shell.exec" && (isReadOnlyShellCommand(command) || isVerificationShellCommand(command))) {
       return null;
     }
     if (descriptor.permission !== "safe") {
@@ -10975,6 +11219,9 @@ function enforceToolPolicy(toolId, input, descriptor, context) {
       return new ToolApprovalRequiredError(createApprovalRequest(toolId, input, descriptor, context, `Approval required for destructive shell command: ${command}`));
     }
   }
+  if (toolId === "shell.exec" && isVerificationShellCommand(command)) {
+    return null;
+  }
   if ((toolId === "file.write" || toolId === "file.patch") && sandboxMode === "workspace-write") {
     const targets = extractProspectiveWriteTargets(toolId, input, context.cwd);
     const protectedTargets = targets.filter((target) => isProtectedWritePath(target));
@@ -11884,16 +12131,6 @@ function truncateForModel(value) {
   return `${value.slice(0, MAX_TOOL_OUTPUT_CHARS)}
 ... [truncated]`;
 }
-function extractJsonObject(raw) {
-  const fenced = raw.match(/```(?:json)?\s*([\s\S]*?)```/i);
-  const candidate = (fenced?.[1] ?? raw).trim();
-  const firstBrace = candidate.indexOf("{");
-  const lastBrace = candidate.lastIndexOf("}");
-  if (firstBrace === -1 || lastBrace === -1 || lastBrace <= firstBrace) {
-    throw new Error("Expected a JSON object in the model response.");
-  }
-  return JSON.parse(candidate.slice(firstBrace, lastBrace + 1));
-}
 function renderToolResultForModel(result) {
   const sections = [
     `tool: ${result.toolId}`,
@@ -12009,6 +12246,7 @@ function buildSystemPrompt(agent, task, request, allowedTools, plan) {
     `- Use browser.open, browser.inspect, browser.click, browser.fill, and browser.close when a web UI needs browser-level verification.`,
     `- Use process.start/process.logs/process.stop for long-running dev servers or watchers when they are available.`,
     `- Keep paths relative to the workspace.`,
+    `- In an existing repo, inspect and change the likely source files before running build or test verification. Do not front-load verification unless you are confirming an already-completed change or diagnosing a failure.`,
     `- After changing code, run verification with tests.run or shell.exec when appropriate.`,
     `- Do not claim success unless the task acceptance criteria are satisfied.`,
     `- If the task is underspecified, make a pragmatic implementation choice and continue.`
@@ -12061,6 +12299,9 @@ function summarizeSavedSessionContext(sessionId, session) {
     ...notes
   ];
 }
+function summarizeModelActionError(error) {
+  return summarizeStructuredOutputError("Model action", error);
+}
 function buildInitialUserPrompt(task, request) {
   return [
     `Complete this task in the workspace.`,
@@ -12071,6 +12312,114 @@ function buildInitialUserPrompt(task, request) {
     `Choose the next single action now.`
   ].join("\n");
 }
+function extractCodeFences(raw) {
+  const matches = Array.from(raw.matchAll(/```([a-z0-9_-]*)\s*\n([\s\S]*?)```/gi));
+  return matches.map((match) => ({
+    language: (match[1] ?? "").trim().toLowerCase(),
+    code: (match[2] ?? "").trim()
+  })).filter((match) => match.code.length > 0);
+}
+function normalizeWritableTaskFiles(task) {
+  return Array.from(new Set(task.filesLikelyTouched.map((filePath) => filePath.trim()).filter((filePath) => filePath.length > 0 && !filePath.endsWith("/") && !filePath.includes("*") && !filePath.startsWith(".kimbho/"))));
+}
+function extractMentionedFilePaths(raw, task) {
+  const mentioned = /* @__PURE__ */ new Set();
+  const normalizedTaskFiles = normalizeWritableTaskFiles(task);
+  const directMatches = raw.match(/([A-Za-z0-9_./-]+\.(?:tsx|ts|jsx|js|css|html|md|json|sql|prisma))/g) ?? [];
+  for (const match of directMatches) {
+    mentioned.add(match);
+  }
+  for (const candidate of normalizedTaskFiles) {
+    const basename = import_node_path9.default.basename(candidate);
+    if (raw.includes(candidate) || raw.includes(basename)) {
+      mentioned.add(candidate);
+    }
+  }
+  return Array.from(mentioned);
+}
+function inferFallbackFilePath(raw, task, fence) {
+  const mentioned = extractMentionedFilePaths(raw, task);
+  if (mentioned.length === 1) {
+    return mentioned[0] ?? null;
+  }
+  const writableFiles = normalizeWritableTaskFiles(task);
+  const sourceFiles = writableFiles.filter((filePath) => /\.[a-z0-9]+$/i.test(filePath));
+  if (sourceFiles.length === 1) {
+    return sourceFiles[0] ?? null;
+  }
+  if (fence.language === "html") {
+    return sourceFiles.find((filePath) => filePath.endsWith(".html")) ?? null;
+  }
+  if (fence.language === "css") {
+    return sourceFiles.find((filePath) => filePath.endsWith(".css")) ?? null;
+  }
+  if ([
+    "tsx",
+    "ts",
+    "jsx",
+    "js",
+    "typescript",
+    "javascript"
+  ].includes(fence.language)) {
+    return sourceFiles.find((filePath) => /\.(tsx?|jsx?)$/i.test(filePath)) ?? null;
+  }
+  if (fence.language === "json") {
+    return sourceFiles.find((filePath) => filePath.endsWith(".json")) ?? null;
+  }
+  return sourceFiles[0] ?? null;
+}
+function extractCommandFromResponse(raw) {
+  const trimmed = raw.trim();
+  if (/^(npm|pnpm|yarn|bun|npx|tsx|tsc|vitest|jest|next)\b/i.test(trimmed) && !trimmed.includes("\n")) {
+    return trimmed;
+  }
+  const bashFence = extractCodeFences(raw).find((fence) => [
+    "bash",
+    "sh",
+    "shell",
+    "zsh"
+  ].includes(fence.language));
+  if (!bashFence) {
+    return null;
+  }
+  const lines = bashFence.code.split("\n").map((line) => line.trim()).filter((line) => line.length > 0 && !line.startsWith("#"));
+  return lines.length === 1 ? lines[0] ?? null : null;
+}
+function inferFallbackActionFromResponse(raw, task, allowedTools) {
+  if (allowedTools.includes("shell.exec")) {
+    const command = extractCommandFromResponse(raw);
+    if (command) {
+      return {
+        type: "tool",
+        tool: "shell.exec",
+        input: {
+          command
+        },
+        reason: "Run the command inferred from the model response."
+      };
+    }
+  }
+  if (!allowedTools.includes("file.write")) {
+    return null;
+  }
+  const fences = extractCodeFences(raw);
+  for (const fence of fences) {
+    const filePath = inferFallbackFilePath(raw, task, fence);
+    if (!filePath) {
+      continue;
+    }
+    return {
+      type: "tool",
+      tool: "file.write",
+      input: {
+        path: filePath,
+        content: fence.code
+      },
+      reason: `Apply the drafted contents for ${filePath} inferred from the model response.`
+    };
+  }
+  return null;
+}
 function buildToolResultUserMessage(step, result) {
   return [
     `Step ${step} tool result:`,
@@ -12568,17 +12917,44 @@ var AutonomousTaskExecutor = class {
       let responseText = "";
       let parsedAction = null;
       for (let attempt = 0; attempt <= MAX_PARSE_RETRIES; attempt += 1) {
-        const response = await brain.client.generateText({
-          model: brain.model,
-          systemPrompt: buildSystemPrompt(agent, task, request, allowedTools, options.plan),
-          messages,
-          ...typeof brain.settings.temperature === "number" ? {
-            temperature: brain.settings.temperature
-          } : {},
-          ...typeof brain.settings.maxTokens === "number" ? {
-            maxTokens: brain.settings.maxTokens
-          } : {}
+        await emitProgress({
+          type: "task-note",
+          sessionId,
+          taskId: task.id,
+          agentRole: task.agentRole,
+          step,
+          message: attempt === 0 ? "Thinking through the next safe action." : `Re-asking the model for a stricter machine-readable action (${attempt + 1}/${MAX_PARSE_RETRIES + 1}).`
         });
+        let response;
+        try {
+          response = await brain.client.generateText({
+            model: brain.model,
+            systemPrompt: buildSystemPrompt(agent, task, request, allowedTools, options.plan),
+            messages,
+            responseFormat: "json_object",
+            ...typeof brain.settings.temperature === "number" ? {
+              temperature: brain.settings.temperature
+            } : {},
+            ...typeof brain.settings.maxTokens === "number" ? {
+              maxTokens: brain.settings.maxTokens
+            } : {}
+          });
+        } catch (error) {
+          transcript.push({
+            step,
+            response: "",
+            runtimeNote: `Model request failed: ${error instanceof Error ? error.message : String(error)}`
+          });
+          const transcriptPath2 = await writeTranscriptArtifact(request.cwd, sessionId, task.id, transcript);
+          artifacts.add(transcriptPath2);
+          return {
+            status: "blocked",
+            summary: `Model request failed before ${task.id} could choose a safe action: ${error instanceof Error ? error.message : String(error)}`,
+            toolResults,
+            artifacts: Array.from(artifacts),
+            usage: usageTotals
+          };
+        }
         if (options.signal?.aborted) {
           const transcriptPath2 = await writeTranscriptArtifact(request.cwd, sessionId, task.id, transcript);
           artifacts.add(transcriptPath2);
@@ -12607,11 +12983,46 @@ var AutonomousTaskExecutor = class {
           } : {}
         });
         try {
-          parsedAction = actionSchema.parse(extractJsonObject(response.text));
+          parsedAction = actionSchema.parse(extractJsonObjectish(response.text, "model response"));
           break;
         } catch (error) {
+          const parseSummary = summarizeModelActionError(error);
+          transcript.push({
+            step,
+            response: response.text,
+            runtimeNote: `${parseSummary} ${error instanceof Error ? error.message : String(error)}`
+          });
           if (attempt === MAX_PARSE_RETRIES) {
-            throw error;
+            const inferredFallbackAction = inferFallbackActionFromResponse(response.text, task, allowedTools);
+            if (inferredFallbackAction) {
+              parsedAction = inferredFallbackAction;
+              await emitProgress({
+                type: "task-note",
+                sessionId,
+                taskId: task.id,
+                agentRole: task.agentRole,
+                step,
+                message: `Model stayed out of structured mode; inferred ${inferredFallbackAction.tool} from the response.`
+              });
+              break;
+            }
+            const transcriptPath2 = await writeTranscriptArtifact(request.cwd, sessionId, task.id, transcript);
+            artifacts.add(transcriptPath2);
+            await emitProgress({
+              type: "task-note",
+              sessionId,
+              taskId: task.id,
+              agentRole: task.agentRole,
+              step,
+              message: "Model stayed out of structured mode after multiple retries."
+            });
+            return {
+              status: "blocked",
+              summary: `${parseSummary} The task stopped before a safe tool action could be chosen.`,
+              toolResults,
+              artifacts: Array.from(artifacts),
+              usage: usageTotals
+            };
           }
           await emitProgress({
             type: "task-note",
@@ -12619,7 +13030,7 @@ var AutonomousTaskExecutor = class {
             taskId: task.id,
             agentRole: task.agentRole,
             step,
-            message: `Model response was invalid JSON; retrying parse (${attempt + 1}/${MAX_PARSE_RETRIES + 1}).`
+            message: `Reformatting model output to match Kimbho's action schema (${attempt + 1}/${MAX_PARSE_RETRIES + 1}).`
           });
           messages.push({
             role: "assistant",
@@ -12628,9 +13039,11 @@ var AutonomousTaskExecutor = class {
           messages.push({
             role: "user",
             content: [
-              "Your previous response was invalid.",
+              "Your previous response did not parse as a valid JSON object.",
+              parseSummary,
               error instanceof Error ? error.message : String(error),
-              "Return exactly one valid JSON object matching the required action schema."
+              "Return exactly one valid JSON object matching the required action schema.",
+              "Do not include prose, markdown fences, comments, or trailing explanations."
             ].join("\n")
           });
         }
@@ -12850,16 +13263,27 @@ function foundationMilestone(shape) {
         "docs/",
         "packages/"
       ], "medium"),
-      buildTask("t3-scaffold", "Scaffold the repository foundation", "Create the workspace layout, TypeScript build config, package manifests, and initial CLI entry points.", shape === "cli-agent" ? "backend-specialist" : "infra-specialist", "scaffold", [
+      buildTask("t3-scaffold", "Scaffold the repository foundation", shape === "static-site" ? "Create or adapt the primary landing-page entrypoint, styles, and workspace shell needed for the requested site." : "Create the workspace layout, TypeScript build config, package manifests, and initial CLI entry points.", shape === "cli-agent" ? "backend-specialist" : "infra-specialist", "scaffold", [
         "t2-architecture"
       ], [
-        "The monorepo or app workspace builds cleanly.",
-        "Core commands or entry points exist."
-      ], [
-        "package manifests",
-        "TypeScript config",
-        "CLI or app shell"
+        shape === "static-site" ? "The primary page entry exists and renders the requested brand direction." : "The monorepo or app workspace builds cleanly.",
+        shape === "static-site" ? "Core layout files or styles exist for the landing page." : "Core commands or entry points exist."
       ], [
+        ...shape === "static-site" ? [
+          "Page entrypoint",
+          "Stylesheet or layout shell"
+        ] : [
+          "package manifests",
+          "TypeScript config",
+          "CLI or app shell"
+        ]
+      ], shape === "static-site" ? [
+        "src/app/page.tsx",
+        "src/app/layout.tsx",
+        "src/pages/index.tsx",
+        "index.html",
+        "styles.css"
+      ] : [
         "package.json",
         "packages/",
         "src/"
@@ -12882,6 +13306,9 @@ function implementationMilestone(shape) {
         ], [
           "Customized landing page"
         ], [
+          "src/app/page.tsx",
+          "src/app/layout.tsx",
+          "src/pages/index.tsx",
           "index.html",
           "styles.css",
           "src/"
@@ -13147,16 +13574,6 @@ function createPlan(input) {
 var DEFAULT_PLANNER_TEMPERATURE = 0.1;
 var DEFAULT_PLANNER_MAX_TOKENS = 2400;
 var MAX_REPLAN_CONTEXT_CHARS = 8e3;
-function extractJsonObject2(raw) {
-  const fenced = raw.match(/```(?:json)?\s*([\s\S]*?)```/i);
-  const candidate = (fenced?.[1] ?? raw).trim();
-  const firstBrace = candidate.indexOf("{");
-  const lastBrace = candidate.lastIndexOf("}");
-  if (firstBrace === -1 || lastBrace === -1 || lastBrace <= firstBrace) {
-    throw new Error("Expected a JSON object in the planner response.");
-  }
-  return JSON.parse(candidate.slice(firstBrace, lastBrace + 1));
-}
 function validateTaskGraph(plan) {
   const taskIds = /* @__PURE__ */ new Set();
   for (const task of flattenPlanTasks(plan)) {
@@ -13300,7 +13717,7 @@ async function generatePlannerPlan(request, seedPlan, invocation, userPrompt, pr
       temperature: invocation.temperature ?? DEFAULT_PLANNER_TEMPERATURE,
       maxTokens: invocation.maxTokens ?? DEFAULT_PLANNER_MAX_TOKENS
     });
-    const parsed = extractJsonObject2(response.text);
+    const parsed = extractJsonObjectish(response.text, "planner response");
     const candidatePlan = KimbhoPlanSchema.parse(parsed);
     const normalized = normalizeCandidatePlan(request, seedPlan, candidatePlan, true, preserveStatusesFrom);
     return {
@@ -13318,7 +13735,7 @@ async function generatePlannerPlan(request, seedPlan, invocation, userPrompt, pr
     return {
       plan: preserveStatusesFrom ? preserveTaskStatuses(preserveStatusesFrom, seedPlan) : seedPlan,
       source: "fallback",
-      warning: error instanceof Error ? error.message : String(error),
+      warning: summarizeStructuredOutputError("Planner", error),
       ...invocation.modelLabel ? {
         modelLabel: invocation.modelLabel
       } : {}
@@ -13361,16 +13778,6 @@ function truncate2(value, maxChars = MAX_EXPANSION_CONTEXT_CHARS) {
   return `${value.slice(0, maxChars)}
 ... [truncated]`;
 }
-function extractJsonObject3(raw) {
-  const fenced = raw.match(/```(?:json)?\s*([\s\S]*?)```/i);
-  const candidate = (fenced?.[1] ?? raw).trim();
-  const firstBrace = candidate.indexOf("{");
-  const lastBrace = candidate.lastIndexOf("}");
-  if (firstBrace === -1 || lastBrace === -1 || lastBrace <= firstBrace) {
-    throw new Error("Expected a JSON object in the task expansion response.");
-  }
-  return JSON.parse(candidate.slice(firstBrace, lastBrace + 1));
-}
 function slugify(value) {
   return value.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").replace(/-{2,}/g, "-");
 }
@@ -13676,7 +14083,7 @@ async function generateExpandedTasks(request, plan, task, invocation, repoSummar
       temperature: invocation.temperature ?? DEFAULT_EXPANDER_TEMPERATURE,
       maxTokens: invocation.maxTokens ?? DEFAULT_EXPANDER_MAX_TOKENS
     });
-    const parsed = extractJsonObject3(response.text);
+    const parsed = extractJsonObjectish(response.text, "task expansion response");
     const payload = TaskExpansionPayloadSchema.parse(parsed);
     const normalizedTasks = normalizeExpandedTasks(plan, task, payload, "model");
     const note = `Planner expanded ${task.id} into ${normalizedTasks.length} subtasks via ${invocation.modelLabel ?? "planner model"}: ${normalizedTasks.map((candidate) => candidate.id).join(", ")}.`;
@@ -13715,7 +14122,7 @@ async function generateExpandedTasks(request, plan, task, invocation, repoSummar
       expandedTaskId: task.id,
       createdTaskIds: fallbackTasks.map((candidate) => candidate.id),
       note,
-      warning: error instanceof Error ? error.message : String(error),
+      warning: summarizeStructuredOutputError("Planner task expansion", error),
       ...invocation.modelLabel ? {
         modelLabel: invocation.modelLabel
       } : {}
@@ -15446,14 +15853,25 @@ var ExecutionOrchestrator = class {
   async executeRepoAnalysisTask(sessionId, task, request, emitProgress, signal) {
     const context = { cwd: request.cwd };
     const toolResults = [];
-    const probes = request.workspaceState === "empty" ? [
+    const probes = [
       { toolId: "repo.index", input: {} }
-    ] : [
-      { toolId: "repo.index", input: {} },
-      { toolId: "git.status", input: {} },
-      { toolId: "file.read", input: { path: "package.json" } },
-      { toolId: "file.read", input: { path: "README.md" } }
     ];
+    if (request.workspaceState !== "empty") {
+      const candidatePaths = await Promise.all([
+        (0, import_promises11.access)(import_node_path11.default.join(request.cwd, ".git")).then(() => true).catch(() => false),
+        (0, import_promises11.access)(import_node_path11.default.join(request.cwd, "package.json")).then(() => true).catch(() => false),
+        (0, import_promises11.access)(import_node_path11.default.join(request.cwd, "README.md")).then(() => true).catch(() => false)
+      ]);
+      if (candidatePaths[0]) {
+        probes.push({ toolId: "git.status", input: {} });
+      }
+      if (candidatePaths[1]) {
+        probes.push({ toolId: "file.read", input: { path: "package.json" } });
+      }
+      if (candidatePaths[2]) {
+        probes.push({ toolId: "file.read", input: { path: "README.md" } });
+      }
+    }
     for (const probe of probes) {
       if (emitProgress) {
         await emitProgress({
@@ -15570,6 +15988,7 @@ var ExecutionOrchestrator = class {
             input.systemPrompt
           ].filter(Boolean).join("\n\n"),
           userPrompt: input.userPrompt,
+          responseFormat: "json_object",
           ...typeof input.temperature === "number" ? {
             temperature: input.temperature
           } : {},
@@ -15587,7 +16006,7 @@ var ExecutionOrchestrator = class {
       if (result.warning) {
         return {
           plan,
-          note: `Planner replan fell back to the existing graph: ${result.warning}`
+          note: `${result.warning} Keeping the current task graph.`
         };
       }
       return {
@@ -15653,6 +16072,7 @@ var ExecutionOrchestrator = class {
             input.systemPrompt
           ].filter(Boolean).join("\n\n"),
           userPrompt: input.userPrompt,
+          responseFormat: "json_object",
           ...typeof input.temperature === "number" ? {
             temperature: input.temperature
           } : {},
@@ -16330,6 +16750,7 @@ async function generatePlanForRequest(request) {
           input.systemPrompt
         ].filter(Boolean).join("\n\n"),
         userPrompt: input.userPrompt,
+        responseFormat: "json_object",
         ...typeof input.temperature === "number" ? {
           temperature: input.temperature
         } : {},
@@ -16359,7 +16780,8 @@ function renderPlanGenerationNotes(result) {
     lines.push(`planner tokens: ${result.usage.inputTokens} in / ${result.usage.outputTokens} out`);
   }
   if (result.warning) {
-    lines.push(`planner note: ${result.warning}`);
+    const warning = result.source === "fallback" ? `${summarizeStructuredOutputError("Planner", new Error(result.warning))} Using the safe default plan.` : result.warning;
+    lines.push(`planner note: ${warning}`);
   }
   return lines;
 }
@@ -17037,6 +17459,7 @@ function createProgram(onOpenShell) {
 }
 
 // src/shell.ts
+var import_node_readline = require("node:readline");
 var import_promises14 = require("node:readline/promises");
 var import_node_process12 = __toESM(require("node:process"), 1);
 var AMBER = "\x1B[38;5;214m";
@@ -17045,7 +17468,9 @@ var BOLD = "\x1B[1m";
 var DIM = "\x1B[2m";
 var RESET = "\x1B[0m";
 var TOP_LEVEL_COMMANDS = /* @__PURE__ */ new Set([
+  "approval",
   "approve",
+  "approve-all",
   "agents",
   "brain",
   "brains",
@@ -17089,6 +17514,20 @@ var MAX_CHAT_MESSAGES = 12;
 var DEFAULT_MAX_AUTO_TASKS = 3;
 var DEFAULT_MAX_AGENT_STEPS = 8;
 var DEFAULT_MAX_REPAIR_ATTEMPTS2 = 2;
+var SPINNER_FRAMES = [
+  "-",
+  "\\",
+  "|",
+  "/"
+];
+var IDLE_STATUS_LABELS = [
+  "thinking",
+  "musing",
+  "discombobulating",
+  "assembling",
+  "drafting",
+  "tinkering"
+];
 var EXECUTION_PREFIXES = [
   "build ",
   "create ",
@@ -17148,6 +17587,71 @@ function createExecutionTelemetry() {
     outputTokens: 0
   };
 }
+var ShellActivityIndicator = class {
+  interval = null;
+  frameIndex = 0;
+  label;
+  activeLine = false;
+  constructor(label) {
+    this.label = label;
+  }
+  start() {
+    if (!import_node_process12.default.stdout.isTTY || this.interval) {
+      return;
+    }
+    this.activeLine = true;
+    this.render();
+    this.interval = setInterval(() => {
+      this.frameIndex = (this.frameIndex + 1) % SPINNER_FRAMES.length;
+      this.render();
+    }, 120);
+    this.interval.unref?.();
+  }
+  update(label) {
+    this.label = label;
+    if (this.interval) {
+      this.render();
+    }
+  }
+  suspend() {
+    if (!import_node_process12.default.stdout.isTTY) {
+      return;
+    }
+    this.clear();
+  }
+  resume() {
+    if (!import_node_process12.default.stdout.isTTY || !this.interval) {
+      return;
+    }
+    this.render();
+  }
+  stop() {
+    if (this.interval) {
+      clearInterval(this.interval);
+      this.interval = null;
+    }
+    this.clear();
+    this.activeLine = false;
+  }
+  render() {
+    if (!import_node_process12.default.stdout.isTTY) {
+      return;
+    }
+    const frame = color(AMBER, SPINNER_FRAMES[this.frameIndex]);
+    const status = color(BOLD, this.label);
+    const raw = `${frame} ${status}${color(DIM, "...")}`;
+    this.clear();
+    (0, import_node_readline.cursorTo)(import_node_process12.default.stdout, 0);
+    import_node_process12.default.stdout.write(raw);
+  }
+  clear() {
+    if (!import_node_process12.default.stdout.isTTY || !this.activeLine) {
+      return;
+    }
+    (0, import_node_readline.cursorTo)(import_node_process12.default.stdout, 0);
+    (0, import_node_readline.clearLine)(import_node_process12.default.stdout, 0);
+  }
+};
 function renderExecutionTelemetry(telemetry, startedAt) {
   return `telemetry: ${((Date.now() - startedAt) / 1e3).toFixed(1)}s | ${telemetry.toolCalls} tools | ${telemetry.modelCalls} model calls | ${telemetry.inputTokens} in / ${telemetry.outputTokens} out`;
 }
@@ -17337,7 +17841,9 @@ function renderHelp() {
     "/plan <goal>             Create a structured implementation plan.",
     "/run <goal>              Start a Kimbho execution session for a goal.",
     "/resume                  Show the latest saved session.",
+    "/approval [mode]         Show or set approval mode: manual or auto.",
     "/approve [id]            Approve a pending risky action and continue the session.",
+    "/approve-all             Approve all pending actions in the current session.",
     "/deny [id]               Deny a pending risky action.",
     "/agents                  Inspect agent roles and the active session.",
     "/review                  Review the current git diff and summarize risk.",
@@ -17362,7 +17868,7 @@ function renderStartupCard(cwd, state) {
     renderCardLine("approval", state.approvalMode),
     renderCardLine("sandbox", state.sandboxMode),
     renderCardLine("preset", state.stackPreset),
-    renderCardLine("shortcuts", "/ask  /run  /approve  /brain  /providers  /models  /quit")
+    renderCardLine("shortcuts", "/ask  /run  /approval  /approve-all  /models  /quit")
   ];
   if (!state.configured) {
     cardLines.push("setup: run /init or /providers add <template> to create .kimbho/config.json");
@@ -17446,6 +17952,106 @@ function renderEventType(type) {
 function renderInlineMarkdown(value) {
   return value.replace(/\[([^\]]+)\]\(([^)]+)\)/g, (_match, label, url) => `${color(CYAN, label)} ${color(DIM, `(${url})`)}`).replace(/`([^`]+)`/g, (_match, code) => color(CYAN, code)).replace(/\*\*([^*]+)\*\*/g, (_match, boldText) => color(BOLD, boldText)).replace(/\*([^*]+)\*/g, (_match, italicText) => color(DIM, italicText));
 }
+function hashString(value) {
+  let hash = 0;
+  for (let index = 0; index < value.length; index += 1) {
+    hash = (hash << 5) - hash + value.charCodeAt(index);
+    hash |= 0;
+  }
+  return Math.abs(hash);
+}
+function pickStatusLabel(message) {
+  const lower = message.toLowerCase();
+  const choose = (labels) => labels[hashString(message) % labels.length];
+  if (lower.includes("synthesizing") || lower.includes("architecture brief")) {
+    return choose([
+      "planning",
+      "mapping",
+      "sketching"
+    ]);
+  }
+  if (lower.includes("repo context") || lower.includes("repo analysis") || lower.includes("deterministic repo context")) {
+    return choose([
+      "orienting",
+      "surveying",
+      "mapping"
+    ]);
+  }
+  if (lower.includes("using ") && lower.includes(" via ")) {
+    return choose([
+      "warming up",
+      "locking in",
+      "switching gears"
+    ]);
+  }
+  if (lower.includes("reformatting model output") || lower.includes("structured mode")) {
+    return choose([
+      "reformatting",
+      "straightening",
+      "coaxing"
+    ]);
+  }
+  if (lower.includes("expanded") || lower.includes("revised the task graph") || lower.includes("keeping the current task graph")) {
+    return choose([
+      "replanning",
+      "reshaping",
+      "rerouting"
+    ]);
+  }
+  if (lower.includes("approval")) {
+    return choose([
+      "waiting",
+      "holding",
+      "pausing"
+    ]);
+  }
+  if (lower.includes("integration") || lower.includes("worktree")) {
+    return choose([
+      "reconciling",
+      "merging",
+      "untangling"
+    ]);
+  }
+  return choose([
+    "thinking",
+    "musing",
+    "assembling",
+    "checking"
+  ]);
+}
+function pickIdleStatusLabel(seed) {
+  return IDLE_STATUS_LABELS[hashString(seed) % IDLE_STATUS_LABELS.length];
+}
+function statusLabelForEvent(event) {
+  switch (event.type) {
+    case "task-note":
+      return pickStatusLabel(event.message);
+    case "task-started":
+      return pickStatusLabel(event.task.title);
+    case "tool-started":
+      return pickStatusLabel(event.reason ?? event.toolId);
+    case "model-usage":
+      return "thinking";
+    case "approval-requested":
+      return "waiting";
+    case "approval-resolved":
+      return "continuing";
+    case "task-finished":
+      return event.status === "handoff" ? "rerouting" : "settling";
+    default:
+      return "thinking";
+  }
+}
+function simplifyTaskNote(message) {
+  const trimmed = message.trim();
+  if (trimmed.startsWith("Using ") && trimmed.includes(" via ")) {
+    return trimmed.replace(/^Using\s+/, "");
+  }
+  if (trimmed.startsWith("Reformatting model output")) {
+    return trimmed;
+  }
+  return trimmed;
+}
 function renderTerminalMarkdown(markdown) {
   const lines = markdown.replace(/\r\n/g, "\n").split("\n");
   const output = [];
@@ -17658,7 +18264,7 @@ function renderLiveExecutionEvent(event) {
       ];
     case "task-note":
       return [
-        `${color(DIM, "note")} ${event.message}`
+        `${color(AMBER, `[${pickStatusLabel(event.message)}]`)} ${simplifyTaskNote(event.message)}`
       ];
     case "approval-requested":
       return [
@@ -17791,6 +18397,8 @@ async function handleChatPrompt(cwd, prompt, runtime) {
     }
   ]);
   let result;
+  const activity = new ShellActivityIndicator(pickIdleStatusLabel(prompt));
+  activity.start();
   try {
     result = await brain.client.generateText({
       model: brain.model,
@@ -17806,9 +18414,11 @@ async function handleChatPrompt(cwd, prompt, runtime) {
       } : {}
     });
   } catch (error) {
+    activity.stop();
     const message = error instanceof Error ? error.message : String(error);
     throw new Error(`Chat failed for ${brain.role} via ${brain.provider.id}/${brain.model}: ${message}`);
   }
+  activity.stop();
   const nextConversation = trimConversation([
     ...messages,
     {
@@ -17833,13 +18443,29 @@ async function runGoalExecution(cwd, goal, runtime) {
     workspaceState: workspace.workspaceState,
     constraints: []
   };
-  const planResult = await generatePlanForRequest(request);
+  const startedAt = Date.now();
+  const telemetry = createExecutionTelemetry();
+  const controller = new AbortController();
+  runtime.activeExecution = {
+    controller,
+    label: goal
+  };
+  const planningSpinner = new ShellActivityIndicator("planning");
+  console.log(color(DIM, `Working on: ${goal}`));
+  for (const note of workspace.notes) {
+    console.log(color(DIM, note));
+  }
+  planningSpinner.start();
+  let planResult;
+  try {
+    planResult = await generatePlanForRequest(request);
+  } finally {
+    planningSpinner.stop();
+  }
   const plan = planResult.plan;
   const planPath = await savePlan(plan, request.cwd);
   const envelope = orchestrator.buildEnvelope(request, plan);
   const initialSnapshot = orchestrator.createSessionSnapshot(envelope);
-  const startedAt = Date.now();
-  const telemetry = createExecutionTelemetry();
   const liveBoard = createLiveRunBoard(
     initialSnapshot.id,
     goal,
@@ -17849,21 +18475,14 @@ async function runGoalExecution(cwd, goal, runtime) {
     DEFAULT_MAX_AGENT_STEPS,
     DEFAULT_MAX_REPAIR_ATTEMPTS2
   );
-  const controller = new AbortController();
-  runtime.activeExecution = {
-    controller,
-    label: goal
-  };
-  console.log(color(DIM, `Working on: ${goal}`));
-  for (const note of workspace.notes) {
-    console.log(color(DIM, note));
-  }
   for (const line of renderPlanGenerationNotes(planResult)) {
     console.log(color(DIM, line));
   }
   console.log(renderShellPlanPreview(plan).join("\n"));
   console.log(renderRunStartCard(liveBoard));
   console.log("");
+  const activity = new ShellActivityIndicator("starting");
+  activity.start();
   let snapshot;
   try {
     snapshot = await orchestrator.continueSession(initialSnapshot, {
@@ -17881,6 +18500,8 @@ async function runGoalExecution(cwd, goal, runtime) {
           telemetry.inputTokens += event.usage?.inputTokens ?? 0;
           telemetry.outputTokens += event.usage?.outputTokens ?? 0;
         }
+        activity.update(statusLabelForEvent(event));
+        activity.suspend();
         for (const line of renderLiveExecutionEvent(event)) {
           console.log(line);
         }
@@ -17889,12 +18510,15 @@ async function runGoalExecution(cwd, goal, runtime) {
             console.log(line);
           }
         }
+        activity.resume();
       }
     });
   } catch (error) {
+    activity.stop();
     const message = error instanceof Error ? error.message : String(error);
     throw new Error(`Execution failed while working on "${goal}": ${message}`);
   } finally {
+    activity.stop();
     runtime.activeExecution = null;
   }
   const sessionPath = await saveSession(snapshot, request.cwd);
@@ -17928,6 +18552,8 @@ async function resumeGoalExecution(cwd, runtime) {
     label: session.id
   };
   console.log(renderRunStartCard(liveBoard));
+  const activity = new ShellActivityIndicator("resuming");
+  activity.start();
   let snapshot;
   try {
     snapshot = await new ExecutionOrchestrator().continueSession(session, {
@@ -17945,6 +18571,8 @@ async function resumeGoalExecution(cwd, runtime) {
           telemetry.inputTokens += event.usage?.inputTokens ?? 0;
           telemetry.outputTokens += event.usage?.outputTokens ?? 0;
         }
+        activity.update(statusLabelForEvent(event));
+        activity.suspend();
         for (const line of renderLiveExecutionEvent(event)) {
           console.log(line);
         }
@@ -17953,12 +18581,15 @@ async function resumeGoalExecution(cwd, runtime) {
             console.log(line);
           }
         }
+        activity.resume();
       }
     });
   } catch (error) {
+    activity.stop();
     const message = error instanceof Error ? error.message : String(error);
     throw new Error(`Resume failed for ${session.id}: ${message}`);
   } finally {
+    activity.stop();
     runtime.activeExecution = null;
   }
   const sessionPath = await saveSession(snapshot, cwd);
@@ -17967,29 +18598,42 @@ async function resumeGoalExecution(cwd, runtime) {
   console.log(color(DIM, renderExecutionTelemetry(telemetry, startedAt)));
   console.log(renderShellSessionSummary(snapshot, null, sessionPath));
 }
-function resolveApprovalChoice(snapshot, requestedId) {
+function resolveApprovalChoices(snapshot, requestedId, options = {}) {
   if (snapshot.pendingApprovals.length === 0) {
     throw new Error("No pending approvals in the current session.");
   }
+  if (requestedId === "all") {
+    if (!options.allowAll) {
+      throw new Error("Use /approve-all to approve every pending action.");
+    }
+    return [
+      ...snapshot.pendingApprovals
+    ];
+  }
   if (requestedId) {
     const approval = snapshot.pendingApprovals.find((candidate) => candidate.id === requestedId);
     if (!approval) {
       throw new Error(`No pending approval found for "${requestedId}".`);
     }
-    return approval;
+    return [
+      approval
+    ];
   }
   if (snapshot.pendingApprovals.length > 1) {
-    throw new Error("Multiple pending approvals exist. Use /approve <approval-id> or /deny <approval-id>.");
+    throw new Error("Multiple pending approvals exist. Use /approve <approval-id>, /deny <approval-id>, or /approve-all.");
   }
-  return snapshot.pendingApprovals[0];
+  return [
+    snapshot.pendingApprovals[0]
+  ];
 }
-async function resolvePendingApproval(cwd, runtime, decision, approvalId) {
+async function resolvePendingApproval(cwd, runtime, decision, approvalId, options = {}) {
   const session = await loadLatestSession(cwd);
   if (!session) {
     throw new Error("No saved session found. Run a goal first.");
   }
-  const approval = resolveApprovalChoice(session, approvalId);
-  console.log(color(DIM, `${decision === "approve" ? "Approving" : "Denying"} ${approval.toolId} for ${approval.taskId}...`));
+  const approvals = resolveApprovalChoices(session, approvalId, options);
+  const label = approvals.length === 1 ? `${approvals[0].toolId} for ${approvals[0].taskId}` : `${approvals.length} pending actions`;
+  console.log(color(DIM, `${decision === "approve" ? "Approving" : "Denying"} ${label}...`));
   const startedAt = Date.now();
   const telemetry = createExecutionTelemetry();
   const liveBoard = createLiveRunBoard(
@@ -18005,21 +18649,21 @@ async function resolvePendingApproval(cwd, runtime, decision, approvalId) {
   const controller = new AbortController();
   runtime.activeExecution = {
     controller,
-    label: `${session.id}:${approval.id}`
+    label: approvals.length === 1 ? `${session.id}:${approvals[0].id}` : `${session.id}:batch-approval`
   };
   console.log(renderRunStartCard(liveBoard));
+  const activity = new ShellActivityIndicator(decision === "approve" ? "approving" : "denying");
+  activity.start();
   let snapshot;
   try {
     snapshot = await new ExecutionOrchestrator().continueSession(session, {
       maxAutoTasks: DEFAULT_MAX_AUTO_TASKS,
       maxAgentSteps: DEFAULT_MAX_AGENT_STEPS,
       maxRepairAttempts: DEFAULT_MAX_REPAIR_ATTEMPTS2,
-      approvalDecisions: [
-        {
-          approvalId: approval.id,
-          decision
-        }
-      ],
+      approvalDecisions: approvals.map((approval) => ({
+        approvalId: approval.id,
+        decision
+      })),
       signal: controller.signal,
       onProgress: async (event) => {
         updateLiveRunBoard(liveBoard, event);
@@ -18031,6 +18675,8 @@ async function resolvePendingApproval(cwd, runtime, decision, approvalId) {
           telemetry.inputTokens += event.usage?.inputTokens ?? 0;
           telemetry.outputTokens += event.usage?.outputTokens ?? 0;
         }
+        activity.update(statusLabelForEvent(event));
+        activity.suspend();
         for (const line of renderLiveExecutionEvent(event)) {
           console.log(line);
         }
@@ -18039,12 +18685,15 @@ async function resolvePendingApproval(cwd, runtime, decision, approvalId) {
             console.log(line);
           }
         }
+        activity.resume();
       }
     });
   } catch (error) {
+    activity.stop();
     const message = error instanceof Error ? error.message : String(error);
-    throw new Error(`Approval resolution failed for ${approval.id}: ${message}`);
+    throw new Error(`Approval resolution failed for ${approvals.map((approval) => approval.id).join(", ")}: ${message}`);
   } finally {
+    activity.stop();
     runtime.activeExecution = null;
   }
   const sessionPath = await saveSession(snapshot, cwd);
@@ -18060,6 +18709,28 @@ async function printLatestPlanSummary(cwd) {
   }
   console.log(renderShellPlanSummary(plan).join("\n"));
 }
+async function handleApprovalModeCommand(cwd, tokens) {
+  const config = await loadConfig(cwd);
+  if (!config) {
+    throw new Error("No config found. Run /init or /providers add <template> first.");
+  }
+  const subcommand = tokens[1]?.trim().toLowerCase();
+  if (!subcommand || subcommand === "status") {
+    console.log(`approval mode: ${config.approvalMode}`);
+    console.log("manual = ask before risky actions");
+    console.log("auto = approve non-destructive actions automatically");
+    return;
+  }
+  if (subcommand !== "manual" && subcommand !== "auto") {
+    throw new Error("Usage: /approval [manual|auto|status]");
+  }
+  const outputPath = await saveConfig({
+    ...config,
+    approvalMode: subcommand
+  }, cwd);
+  console.log(`Updated ${outputPath}`);
+  console.log(`approval mode: ${subcommand}`);
+}
 async function createPlanOnly(cwd, goal) {
   const request = {
     goal,
@@ -18068,7 +18739,14 @@ async function createPlanOnly(cwd, goal) {
     workspaceState: await inferPlanningWorkspaceState(cwd, goal),
     constraints: []
   };
-  const planResult = await generatePlanForRequest(request);
+  const activity = new ShellActivityIndicator("planning");
+  activity.start();
+  let planResult;
+  try {
+    planResult = await generatePlanForRequest(request);
+  } finally {
+    activity.stop();
+  }
   const plan = planResult.plan;
   const planPath = await savePlan(plan, cwd);
   for (const line of renderPlanGenerationNotes(planResult)) {
@@ -18647,13 +19325,35 @@ async function handleShellCommand(cwd, input, state, runtime, execute) {
     await resumeGoalExecution(cwd, runtime);
     return cwd;
   }
+  if (head === "approval") {
+    await handleApprovalModeCommand(cwd, [
+      "approval",
+      ...tokens.slice(1)
+    ]);
+    return cwd;
+  }
+  if (head === "approve-all") {
+    await resolvePendingApproval(
+      cwd,
+      runtime,
+      "approve",
+      "all",
+      {
+        allowAll: true
+      }
+    );
+    return cwd;
+  }
   if (head === "approve" || head === "deny") {
     const approvalId = tokens[1]?.trim();
     await resolvePendingApproval(
       cwd,
       runtime,
       head === "approve" ? "approve" : "deny",
-      approvalId && approvalId.length > 0 ? approvalId : void 0
+      approvalId && approvalId.length > 0 ? approvalId : void 0,
+      {
+        allowAll: false
+      }
     );
     return cwd;
   }