@synkro-sh/cli 1.6.30 → 1.6.31

package/dist/bootstrap.js

@@ -2351,12 +2351,10 @@ export async function pushConversationMessage(
         type: role,
         content: text,
         ts: new Date().toISOString(),
+        message_index: seq,
         patch_redacted: opts.patchRedacted ?? true,
       }],
     };
-    if (!opts.patchRedacted) {
-      (body.messages as Record<string, unknown>[])[0].message_index = seq;
-    }
     const resp = await fetch('http://127.0.0.1:' + mcpPort + '/api/conversation-sync', {
       method: 'POST',
       headers: { 'Content-Type': 'application/json', Authorization: 'Bearer ' + mcpToken },
@@ -2493,10 +2491,13 @@ export async function syncConversationTranscript(
     } catch {}
   }
 
-  writeFileSync(offsetFile, String(totalLines), 'utf-8');
-  if (messages.length === 0) return { ingested: 0, messages: [] };
+  if (messages.length === 0) {
+    writeFileSync(offsetFile, String(totalLines), 'utf-8');
+    return { ingested: 0, messages: [] };
+  }
 
-  const mcpPort = process.env.SYNKRO_MCP_PORT || '18931';
+  const rawPort = parseInt(process.env.SYNKRO_MCP_PORT || '18931', 10);
+  const mcpPort = (rawPort > 0 && rawPort < 65536) ? rawPort : 18931;
   let mcpToken = '';
   try { mcpToken = readFileSync(join(HOME, '.synkro', '.mcp-jwt'), 'utf-8').trim(); } catch {}
   if (!mcpToken) return { ingested: 0, messages };
@@ -2509,6 +2510,7 @@ export async function syncConversationTranscript(
       signal: AbortSignal.timeout(5000),
     });
     if (resp.ok) {
+      writeFileSync(offsetFile, String(totalLines), 'utf-8');
       const data = await resp.json() as { ingested?: number };
       return { ingested: data.ingested ?? messages.length, messages };
     }
@@ -3042,7 +3044,17 @@ export function hookSessionId(payload: Record<string, unknown>): string {
 }
 
 export function isCursorHookFormat(): boolean {
-  return process.env.SYNKRO_HOOK_FORMAT === 'cursor';
+  return process.env.SYNKRO_HOOK_FORMAT === 'cursor' || process.argv.includes('--cursor');
+}
+
+// Cursor reads CC hooks from ~/.claude/settings.json and fires them alongside
+// its own ~/.cursor/hooks.json entries. When that happens, agentKind is
+// 'claude_code' but the payload model is non-Claude (e.g. gpt-5.5).
+// Return true so the CC hook can bail out and let Cursor's hooks handle it.
+export function isCursorInvokingCcHook(agentKind: string, model: string): boolean {
+  if (agentKind === 'cursor') return false;
+  if (!model || model === 'unknown' || model === '') return false;
+  return !model.startsWith('claude-');
 }
 
 let cursorHookExited = false;
@@ -3142,13 +3154,13 @@ import {
   appendSessionAction, readSessionLog, compressSessionLog, log,
   outputJson, outputEmpty, setupCursorHookSignals, isEditTool, hookSessionId, GATEWAY_URL,
   logGraderUnavailable, filterRules, ruleFilterText, normalizeMode, countEditLineDelta,
-  captureLineMetrics, cursorModelFromPayload, resolveTranscriptPath,
+  captureLineMetrics, cursorModelFromPayload, resolveTranscriptPath, isCursorInvokingCcHook,
   type HookConfig, type Rule,
 } from './_synkro-common.ts';
 import { existsSync, readFileSync } from 'node:fs';
 import { basename, join } from 'node:path';
 
