@trydecember/cli 0.3.3 → 0.3.6

package/dist/december.js

@@ -108813,6 +108813,161 @@ var init_libesm = __esm(() => {
   init_apply();
 });
 
+// ../../packages/tools/src/fuzzy_patch.ts
+function trimRight(str2) {
+  return str2.replace(/[ \t\r]+$/, "");
+}
+function splitLines(text) {
+  const lines = text.split(`
+`);
+  return lines.map((l) => l.endsWith("\r") ? l.slice(0, -1) : l);
+}
+function parseHunkHeader(line) {
+  if (!line.startsWith("@@"))
+    return null;
+  const endHunk = line.indexOf("@@", 2);
+  if (endHunk === -1)
+    return null;
+  const header = line.substring(2, endHunk).trim();
+  const parts = header.split(/\s+/);
+  if (parts.length < 2)
+    return null;
+  let oldPart = parts[0] || "";
+  let newPart = parts[1] || "";
+  if (oldPart.startsWith("-"))
+    oldPart = oldPart.slice(1);
+  if (newPart.startsWith("+"))
+    newPart = newPart.slice(1);
+  let oldStart = 1;
+  let oldCount = 1;
+  let newStart = 1;
+  let newCount = 1;
+  if (oldPart.includes(",")) {
+    const [s2, c] = oldPart.split(",");
+    oldStart = parseInt(s2 || "1", 10);
+    oldCount = parseInt(c || "0", 10);
+  } else if (oldPart) {
+    oldStart = parseInt(oldPart, 10);
+  }
+  if (newPart.includes(",")) {
+    const [s2, c] = newPart.split(",");
+    newStart = parseInt(s2 || "1", 10);
+    newCount = parseInt(c || "0", 10);
+  } else if (newPart) {
+    newStart = parseInt(newPart, 10);
+  }
+  return {
+    oldStart,
+    oldCount,
+    newStart,
+    newCount,
+    oldLines: [],
+    newLines: []
+  };
+}
+function parseDiff(diffStr) {
+  const hunks = [];
+  const lines = splitLines(diffStr);
+  let currentHunk = null;
+  for (const line of lines) {
+    if (line.startsWith("@@ ")) {
+      if (currentHunk) {
+        hunks.push(currentHunk);
+      }
+      currentHunk = parseHunkHeader(line);
+      continue;
+    }
+    if (!currentHunk)
+      continue;
+    if (line === "") {
+      currentHunk.oldLines.push("");
+      currentHunk.newLines.push("");
+    } else if (line.startsWith(" ")) {
+      const content = line.slice(1);
+      currentHunk.oldLines.push(content);
+      currentHunk.newLines.push(content);
+    } else if (line.startsWith("-")) {
+      currentHunk.oldLines.push(line.slice(1));
+    } else if (line.startsWith("+")) {
+      currentHunk.newLines.push(line.slice(1));
+    }
+  }
+  if (currentHunk) {
+    hunks.push(currentHunk);
+  }
+  return hunks;
+}
+function matchScore(fileLines, fileIdx, patternLines) {
+  if (fileIdx + patternLines.length > fileLines.length)
+    return 0;
+  if (patternLines.length === 0)
+    return 1;
+  let matches = 0;
+  for (let i2 = 0;i2 < patternLines.length; i2++) {
+    const f3 = fileLines[fileIdx + i2] || "";
+    const p = patternLines[i2] || "";
+    if (f3 === p) {
+      matches += 2;
+    } else if (trimRight(f3) === trimRight(p)) {
+      matches += 1;
+    }
+  }
+  return matches / (2 * patternLines.length);
+}
+function findBestMatchOffset(fileLines, hunk, fuzzFactor = 0.5) {
+  const expectedIdx = Math.max(0, hunk.oldStart - 1);
+  if (hunk.oldLines.length === 0) {
+    return Math.min(expectedIdx, fileLines.length);
+  }
+  const score = matchScore(fileLines, expectedIdx, hunk.oldLines);
+  if (score >= 0.99)
+    return expectedIdx;
+  const maxRadius = fileLines.length;
+  let bestIdx = -1;
+  let bestScore = fuzzFactor;
+  for (let r2 = 1;r2 <= maxRadius; r2++) {
+    const up = expectedIdx - r2;
+    const down = expectedIdx + r2;
+    if (up >= 0) {
+      const s2 = matchScore(fileLines, up, hunk.oldLines);
+      if (s2 > bestScore) {
+        bestScore = s2;
+        bestIdx = up;
+        if (s2 >= 0.99)
+          return bestIdx;
+      }
+    }
+    if (down + hunk.oldLines.length <= fileLines.length) {
+      const s2 = matchScore(fileLines, down, hunk.oldLines);
+      if (s2 > bestScore) {
+        bestScore = s2;
+        bestIdx = down;
+        if (s2 >= 0.99)
+          return bestIdx;
+      }
+    }
+  }
+  return bestIdx;
+}
+function applyFuzzyPatchTS(originalContent, unifiedDiff, fuzzFactor = 0.5) {
+  if (!originalContent || !unifiedDiff)
+    return null;
+  const hunks = parseDiff(unifiedDiff);
+  if (hunks.length === 0)
+    return null;
+  const fileLines = splitLines(originalContent);
+  for (const hunk of hunks) {
+    const targetIdx = findBestMatchOffset(fileLines, hunk, fuzzFactor);
+    if (targetIdx < 0) {
+      return null;
+    }
+    const deleteCount = hunk.oldLines.length;
+    fileLines.splice(targetIdx, deleteCount, ...hunk.newLines);
+  }
+  return fileLines.join(`
+`);
+}
+
 // ../../packages/tools/src/edit_diff.ts
 var diffSchema, EditDiffTool;
 var init_edit_diff = __esm(() => {
@@ -108838,8 +108993,11 @@ var init_edit_diff = __esm(() => {
         }
         const normalizedContent = content.replace(/\r\n/g, `
 `);
-        const updated = applyPatch(normalizedContent, formattedDiff);
-        if (updated === false) {
+        let updated = applyFuzzyPatchTS(normalizedContent, formattedDiff);
+        if (updated === null) {
+          updated = applyPatch(normalizedContent, formattedDiff);
+        }
+        if (updated === false || updated === null) {
           return `Error: Failed to apply unified diff patch to '${path10}'. Ensure context lines match the existing file exactly, or use edit_file instead.`;
         }
         await context.operations.fs.writeFile(path10, updated);
@@ -164927,6 +165085,161 @@ var init_web_search = __esm(() => {
   };
 });
 
+// ../../packages/tools/src/python_repl.ts
+import { spawn as spawn4 } from "node:child_process";
+
+class PythonReplKernel {
+  process = null;
+  active = false;
+  ensureProcess() {
+    if (this.process && this.active && !this.process.killed) {
+      return this.process;
+    }
+    const proc = spawn4("python3", ["-u", "-c", PYTHON_DAEMON_SCRIPT], {
+      stdio: ["pipe", "pipe", "pipe"],
+      env: { ...process.env, PYTHONUNBUFFERED: "1" }
+    });
+    proc.on("exit", () => {
+      this.active = false;
+      this.process = null;
+    });
+    this.process = proc;
+    this.active = true;
+    return proc;
+  }
+  reset() {
+    if (this.process) {
+      try {
+        this.process.kill("SIGKILL");
+      } catch {}
+    }
+    this.process = null;
+    this.active = false;
+  }
+  async execute(code, timeoutSeconds = 30) {
+    return new Promise((resolve4) => {
+      let proc;
+      try {
+        proc = this.ensureProcess();
+      } catch (err) {
+        return resolve4(`Error initializing Python REPL: ${err.message}`);
+      }
+      let responseBuffer = "";
+      const onData = (data2) => {
+        responseBuffer += data2.toString();
+        if (responseBuffer.includes(`
+`)) {
+          cleanup();
+          const line = responseBuffer.trim();
+          try {
+            const parsed = JSON.parse(line);
+            const out = (parsed.output || "").trim();
+            const err = (parsed.error || "").trim();
+            let res = "";
+            if (out)
+              res += out;
+            if (err)
+              res += (res ? `
+[stderr]
+` : "") + err;
+            resolve4(res || "Code executed successfully with no output.");
+          } catch (e2) {
+            resolve4(`Failed to parse REPL output: ${e2.message}`);
+          }
+        }
+      };
+      const onError = (data2) => {};
+      const timer = setTimeout(() => {
+        cleanup();
+        this.reset();
+        resolve4(`Execution timed out after ${timeoutSeconds} seconds. REPL session reset.`);
+      }, timeoutSeconds * 1000);
+      const cleanup = () => {
+        clearTimeout(timer);
+        proc.stdout?.off("data", onData);
+        proc.stderr?.off("data", onError);
+      };
+      proc.stdout?.on("data", onData);
+      proc.stderr?.on("data", onError);
+      if (!proc.stdin || proc.stdin.destroyed) {
+        cleanup();
+        this.reset();
+        return resolve4("Error: Python REPL stdin is closed. Session reset.");
+      }
+      const payload = JSON.stringify({ code }) + `
+`;
+      proc.stdin.write(payload, (err) => {
+        if (err) {
+          cleanup();
+          this.reset();
+          return resolve4(`Failed to write to Python REPL: ${err.message}`);
+        }
+      });
+    });
+  }
+}
+var pythonReplSchema, PYTHON_DAEMON_SCRIPT = `
+import sys, json, io, contextlib
+
+globals_dict = {'__name__': '__main__', '__doc__': None, '__package__': None}
+
+while True:
+    line = sys.stdin.readline()
+    if not line:
+        break
+    try:
+        data = json.loads(line)
+        code_str = data.get("code", "")
+        
+        stdout_buf = io.StringIO()
+        stderr_buf = io.StringIO()
+        
+        with contextlib.redirect_stdout(stdout_buf), contextlib.redirect_stderr(stderr_buf):
+            try:
+                compiled = compile(code_str, '<repl>', 'eval')
+                val = eval(compiled, globals_dict)
+                if val is not None:
+                    print(repr(val))
+            except SyntaxError:
+                compiled = compile(code_str, '<repl>', 'exec')
+                exec(compiled, globals_dict)
+
+        out = stdout_buf.getvalue()
+        err = stderr_buf.getvalue()
+        print(json.dumps({"success": True, "output": out, "error": err}), flush=True)
+    except Exception as e:
+        print(json.dumps({"success": False, "output": "", "error": str(e)}), flush=True)
+`, globalReplKernel, PythonReplTool;
+var init_python_repl = __esm(() => {
+  init_src();
+  init_esm2();
+  pythonReplSchema = Type2.Object({
+    code: Type2.String({ description: "Python code snippet to execute." }),
+    reset: Type2.Optional(Type2.Boolean({ description: "Set to true to reset the stateful REPL session." })),
+    timeoutSeconds: Type2.Optional(Type2.Number({ description: "Execution timeout in seconds. Defaults to 30." }))
+  });
+  globalReplKernel = new PythonReplKernel;
+  PythonReplTool = {
+    name: "python_repl",
+    description: "Executes Python code in an interactive stateful REPL environment. Variables, functions, and imports are preserved across calls.",
+    inputSchema: pythonReplSchema,
+    execute: async ({ code, reset = false, timeoutSeconds = 30 }, context) => {
+      try {
+        if (reset) {
+          globalReplKernel.reset();
+          if (!code || !code.trim()) {
+            return "Python REPL session reset successfully.";
+          }
+        }
+        const resultText = await globalReplKernel.execute(code, timeoutSeconds);
+        return truncateOutput(resultText, 1e4, 100).text;
+      } catch (error6) {
+        return `Python REPL execution error: ${error6.message}`;
+      }
+    }
+  };
+});
+
 // ../../packages/tools/src/index.ts
 var exports_src4 = {};
 __export(exports_src4, {
@@ -164939,6 +165252,7 @@ __export(exports_src4, {
   WriteFileTool: () => WriteFileTool,
   WebSearchTool: () => WebSearchTool,
   ReadFileTool: () => ReadFileTool,
+  PythonReplTool: () => PythonReplTool,
   ManageTaskTool: () => ManageTaskTool,
   MCPTool: () => MCPTool,
   LsTool: () => LsTool,
@@ -164965,6 +165279,7 @@ var init_src5 = __esm(() => {
   init_browser();
   init_mcp();
   init_web_search();
+  init_python_repl();
 });
 
 // ../../node_modules/.bun/react@19.2.7/node_modules/react/cjs/react.development.js
@@ -202520,7 +202835,7 @@ var init_render_to_string = __esm(async () => {
 });
 
 // ../../node_modules/.bun/ink@7.1.0+90ffd46201e3176f/node_modules/ink/build/components/Static.js
-function Static12(props) {
+function Static13(props) {
   const { items, children: render4, style: customStyle } = props;
   const [index2, setIndex] = import_react17.useState(0);
   const itemsToRender = import_react17.useMemo(() => {
@@ -203399,7 +203714,7 @@ __export(exports_build, {
   kittyFlags: () => kittyFlags,
   Transform: () => Transform2,
   Text: () => Text3,
-  Static: () => Static12,
+  Static: () => Static13,
   Spacer: () => Spacer,
   Newline: () => Newline,
   Box: () => Box_default
@@ -204565,7 +204880,7 @@ var init_shortcuts_menu = __esm(async () => {
     { key: "ctrl+c", desc: "Exit / Graceful interrupt" },
     { key: "ctrl+h", desc: "Session history" },
     { key: "ctrl+l", desc: "Login / Account menu" },
-    { key: "ctrl+o", desc: "Toggle expand commands" },
+    { key: "ctrl+o", desc: "Toggle expand commands & thoughts" },
     { key: "ctrl+t", desc: "Tasks mode" },
     { key: "alt+enter", desc: "Insert newline" },
     { key: "esc", desc: "Cancel / Close menu" }
@@ -249855,13 +250170,21 @@ var init_smooth_markdown = __esm(async () => {
 });
 
 // ../../packages/tui/src/components/messages/bot-message.tsx
-function CollapsibleThought({ content, isStreaming }) {
-  const [expanded, setExpanded] = import_react45.useState(false);
+function CollapsibleThought({
+  content,
+  isStreaming,
+  forceExpanded
+}) {
+  const [userExpanded, setUserExpanded] = import_react45.useState(null);
+  const expanded = userExpanded !== null ? userExpanded : forceExpanded ?? true;
   const words2 = content.trim() ? content.trim().split(/\s+/).length : 0;
   const tokenCount = Math.max(1, Math.round(words2 * 1.33));
   use_input_default((input, key) => {
     if (key.ctrl && input.toLowerCase() === "o" || input === "\x0F") {
-      setExpanded((prev2) => !prev2);
+      setUserExpanded((prev2) => {
+        const current = prev2 !== null ? prev2 : forceExpanded ?? true;
+        return !current;
+      });
     }
   });
   if (isStreaming) {
@@ -249945,11 +250268,14 @@ function CollapsibleCommandOutput({
   forceExpanded
 }) {
   const { isFocused } = use_focus_default({ autoFocus: true });
-  const [userExpanded, setUserExpanded] = import_react45.useState(false);
-  const isExpanded = userExpanded || Boolean(forceExpanded);
+  const [userExpanded, setUserExpanded] = import_react45.useState(null);
+  const isExpanded = userExpanded !== null ? userExpanded : forceExpanded ?? true;
   use_input_default((input, key) => {
     if (key.ctrl && (key.name === "o" || input?.toLowerCase() === "o") || input === "\x0F") {
-      setUserExpanded((prev2) => !prev2);
+      setUserExpanded((prev2) => {
+        const current = prev2 !== null ? prev2 : forceExpanded ?? true;
+        return !current;
+      });
     }
   });
   const lines = output ? output.trim().split(/\r?\n/) : [];
@@ -250104,7 +250430,8 @@ var init_bot_message = __esm(async () => {
                     const thoughtContent = part.replace(/^<thought(?:>| [^>]*>)/i, "").replace(/<\/thought>$/i, "").trim();
                     return /* @__PURE__ */ jsx_dev_runtime12.jsxDEV(CollapsibleThought, {
                       content: thoughtContent,
-                      isStreaming
+                      isStreaming,
+                      forceExpanded: expandCommands
                     }, pidx, false, undefined, this);
                   }
                   if (part.trim() === "")
@@ -250147,7 +250474,8 @@ var init_bot_message = __esm(async () => {
             const isStreaming = block.isStreaming ?? idx === blocks.length - 1;
             return /* @__PURE__ */ jsx_dev_runtime12.jsxDEV(CollapsibleThought, {
               content: block.content,
-              isStreaming
+              isStreaming,
+              forceExpanded: expandCommands
             }, idx, false, undefined, this);
           }
           case "compaction": {
@@ -254936,7 +255264,7 @@ function useAgentSession({
     settingsFollowUpMode,
     setSettingsFollowUpMode
   } = state;
-  const [expandCommands, setExpandCommands] = import_react55.useState(false);
+  const [expandCommands, setExpandCommands] = import_react55.useState(true);
   const toggleExpandCommands = import_react55.useCallback(() => {
     setExpandCommands((prev2) => !prev2);
   }, []);
@@ -261027,7 +261355,7 @@ var exports_local_operations = {};
 __export(exports_local_operations, {
   localOperations: () => localOperations
 });
-import { exec as exec5, spawn as spawn4 } from "node:child_process";
+import { exec as exec5, spawn as spawn5 } from "node:child_process";
 import fs14 from "node:fs/promises";
 import path13 from "node:path";
 import { promisify as promisify3 } from "node:util";
@@ -261042,7 +261370,7 @@ var init_local_operations = __esm(() => {
     bash: {
       exec: async (command, cwd2, options) => {
         return new Promise((resolve4, reject2) => {
-          const child = spawn4(command, {
+          const child = spawn5(command, {
             cwd: cwd2,
             detached: process.platform !== "win32",
             env: options.env ?? process.env,
@@ -261284,8 +261612,17 @@ var init_version_check = __esm(() => {
 // package.json
 var package_default = {
   name: "@trydecember/cli",
-  version: "0.3.3",
-  description: "AI coding assistant for your terminal — write code, fix bugs, and run commands.",
+  version: "0.3.6",
+  description: "coding agent that runs in your terminal and the cloud.",
+  homepage: "https://trydecember.com",
+  repository: {
+    type: "git",
+    url: "https://github.com/phasehumans/december",
+    directory: "apps/cli"
+  },
+  bugs: {
+    url: "https://github.com/phasehumans/december/issues"
+  },
   module: "src/index.ts",
   type: "module",
   private: false,
@@ -261296,15 +261633,6 @@ var package_default = {
     "terminal",
     "agent"
   ],
-  homepage: "https://trydecember.com",
-  repository: {
-    type: "git",
-    url: "https://github.com/phasehumans/december.git",
-    directory: "apps/cli"
-  },
-  bugs: {
-    url: "https://github.com/phasehumans/december/issues"
-  },
   engines: {
     node: ">=18.0.0"
   },
@@ -261313,7 +261641,7 @@ var package_default = {
   },
   main: "./dist/december.js",
   bin: {
-    december: "./dist/december.js"
+    december: "dist/december.js"
   },
   files: [
     "dist",

package/package.json

@@ -1,7 +1,16 @@
 {
     "name": "@trydecember/cli",
-    "version": "0.3.3",
-    "description": "AI coding assistant for your terminal — write code, fix bugs, and run commands.",
+    "version": "0.3.6",
+    "description": "coding agent that runs in your terminal and the cloud.",
+    "homepage": "https://trydecember.com",
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/phasehumans/december",
+        "directory": "apps/cli"
+    },
+    "bugs": {
+        "url": "https://github.com/phasehumans/december/issues"
+    },
     "module": "src/index.ts",
     "type": "module",
     "private": false,
@@ -12,15 +21,6 @@
         "terminal",
         "agent"
     ],
-    "homepage": "https://trydecember.com",
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/phasehumans/december.git",
-        "directory": "apps/cli"
-    },
-    "bugs": {
-        "url": "https://github.com/phasehumans/december/issues"
-    },
     "engines": {
         "node": ">=18.0.0"
     },
@@ -29,7 +29,7 @@
     },
     "main": "./dist/december.js",
     "bin": {
-        "december": "./dist/december.js"
+        "december": "dist/december.js"
     },
     "files": [
         "dist",