@dugleelabs/copair 1.0.1 → 1.0.2

package/dist/index.js

@@ -545,33 +545,41 @@ Error: ${chunk.error}
    */
   showGitDiff(output) {
     if (!output.trim()) return;
-    if (this.inkMode) return;
-    const maxLines = 80;
-    const lines = output.split("\n");
-    const display = lines.slice(0, maxLines);
-    process.stderr.write("\n");
-    for (const line of display) {
-      if (line.startsWith("+++") || line.startsWith("---")) {
-        process.stderr.write(chalk3.bold.white(line) + "\n");
-      } else if (line.startsWith("+")) {
-        process.stderr.write(chalk3.bgGreen.black(line) + "\n");
-      } else if (line.startsWith("-")) {
-        process.stderr.write(chalk3.bgRedBright.black(line) + "\n");
-      } else if (line.startsWith("@@")) {
-        process.stderr.write(chalk3.cyan(line) + "\n");
-      } else if (line.startsWith("diff ")) {
-        process.stderr.write(chalk3.bold.yellow(line) + "\n");
-      } else if (line.startsWith("index ")) {
-        process.stderr.write(chalk3.gray(line) + "\n");
-      } else {
-        process.stderr.write(chalk3.gray(line) + "\n");
+    if (!this.inkMode) {
+      const maxLines = 80;
+      const lines = output.split("\n");
+      const display = lines.slice(0, maxLines);
+      process.stderr.write("\n");
+      for (const line of display) {
+        if (line.startsWith("+++") || line.startsWith("---")) {
+          process.stderr.write(chalk3.bold.white(line) + "\n");
+        } else if (line.startsWith("+")) {
+          process.stderr.write(chalk3.bgGreen.black(line) + "\n");
+        } else if (line.startsWith("-")) {
+          process.stderr.write(chalk3.bgRedBright.black(line) + "\n");
+        } else if (line.startsWith("@@")) {
+          process.stderr.write(chalk3.cyan(line) + "\n");
+        } else if (line.startsWith("diff ")) {
+          process.stderr.write(chalk3.bold.yellow(line) + "\n");
+        } else if (line.startsWith("index ")) {
+          process.stderr.write(chalk3.gray(line) + "\n");
+        } else {
+          process.stderr.write(chalk3.gray(line) + "\n");
+        }
       }
-    }
-    if (lines.length > maxLines) {
-      process.stderr.write(chalk3.gray(`  ... ${lines.length - maxLines} more lines
+      if (lines.length > maxLines) {
+        process.stderr.write(chalk3.gray(`  ... ${lines.length - maxLines} more lines
 `));
+      }
+      process.stderr.write("\n");
+    }
+    if (this.bridge) {
+      const lines = output.split("\n");
+      this.bridge.emit("diff", {
+        filePath: extractDiffFilePath(lines),
+        hunks: [{ oldStart: 0, newStart: 0, lines }]
+      });
     }
-    process.stderr.write("\n");
   }
   /**
    * Show a diff snippet for file mutations (write/edit).
@@ -694,6 +702,15 @@ function formatDuration(ms) {
   if (ms < 1e3) return `${Math.round(ms)}ms`;
   return `${(ms / 1e3).toFixed(1)}s`;
 }
+function extractDiffFilePath(lines) {
+  for (const line of lines) {
+    if (line.startsWith("diff --git")) {
+      const match = line.match(/b\/(.+)$/);
+      if (match) return match[1];
+    }
+  }
+  return "git diff";
+}
 
 // src/core/formats/fenced-block.ts
 function tryParseToolCall(json) {
@@ -4656,7 +4673,7 @@ function ApprovalHandler({ bridge }) {
 }
 
 // src/cli/ui/app.tsx
-import { jsx as jsx6, jsxs as jsxs6 } from "react/jsx-runtime";
+import { Fragment as Fragment2, jsx as jsx6, jsxs as jsxs6 } from "react/jsx-runtime";
 var DEFAULT_UI_CONFIG = {
   bordered_input: true,
   status_bar: true,
@@ -4689,6 +4706,139 @@ function useSpinner(active) {
   const elapsedStr = secs < 60 ? `${secs}s` : `${Math.floor(secs / 60)}m ${String(secs % 60).padStart(2, "0")}s`;
   return { frame: SPINNER_FRAMES[frameIdx], elapsed: elapsedStr };
 }
+function renderInline(text) {
+  const parts = [];
+  let remaining = text;
+  let key = 0;
+  while (remaining.length > 0) {
+    const boldMatch = remaining.match(/^\*\*(.+?)\*\*/);
+    if (boldMatch) {
+      parts.push(/* @__PURE__ */ jsx6(Text6, { bold: true, children: boldMatch[1] }, key++));
+      remaining = remaining.slice(boldMatch[0].length);
+      continue;
+    }
+    const italicMatch = remaining.match(/^\*(.+?)\*/);
+    if (italicMatch) {
+      parts.push(/* @__PURE__ */ jsx6(Text6, { italic: true, children: italicMatch[1] }, key++));
+      remaining = remaining.slice(italicMatch[0].length);
+      continue;
+    }
+    const codeMatch = remaining.match(/^`([^`]+)`/);
+    if (codeMatch) {
+      parts.push(/* @__PURE__ */ jsx6(Text6, { color: "cyan", bold: true, children: codeMatch[1] }, key++));
+      remaining = remaining.slice(codeMatch[0].length);
+      continue;
+    }
+    const nextSpecial = remaining.search(/[*`]/);
+    if (nextSpecial === -1) {
+      parts.push(remaining);
+      break;
+    }
+    if (nextSpecial === 0) {
+      parts.push(remaining[0]);
+      remaining = remaining.slice(1);
+    } else {
+      parts.push(remaining.slice(0, nextSpecial));
+      remaining = remaining.slice(nextSpecial);
+    }
+  }
+  return parts.length === 1 ? parts[0] : /* @__PURE__ */ jsx6(Fragment2, { children: parts });
+}
+function renderMarkdownBlocks(text) {
+  const lines = text.split("\n");
+  const elements = [];
+  let key = 0;
+  let i = 0;
+  while (i < lines.length) {
+    const line = lines[i];
+    const trimmed = line.trim();
+    if (trimmed.startsWith("```")) {
+      const lang = trimmed.slice(3).trim();
+      const codeLines = [];
+      i++;
+      while (i < lines.length && !lines[i].trim().startsWith("```")) {
+        codeLines.push(lines[i]);
+        i++;
+      }
+      if (i < lines.length) i++;
+      elements.push(
+        /* @__PURE__ */ jsxs6(Box6, { flexDirection: "column", marginY: 1, children: [
+          lang && /* @__PURE__ */ jsx6(Text6, { dimColor: true, children: lang }),
+          /* @__PURE__ */ jsx6(Box6, { borderStyle: "single", borderColor: "gray", paddingX: 1, flexDirection: "column", children: codeLines.map((cl, ci) => /* @__PURE__ */ jsx6(Text6, { color: "white", children: cl }, ci)) })
+        ] }, key++)
+      );
+      continue;
+    }
+    const headerMatch = trimmed.match(/^(#{1,6})\s+(.+)/);
+    if (headerMatch) {
+      const level = headerMatch[1].length;
+      const content = headerMatch[2];
+      elements.push(
+        /* @__PURE__ */ jsxs6(Text6, { bold: true, color: level <= 2 ? "white" : void 0, children: [
+          level <= 2 ? "\n" : "",
+          content
+        ] }, key++)
+      );
+      i++;
+      continue;
+    }
+    if (/^[-*_]{3,}$/.test(trimmed)) {
+      elements.push(
+        /* @__PURE__ */ jsx6(Text6, { dimColor: true, children: "\u2500".repeat(40) }, key++)
+      );
+      i++;
+      continue;
+    }
+    const ulMatch = trimmed.match(/^[-*+]\s+(.*)/);
+    if (ulMatch) {
+      elements.push(
+        /* @__PURE__ */ jsxs6(Text6, { wrap: "wrap", children: [
+          "  ",
+          "\u2022",
+          " ",
+          renderInline(ulMatch[1])
+        ] }, key++)
+      );
+      i++;
+      continue;
+    }
+    const olMatch = trimmed.match(/^(\d+)[.)]\s+(.*)/);
+    if (olMatch) {
+      elements.push(
+        /* @__PURE__ */ jsxs6(Text6, { wrap: "wrap", children: [
+          "  ",
+          olMatch[1],
+          ". ",
+          renderInline(olMatch[2])
+        ] }, key++)
+      );
+      i++;
+      continue;
+    }
+    if (trimmed.startsWith(">")) {
+      const content = trimmed.replace(/^>\s?/, "");
+      elements.push(
+        /* @__PURE__ */ jsxs6(Text6, { dimColor: true, wrap: "wrap", children: [
+          "  ",
+          "\u2502",
+          " ",
+          renderInline(content)
+        ] }, key++)
+      );
+      i++;
+      continue;
+    }
+    if (trimmed === "") {
+      i++;
+      continue;
+    }
+    elements.push(
+      /* @__PURE__ */ jsx6(Text6, { wrap: "wrap", children: renderInline(line) }, key++)
+    );
+    i++;
+  }
+  return elements;
+}
 var CopairApp = forwardRef(function CopairApp2({
   bridge,
   model,
@@ -4786,6 +4936,12 @@ var CopairApp = forwardRef(function CopairApp2({
         { id: nextId.current++, type: "error", content: `\u2717 ${tool.label} denied` }
       ]);
     };
+    const onDiff = (diff) => {
+      setStaticItems((items) => [
+        ...items,
+        { id: nextId.current++, type: "diff", content: "", diff }
+      ]);
+    };
     const onError = (message) => {
       setStaticItems((items) => [
         ...items,
@@ -4816,6 +4972,7 @@ var CopairApp = forwardRef(function CopairApp2({
     bridge.on("tool-start", onToolStart);
     bridge.on("tool-complete", onToolComplete);
     bridge.on("tool-denied", onToolDenied);
+    bridge.on("diff", onDiff);
     bridge.on("error", onError);
     bridge.on("usage", onUsage);
     bridge.on("turn-complete", onTurnComplete);
@@ -4825,6 +4982,7 @@ var CopairApp = forwardRef(function CopairApp2({
       bridge.off("tool-start", onToolStart);
       bridge.off("tool-complete", onToolComplete);
       bridge.off("tool-denied", onToolDenied);
+      bridge.off("diff", onDiff);
       bridge.off("error", onError);
       bridge.off("usage", onUsage);
       bridge.off("turn-complete", onTurnComplete);
@@ -4860,9 +5018,11 @@ var CopairApp = forwardRef(function CopairApp2({
             "  ",
             item.content
           ] }, item.id);
+        case "diff":
+          return item.diff ? /* @__PURE__ */ jsx6(DiffView, { diff: item.diff }, item.id) : null;
         case "text":
         default:
-          return /* @__PURE__ */ jsx6(Text6, { wrap: "wrap", children: item.content }, item.id);
+          return /* @__PURE__ */ jsx6(Box6, { flexDirection: "column", children: renderMarkdownBlocks(item.content) }, item.id);
       }
     } }),
     state.phase === "thinking" && /* @__PURE__ */ jsxs6(Text6, { children: [
@@ -4874,7 +5034,7 @@ var CopairApp = forwardRef(function CopairApp2({
         /* @__PURE__ */ jsx6(Text6, { color: "gray", children: spinner.elapsed })
       ] })
     ] }),
-    liveText && /* @__PURE__ */ jsx6(Text6, { wrap: "wrap", children: liveText }),
+    liveText && /* @__PURE__ */ jsx6(Box6, { flexDirection: "column", children: renderMarkdownBlocks(liveText) }),
     liveTool && /* @__PURE__ */ jsxs6(Text6, { color: "green", children: [
       "  ",
       "\u25CF",
@@ -5084,7 +5244,7 @@ import chalk6 from "chalk";
 // package.json
 var package_default = {
   name: "@dugleelabs/copair",
-  version: "1.0.1",
+  version: "1.0.2",
   description: "Model-agnostic AI coding agent for the terminal",
   type: "module",
   main: "dist/index.js",