-const agentKind = process.env.SYNKRO_HOOK_FORMAT === 'cursor' ? 'cursor' : 'claude_code';
+const agentKind = (process.env.SYNKRO_HOOK_FORMAT === 'cursor' || process.argv.includes('--cursor')) ? 'cursor' : 'claude_code';
 
 async function main() {
   setupCursorHookSignals();
@@ -3235,6 +3247,8 @@ async function main() {
       ? cursorModelFromPayload(payload)
       : (transcript.ccModel || String(payload.model ?? payload.model_id ?? ''));
 
+    if (isCursorInvokingCcHook(agentKind, captureModel)) { outputEmpty(); return; }
+
     // Model detection: prefer transcript (CC), fall back to payload (Cursor)
     if (!transcript.ccModel) {
       transcript.ccModel = captureModel;
@@ -3392,12 +3406,12 @@ import {
   localGradeCwe, parseVerdict, reconstructContent, readStdin, log,
   outputJson, outputEmpty, setupCursorHookSignals, isEditTool, isShellTool, isCursorHookFormat,
   extractShellCodeWrites, hookSessionId, filePathFromToolInput, emitBlockScanFindings, dispatchFinding, dispatchCapture, GATEWAY_URL,
-  logGraderUnavailable, resolveTranscriptPath,
+  logGraderUnavailable, resolveTranscriptPath, isCursorInvokingCcHook,
 } from './_synkro-common.ts';
 import { basename, extname, resolve, join, dirname } from 'node:path';
 import { readFileSync, readdirSync, existsSync } from 'node:fs';
 
-const agentKind = process.env.SYNKRO_HOOK_FORMAT === 'cursor' ? 'cursor' : 'claude_code';
+const agentKind = (process.env.SYNKRO_HOOK_FORMAT === 'cursor' || process.argv.includes('--cursor')) ? 'cursor' : 'claude_code';
 
 function detectModel(payload: Record<string, unknown>): string {
   const raw = String(payload.model ?? payload.model_id ?? '');
@@ -3543,6 +3557,8 @@ async function main() {
     const shellCommand = typeof payload.command === 'string' ? payload.command.trim() : '';
     const ccModel = detectModel(payload);
 
+    if (isCursorInvokingCcHook(agentKind, ccModel)) { outputEmpty(); return; }
+
     const targets: CweScanTarget[] = [];
 
     if (isCursorHookFormat() && (shellCommand || isShellTool(toolName))) {
@@ -3946,6 +3962,7 @@ import {
   loadJwt, ensureFreshJwt, detectRepo, loadConfig, route, tag,
   reconstructContent, readStdin, findNearestDeps, filePathFromToolInput, log,
   outputJson, outputEmpty, setupCursorHookSignals, isEditTool, hookSessionId, dispatchFinding, dispatchCapture, dispatchScanResult, extractTranscript, emitBlockScanFindings, resolveTranscriptPath, GATEWAY_URL,
+  isCursorHookFormat,
 } from './_synkro-common.ts';
 import { basename } from 'node:path';
 import { readFileSync } from 'node:fs';
@@ -3976,6 +3993,9 @@ async function main() {
       return;
     }
 
+    const _m = String(payload.model ?? payload.model_id ?? '');
+    if (!isCursorHookFormat() && _m && !_m.startsWith('claude-')) { outputEmpty(); return; }
+
     const toolInput = payload.tool_input || {};
     const sessionId = hookSessionId(payload);
     const workspaceRoots = Array.isArray(payload.workspace_roots) ? payload.workspace_roots as string[] : [];
@@ -4238,6 +4258,9 @@ async function main() {
     if (!input.trim()) { outputEmpty(); return; }
 
     const payload = JSON.parse(input);
+    const _m = String(payload.model ?? payload.model_id ?? '');
+    if (!isCursorHookFormat() && _m && !_m.startsWith('claude-')) { outputEmpty(); return; }
+
     const toolInput = payload.tool_input || {};
     const command = typeof payload.command === 'string' ? payload.command : (toolInput.command || '');
     if (!command) { outputEmpty(); return; }
@@ -4340,7 +4363,7 @@ import {
   extractTranscript, readLastPrompt, appendSessionAction, readSessionLog, compressSessionLog, log,
   outputJson, outputEmpty, setupCursorHookSignals, isShellTool, hookSessionId, GATEWAY_URL,
   logGraderUnavailable, filterRules, ruleFilterText, normalizeMode, appendLocalTelemetry, isSafeInRepoRead,
-  hashCommand, resolveTranscriptPath,
+  hashCommand, resolveTranscriptPath, isCursorHookFormat,
   type HookConfig, type Rule,
 } from './_synkro-common.ts';
 import { createHash } from 'node:crypto';
@@ -4391,6 +4414,9 @@ async function main() {
       return;
     }
 
+    const _m = String(payload.model ?? payload.model_id ?? '');
+    if (!isCursorHookFormat() && _m && !_m.startsWith('claude-')) { outputEmpty(); return; }
+
     const toolInput = payload.tool_input || {};
     const sessionId = hookSessionId(payload);
     const toolUseId = payload.tool_use_id || '';
@@ -4630,11 +4656,11 @@ import {
   parseVerdict, dispatchCapture, ruleMode, postWithRetry, readStdin,
   extractTranscript, readLastPrompt, appendSessionAction, readSessionLog, compressSessionLog, log,
   outputJson, outputEmpty, setupCursorHookSignals, isAgentTool, hookSessionId, GATEWAY_URL,
-  logGraderUnavailable, filterRules, normalizeMode, resolveTranscriptPath,
+  logGraderUnavailable, filterRules, normalizeMode, resolveTranscriptPath, isCursorInvokingCcHook,
   type HookConfig, type Rule,
 } from './_synkro-common.ts';
 
-const agentKind = process.env.SYNKRO_HOOK_FORMAT === 'cursor' ? 'cursor' : 'claude_code';
+const agentKind = (process.env.SYNKRO_HOOK_FORMAT === 'cursor' || process.argv.includes('--cursor')) ? 'cursor' : 'claude_code';
 
 async function main() {
   setupCursorHookSignals();
@@ -4649,6 +4675,9 @@ async function main() {
       return;
     }
 
+    const _m = String(payload.model ?? payload.model_id ?? '');
+    if (isCursorInvokingCcHook(agentKind, _m)) { outputEmpty(); return; }
+
     const toolInput = payload.tool_input || {};
     const sessionId = hookSessionId(payload);
     const toolUseId = payload.tool_use_id || '';
@@ -4809,13 +4838,13 @@ import {
   loadJwt, ensureFreshJwt, detectRepo, loadConfig, route, tag, localGrade,
   parseVerdict, dispatchCapture, appendSessionAction, readSessionLog, compressSessionLog, postWithRetry, readStdin, log,
   outputJson, outputEmpty, setupCursorHookSignals, isPlanTool, hookSessionId, GATEWAY_URL,
-  filterRules, resolveTranscriptPath,
+  filterRules, resolveTranscriptPath, isCursorInvokingCcHook,
 } from './_synkro-common.ts';
 import { existsSync, readFileSync, writeFileSync, readdirSync, statSync } from 'node:fs';
 import { join } from 'node:path';
 import { homedir } from 'node:os';
 
-const agentKind = process.env.SYNKRO_HOOK_FORMAT === 'cursor' ? 'cursor' : 'claude_code';
+const agentKind = (process.env.SYNKRO_HOOK_FORMAT === 'cursor' || process.argv.includes('--cursor')) ? 'cursor' : 'claude_code';
 
 function findLatestPlanInDir(plansDir: string): string | null {
   if (!existsSync(plansDir)) return null;
@@ -4867,6 +4896,9 @@ async function main() {
     const toolName = payload.tool_name || '';
     if (!isPlanTool(toolName)) { outputEmpty(); return; }
 
+    const _m = String(payload.model ?? payload.model_id ?? '');
+    if (isCursorInvokingCcHook(agentKind, _m)) { outputEmpty(); return; }
+
     const planFile = findLatestPlan();
     if (!planFile) { outputEmpty(); return; }
     const plan = readFileSync(planFile, 'utf-8');
@@ -7944,7 +7976,7 @@ function writeConfigEnv(opts) {
     `SYNKRO_CREDENTIALS_PATH=${shellQuoteSingle(credsPath)}`,
     `SYNKRO_TIER=${shellQuoteSingle(safeTier)}`,
     `SYNKRO_INFERENCE=${shellQuoteSingle(safeInference)}`,
-    `SYNKRO_VERSION=${shellQuoteSingle("1.6.30")}`
+    `SYNKRO_VERSION=${shellQuoteSingle("1.6.31")}`
   ];
   if (safeSynkroBin) lines.push(`SYNKRO_CLI_BIN=${shellQuoteSingle(safeSynkroBin)}`);
   if (safeUserId) lines.push(`SYNKRO_USER_ID=${shellQuoteSingle(safeUserId)}`);
@@ -10715,7 +10747,7 @@ var args = process.argv.slice(2);
 var cmd = args[0] || "";
 var subArgs = args.slice(1);
 function printVersion() {
-  console.log("1.6.30");
+  console.log("1.6.31");
 }
 function printHelp2() {
   console.log(`Synkro CLI \u2014 runtime safety for AI coding agents