@rely-ai/caliber 1.47.2 → 1.48.1

package/dist/bin.js

@@ -276,6 +276,21 @@ var init_resolve_caliber = __esm({
   }
 });
 
+// src/utils/windows.ts
+function quoteForWindows(arg) {
+  if (!arg) return '""';
+  if (!/[ \t\n\v"]/.test(arg)) return arg;
+  return '"' + arg.replace(/(\\*)"/g, '$1$1\\"').replace(/(\\+)$/, "$1$1") + '"';
+}
+function bashPath(p) {
+  return p.replace(/\\/g, "/");
+}
+var init_windows = __esm({
+  "src/utils/windows.ts"() {
+    "use strict";
+  }
+});
+
 // src/llm/types.ts
 var types_exports = {};
 __export(types_exports, {
@@ -961,10 +976,20 @@ function openDiffsInEditor(editor, files) {
     try {
       const leftPath = file.originalPath ?? getEmptyFilePath(file.proposedPath);
       if (IS_WINDOWS5) {
-        const quote = (s) => `"${s}"`;
-        spawn4([cmd, "--diff", quote(leftPath), quote(file.proposedPath)].join(" "), { shell: true, stdio: "ignore", detached: true }).unref();
+        spawn4(
+          [
+            quoteForWindows(cmd),
+            "--diff",
+            quoteForWindows(leftPath),
+            quoteForWindows(file.proposedPath)
+          ].join(" "),
+          { shell: true, stdio: "ignore", detached: true }
+        ).unref();
       } else {
-        spawn4(cmd, ["--diff", leftPath, file.proposedPath], { stdio: "ignore", detached: true }).unref();
+        spawn4(cmd, ["--diff", leftPath, file.proposedPath], {
+          stdio: "ignore",
+          detached: true
+        }).unref();
       }
     } catch {
       continue;
@@ -975,6 +1000,7 @@ var IS_WINDOWS5, DIFF_TEMP_DIR;
 var init_editor = __esm({
   "src/utils/editor.ts"() {
     "use strict";
+    init_windows();
     IS_WINDOWS5 = process.platform === "win32";
     DIFF_TEMP_DIR = path25.join(os6.tmpdir(), "caliber-diff");
   }
@@ -2622,11 +2648,21 @@ function estimateTokens(text) {
   return Math.ceil(text.length / 4);
 }
 
-// src/utils/windows.ts
-function quoteForWindows(arg) {
-  if (!arg) return '""';
-  if (!/[ \t\n\v"]/.test(arg)) return arg;
-  return '"' + arg.replace(/(\\*)"/g, '$1$1\\"').replace(/(\\+)$/, "$1$1") + '"';
+// src/llm/cursor-acp.ts
+init_windows();
+
+// src/lib/subprocess-sentinel.ts
+var CALIBER_SUBPROCESS_ENV = "CALIBER_SUBPROCESS";
+var CALIBER_SUBPROCESS_LEGACY_ENV = "CALIBER_SPAWNED";
+function isCaliberSubprocess() {
+  return process.env[CALIBER_SUBPROCESS_ENV] === "1";
+}
+function withCaliberSubprocessEnv(env) {
+  return {
+    ...env,
+    [CALIBER_SUBPROCESS_ENV]: "1",
+    [CALIBER_SUBPROCESS_LEGACY_ENV]: "1"
+  };
 }
 
 // src/llm/cursor-acp.ts
@@ -2704,7 +2740,10 @@ var CursorAcpProvider = class {
     const targetModel = model || this.defaultModel;
     if (this.warmProcess && !this.warmProcess.killed && this.warmModel === targetModel) return;
     const args = this.buildArgs(targetModel, false);
-    const env = { ...process.env, ...this.cursorApiKey && { CURSOR_API_KEY: this.cursorApiKey } };
+    const env = withCaliberSubprocessEnv({
+      ...process.env,
+      ...this.cursorApiKey && { CURSOR_API_KEY: this.cursorApiKey }
+    });
     this.warmProcess = IS_WINDOWS ? spawn([quoteForWindows(resolveAgentBin()), ...args.map(quoteForWindows)].join(" "), {
       stdio: ["pipe", "pipe", "pipe"],
       env,
@@ -2755,7 +2794,10 @@ var CursorAcpProvider = class {
       return { child: warm, stderrChunks: stderrChunks2 };
     }
     const args = this.buildArgs(model, streaming);
-    const env = { ...process.env, ...this.cursorApiKey && { CURSOR_API_KEY: this.cursorApiKey } };
+    const env = withCaliberSubprocessEnv({
+      ...process.env,
+      ...this.cursorApiKey && { CURSOR_API_KEY: this.cursorApiKey }
+    });
     const child = IS_WINDOWS ? spawn([quoteForWindows(resolveAgentBin()), ...args.map(quoteForWindows)].join(" "), {
       stdio: ["pipe", "pipe", "pipe"],
       env,
@@ -2957,6 +2999,7 @@ function isCursorLoggedIn() {
 // src/llm/claude-cli.ts
 import fs7 from "fs";
 import { spawn as spawn2, execSync as execSync7, execFileSync as execFileSync2 } from "child_process";
+init_windows();
 var DEFAULT_TIMEOUT_MS3 = 10 * 60 * 1e3;
 var IS_WINDOWS2 = process.platform === "win32";
 function candidateClaudePaths() {
@@ -3006,13 +3049,19 @@ function cleanClaudeEnv() {
 }
 function spawnClaude(args) {
   const bin = resolveClaudeBin();
-  const env = { ...cleanClaudeEnv(), CALIBER_SPAWNED: "1" };
-  return IS_WINDOWS2 ? spawn2([bin, ...args].join(" "), {
-    cwd: process.cwd(),
-    stdio: ["pipe", "pipe", "pipe"],
-    env,
-    shell: true
-  }) : spawn2(bin, args, {
+  const env = withCaliberSubprocessEnv(cleanClaudeEnv());
+  return IS_WINDOWS2 ? (
+    // Windows path: shell:true skips Node's exe quoting, so paths like
+    // `C:\Program Files\caliber\claude.cmd` (with spaces) would be parsed by
+    // cmd.exe as multiple words. Quote each piece explicitly. Mirrors the
+    // pattern used in cursor-acp.ts and the learn-finalize background spawn.
+    spawn2([quoteForWindows(bin), ...args.map(quoteForWindows)].join(" "), {
+      cwd: process.cwd(),
+      stdio: ["pipe", "pipe", "pipe"],
+      env,
+      shell: true
+    })
+  ) : spawn2(bin, args, {
     cwd: process.cwd(),
     stdio: ["pipe", "pipe", "pipe"],
     env
@@ -3174,7 +3223,7 @@ function isClaudeCliLoggedIn() {
       input: "",
       stdio: ["pipe", "pipe", "pipe"],
       timeout: 5e3,
-      env: cleanClaudeEnv()
+      env: withCaliberSubprocessEnv(cleanClaudeEnv())
     });
     const output = result.toString().trim();
     try {
@@ -3224,7 +3273,7 @@ function isOpenCodeLoggedIn() {
   return cachedLoggedIn2;
 }
 function spawnOpenCode(args) {
-  const env = { ...process.env, OPENCODE_DISABLE_AUTOCOMPACT: "TRUE" };
+  const env = withCaliberSubprocessEnv({ ...process.env, OPENCODE_DISABLE_AUTOCOMPACT: "TRUE" });
   if (IS_WINDOWS3) {
     return spawn3([OPENCODE_BIN, ...args].join(" "), {
       cwd: process.cwd(),
@@ -4587,6 +4636,7 @@ function getCursorConfigDir() {
 
 // src/lib/hooks.ts
 init_resolve_caliber();
+init_windows();
 import fs11 from "fs";
 import path10 from "path";
 import { execSync as execSync10 } from "child_process";
@@ -4705,6 +4755,10 @@ function createScriptHook(config) {
   return { isInstalled, install, remove };
 }
 var STOP_HOOK_SCRIPT_CONTENT = `#!/bin/sh
+# Don't block headless claude sessions spawned by caliber itself (e.g. during caliber refresh)
+if [ "$CALIBER_SUBPROCESS" = "1" ] || [ -n "$CALIBER_SPAWNED" ]; then
+  exit 0
+fi
 if grep -q "caliber" .git/hooks/pre-commit 2>/dev/null; then
   exit 0
 fi
@@ -4727,6 +4781,11 @@ var removeStopHook = stopHook.remove;
 function getFreshnessScript() {
   const bin = resolveCaliber();
   return `#!/bin/sh
+# Don't run inside a caliber-spawned headless session \u2014 the systemMessage would
+# pollute the spawned agent's output and serves no purpose there.
+if [ "$CALIBER_SUBPROCESS" = "1" ] || [ -n "$CALIBER_SPAWNED" ]; then
+  exit 0
+fi
 STATE_FILE=".caliber/.caliber-state.json"
 [ ! -f "$STATE_FILE" ] && exit 0
 LAST_SHA=$(grep -o '"lastRefreshSha":"[^"]*"' "$STATE_FILE" 2>/dev/null | cut -d'"' -f4)
@@ -4765,22 +4824,24 @@ function getPrecommitBlock() {
   let guard;
   let invoke;
   if (npx) {
-    const npxBin = cmd.split(" ")[0];
-    if (npxBin.startsWith("/")) {
+    const npxBinRaw = cmd.split(" ")[0];
+    const npxBin = bashPath(npxBinRaw);
+    if (path10.isAbsolute(npxBinRaw)) {
       guard = `[ -x "${npxBin}" ]`;
-      const npxArgs = cmd.slice(npxBin.length);
+      const npxArgs = cmd.slice(npxBinRaw.length);
       invoke = `"${npxBin}"${npxArgs}`;
     } else {
       guard = "command -v npx >/dev/null 2>&1";
       invoke = cmd;
     }
   } else {
-    if (cmd.startsWith("/")) {
-      guard = `[ -x "${cmd}" ]`;
+    const cmdBash = bashPath(cmd);
+    if (path10.isAbsolute(cmd)) {
+      guard = `[ -x "${cmdBash}" ]`;
     } else {
-      guard = `[ -x "${cmd}" ] || command -v "${cmd}" >/dev/null 2>&1`;
+      guard = `[ -x "${cmdBash}" ] || command -v "${cmdBash}" >/dev/null 2>&1`;
     }
-    invoke = `"${cmd}"`;
+    invoke = `"${cmdBash}"`;
   }
   return `${PRECOMMIT_START}
 if ${guard}; then
@@ -13114,7 +13175,7 @@ async function refreshSingleRepo(repoDir, options) {
 }
 async function refreshCommand(options) {
   const quiet = !!options.quiet;
-  if (quiet && process.env.CALIBER_SPAWNED === "1") return;
+  if (quiet && isCaliberSubprocess()) return;
   if (quiet) {
     const { isCaliberRunning: isCaliberRunning2 } = await Promise.resolve().then(() => (init_lock(), lock_exports));
     if (isCaliberRunning2()) return;
@@ -13425,6 +13486,7 @@ async function configCommand() {
 }
 
 // src/commands/learn.ts
+init_windows();
 import fs48 from "fs";
 import path39 from "path";
 import chalk23 from "chalk";
@@ -14082,7 +14144,7 @@ function readFinalizeError() {
   }
 }
 async function learnObserveCommand(options) {
-  if (process.env.CALIBER_SPAWNED === "1") return;
+  if (isCaliberSubprocess()) return;
   try {
     const raw = await readStdin();
     if (!raw.trim()) return;
@@ -14162,7 +14224,7 @@ async function learnObserveCommand(options) {
 async function learnFinalizeCommand(options) {
   const isAuto = options?.auto === true;
   const isIncremental = options?.incremental === true;
-  if (isAuto && process.env.CALIBER_SPAWNED === "1") return;
+  if (isAuto && isCaliberSubprocess()) return;
   if (!options?.force && !isAuto) {
     const { isCaliberRunning: isCaliberRunning2 } = await Promise.resolve().then(() => (init_lock(), lock_exports));
     if (isCaliberRunning2()) {
@@ -15194,10 +15256,9 @@ function parseAgentOption(value) {
     )
   ];
   if (agents.length === 0) {
-    console.error(
+    throw new Error(
       `Invalid agent "${value}". Choose from: claude, cursor, codex, opencode, github-copilot (comma-separated for multiple)`
     );
-    process.exit(1);
   }
   return agents;
 }

package/package.json

@@ -1,13 +1,16 @@
 {
   "name": "@rely-ai/caliber",
-  "version": "1.47.2",
+  "version": "1.48.1",
   "description": "AI context infrastructure for coding agents — keeps CLAUDE.md, Cursor rules, and skills in sync as your codebase evolves",
   "type": "module",
   "bin": {
     "caliber": "./dist/bin.js"
   },
   "scripts": {
+    "prebuild": "npm run build:skills:check",
     "build": "tsup",
+    "build:skills": "node scripts/generate-skills.mjs",
+    "build:skills:check": "node scripts/generate-skills.mjs --check",
     "dev": "tsup --watch",
     "dev:install": "npm run build && npm link",
     "test": "vitest run",