diffowl 0.1.0 → 0.2.0

package/dist/cli.js

@@ -12,6 +12,19 @@ import { existsSync } from "fs";
 import { join, dirname } from "path";
 import { parse, stringify } from "yaml";
 import { z, ZodError } from "zod";
+var ReviewConfidenceSchema = z.enum(["low", "medium", "high"]);
+var ReviewContextDepthSchema = z.enum(["shallow", "default"]);
+var ReasoningEffortSchema = z.enum([
+  "auto",
+  "none",
+  "minimal",
+  "low",
+  "medium",
+  "high",
+  "max",
+  "xhigh"
+]);
+var ModelSchema = z.string().trim().min(1, "model must not be empty").regex(/^[^/\s]+\/\S+$/, "model must use provider/model format");
 var DEFAULT_CONFIG = {
   model: "opencode-go/big-pickle",
   server: {
@@ -19,17 +32,17 @@ var DEFAULT_CONFIG = {
     auto_start: true
   },
   context: {
-    depth: "default"
+    depth: ReviewContextDepthSchema.enum.default
   },
   reasoning: {
-    effort: "auto"
+    effort: ReasoningEffortSchema.enum.auto
   },
   retention: {
     hook_log_kb: 1024
   },
   timeout: 300,
   // 5 minutes
-  min_confidence: "medium",
+  min_confidence: ReviewConfidenceSchema.enum.medium,
   include: ["**/*"],
   exclude: [
     "**/*.test.*",
@@ -45,19 +58,6 @@ var DEFAULT_CONFIG = {
   verbose: false
 };
 var CONFIG_FILENAME = ".diffowl.yml";
-var ReviewConfidenceSchema = z.enum(["low", "medium", "high"]);
-var ReviewContextDepthSchema = z.enum(["shallow", "default"]);
-var ReasoningEffortSchema = z.enum([
-  "auto",
-  "none",
-  "minimal",
-  "low",
-  "medium",
-  "high",
-  "max",
-  "xhigh"
-]);
-var ModelSchema = z.string().trim().min(1, "model must not be empty").regex(/^[^/\s]+\/\S+$/, "model must use provider/model format");
 var stringArraySchema = z.array(z.string().trim().min(1));
 var DiffOwlConfigSchema = z.object({
   model: ModelSchema.default(DEFAULT_CONFIG.model),
@@ -114,7 +114,7 @@ function findConfigPath() {
 async function loadConfig() {
   const configPath = findConfigPath();
   if (!existsSync(configPath)) {
-    return { ...DEFAULT_CONFIG };
+    return parseConfigInput({});
   }
   try {
     const raw = await readFile(configPath, "utf-8");
@@ -366,8 +366,8 @@ Required review passes:
 - Performance and boundedness: Look for unbounded scans, large-file/diff cliffs, slow hook behavior, and expensive operations in common paths.
 - Data filtering/loss: Look for data silently dropped, hidden, duplicated, parsed with a fallback, or reported inconsistently.
 `;
-function buildReviewPrompt(mode, customRules, include, exclude, localContext, depth = "default") {
-  const modeInstruction = mode === "staged" ? "Review the currently staged changes." : mode === "commit" ? "Review the selected commit." : "Review the last commit.";
+function buildReviewPrompt(target, customRules, include, exclude, localContext, depth = "default") {
+  const modeInstruction = target.kind === "staged" ? "Review the currently staged changes." : target.kind === "commit" ? "Review the selected commit." : "Review the last commit.";
   let prompt = `${modeInstruction}
 
 DiffOwl has already collected the diff and likely-relevant local context below. Use this context first.
@@ -425,7 +425,7 @@ var ReviewSeveritySchema = z2.preprocess(
 );
 var ReviewConfidenceSchema2 = z2.preprocess(
   (value) => typeof value === "string" ? value.toLowerCase() : value,
-  z2.enum(["low", "medium", "high"])
+  ReviewConfidenceSchema
 ).catch("low");
 var ReviewFindingLineSchema = z2.preprocess(
   (value) => typeof value === "string" ? Number(value) : value,
@@ -553,19 +553,20 @@ function createReviewSettlementCoordinator(options) {
   let reconciliationRunning = false;
   let timeoutRequested = false;
   let lastReconciliationError;
-  const settle = (outcome, value) => {
+  const settle = (outcome) => {
     if (settled) return;
     settled = true;
     clearTimeout(safetyTimeout);
     clearInterval(reconciliationInterval);
     options.onAbort();
-    if (outcome === "resolve") {
-      options.resolve(value);
+    if (outcome.kind === "resolve") {
+      options.resolve(outcome.text);
     } else {
-      options.reject(value);
+      options.reject(outcome.error);
     }
   };
   const acceptText = (text) => {
+    if (settled) return false;
     if (text.length > fullResponse.length) {
       fullResponse = text;
       options.onText?.(fullResponse);
@@ -576,7 +577,7 @@ function createReviewSettlementCoordinator(options) {
     if (lengthDelta > 500 || endsWithBrace) {
       lastCheckedLength = fullResponse.length;
       if (looksLikeCompleteStructuredReview(fullResponse)) {
-        settle("resolve", fullResponse);
+        settle({ kind: "resolve", text: fullResponse });
         return true;
       }
     }
@@ -587,27 +588,30 @@ function createReviewSettlementCoordinator(options) {
     reconciliationRunning = true;
     try {
       const result = await options.reconcile();
-      if (result?.error) {
-        settle("reject", result.error);
-        return;
-      }
-      if (result?.reconciliationError) {
-        lastReconciliationError = result.reconciliationError;
-      } else if (result) {
-        lastReconciliationError = void 0;
-      }
-      if (result?.text && acceptText(result.text)) {
-        return;
+      switch (result.kind) {
+        case "review-error":
+          settle({ kind: "reject", error: result.error });
+          return;
+        case "transport-error":
+          lastReconciliationError = result.error;
+          break;
+        case "text":
+          lastReconciliationError = void 0;
+          if (acceptText(result.text)) return;
+          break;
+        case "empty":
+          lastReconciliationError = void 0;
+          break;
       }
       if (isTimeout || timeoutRequested) {
         const suffix = lastReconciliationError ? ` Last session reconciliation error: ${lastReconciliationError.message}` : "";
-        settle(
-          "reject",
-          new Error(
+        settle({
+          kind: "reject",
+          error: new Error(
             `Review timed out.${suffix}`,
             lastReconciliationError ? { cause: lastReconciliationError } : void 0
           )
-        );
+        });
       }
     } finally {
       reconciliationRunning = false;
@@ -625,14 +629,14 @@ function createReviewSettlementCoordinator(options) {
     acceptText,
     finish: () => {
       if (settled || acceptText(fullResponse)) return;
-      settle(
-        "reject",
-        new Error("OpenCode event stream ended before a complete review was received.")
-      );
+      settle({
+        kind: "reject",
+        error: new Error("OpenCode event stream ended before a complete review was received.")
+      });
     },
     isSettled: () => settled,
-    reject: (error) => settle("reject", error),
-    resolve: (text) => settle("resolve", text)
+    reject: (error) => settle({ kind: "reject", error }),
+    resolve: (text) => settle({ kind: "resolve", text })
   };
 }
 
@@ -706,7 +710,7 @@ async function replyWithAvailableEndpoint(client, permission, response) {
     });
   }
 }
-function extractPermissionRequest(payload, sessionId) {
+function extractPermissionRequest(payload, expectedSessionId) {
   if (!payload || typeof payload !== "object") {
     return void 0;
   }
@@ -715,7 +719,8 @@ function extractPermissionRequest(payload, sessionId) {
     return void 0;
   }
   const properties = event.properties;
-  if (properties["sessionID"] !== sessionId) {
+  const sessionId = properties["sessionID"];
+  if (typeof sessionId !== "string" || expectedSessionId !== void 0 && sessionId !== expectedSessionId) {
     return void 0;
   }
   if (event.type === "permission.updated") {
@@ -832,14 +837,96 @@ function listAvailableModels(payload) {
 }
 
 // src/opencode/client.ts
-function extractEventPayload(event) {
+function normalizeOpenCodeEvent(event, expectedSessionId) {
   if (!event || typeof event !== "object") return void 0;
   const payload = event.payload;
   if (!payload || typeof payload !== "object") return void 0;
-  return payload;
+  const raw = payload;
+  if (typeof raw.type !== "string" || !raw.properties || typeof raw.properties !== "object") {
+    return void 0;
+  }
+  const permission = extractPermissionRequest(payload, expectedSessionId);
+  if (permission) return { type: "permission", request: permission };
+  const properties = raw.properties;
+  const sessionId = properties["sessionID"];
+  if (expectedSessionId !== void 0 && typeof sessionId === "string" && sessionId !== expectedSessionId) {
+    return void 0;
+  }
+  if (raw.type === "session.error" && typeof sessionId === "string") {
+    return {
+      type: "session-error",
+      sessionId,
+      error: new Error(`OpenCode session failed: ${describeSessionError(properties["error"])}`)
+    };
+  }
+  if (raw.type === "message.part.updated") {
+    return normalizeMessagePart(properties["part"], expectedSessionId);
+  }
+  if (raw.type === "message.updated") {
+    return normalizeAssistantMessage(properties["info"], expectedSessionId);
+  }
+  if (raw.type === "session.status" && typeof sessionId === "string") {
+    const status = properties["status"];
+    if (!status || typeof status !== "object") return void 0;
+    const statusType = status.type;
+    if (typeof statusType !== "string") return void 0;
+    const message = status.message;
+    return {
+      type: "session-status",
+      sessionId,
+      status: statusType,
+      ...typeof message === "string" ? { message } : {}
+    };
+  }
+  if (raw.type === "session.idle" && typeof sessionId === "string") {
+    return { type: "session-idle", sessionId };
+  }
+  return void 0;
+}
+function normalizeMessagePart(part, expectedSessionId) {
+  if (!part || typeof part !== "object") return void 0;
+  const value = part;
+  const sessionId = value["sessionID"];
+  if (typeof sessionId !== "string" || expectedSessionId !== void 0 && sessionId !== expectedSessionId) {
+    return void 0;
+  }
+  if (value["type"] === "tool" && typeof value["tool"] === "string") {
+    const state = value["state"] && typeof value["state"] === "object" ? value["state"] : void 0;
+    const status = typeof state?.["status"] === "string" ? state["status"] : "unknown";
+    const title = typeof state?.["title"] === "string" ? state["title"] : value["tool"];
+    return {
+      type: "tool-part",
+      sessionId,
+      tool: value["tool"],
+      status,
+      title
+    };
+  }
+  if (value["type"] === "text" && typeof value["messageID"] === "string" && typeof value["text"] === "string" && value["text"] !== "") {
+    return {
+      type: "text-part",
+      sessionId,
+      messageId: value["messageID"],
+      text: value["text"]
+    };
+  }
+  return void 0;
+}
+function normalizeAssistantMessage(info, expectedSessionId) {
+  if (!info || typeof info !== "object") return void 0;
+  const value = info;
+  if (value["role"] !== "assistant" || typeof value["sessionID"] !== "string" || typeof value["id"] !== "string" || expectedSessionId !== void 0 && value["sessionID"] !== expectedSessionId) {
+    return void 0;
+  }
+  return {
+    type: "assistant-message",
+    sessionId: value["sessionID"],
+    messageId: value["id"],
+    ...value["error"] ? { error: new Error(describeSessionError(value["error"]) || "Review failed") } : {}
+  };
 }
 async function runReview(options) {
-  const { mode, config, localContext, depth, onProgress } = options;
+  const { target, config, localContext, depth, onProgress } = options;
   const port = config.server.port;
   const directoryOptions = opencodeDirectoryOptions();
   const timings = [];
@@ -869,7 +956,7 @@ async function runReview(options) {
   recordTiming(timings, onProgress, "tool-policy", "OpenCode tool policy", toolPolicyStart);
   const promptStart = performance.now();
   const prompt = buildReviewPrompt(
-    mode,
+    target,
     config.rules,
     config.include,
     config.exclude,
@@ -920,69 +1007,59 @@ async function runReview(options) {
         try {
           for await (const event of sseResult.stream) {
             if (settlement.isSettled()) break;
-            const payload = extractEventPayload(event);
-            if (!payload) continue;
-            const permission = extractPermissionRequest(payload, sessionId);
-            if (permission) {
-              void replyToPermissionRequest(client, permission, onProgress).catch((err) => {
-                onProgress?.({
-                  type: "session",
-                  message: `OpenCode permission reply failed: ${err instanceof Error ? err.message : String(err)}`,
-                  sessionId
-                });
-              });
-              continue;
-            }
-            const sessionError = extractSessionError(payload, sessionId);
-            if (sessionError) {
-              settlement.reject(sessionError);
-              break;
-            }
-            if (payload.type === "message.part.updated" && payload.properties?.part?.sessionID === sessionId) {
-              const part = payload.properties.part;
-              if (part.type === "tool" && typeof part.tool === "string") {
-                const state = typeof part.state?.status === "string" ? part.state.status : "unknown";
-                const title = typeof part.state?.title === "string" ? part.state.title : part.tool;
+            const normalized = normalizeOpenCodeEvent(event, sessionId);
+            if (!normalized) continue;
+            switch (normalized.type) {
+              case "permission":
+                void replyToPermissionRequest(client, normalized.request, onProgress).catch(
+                  (err) => {
+                    onProgress?.({
+                      type: "session",
+                      message: `OpenCode permission reply failed: ${err instanceof Error ? err.message : String(err)}`,
+                      sessionId
+                    });
+                  }
+                );
+                break;
+              case "session-error":
+                settlement.reject(normalized.error);
+                break;
+              case "tool-part":
                 onProgress?.({
                   type: "tool",
-                  message: `${title} (${state})`,
-                  tool: part.tool,
-                  status: state
+                  message: `${normalized.title} (${normalized.status})`,
+                  tool: normalized.tool,
+                  status: normalized.status
                 });
-              }
-              if (part.type === "text" && typeof part.messageID === "string" && typeof part.text === "string" && part.text) {
-                textPartsByMessageId.set(part.messageID, part.text);
-                if (assistantMessageIds.has(part.messageID) && settlement.acceptText(part.text)) {
+                break;
+              case "text-part":
+                textPartsByMessageId.set(normalized.messageId, normalized.text);
+                if (assistantMessageIds.has(normalized.messageId) && settlement.acceptText(normalized.text)) {
                   break;
                 }
-              }
-            }
-            if (payload.type === "message.updated" && payload.properties?.info?.sessionID === sessionId) {
-              const msg = payload.properties?.info;
-              if (msg?.role === "assistant" && typeof msg.id === "string") {
-                assistantMessageIds.add(msg.id);
-                const text = textPartsByMessageId.get(msg.id);
+                break;
+              case "assistant-message": {
+                assistantMessageIds.add(normalized.messageId);
+                const text = textPartsByMessageId.get(normalized.messageId);
                 if (text && settlement.acceptText(text)) {
                   break;
                 }
-                if (msg.error) {
-                  const message = typeof msg.error.data?.message === "string" ? msg.error.data.message : "Review failed";
-                  settlement.reject(new Error(message));
-                  break;
+                if (normalized.error) {
+                  settlement.reject(normalized.error);
                 }
+                break;
               }
+              case "session-status":
+                const message = normalized.status === "retry" ? `OpenCode retrying: ${normalized.message ?? "unknown error"}` : `OpenCode session ${normalized.status}.`;
+                onProgress?.({ type: "session", message, sessionId });
+                break;
+              case "session-idle":
+                if (fullResponse.length === 0) break;
+                onProgress?.({ type: "idle", message: "OpenCode session is idle." });
+                settlement.finish();
+                break;
             }
-            if (payload.type === "session.status" && payload.properties?.sessionID === sessionId) {
-              const status = payload.properties.status;
-              if (!status || typeof status.type !== "string") continue;
-              const message = status.type === "retry" ? `OpenCode retrying: ${typeof status.message === "string" ? status.message : "unknown error"}` : `OpenCode session ${status.type}.`;
-              onProgress?.({ type: "session", message, sessionId });
-            }
-            if (payload.type === "session.idle" && payload.properties?.sessionID === sessionId && fullResponse.length > 0) {
-              onProgress?.({ type: "idle", message: "OpenCode session is idle." });
-              settlement.finish();
-              break;
-            }
+            if (settlement.isSettled()) break;
           }
           if (!settlement.isSettled()) {
             settlement.finish();
@@ -1031,18 +1108,10 @@ async function runReview(options) {
     sessionId
   };
 }
-function extractSessionError(payload, sessionId) {
-  if (!payload || typeof payload !== "object") return void 0;
-  const event = payload;
-  if (event.type !== "session.error" || event.properties?.sessionID !== sessionId) {
-    return void 0;
-  }
-  return new Error(`OpenCode session failed: ${describeSessionError(event.properties.error)}`);
-}
 function extractSessionMessageResult(response) {
-  if (!response || typeof response !== "object") return void 0;
+  if (!response || typeof response !== "object") return { kind: "empty" };
   const data = response.data;
-  if (!Array.isArray(data)) return void 0;
+  if (!Array.isArray(data)) return { kind: "empty" };
   for (let index = data.length - 1; index >= 0; index--) {
     const message = data[index];
     if (!message || typeof message !== "object") continue;
@@ -1052,7 +1121,10 @@ function extractSessionMessageResult(response) {
     }
     const error = info.error;
     if (error) {
-      return { error: new Error(`OpenCode session failed: ${describeSessionError(error)}`) };
+      return {
+        kind: "review-error",
+        error: new Error(`OpenCode session failed: ${describeSessionError(error)}`)
+      };
     }
     const parts = message.parts;
     if (!Array.isArray(parts)) continue;
@@ -1061,9 +1133,9 @@ function extractSessionMessageResult(response) {
         part && typeof part === "object" && part.type === "text" && typeof part.text === "string"
       )
     ).map((part) => part.text).join("");
-    if (text) return { text };
+    if (text) return { kind: "text", text };
   }
-  return void 0;
+  return { kind: "empty" };
 }
 async function reconcileSessionMessages(client, directoryOptions, sessionId) {
   try {
@@ -1080,7 +1152,8 @@ async function reconcileSessionMessages(client, directoryOptions, sessionId) {
     return extractSessionMessageResult(response);
   } catch (error) {
     return {
-      reconciliationError: error instanceof Error ? error : new Error(`Session reconciliation failed: ${String(error)}`)
+      kind: "transport-error",
+      error: error instanceof Error ? error : new Error(`Session reconciliation failed: ${String(error)}`)
     };
   }
 }
@@ -1298,7 +1371,7 @@ async function installHook() {
   const command = await resolveHookCommand();
   if (existsSync3(hookPath)) {
     const existing = await readFile4(hookPath, "utf-8");
-    const base = existing.includes(HOOK_MARKER) || existing.includes("# commitdog-managed") ? removeManagedSection(existing) : existing.trimEnd();
+    const base = existing.includes(HOOK_MARKER) ? removeManagedSection(existing) : existing.trimEnd();
     const hookSection = generateManagedSection(command);
     const updated = base && !isOnlyShebangs(base) ? `${base}
 
@@ -1315,7 +1388,7 @@ async function uninstallHook() {
   const hookPath = join3(hooksDir, "post-commit");
   if (!existsSync3(hookPath)) return false;
   const content = await readFile4(hookPath, "utf-8");
-  if (!content.includes(HOOK_MARKER) && !content.includes("# commitdog-managed")) return false;
+  if (!content.includes(HOOK_MARKER)) return false;
   const cleaned = removeManagedSection(content);
   if (isOnlyShebangs(cleaned) || cleaned === "") {
     await unlink2(hookPath);
@@ -1579,8 +1652,12 @@ function isHookReviewLockActive(lockFile) {
   try {
     const pid = Number.parseInt(readFileSync(lockFile, "utf-8"), 10);
     if (!Number.isInteger(pid) || pid <= 0) return false;
-    process.kill(pid, 0);
-    return true;
+    try {
+      process.kill(pid, 0);
+      return true;
+    } catch (err) {
+      return err.code === "EPERM";
+    }
   } catch {
     return false;
   }
@@ -1675,7 +1752,6 @@ async function resolveCommand(command) {
 function removeManagedSection(content) {
   let lines = content.split("\n");
   lines = removeSectionByMarkers(lines, "# diffowl-managed", "# end-diffowl");
-  lines = removeSectionByMarkers(lines, "# commitdog-managed", "# end-commitdog");
   return lines.join("\n").trim();
 }
 function removeSectionByMarkers(lines, startMarker, endMarker) {
@@ -1821,12 +1897,13 @@ async function hasCommits() {
   }
 }
 function parseDiff(raw, diagnostics = []) {
-  const files = [];
+  const drafts = [];
   const lines = raw.split(/\r?\n/).map((line) => line.endsWith("\r") ? line.slice(0, -1) : line);
   for (const line of lines) {
     const gitDiffPaths = parseGitDiffLine(line);
     if (gitDiffPaths) {
-      files.push({
+      drafts.push({
+        sourcePath: gitDiffPaths.pathA,
         path: gitDiffPaths.pathB,
         status: "modified",
         additions: 0,
@@ -1836,7 +1913,8 @@ function parseDiff(raw, diagnostics = []) {
     }
     const combinedPath = parseCombinedDiffLine(line);
     if (combinedPath) {
-      files.push({
+      drafts.push({
+        sourcePath: combinedPath,
         path: combinedPath,
         status: "modified",
         additions: 0,
@@ -1844,11 +1922,10 @@ function parseDiff(raw, diagnostics = []) {
       });
       continue;
     }
-    const lastFile = files[files.length - 1];
+    const lastFile = drafts[drafts.length - 1];
     if (lastFile) {
       if (line.startsWith("rename to ")) {
-        const target = unescapePath(line.slice("rename to ".length));
-        lastFile.path = target;
+        lastFile.path = unescapePath(line.slice("rename to ".length));
         lastFile.status = "renamed";
         continue;
       }
@@ -1867,9 +1944,20 @@ function parseDiff(raw, diagnostics = []) {
       }
     }
   }
-  const summary = files.map((f) => `${statusSymbol(f.status)} ${f.path} (+${f.additions}/-${f.deletions})`).join("\n");
+  const files = drafts.map(finalizeDiffFile);
+  const summary = files.map((file) => {
+    const path = file.status === "renamed" ? `${file.oldPath} -> ${file.path}` : file.path;
+    return `${statusSymbol(file.status)} ${path} (+${file.additions}/-${file.deletions})`;
+  }).join("\n");
   return { files, raw, summary, ...diagnostics.length > 0 ? { diagnostics } : {} };
 }
+function finalizeDiffFile(draft) {
+  const { sourcePath, path, status, additions, deletions } = draft;
+  if (status === "renamed") {
+    return { oldPath: sourcePath, path, status, additions, deletions };
+  }
+  return { path, status, additions, deletions };
+}
 function isMaxBufferError(err) {
   return err !== null && typeof err === "object" && err.isMaxBuffer === true && "stdout" in err && typeof err.stdout === "string";
 }
@@ -2347,7 +2435,7 @@ function renderReviewContext(context, options = {}) {
   const lines = [];
   lines.push("## Local Review Context");
   lines.push("");
-  lines.push(`Mode: ${context.mode}`);
+  lines.push(`Mode: ${context.target.kind}`);
   lines.push(`Review depth: ${depth}`);
   lines.push("");
   lines.push("### Changed Files");
@@ -2413,22 +2501,30 @@ function renderReviewContext(context, options = {}) {
         lines.push("");
       }
     }
-    if (fileContext.content && fileContext.astSymbols.length === 0 && fileContext.shouldRenderContent) {
-      lines.push(
-        fence(
-          shallow ? truncateText2(fileContext.content, MAX_QUICK_FILE_CHARS).text : fileContext.content,
-          languageForPath(fileContext.file.path)
-        )
-      );
-      if (fileContext.truncated) {
-        lines.push("_File content truncated._");
-      }
-    } else if (fileContext.content && fileContext.astSymbols.length === 0) {
-      lines.push("_Full file content omitted because the diff already shows the changed hunks._");
-    } else if (fileContext.content) {
-      lines.push("_Full file content omitted because changed AST symbols are shown._");
+    if (fileContext.content.status === "skipped") {
+      lines.push(`_File content skipped: ${fileContext.content.reason}._`);
     } else {
-      lines.push(`_File content skipped: ${fileContext.skippedReason ?? "unavailable"}._`);
+      switch (fileContext.content.render) {
+        case "full":
+          lines.push(
+            fence(
+              shallow ? truncateText2(fileContext.content.text, MAX_QUICK_FILE_CHARS).text : fileContext.content.text,
+              languageForPath(fileContext.file.path)
+            )
+          );
+          if (fileContext.content.truncated) {
+            lines.push("_File content truncated._");
+          }
+          break;
+        case "diff-only":
+          lines.push(
+            "_Full file content omitted because the diff already shows the changed hunks._"
+          );
+          break;
+        case "ast-symbols":
+          lines.push("_Full file content omitted because changed AST symbols are shown._");
+          break;
+      }
     }
     lines.push("");
   }
@@ -2536,8 +2632,18 @@ var MAX_INLINE_FILE_LINES = 80;
 var MAX_CONTEXT_FILE_BYTES = 512 * 1024;
 var MIN_CHANGED_RATIO_FOR_INLINE_CONTENT = 0.4;
 var LOCKFILE_EXCLUDES = ["package-lock.json", "pnpm-lock.yaml", "yarn.lock", "bun.lockb"];
-async function buildReviewContext(mode, config, depth = config.context.depth, diff) {
-  const diffResult = diff ?? await loadDiffForMode(mode);
+async function loadReviewDiff(target) {
+  switch (target.kind) {
+    case "staged":
+      return getStagedDiff();
+    case "commit":
+      return getCommitDiff(target.ref);
+    case "last-commit":
+      return getLastCommitDiff();
+  }
+}
+async function buildReviewContextFromDiff(snapshot, config, depth = config.context.depth) {
+  const { target, diff: diffResult } = snapshot;
   const reviewableFiles = diffResult.files.filter((file) => shouldReviewFile(file.path, config));
   const skippedFiles = diffResult.files.filter((file) => !shouldReviewFile(file.path, config));
   const changedLines = getChangedLinesByFile(diffResult.raw);
@@ -2553,7 +2659,7 @@ async function buildReviewContext(mode, config, depth = config.context.depth, di
   const relatedFiles = depth === "shallow" ? [] : await buildRelatedFileContexts(reviewableFiles);
   const references = depth === "shallow" ? [] : await buildReferenceContexts(changedFiles, skippedFiles, diagnostics);
   return {
-    mode,
+    target,
     depth,
     diff: diffResult,
     changedFiles,
@@ -2563,15 +2669,6 @@ async function buildReviewContext(mode, config, depth = config.context.depth, di
     diagnostics
   };
 }
-async function loadDiffForMode(mode) {
-  if (mode === "staged") {
-    return getStagedDiff();
-  }
-  if (mode === "commit") {
-    throw new Error("Commit review context requires an explicit diff.");
-  }
-  return getLastCommitDiff();
-}
 async function buildChangedFileContext(file, changedLines) {
   if (file.status === "deleted") {
     return {
@@ -2581,15 +2678,13 @@ async function buildChangedFileContext(file, changedLines) {
         symbols: [],
         changedLines,
         astSymbols: [],
-        truncated: false,
-        shouldRenderContent: false,
-        skippedReason: "deleted file"
+        content: { status: "skipped", reason: "deleted file" }
       },
       diagnostics: []
     };
   }
   const contentResult = await readTextFile(file.path, MAX_FILE_CHARS);
-  if (!contentResult.content) {
+  if (contentResult.status === "skipped") {
     return {
       fileContext: {
         file,
@@ -2597,9 +2692,7 @@ async function buildChangedFileContext(file, changedLines) {
         symbols: [],
         changedLines,
         astSymbols: [],
-        truncated: false,
-        shouldRenderContent: false,
-        skippedReason: contentResult.reason
+        content: { status: "skipped", reason: contentResult.reason }
       },
       diagnostics: []
     };
@@ -2615,9 +2708,12 @@ async function buildChangedFileContext(file, changedLines) {
       ),
       changedLines,
       astSymbols: astResult.symbols,
-      content: contentResult.content,
-      truncated: contentResult.truncated,
-      shouldRenderContent: shouldRenderFullFileContent(file, contentResult.content)
+      content: {
+        status: "loaded",
+        text: contentResult.content,
+        truncated: contentResult.truncated,
+        render: astResult.symbols.length > 0 ? "ast-symbols" : shouldRenderFullFileContent(file, contentResult.content) ? "full" : "diff-only"
+      }
     },
     diagnostics: astResult.diagnostics ?? []
   };
@@ -2631,7 +2727,7 @@ async function buildRelatedFileContexts(files) {
       if (seen.has(candidate) || !existsSync4(candidate)) continue;
       seen.add(candidate);
       const result = await readTextFile(candidate, MAX_RELATED_FILE_CHARS);
-      if (!result.content) continue;
+      if (result.status === "skipped") continue;
       related.push({
         path: candidate,
         reason: `Likely test file for ${file.path}`,
@@ -2654,23 +2750,23 @@ async function readTextFile(path, maxChars) {
   try {
     const info = await stat2(path);
     if (!info.isFile()) {
-      return { truncated: false, reason: "not a regular file" };
+      return { status: "skipped", reason: "not a regular file" };
     }
     if (info.size > MAX_CONTEXT_FILE_BYTES) {
       return {
-        truncated: false,
+        status: "skipped",
         reason: `file too large for context (${formatBytes2(info.size)} > ${formatBytes2(MAX_CONTEXT_FILE_BYTES)})`
       };
     }
     const raw = await readFile6(path, "utf-8");
     if (raw.includes("\0")) {
-      return { truncated: false, reason: "binary file" };
+      return { status: "skipped", reason: "binary file" };
     }
     const result = truncateText3(raw, maxChars);
-    return { content: result.text, truncated: result.truncated };
+    return { status: "loaded", content: result.text, truncated: result.truncated };
   } catch (err) {
     return {
-      truncated: false,
+      status: "skipped",
       reason: err instanceof Error ? err.message : String(err)
     };
   }
@@ -3033,7 +3129,7 @@ import { execa as execa5 } from "execa";
 // package.json
 var package_default = {
   name: "diffowl",
-  version: "0.1.0",
+  version: "0.2.0",
   description: "Local AI code review agent powered by OpenCode",
   keywords: [
     "ai",
@@ -3052,7 +3148,7 @@ var package_default = {
     url: "git+https://github.com/gutierrezje/diffowl.git"
   },
   bin: {
-    diffowl: "./dist/cli.js"
+    diffowl: "dist/cli.js"
   },
   files: [
     "dist"
@@ -3147,11 +3243,11 @@ program.command("review", { isDefault: true }).description("Review the last comm
     console.error(chalk2.red("Cannot use --staged and --commit together"));
     process.exit(1);
   }
-  const mode = options.staged ? "staged" : options.commit ? "commit" : "last-commit";
+  const target = options.staged ? { kind: "staged" } : options.commit ? { kind: "commit", ref: String(options.commit) } : { kind: "last-commit" };
   const depth = resolveReviewDepth(options.depth, config);
   config.reasoning.effort = resolveReasoningEffort(options.reasoning, config);
   const verbose = Boolean(config.verbose || options.verbose);
-  if (mode !== "staged") {
+  if (target.kind !== "staged") {
     const hasCommitsStart = performance.now();
     const commitsExist = await hasCommits();
     recordCliTiming(timings, "git-commit-check", "Git commit check", hasCommitsStart);
@@ -3166,17 +3262,6 @@ program.command("review", { isDefault: true }).description("Review the last comm
     console.log(chalk2.yellow(`\u26A0 ${formatHookFailure(hookFailure)}`));
     console.log();
   }
-  const diff = mode === "staged" ? await getStagedDiff() : mode === "commit" ? await getCommitDiff(String(options.commit)) : await getLastCommitDiff();
-  if (config.skip_doc_only && isDocOnlyDiff(diff)) {
-    console.warn(chalk2.yellow("Documentation-only changes detected. Skipping review."));
-    const skipContent = buildDocOnlySkipMarkdown(diff);
-    const reportPath = await writeMarkdownReport(skipContent);
-    console.log(chalk2.dim(`Report saved: ${reportPath}`));
-    if (options.hook) {
-      await writeHookStatus(0, hookCommit);
-    }
-    process.exit(0);
-  }
   const spinner = ora({
     text: "Building local review context...",
     color: "cyan",
@@ -3199,14 +3284,26 @@ program.command("review", { isDefault: true }).description("Review the last comm
     process.exit(146);
   });
   try {
-    const contextStart = performance.now();
-    const reviewContext = await buildReviewContext(mode, config, depth, diff);
-    recordCliTiming(timings, "context-build", "Local review context build", contextStart);
-    if (mode === "staged" && reviewContext.diff.files.length === 0) {
+    const diff = await loadReviewDiff(target);
+    if (target.kind === "staged" && diff.files.length === 0) {
       spinner.stop();
       console.log(chalk2.yellow("No staged changes to review"));
       process.exit(0);
     }
+    if (config.skip_doc_only && isDocOnlyDiff(diff)) {
+      spinner.stop();
+      console.warn(chalk2.yellow("Documentation-only changes detected. Skipping review."));
+      const skipContent = buildDocOnlySkipMarkdown(diff);
+      const reportPath2 = await writeMarkdownReport(skipContent);
+      console.log(chalk2.dim(`Report saved: ${reportPath2}`));
+      if (options.hook) {
+        await writeHookStatus(0, hookCommit);
+      }
+      process.exit(0);
+    }
+    const contextStart = performance.now();
+    const reviewContext = await buildReviewContextFromDiff({ target, diff }, config, depth);
+    recordCliTiming(timings, "context-build", "Local review context build", contextStart);
     const contextRenderStart = performance.now();
     const localContext = renderReviewContext(reviewContext, { depth });
     recordCliTiming(timings, "context-render", "Local review context render", contextRenderStart);
@@ -3225,7 +3322,7 @@ program.command("review", { isDefault: true }).description("Review the last comm
     spinner.text = "Reviewing changes...";
     const reviewStart = performance.now();
     const reviewResult = await runReview({
-      mode,
+      target,
       config,
       localContext,
       depth,