@kimbho/kimbho-cli 0.1.8 → 0.1.9

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.9",
   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 : "",
@@ -11884,16 +12099,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}`,
@@ -12061,6 +12266,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.`,
@@ -12568,17 +12776,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 +12842,33 @@ 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 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 +12876,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 +12885,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")
           });
         }
@@ -13147,16 +13406,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 +13549,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 +13567,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 +13610,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 +13915,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 +13954,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
       } : {}
@@ -15570,6 +15809,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 +15827,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 +15893,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 +16571,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 +16601,7 @@ function renderPlanGenerationNotes(result) {
     lines.push(`planner tokens: ${result.usage.inputTokens} in / ${result.usage.outputTokens} out`);
   }
   if (result.warning) {
-    lines.push(`planner note: ${result.warning}`);
+    lines.push(`planner note: ${result.source === "fallback" ? `${result.warning} Using the safe default plan.` : result.warning}`);
   }
   return lines;
 }
@@ -17446,6 +17688,83 @@ 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 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 +17977,7 @@ function renderLiveExecutionEvent(event) {
       ];
     case "task-note":
       return [
-        `${color(DIM, "note")} ${event.message}`
+        `${color(DIM, `${pickStatusLabel(event.message)}...`)} ${simplifyTaskNote(event.message)}`
       ];
     case "approval-requested":
       return [