open-research 0.1.23 → 0.1.25

package/dist/cli.js

@@ -8,7 +8,7 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
 
 // src/cli.ts
 import React5 from "react";
-import path22 from "path";
+import path21 from "path";
 import { Command } from "commander";
 import { render } from "ink";
 
@@ -811,7 +811,7 @@ function formatDateTime(value) {
 }
 
 // src/lib/cli/version.ts
-var PACKAGE_VERSION = "0.1.23";
+var PACKAGE_VERSION = "0.1.25";
 function getPackageVersion() {
   return PACKAGE_VERSION;
 }
@@ -871,7 +871,7 @@ async function ensureOpenResearchConfig(options) {
 }
 
 // src/tui/app.tsx
-import path21 from "path";
+import path20 from "path";
 import {
   startTransition,
   useDeferredValue,
@@ -5414,7 +5414,7 @@ ${skill.prompt}`).join("\n\n");
     "- Be transparent. Show the user what you're doing and why.",
     "- When unsure, ask. Use ask_user rather than guessing.",
     "- For large outputs, redirect to a file and read selectively.",
-    "- Always wrap file paths in backticks when mentioning them, e.g. `notes/brief.md` or `experiments/analysis.py`. This makes them clickable in the terminal.",
+    "- Always wrap file paths in backticks: `notes/brief.md`, `experiments/analysis.py`. Include line references as `src/file.ts:42`. This makes them clickable.",
     "",
     `## Workspace
 Root: ${process.cwd()}
@@ -6617,67 +6617,7 @@ function truncate3(value, max = 96) {
 import { Box as Box4, Text as Text4 } from "ink";
 
 // src/tui/markdown.ts
-import path20 from "path";
-import fs21 from "fs";
-var FILE_EXTENSIONS = /* @__PURE__ */ new Set([
-  ".py",
-  ".ts",
-  ".tsx",
-  ".js",
-  ".jsx",
-  ".r",
-  ".R",
-  ".tex",
-  ".bib",
-  ".md",
-  ".txt",
-  ".json",
-  ".yaml",
-  ".yml",
-  ".toml",
-  ".csv",
-  ".tsv",
-  ".sh",
-  ".bash",
-  ".zsh",
-  ".sql",
-  ".html",
-  ".css",
-  ".xml",
-  ".pdf",
-  ".png",
-  ".jpg",
-  ".svg",
-  ".gif",
-  ".cfg",
-  ".ini",
-  ".env",
-  ".lock",
-  ".log"
-]);
-function looksLikeFilePath(text) {
-  if (text.length < 3 || text.length > 200) return false;
-  if (text.includes(" ") || text.includes("\n")) return false;
-  const ext = path20.extname(text).toLowerCase();
-  if (FILE_EXTENSIONS.has(ext)) return true;
-  if (text.includes("/") && !text.startsWith("http")) return true;
-  return false;
-}
-function resolveFilePath(filePath) {
-  if (path20.isAbsolute(filePath)) return filePath;
-  return path20.resolve(process.cwd(), filePath);
-}
-function fileLink(displayText, filePath) {
-  const absPath = resolveFilePath(filePath);
-  try {
-    fs21.statSync(absPath);
-  } catch {
-    return displayText;
-  }
-  const uri = `file://${absPath}`;
-  return `\x1B]8;;${uri}\x1B\\${displayText}\x1B]8;;\x1B\\`;
-}
-function renderMarkdown(text) {
+function renderMarkdown(text, options = {}) {
   if (!text || !text.trim()) return text;
   if (!/[*_`#\[\]>~\-]/.test(text) && !text.includes("```")) return text;
   const lines = text.split("\n");
@@ -6713,13 +6653,9 @@ function renderMarkdown(text) {
     if (headingMatch) {
       const level = headingMatch[1].length;
       const content = renderInline(headingMatch[2]);
-      if (level === 1) {
-        output2.push(source_default.bold.cyan(content));
-      } else if (level === 2) {
-        output2.push(source_default.bold.white(content));
-      } else {
-        output2.push(source_default.bold(content));
-      }
+      if (level === 1) output2.push(source_default.bold.cyan(content));
+      else if (level === 2) output2.push(source_default.bold.white(content));
+      else output2.push(source_default.bold(content));
       continue;
     }
     if (/^[-*_]{3,}\s*$/.test(line.trim())) {
@@ -6733,17 +6669,12 @@ function renderMarkdown(text) {
     }
     const ulMatch = line.match(/^(\s*)[*+-]\s+(.+)$/);
     if (ulMatch) {
-      const indent = ulMatch[1];
-      const content = renderInline(ulMatch[2]);
-      output2.push(`${indent}${source_default.gray("\u2022")} ${content}`);
+      output2.push(`${ulMatch[1]}${source_default.gray("\u2022")} ${renderInline(ulMatch[2])}`);
       continue;
     }
     const olMatch = line.match(/^(\s*)(\d+)[.)]\s+(.+)$/);
     if (olMatch) {
-      const indent = olMatch[1];
-      const num = olMatch[2];
-      const content = renderInline(olMatch[3]);
-      output2.push(`${indent}${source_default.gray(num + ".")} ${content}`);
+      output2.push(`${olMatch[1]}${source_default.gray(olMatch[2] + ".")} ${renderInline(olMatch[3])}`);
       continue;
     }
     output2.push(renderInline(line));
@@ -6759,12 +6690,7 @@ function renderMarkdown(text) {
 }
 function renderInline(text) {
   let result = text;
-  result = result.replace(/`([^`]+)`/g, (_, code) => {
-    if (looksLikeFilePath(code)) {
-      return fileLink(source_default.cyan.underline(code), code);
-    }
-    return source_default.cyan(code);
-  });
+  result = result.replace(/`([^`]+)`/g, (_, code) => source_default.cyan(code));
   result = result.replace(/\*\*\*(.+?)\*\*\*/g, (_, t) => source_default.bold.italic(t));
   result = result.replace(/___(.+?)___/g, (_, t) => source_default.bold.italic(t));
   result = result.replace(/\*\*(.+?)\*\*/g, (_, t) => source_default.bold(t));
@@ -7144,12 +7070,14 @@ function App({
   const [cursorToEnd, setCursorToEnd] = useState4(0);
   const [screen, setScreen] = useState4("main");
   const [resumeSessions, setResumeSessions] = useState4([]);
+  const [ctrlCPending, setCtrlCPending] = useState4(false);
   const sessionId = useMemo3(() => crypto.randomUUID(), []);
   const deferredMessages = useDeferredValue(messages);
   const deferredPendingUpdates = useDeferredValue(pendingUpdates);
   const activityFrame = useAnimatedFrame(busy);
   const [agentQuestion, setAgentQuestion] = useState4(null);
   const previewRef = useRef2(null);
+  const ctrlCTimerRef = useRef2(null);
   const isHome = deferredMessages.length === 0 && !busy;
   const hasWorkspace = workspacePath !== null;
   const hasAuth = authStatus === "connected";
@@ -7202,6 +7130,13 @@ function App({
       cancelled = true;
     };
   }, [homeDir]);
+  useEffect2(() => {
+    return () => {
+      if (ctrlCTimerRef.current) {
+        clearTimeout(ctrlCTimerRef.current);
+      }
+    };
+  }, []);
   const [selectedSuggestion, setSelectedSuggestion] = useState4(-1);
   const atMention = useMemo3(() => extractAtMention(input2), [input2]);
   const suggestions = useMemo3(() => {
@@ -7733,7 +7668,58 @@ ${msg.text}
       addSystemMessage(`Rejected: ${next.summary}`);
     });
   }
+  function clearCtrlCPending() {
+    if (ctrlCTimerRef.current) {
+      clearTimeout(ctrlCTimerRef.current);
+      ctrlCTimerRef.current = null;
+    }
+    setCtrlCPending(false);
+  }
+  function armCtrlCExitWindow() {
+    if (ctrlCTimerRef.current) {
+      clearTimeout(ctrlCTimerRef.current);
+    }
+    setCtrlCPending(true);
+    ctrlCTimerRef.current = setTimeout(() => {
+      ctrlCTimerRef.current = null;
+      setCtrlCPending(false);
+    }, 3e3);
+  }
+  function returnToMainScreen() {
+    setScreen("main");
+    setComposerFocused(true);
+  }
   useInput4((key, inputKey) => {
+    if (inputKey.ctrl && key === "c") {
+      if (busy) {
+        clearCtrlCPending();
+        if (abortRef.current) {
+          abortRef.current.abort();
+          addSystemMessage("Interrupting agent...");
+        }
+        return;
+      }
+      if (screen !== "main") {
+        clearCtrlCPending();
+        returnToMainScreen();
+        return;
+      }
+      if (planningState.status === "charter-review") {
+        clearCtrlCPending();
+        rejectCharter();
+        return;
+      }
+      if (ctrlCPending) {
+        clearCtrlCPending();
+        app.exit();
+        return;
+      }
+      armCtrlCExitWindow();
+      return;
+    }
+    if (ctrlCPending) {
+      clearCtrlCPending();
+    }
     if (inputKey.shift && inputKey.tab) {
       setAgentMode((prev) => {
         const modes = ["manual-review", "auto-approve", "auto-research"];
@@ -8132,6 +8118,7 @@ ${error.stack}` : String(error)}` }
     addSystemMessage("Charter cancelled. Planning reset.");
   }
   const statusParts = [];
+  if (ctrlCPending) statusParts.push("Press Ctrl+C again to exit.");
   if (hasAuth) statusParts.push("connected");
   else statusParts.push("no auth");
   if (hasWorkspace) statusParts.push(`${workspaceFiles.length} files`);
@@ -8139,7 +8126,7 @@ ${error.stack}` : String(error)}` }
   if (skills2.length > 0) statusParts.push(`${skills2.length} skills`);
   statusParts.push(agentMode);
   if (deferredPendingUpdates.length > 0) statusParts.push(`${deferredPendingUpdates.length} pending`);
-  const statusColor = busy ? "yellow" : !hasAuth ? "red" : deferredPendingUpdates.length > 0 ? "magenta" : "green";
+  const statusColor = busy ? "yellow" : ctrlCPending ? "yellow" : !hasAuth ? "red" : deferredPendingUpdates.length > 0 ? "magenta" : "green";
   const configItems = useMemo3(() => [
     {
       key: "defaults.model",
@@ -8194,8 +8181,7 @@ ${error.stack}` : String(error)}` }
     await saveOpenResearchConfig(updated, { homeDir });
   }
   function handleConfigClose() {
-    setScreen("main");
-    setComposerFocused(true);
+    returnToMainScreen();
   }
   if (screen === "resume") {
     return /* @__PURE__ */ jsx5(
@@ -8213,12 +8199,10 @@ ${error.stack}` : String(error)}` }
           } catch (err) {
             addSystemMessage(`Failed: ${err instanceof Error ? err.message : String(err)}`);
           }
-          setScreen("main");
-          setComposerFocused(true);
+          returnToMainScreen();
         },
         onCancel: () => {
-          setScreen("main");
-          setComposerFocused(true);
+          returnToMainScreen();
         }
       }
     );
@@ -8371,7 +8355,7 @@ ${error.stack}` : String(error)}` }
         statusParts,
         statusColor,
         tokenDisplay,
-        workspaceName: hasWorkspace ? path21.basename(workspacePath) : process.cwd(),
+        workspaceName: hasWorkspace ? path20.basename(workspacePath) : process.cwd(),
         mode: agentMode,
         planningStatus: planningState.status
       }
@@ -8383,7 +8367,7 @@ ${error.stack}` : String(error)}` }
 var program = new Command();
 program.name("open-research").version(getPackageVersion()).description("Local-first research CLI powered by ChatGPT/Codex auth.").argument("[workspacePath]", "Optional workspace path to open").action(async (workspacePath) => {
   await ensureOpenResearchConfig();
-  const target = workspacePath ? path22.resolve(workspacePath) : process.cwd();
+  const target = workspacePath ? path21.resolve(workspacePath) : process.cwd();
   const project = await loadWorkspaceProject(target);
   const auth2 = await loadStoredAuth();
   render(
@@ -8394,12 +8378,13 @@ program.name("open-research").version(getPackageVersion()).description("Local-fi
         screen: "home",
         pendingUpdates: []
       }
-    })
+    }),
+    { exitOnCtrlC: false }
   );
 });
 program.command("init").argument("[workspacePath]").description("Initialize an Open Research workspace.").action(async (workspacePath) => {
   await ensureOpenResearchConfig();
-  const target = path22.resolve(workspacePath ?? process.cwd());
+  const target = path21.resolve(workspacePath ?? process.cwd());
   const project = await initWorkspace({ workspaceDir: target });
   console.log(`Initialized workspace: ${target}`);
   console.log(`Title: ${project.title}`);
@@ -8468,8 +8453,8 @@ skills.command("create").argument("[name]").description("Scaffold a new user ski
 });
 skills.command("edit").argument("<name>").description("Open a user skill in $EDITOR.").action(async (name) => {
   await ensureOpenResearchConfig();
-  const skillDir = path22.join(getOpenResearchSkillsDir(), name);
-  openInEditor(path22.join(skillDir, "SKILL.md"));
+  const skillDir = path21.join(getOpenResearchSkillsDir(), name);
+  openInEditor(path21.join(skillDir, "SKILL.md"));
   const validation = await validateSkillDirectory({ skillDir });
   if (!validation.ok) {
     console.error(validation.errors.join("\n"));
@@ -8480,9 +8465,9 @@ skills.command("edit").argument("<name>").description("Open a user skill in $EDI
 });
 skills.command("validate").argument("[nameOrPath]").description("Validate one user skill.").action(async (nameOrPath) => {
   await ensureOpenResearchConfig();
-  const skillDir = nameOrPath ? path22.isAbsolute(nameOrPath) ? nameOrPath : path22.join(getOpenResearchSkillsDir(), nameOrPath) : getOpenResearchSkillsDir();
+  const skillDir = nameOrPath ? path21.isAbsolute(nameOrPath) ? nameOrPath : path21.join(getOpenResearchSkillsDir(), nameOrPath) : getOpenResearchSkillsDir();
   const stat = await import("fs/promises").then(
-    (fs22) => fs22.stat(skillDir).catch(() => null)
+    (fs21) => fs21.stat(skillDir).catch(() => null)
   );
   if (!stat) {
     throw new Error(`Skill path not found: ${skillDir}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "open-research",
-  "version": "0.1.23",
+  "version": "0.1.25",
   "description": "Local-first research CLI agent — discover papers, synthesize notes, run analysis, and draft artifacts from your terminal.",
   "type": "module",
   "license": "MIT",