@rely-ai/caliber 1.49.1 → 1.49.4

package/dist/bin.js

@@ -333,6 +333,19 @@ __export(pre_commit_block_exports, {
   hasSyncBlock: () => hasSyncBlock,
   stripManagedBlocks: () => stripManagedBlocks
 });
+function getManagedDocPaths(activeTargets) {
+  if (!activeTargets) {
+    return "CLAUDE.md .claude/ .cursor/ .cursorrules .github/copilot-instructions.md .github/instructions/ AGENTS.md CALIBER_LEARNINGS.md .agents/ .opencode/";
+  }
+  const paths = ["CALIBER_LEARNINGS.md"];
+  if (activeTargets.includes("claude")) paths.push("CLAUDE.md", ".claude/");
+  if (activeTargets.includes("cursor")) paths.push(".cursor/", ".cursorrules");
+  if (activeTargets.includes("github-copilot"))
+    paths.push(".github/copilot-instructions.md", ".github/instructions/");
+  if (activeTargets.includes("codex")) paths.push("AGENTS.md", ".agents/");
+  if (activeTargets.includes("opencode")) paths.push(".opencode/");
+  return paths.join(" ");
+}
 function getCaliberNotFoundFallback(platform, bin) {
   switch (platform) {
     case "claude":
@@ -347,8 +360,9 @@ npx @rely-ai/caliber refresh
 \`\`\``;
   }
 }
