perchai-cli 2.4.18 → 2.4.19

package/dist/perch.mjs

@@ -75900,7 +75900,6 @@ function isTurnAbortedError(error) {
 var TURN_STOPPED_BY_USER_MESSAGE;
 var init_turnAbort = __esm({
   "features/perchTerminal/runtime/turnAbort.ts"() {
-    "use strict";
     TURN_STOPPED_BY_USER_MESSAGE = "Turn stopped by user.";
   }
 });
@@ -76201,7 +76200,6 @@ function getToolDisplayName(toolName) {
 var NON_MODULE_TOOL_OWNERS, TOOL_RISK, TOOL_DISPLAY_NAMES;
 var init_catalog = __esm({
   "features/perchTerminal/runtime/toolSystem/catalog.ts"() {
-    "use strict";
     init_toolNames();
     NON_MODULE_TOOL_OWNERS = {
       [TOOL_NAMES.listSources]: "lane",
@@ -137811,12 +137809,17 @@ async function restartBashTerminal(request) {
 async function runBashTerminalCommand(request) {
   const bridge = getDesktopBridge();
   if (!bridge) return null;
-  return bridge.runBashTerminalCommand(request);
+  return bridge.runBashTerminalCommand(stripBrowserOnlyAbortSignal(request));
 }
 async function runLocalBash(request) {
   const bridge = getDesktopBridge();
   if (!bridge) return null;
-  return bridge.runLocalBash(withPermissionMode(request, request));
+  return bridge.runLocalBash(withPermissionMode(stripBrowserOnlyAbortSignal(request), request));
+}
+function stripBrowserOnlyAbortSignal(request) {
+  if (typeof window === "undefined" || !("signal" in request)) return request;
+  const { signal: _signal, ...rest2 } = request;
+  return rest2;
 }
 async function readWorkspaceFile(request) {
   const bridge = getDesktopBridge();
@@ -213107,18 +213110,24 @@ var init_terminal = __esm({
           command,
           cwd: cwd2,
           timeoutMs,
-          fsAccessOverride: ctx.fsAccessOverride
+          fsAccessOverride: ctx.fsAccessOverride,
+          signal: ctx.cliLocalTools ? ctx.signal : void 0
         });
       }
     };
     runBashTerminalCommandTool = {
       name: TOOL_NAMES.runBashTerminalCommand,
       classification: { native: false },
-      handler: async (args) => {
+      handler: async (args, ctx) => {
         const command = String(args.command ?? "");
         const cwd2 = args.cwd ? String(args.cwd) : void 0;
         const commandArgs = Array.isArray(args.args) ? args.args.map(String) : void 0;
-        return runBashTerminalCommand({ command, cwd: cwd2, args: commandArgs });
+        return runBashTerminalCommand({
+          command,
+          cwd: cwd2,
+          args: commandArgs,
+          signal: ctx.cliLocalTools ? ctx.signal : void 0
+        });
       }
     };
     terminalTools = [bashTool, runBashTerminalCommandTool];
@@ -213769,6 +213778,11 @@ var init_fixtureStore = __esm({
 function calendarTicker() {
   return process.env.PERCH_MARKET_CALENDAR_TICKER || "SPY";
 }
+function sourceRank(source) {
+  if (source === "yahoo") return 3;
+  if (source === "stooq") return 2;
+  return 1;
+}
 function createSupabaseMarketStore(supabase) {
   return {
     async listInstruments() {
@@ -213786,13 +213800,13 @@ function createSupabaseMarketStore(supabase) {
     async getBars(ticker, opts) {
       const cutoff = endOfDayUtc(opts.upTo);
       const wanted = opts.lookbackBars ?? Number.MAX_SAFE_INTEGER;
-      const rows = [];
-      for (let page2 = 0; rows.length < wanted; page2++) {
-        const { data, error } = await supabase.from("perch_ai_market_bars").select("bar_date, open, high, low, close, adj_close, volume, known_at").eq("ticker", ticker).lte("bar_date", opts.upTo).lte("known_at", cutoff).order("bar_date", { ascending: false }).range(page2 * PAGE_SIZE, page2 * PAGE_SIZE + PAGE_SIZE - 1);
+      const byDate = /* @__PURE__ */ new Map();
+      for (let page2 = 0; byDate.size < wanted; page2++) {
+        const { data, error } = await supabase.from("perch_ai_market_bars").select("bar_date, open, high, low, close, adj_close, volume, known_at, source").eq("ticker", ticker).lte("bar_date", opts.upTo).lte("known_at", cutoff).order("bar_date", { ascending: false }).order("known_at", { ascending: false }).range(page2 * PAGE_SIZE, page2 * PAGE_SIZE + PAGE_SIZE - 1);
         if (error) throw new Error(`market bars read failed: ${error.message}`);
         const batch = data ?? [];
         for (const row of batch) {
-          rows.push({
+          const bar = {
             ticker,
             date: row.bar_date,
             open: row.open === null ? void 0 : Number(row.open),
@@ -213801,13 +213815,17 @@ function createSupabaseMarketStore(supabase) {
             close: Number(row.close),
             adjClose: row.adj_close === null ? Number(row.close) : Number(row.adj_close),
             volume: row.volume === null ? void 0 : Number(row.volume),
-            knownAt: row.known_at
-          });
-          if (rows.length >= wanted) break;
+            knownAt: row.known_at,
+            source: row.source ?? void 0
+          };
+          const existing = byDate.get(bar.date);
+          if (!existing || sourceRank(bar.source) > sourceRank(existing.source)) {
+            byDate.set(bar.date, bar);
+          }
         }
         if (batch.length < PAGE_SIZE) break;
       }
-      return rows.reverse();
+      return [...byDate.values()].sort((a, b2) => a.date > b2.date ? -1 : a.date < b2.date ? 1 : 0).slice(0, wanted).reverse().map(({ source: _source, ...bar }) => bar);
     },
     async getTradingDates(opts) {
       const dates = [];
@@ -226567,7 +226585,8 @@ function createCliNodeLocalBridge(input) {
       workspaceRoot: resolveRequestRoot(workspaceRoot, request.workspaceRoot),
       command: request.command,
       cwd: request.cwd,
-      timeoutMs: request.timeoutMs
+      timeoutMs: request.timeoutMs,
+      signal: request.signal
     }),
     runBashTerminalCommand: async (request) => {
       const startedAt = Date.now();
@@ -226575,7 +226594,8 @@ function createCliNodeLocalBridge(input) {
       const result2 = await runShellCommand({
         workspaceRoot,
         command: request.args?.length ? shellQuote([request.command, ...request.args]) : request.command,
-        cwd: request.cwd
+        cwd: request.cwd,
+        signal: request.signal
       });
       return {
         ok: result2.ok,
@@ -227063,15 +227083,28 @@ async function runShellCommand(input) {
     const child = spawn2(process.env.SHELL || "/bin/zsh", ["-lc", input.command], {
       cwd: cwd2,
       env: process.env,
-      stdio: ["ignore", "pipe", "pipe"]
+      stdio: ["ignore", "pipe", "pipe"],
+      detached: true
     });
     let stdout = "";
     let stderr = "";
     let timedOut = false;
+    let aborted = false;
+    let settled = false;
+    const stopChild = (reason) => {
+      if (reason === "abort") aborted = true;
+      if (reason === "timeout") timedOut = true;
+      terminateProcessGroup(child, "SIGTERM");
+      setTimeout(() => {
+        if (!settled) terminateProcessGroup(child, "SIGKILL");
+      }, 1e3).unref?.();
+    };
     const timer = setTimeout(() => {
-      timedOut = true;
-      child.kill("SIGTERM");
+      stopChild("timeout");
     }, timeoutMs);
+    const onAbort = () => stopChild("abort");
+    if (input.signal?.aborted) onAbort();
+    input.signal?.addEventListener("abort", onAbort, { once: true });
     child.stdout.on("data", (chunk2) => {
       stdout += String(chunk2);
     });
@@ -227079,7 +227112,9 @@ async function runShellCommand(input) {
       stderr += String(chunk2);
     });
     child.on("error", (error) => {
+      settled = true;
       clearTimeout(timer);
+      input.signal?.removeEventListener("abort", onAbort);
       resolve5({
         ok: false,
         stdout,
@@ -227095,10 +227130,12 @@ async function runShellCommand(input) {
       });
     });
     child.on("close", (code, signal) => {
+      settled = true;
       clearTimeout(timer);
+      input.signal?.removeEventListener("abort", onAbort);
       const capped = capOutput(stdout, stderr);
       resolve5({
-        ok: code === 0 && !timedOut,
+        ok: code === 0 && !timedOut && !aborted,
         stdout: capped.stdout,
         stderr: capped.stderr,
         exitCode: code,
@@ -227109,11 +227146,25 @@ async function runShellCommand(input) {
         command: input.command,
         cwd: cwd2,
         executionHost: "electron_desktop",
-        ...timedOut ? { errorCode: "timed_out", errorMessage: `Command timed out after ${timeoutMs}ms.` } : {}
+        ...timedOut ? { errorCode: "timed_out", errorMessage: `Command timed out after ${timeoutMs}ms.` } : {},
+        ...aborted ? { errorCode: "aborted", errorMessage: "Command stopped by user." } : {}
       });
     });
   });
 }
+function terminateProcessGroup(child, signal) {
+  if (child.pid) {
+    try {
+      process.kill(-child.pid, signal);
+      return;
+    } catch {
+    }
+  }
+  try {
+    child.kill(signal);
+  } catch {
+  }
+}
 function resolveReadPath(root2, inputPath) {
   const expanded = expandHome4(inputPath || ".");
   return path11.resolve(path11.isAbsolute(expanded) ? expanded : path11.join(root2, expanded));
@@ -284616,7 +284667,7 @@ Usage:
   perch login
   perch status
   perch logout
-  perch run "<task>" [--json] [--cwd <dir>] [--mode ask|agents|plan] [--persona saffron|quill]
+  perch run "<task>" [--json] [--thread <id>] [--cwd <dir>] [--mode ask|agents|plan] [--persona saffron|quill]
   perch ap evidence <folder> [--json] [--out <dir>] [--timestamp <id>]
   perch ap packet   <folder> [--json] [--out <dir>] [--timestamp <id>]
   perch test ap      <folder> [--json] [--out <dir>] [--timestamp <id>] [--profile financial-lab-v2] [--expect key=value]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "perchai-cli",
-  "version": "2.4.18",
+  "version": "2.4.19",
   "description": "Perch AI command-line interface",
   "bin": {
     "perch": "bin/perch"