-function getPreCommitBlock(platform = "claude") {
+function getPreCommitBlock(platform = "claude", activeTargets) {
   const bin = displayCaliberName();
+  const docPaths = getManagedDocPaths(activeTargets);
   return `${BLOCK_START}
 ## Before Committing
 
@@ -362,7 +376,7 @@ grep -q "caliber" .git/hooks/pre-commit 2>/dev/null && echo "hook-active" || ech
 - If **hook-active**: the hook handles sync automatically \u2014 just commit normally. Tell the user: "Caliber will sync your agent configs automatically via the pre-commit hook."
 - If **no-hook**: run Caliber manually before committing:
   1. Tell the user: "Caliber: Syncing agent configs with your latest changes..."
-  2. Run: \`${bin} refresh && git add ${MANAGED_DOC_PATHS} 2>/dev/null\`
+  2. Run: \`${bin} refresh && git add ${docPaths} 2>/dev/null\`
   3. After it completes, briefly tell the user what Caliber updated. Then proceed with the commit.
 
 **Valid \`${bin} refresh\` options:** \`--quiet\` (suppress output) and \`--dry-run\` (preview without writing). Do not pass any other flags \u2014 options like \`--auto-approve\`, \`--debug\`, or \`--force\` do not exist and will cause errors.
@@ -372,8 +386,9 @@ grep -q "caliber" .git/hooks/pre-commit 2>/dev/null && echo "hook-active" || ech
 ${getCaliberNotFoundFallback(platform, bin)}
 ${BLOCK_END}`;
 }
-function getCursorRuleContent() {
+function getCursorRuleContent(activeTargets) {
   const bin = displayCaliberName();
+  const docPaths = getManagedDocPaths(activeTargets);
   return `---
 description: Run Caliber sync before git commits to keep agent configs up to date
 alwaysApply: true
@@ -382,7 +397,7 @@ Before every git commit, check if the Caliber pre-commit hook is installed:
 Run: \`grep -q "caliber" .git/hooks/pre-commit 2>/dev/null && echo "hook-active" || echo "no-hook"\`
 
 If hook-active: just commit normally \u2014 Caliber syncs automatically via the hook. Tell the user: "Caliber will sync your agent configs automatically."
-If no-hook: run \`${bin} refresh && git add ${MANAGED_DOC_PATHS} 2>/dev/null\` before committing, and tell the user what was updated.
+If no-hook: run \`${bin} refresh && git add ${docPaths} 2>/dev/null\` before committing, and tell the user what was updated.
 
 Valid \`${bin} refresh\` options: \`--quiet\` and \`--dry-run\` only. Do not pass \`--auto-approve\`, \`--debug\`, \`--force\`, or any other flags.
 \`${bin} config\` takes no flags \u2014 it is interactive. Do not pass \`--provider\`, \`--api-key\`, or \`--endpoint\`.
@@ -390,19 +405,34 @@ Valid \`${bin} refresh\` options: \`--quiet\` and \`--dry-run\` only. Do not pas
 If \`${bin}\` is not found, read the setup-caliber skill from .cursor/skills/setup-caliber/SKILL.md and follow its instructions to install Caliber.
 `;
 }
+function getSectionBody(content, headingRe) {
+  const match = content.match(headingRe);
+  if (!match || match.index === void 0) return null;
+  const start = match.index + match[0].length;
+  const tail = content.slice(start);
+  const nextHeadingMatch = tail.match(/^##\s/m);
+  const end = nextHeadingMatch?.index ?? tail.length;
+  return tail.slice(0, end);
+}
 function hasPreCommitBlock(content) {
-  return content.includes(BLOCK_START);
+  if (content.includes(BLOCK_START)) return true;
+  const body = getSectionBody(content, PRECOMMIT_HEADING_RE);
+  if (body && /caliber/i.test(body)) return true;
+  return false;
 }
-function appendPreCommitBlock(content, platform = "claude") {
+function appendPreCommitBlock(content, platform = "claude", activeTargets) {
   if (hasPreCommitBlock(content)) return content;
   const trimmed = content.trimEnd();
-  return trimmed + "\n\n" + getPreCommitBlock(platform) + "\n";
+  return trimmed + "\n\n" + getPreCommitBlock(platform, activeTargets) + "\n";
 }
-function getCursorPreCommitRule() {
-  return { filename: CURSOR_RULE_FILENAME, content: getCursorRuleContent() };
+function getCursorPreCommitRule(activeTargets) {
+  return { filename: CURSOR_RULE_FILENAME, content: getCursorRuleContent(activeTargets) };
 }
 function hasLearningsBlock(content) {
-  return content.includes(LEARNINGS_BLOCK_START);
+  if (content.includes(LEARNINGS_BLOCK_START)) return true;
+  const body = getSectionBody(content, LEARNINGS_HEADING_RE);
+  if (body && /CALIBER_LEARNINGS/.test(body)) return true;
+  return false;
 }
 function appendLearningsBlock(content) {
   if (hasLearningsBlock(content)) return content;
@@ -424,50 +454,59 @@ Pin your choice (\`/model\` in Claude Code, or \`CALIBER_MODEL\` when using Cali
 ${MODEL_BLOCK_END}`;
 }
 function hasModelBlock(content) {
-  return content.includes(MODEL_BLOCK_START);
+  if (content.includes(MODEL_BLOCK_START)) return true;
+  const body = getSectionBody(content, MODEL_HEADING_RE);
+  if (body && /CALIBER_MODEL/.test(body)) return true;
+  return false;
 }
 function appendModelBlock(content) {
   if (hasModelBlock(content)) return content;
   const trimmed = content.trimEnd();
   return trimmed + "\n\n" + buildManagedModelBlock() + "\n";
 }
-function getSyncSetupInstruction(platform) {
+function getSyncSetupInstruction(platform, activeTargets) {
   switch (platform) {
     case "claude":
       return `If the pre-commit hook is not set up, run \`/setup-caliber\` to configure everything automatically.`;
     case "codex":
       return `If the pre-commit hook is not set up, read \`.agents/skills/setup-caliber/SKILL.md\` and follow the setup instructions.`;
-    case "copilot":
+    case "copilot": {
+      const docPaths = getManagedDocPaths(activeTargets);
       return `If the pre-commit hook is not set up, the developer should run \`/setup-caliber\` in Claude Code or Cursor for automated setup. Alternatively, run in terminal:
 \`\`\`bash
 npx @rely-ai/caliber hooks --install
 npx @rely-ai/caliber refresh
-git add ${MANAGED_DOC_PATHS} 2>/dev/null
+git add ${docPaths} 2>/dev/null
 \`\`\``;
+    }
   }
 }
-function getSyncBlock(platform = "claude") {
+function getSyncBlock(platform = "claude", activeTargets) {
   const bin = displayCaliberName();
   return `${SYNC_BLOCK_START}
 ## Context Sync
 
 This project uses [Caliber](https://github.com/caliber-ai-org/ai-setup) to keep AI agent configs in sync across Claude Code, Cursor, Copilot, and Codex.
 Configs update automatically before each commit via \`${bin} refresh\`.
-${getSyncSetupInstruction(platform)}
+${getSyncSetupInstruction(platform, activeTargets)}
 ${SYNC_BLOCK_END}`;
 }
 function hasSyncBlock(content) {
-  return content.includes(SYNC_BLOCK_START);
+  if (content.includes(SYNC_BLOCK_START)) return true;
+  const body = getSectionBody(content, SYNC_HEADING_RE);
+  if (body && /caliber-ai-org\/ai-setup/.test(body)) return true;
+  return false;
 }
-function appendSyncBlock(content, platform = "claude") {
+function appendSyncBlock(content, platform = "claude", activeTargets) {
   if (hasSyncBlock(content)) return content;
   const trimmed = content.trimEnd();
-  return trimmed + "\n\n" + getSyncBlock(platform) + "\n";
+  return trimmed + "\n\n" + getSyncBlock(platform, activeTargets) + "\n";
 }
-function appendManagedBlocks(content, platform = "claude") {
+function appendManagedBlocks(content, platform = "claude", activeTargets) {
   return appendSyncBlock(
-    appendModelBlock(appendLearningsBlock(appendPreCommitBlock(content, platform))),
-    platform
+    appendModelBlock(appendLearningsBlock(appendPreCommitBlock(content, platform, activeTargets))),
+    platform,
+    activeTargets
   );
 }
 function getCursorSyncContent() {
@@ -513,7 +552,7 @@ function stripManagedBlocks(content) {
   }
   return result.replace(/\n{3,}/g, "\n\n").trim() + "\n";
 }
-var BLOCK_START, BLOCK_END, MANAGED_DOC_PATHS, CURSOR_RULE_FILENAME, LEARNINGS_BLOCK_START, LEARNINGS_BLOCK_END, LEARNINGS_BLOCK, CURSOR_LEARNINGS_FILENAME, CURSOR_LEARNINGS_CONTENT, MODEL_BLOCK_START, MODEL_BLOCK_END, SYNC_BLOCK_START, SYNC_BLOCK_END, CURSOR_SYNC_FILENAME, CURSOR_SETUP_FILENAME, MANAGED_BLOCK_PAIRS;
+var BLOCK_START, BLOCK_END, CURSOR_RULE_FILENAME, PRECOMMIT_HEADING_RE, LEARNINGS_BLOCK_START, LEARNINGS_BLOCK_END, LEARNINGS_BLOCK, CURSOR_LEARNINGS_FILENAME, CURSOR_LEARNINGS_CONTENT, LEARNINGS_HEADING_RE, MODEL_BLOCK_START, MODEL_BLOCK_END, MODEL_HEADING_RE, SYNC_BLOCK_START, SYNC_BLOCK_END, SYNC_HEADING_RE, CURSOR_SYNC_FILENAME, CURSOR_SETUP_FILENAME, MANAGED_BLOCK_PAIRS;
 var init_pre_commit_block = __esm({
   "src/writers/pre-commit-block.ts"() {
     "use strict";
@@ -521,8 +560,8 @@ var init_pre_commit_block = __esm({
     init_config();
     BLOCK_START = "<!-- caliber:managed:pre-commit -->";
     BLOCK_END = "<!-- /caliber:managed:pre-commit -->";
-    MANAGED_DOC_PATHS = "CLAUDE.md .claude/ .cursor/ .cursorrules .github/copilot-instructions.md .github/instructions/ AGENTS.md CALIBER_LEARNINGS.md .agents/ .opencode/";
     CURSOR_RULE_FILENAME = "caliber-pre-commit.mdc";
+    PRECOMMIT_HEADING_RE = /^##\s+Before Committing\s*$/m;
     LEARNINGS_BLOCK_START = "<!-- caliber:managed:learnings -->";
     LEARNINGS_BLOCK_END = "<!-- /caliber:managed:learnings -->";
     LEARNINGS_BLOCK = `${LEARNINGS_BLOCK_START}
@@ -539,10 +578,13 @@ alwaysApply: true
 Read \`CALIBER_LEARNINGS.md\` for patterns and anti-patterns learned from previous sessions.
 These are auto-extracted from real tool usage \u2014 treat them as project-specific rules.
 `;
+    LEARNINGS_HEADING_RE = /^##\s+Session Learnings\s*$/m;
     MODEL_BLOCK_START = "<!-- caliber:managed:model-config -->";
     MODEL_BLOCK_END = "<!-- /caliber:managed:model-config -->";
+    MODEL_HEADING_RE = /^##\s+Model Configuration\s*$/m;
     SYNC_BLOCK_START = "<!-- caliber:managed:sync -->";
     SYNC_BLOCK_END = "<!-- /caliber:managed:sync -->";
+    SYNC_HEADING_RE = /^##\s+Context Sync\s*$/m;
     CURSOR_SYNC_FILENAME = "caliber-sync.mdc";
     CURSOR_SETUP_FILENAME = "caliber-setup.mdc";
     MANAGED_BLOCK_PAIRS = [
@@ -2645,17 +2687,25 @@ function extractJson(text) {
 function stripMarkdownFences(text) {
   return text.replace(/^```(?:json)?\s*/im, "").replace(/```\s*$/m, "").trim();
 }
+function isJsonObject(value) {
+  return value !== null && typeof value === "object";
+}
 function parseJsonResponse(raw) {
   const cleaned = stripMarkdownFences(raw);
   try {
-    return JSON.parse(cleaned);
+    const parsed = JSON.parse(cleaned);
+    if (isJsonObject(parsed)) return parsed;
   } catch {
   }
   const json = extractJson(cleaned);
   if (!json) {
-    throw new Error(`No JSON found in LLM response: ${raw.slice(0, 200)}`);
+    throw new Error(`No valid JSON object in LLM response: ${raw.slice(0, 200)}`);
   }
-  return JSON.parse(json);
+  const extracted = JSON.parse(json);
+  if (!isJsonObject(extracted)) {
+    throw new Error(`No valid JSON object in LLM response: ${raw.slice(0, 200)}`);
+  }
+  return extracted;
 }
 function estimateTokens(text) {
   return Math.ceil(text.length / 4);
@@ -2677,6 +2727,12 @@ function withCaliberSubprocessEnv(env) {
     [CALIBER_SUBPROCESS_LEGACY_ENV]: "1"
   };
 }
+function isHookCascadeFromUserClaudeSession() {
+  const inClaudeSession = process.env.CLAUDECODE === "1";
+  const isCaliberSpawned = process.env[CALIBER_SUBPROCESS_ENV] === "1";
+  const isInteractiveTty = process.stdin.isTTY === true;
+  return inClaudeSession && !isCaliberSpawned && !isInteractiveTty;
+}
 
 // src/llm/cursor-acp.ts
 var IS_WINDOWS = process.platform === "win32";
@@ -3001,9 +3057,10 @@ function isCursorLoggedIn() {
     const result = execFileSync(resolveAgentBin(), ["status"], {
       input: "",
       stdio: ["pipe", "pipe", "pipe"],
-      timeout: 5e3
+      timeout: 5e3,
+      env: withCaliberSubprocessEnv({ ...process.env })
     });
-    return !result.toString().includes("not logged in");
+    return !result.toString().toLowerCase().includes("not logged in");
   } catch {
     return false;
   }
@@ -5600,7 +5657,8 @@ var CORE_MAX_TOKENS = 16e3;
 var GENERATION_MAX_TOKENS = 64e3;
 var MODEL_MAX_OUTPUT_TOKENS = 128e3;
 var MAX_RETRIES2 = 5;
-var DEFAULT_INACTIVITY_TIMEOUT_MS = 12e4;
+var DEFAULT_INACTIVITY_TIMEOUT_MS = 3e5;
+var SOFT_INACTIVITY_WARN_MS = 6e4;
 var DEFAULT_TOTAL_TIMEOUT_MS = 6e5;
 function parseEnvTimeout(envVar, defaultMs, minMs = 5e3) {
   const val = process.env[envVar];
@@ -5853,14 +5911,30 @@ async function streamGeneration(config) {
       let charsReceived = 0;
       let settled = false;
       let inactivityTimer = null;
+      let softWarnTimer = null;
+      let softWarnFired = false;
       function clearInactivityTimer() {
         if (inactivityTimer) {
           clearTimeout(inactivityTimer);
           inactivityTimer = null;
         }
+        if (softWarnTimer) {
+          clearTimeout(softWarnTimer);
+          softWarnTimer = null;
+        }
       }
       function resetInactivityTimer() {
         if (inactivityTimer) clearTimeout(inactivityTimer);
+        if (softWarnTimer) clearTimeout(softWarnTimer);
+        if (config.callbacks && !softWarnFired && SOFT_INACTIVITY_WARN_MS < inactivityTimeoutMs) {
+          softWarnTimer = setTimeout(() => {
+            if (settled) return;
+            softWarnFired = true;
+            config.callbacks?.onStatus(
+              "Model is taking longer than usual on this prompt \u2014 large repos may need more time. Set CALIBER_STREAM_INACTIVITY_TIMEOUT_MS to override."
+            );
+          }, SOFT_INACTIVITY_WARN_MS);
+        }
         inactivityTimer = setTimeout(() => {
           if (settled) return;
           settled = true;
@@ -6333,7 +6407,7 @@ function writeClaudeConfig(config) {
   const written = [];
   fs13.writeFileSync(
     "CLAUDE.md",
-    appendManagedBlocks(config.claudeMd)
+    appendManagedBlocks(config.claudeMd, "claude", config.activeTargets)
   );
   written.push("CLAUDE.md");
   if (config.rules?.length) {
@@ -6577,6 +6651,7 @@ function writeSetup(setup) {
   const backupDir = existingFiles.length > 0 ? createBackup(existingFiles) : void 0;
   const written = [];
   if (setup.targetAgent.includes("claude") && setup.claude) {
+    setup.claude.activeTargets = setup.targetAgent;
     written.push(...writeClaudeConfig(setup.claude));
   }
   if (setup.targetAgent.includes("cursor") && setup.cursor) {
@@ -11469,7 +11544,7 @@ async function initCommand(options) {
       claudeContent = `# ${path29.basename(process.cwd())}
 `;
     }
-    const updatedClaude = appendManagedBlocks2(claudeContent, "claude");
+    const updatedClaude = appendManagedBlocks2(claudeContent, "claude", targetAgent);
     if (updatedClaude !== claudeContent || !fs36.existsSync(claudeMdPath)) {
       fs36.writeFileSync(claudeMdPath, updatedClaude);
       console.log(`  ${chalk14.green("\u2713")} CLAUDE.md \u2014 added Caliber sync instructions`);
@@ -11478,7 +11553,7 @@ async function initCommand(options) {
       const rulesDir = path29.join(".cursor", "rules");
       if (!fs36.existsSync(rulesDir)) fs36.mkdirSync(rulesDir, { recursive: true });
       for (const rule of [
-        getCursorPreCommitRule2(),
+        getCursorPreCommitRule2(targetAgent),
         getCursorLearningsRule2(),
         getCursorSyncRule2(),
         getCursorSetupRule2()
@@ -11499,7 +11574,7 @@ async function initCommand(options) {
         copilotContent = `# ${path29.basename(process.cwd())}
 `;
       }
-      const updatedCopilot = appendManagedBlocks2(copilotContent, "copilot");
+      const updatedCopilot = appendManagedBlocks2(copilotContent, "copilot", targetAgent);
       if (updatedCopilot !== copilotContent) {
         fs36.writeFileSync(copilotPath, updatedCopilot);
         console.log(`  ${chalk14.green("\u2713")} Copilot instructions \u2014 added Caliber sync instructions`);
@@ -12508,6 +12583,14 @@ function scopeDiffToDir(diff, dir, allConfigDirs) {
 init_pre_commit_block();
 import fs39 from "fs";
 import path31 from "path";
+function inferActiveTargets(docs) {
+  const targets = [];
+  if (docs.claudeMd) targets.push("claude");
+  if (docs.cursorrules || docs.cursorRules) targets.push("cursor");
+  if (docs.copilotInstructions || docs.copilotInstructionFiles) targets.push("github-copilot");
+  if (docs.agentsMd) targets.push("codex");
+  return targets;
+}
 function writeFileGroup(groupDir, files) {
   fs39.mkdirSync(groupDir, { recursive: true });
   return files.map((file) => {
@@ -12518,6 +12601,7 @@ function writeFileGroup(groupDir, files) {
 }
 function writeRefreshDocs(docs, dir = ".") {
   const written = [];
+  const targets = inferActiveTargets(docs);
   const p = (relPath) => (dir === "." ? relPath : path31.join(dir, relPath)).replace(/\\/g, "/");
   const ensureParent = (filePath) => {
     const parent = path31.dirname(filePath);
@@ -12526,13 +12610,13 @@ function writeRefreshDocs(docs, dir = ".") {
   if (docs.agentsMd) {
     const filePath = p("AGENTS.md");
     ensureParent(filePath);
-    fs39.writeFileSync(filePath, appendManagedBlocks(docs.agentsMd, "codex"));
+    fs39.writeFileSync(filePath, appendManagedBlocks(docs.agentsMd, "codex", targets));
     written.push(filePath);
   }
   if (docs.claudeMd) {
     const filePath = p("CLAUDE.md");
     ensureParent(filePath);
-    fs39.writeFileSync(filePath, appendManagedBlocks(docs.claudeMd));
+    fs39.writeFileSync(filePath, appendManagedBlocks(docs.claudeMd, "claude", targets));
     written.push(filePath);
   }
   if (docs.claudeRules) {
@@ -12556,7 +12640,7 @@ function writeRefreshDocs(docs, dir = ".") {
   if (docs.copilotInstructions) {
     const filePath = p(path31.join(".github", "copilot-instructions.md"));
     ensureParent(filePath);
-    fs39.writeFileSync(filePath, appendManagedBlocks(docs.copilotInstructions, "copilot"));
+    fs39.writeFileSync(filePath, appendManagedBlocks(docs.copilotInstructions, "copilot", targets));
     written.push(filePath);
   }
   if (docs.copilotInstructionFiles) {
@@ -13300,6 +13384,7 @@ async function refreshSingleRepo(repoDir, options) {
 async function refreshCommand(options) {
   const quiet = !!options.quiet;
   if (quiet && isCaliberSubprocess()) return;
+  if (quiet && isHookCascadeFromUserClaudeSession()) return;
   if (quiet) {
     const { isCaliberRunning: isCaliberRunning2 } = await Promise.resolve().then(() => (init_lock(), lock_exports));
     if (isCaliberRunning2()) return;
@@ -14351,6 +14436,7 @@ async function learnFinalizeCommand(options) {
   const isAuto = options?.auto === true;
   const isIncremental = options?.incremental === true;
   if (isAuto && isCaliberSubprocess()) return;
+  if (isAuto && isHookCascadeFromUserClaudeSession()) return;
   if (!options?.force && !isAuto) {
     const { isCaliberRunning: isCaliberRunning2 } = await Promise.resolve().then(() => (init_lock(), lock_exports));
     if (isCaliberRunning2()) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rely-ai/caliber",
-  "version": "1.49.1",
+  "version": "1.49.4",
   "description": "AI context infrastructure for coding agents — keeps CLAUDE.md, Cursor rules, and skills in sync as your codebase evolves",
   "type": "module",
   "bin": {