@haposoft/cafekit 0.18.1 → 0.18.3

package/src/claude/hooks/session.cjs

@@ -11,11 +11,24 @@
  * Exit: 0 always (fail-open)
  */
 
+function logCrash(error) {
+  try {
+    const fs = require('fs'), path = require('path');
+    const dir = require('./lib/hook-state-dir.cjs').hookStateDir();
+    fs.mkdirSync(dir, { recursive: true });
+    fs.appendFileSync(path.join(dir, 'hook-log.jsonl'),
+      JSON.stringify({ ts: new Date().toISOString(), hook: 'session', status: 'crash', error: error.message }) + '\n');
+  } catch (_) {}
+}
+
 try {
   const fs   = require('fs');
   const path = require('path');
   const { runtimeDirName, runtimeDir, runtimePath } = require('./lib/runtime-dir.cjs');
   const os   = require('os');
+  const { projectRoot } = require('./lib/project-root.cjs');
+  const { checkCafeKitUpdate } = require('./lib/update-check.cjs');
+  const { clearSessionReservation } = require('./lib/rules-reservation.cjs');
   const { execSync } = require('child_process');
 
   // ── Utilities ─────────────────────────────────────────────────────────────
@@ -41,21 +54,6 @@ try {
     } catch { /* fail-open */ }
   }
 
-  function projectRoot() {
-    const configured = typeof process.env.CLAUDE_PROJECT_DIR === 'string'
-      ? process.env.CLAUDE_PROJECT_DIR.trim()
-      : '';
-    if (configured) {
-      try { return fs.realpathSync(path.resolve(configured)); } catch { /* continue */ }
-    }
-
-    const installedRoot = path.resolve(__dirname, '..', '..');
-    const installedHook = runtimePath(installedRoot, 'hooks', path.basename(__filename));
-    if (fs.existsSync(installedHook)) return installedRoot;
-
-    try { return fs.realpathSync(process.cwd()); } catch { return path.resolve(process.cwd()); }
-  }
-
   /** Read <runtime>/runtime.json config */
   function readRuntime(cwd) {
     try {
@@ -104,94 +102,6 @@ try {
     return '';
   }
 
-  // ── CafeKit Update Check ──────────────────────────────────────────────────
-
-  /**
-   * Fetch the latest published version of @haposoft/cafekit from the npm registry.
-   * Returns a string (e.g. "0.11.2") or null on any failure. Timeout: 3 s.
-   */
-  function fetchLatestVersion() {
-    try {
-      const https = require('https');
-      return new Promise((resolve) => {
-        const req = https.get(
-          'https://registry.npmjs.org/@haposoft/cafekit/latest',
-          { timeout: 3000, headers: { Accept: 'application/json' } },
-          (res) => {
-            let body = '';
-            res.on('data', (chunk) => { body += chunk; });
-            res.on('end', () => {
-              try { resolve(JSON.parse(body).version || null); }
-              catch { resolve(null); }
-            });
-          }
-        );
-        req.on('error', () => resolve(null));
-        req.on('timeout', () => { req.destroy(); resolve(null); });
-      });
-    } catch { return Promise.resolve(null); }
-  }
-
-  /** Simple semver compare: returns true when b > a. */
-  function isNewer(a, b) {
-    const n = (v) => String(v).split('.').map((x) => parseInt(x, 10) || 0);
-    const [aN, bN] = [n(a), n(b)];
-    for (let i = 0; i < 3; i++) {
-      if (bN[i] > aN[i]) return true;
-      if (bN[i] < aN[i]) return false;
-    }
-    return false;
-  }
-
-  /**
-   * Read the installed CafeKit version from <runtime>/cafekit.json.
-   * Returns null if not found.
-   */
-  function getInstalledVersion(cwd) {
-    try {
-      const p = runtimePath(cwd, 'cafekit.json');
-      if (!fs.existsSync(p)) return null;
-      const meta = JSON.parse(fs.readFileSync(p, 'utf8'));
-      return typeof meta.version === 'string' ? meta.version : null;
-    } catch { return null; }
-  }
-
-  /**
-   * Check for a newer CafeKit version and return an update notice string,
-   * or an empty string if already up to date or check fails.
-   * Result is cached in <runtime>/.cafekit-update-cache.json for 12 hours.
-   */
-  async function checkCafeKitUpdate(cwd) {
-    const installed = getInstalledVersion(cwd);
-    if (!installed) return '';
-
-    const CACHE_TTL = 12 * 60 * 60 * 1000; // 12 hours
-    const cachePath = runtimePath(cwd, '.cafekit-update-cache.json');
-
-    // Return cached result if still fresh.
-    try {
-      if (fs.existsSync(cachePath)) {
-        const cache = JSON.parse(fs.readFileSync(cachePath, 'utf8'));
-        if (Date.now() - (cache.ts || 0) < CACHE_TTL) {
-          return cache.notice || '';
-        }
-      }
-    } catch { /* stale or corrupt — refetch */ }
-
-    // Fetch from npm registry.
-    const latest = await fetchLatestVersion();
-    const notice = (latest && isNewer(installed, latest))
-      ? `\n⚡ CafeKit update available: ${installed} → ${latest}\n   Run: npx @haposoft/cafekit\n`
-      : '';
-
-    // Persist cache (fail-open if write fails).
-    try {
-      fs.writeFileSync(cachePath, JSON.stringify({ ts: Date.now(), notice }), 'utf8');
-    } catch { /* fail-open */ }
-
-    return notice;
-  }
-
   // ── Main ──────────────────────────────────────────────────────────────────
 
   (async () => {
@@ -199,12 +109,16 @@ try {
   const { normalizeHookPayload } = require('./lib/hook-payload.cjs');
   const payload = stdin ? normalizeHookPayload(JSON.parse(stdin)) : {};
   const source  = payload.source || 'unknown';
+  if (source === 'compact') clearSessionReservation(payload.session_id);
   const envFile = process.env.CLAUDE_ENV_FILE;
-  const cwd     = projectRoot();
+  const cwd     = projectRoot(payload);
   const runtime = readRuntime(cwd);
 
   // Check CafeKit update in parallel with project detection (async, fail-open).
-  const updateCheckPromise = checkCafeKitUpdate(cwd);
+  // The plugin is updated by its marketplace, so an npx notice would be wrong there.
+  const updateCheckPromise = process.env.CLAUDE_PLUGIN_ROOT
+    ? Promise.resolve('')
+    : checkCafeKitUpdate(runtimeDir(cwd)).catch(() => '');
 
   // Project detection
   const projectType = runtime.project?.type !== 'auto'
@@ -221,7 +135,6 @@ try {
 
   // Static environment
   const gitBranch  = run('git branch --show-current', '', cwd);
-  const gitUrl     = run('git remote get-url origin', '', cwd);
   const gitRoot    = run('git rev-parse --show-toplevel', '', cwd);
   const nodeVer    = process.version;
   const pythonVer  = run('python3 --version', '', cwd) || run('python --version', '', cwd);
@@ -235,7 +148,6 @@ try {
     writeEnv(envFile, 'PACKAGE_MANAGER', packageManager);
     writeEnv(envFile, 'FRAMEWORK',       framework);
     writeEnv(envFile, 'GIT_BRANCH',      gitBranch);
-    writeEnv(envFile, 'GIT_URL',         gitUrl);
     writeEnv(envFile, 'GIT_ROOT',        gitRoot);
     writeEnv(envFile, 'NODE_VERSION',    nodeVer);
     writeEnv(envFile, 'PYTHON_VERSION',  pythonVer);
@@ -262,6 +174,14 @@ try {
 
   console.log(`Session ${source}. ${parts.length ? parts.join(' | ') : 'No project info detected.'}${updateNotice}`);
 
+  if (typeof payload.cwd === 'string' && payload.cwd) {
+    let sessionCwd = path.resolve(payload.cwd);
+    try { sessionCwd = fs.realpathSync(sessionCwd); } catch { /* lexical fallback */ }
+    if (sessionCwd !== cwd) {
+      console.log(`CafeKit project root: ${cwd} (session working directory: ${sessionCwd}).`);
+    }
+  }
+
   // Compact warning — context compaction can lose pending approval state
   if (source === 'compact') {
     console.log('\n🚨 SESSION COMPRESSED — VERIFY PENDING AUTHORIZATIONS:');
@@ -274,8 +194,11 @@ try {
     // bearings, and nothing more.
     try {
       const fs2 = require('fs'), p2 = require('path');
-      const file = p2.join(require('./lib/hook-state-dir.cjs').hookStateDir(), 'compact-recovery.json');
+      if (typeof payload.session_id !== 'string' || !payload.session_id.trim()) process.exit(0);
+      const key = require('crypto').createHash('sha256').update(payload.session_id).digest('hex');
+      const file = p2.join(require('./lib/hook-state-dir.cjs').hookStateDir(), `compact-recovery-${key}.json`);
       const record = JSON.parse(fs2.readFileSync(file, 'utf8'));
+      if (record.session_id !== payload.session_id) process.exit(0);
       const parts = [];
       if (record.branch) parts.push(`branch ${record.branch}`);
       if (record.head) parts.push(`HEAD ${record.head}`);
@@ -297,15 +220,12 @@ try {
   }
 
   process.exit(0);
-  })(); // end async IIFE
+  })().catch((error) => {
+    logCrash(error);
+    process.exit(0);
+  });
 
-} catch (e) {
-  try {
-    const fs = require('fs'), p = require('path');
-    const d = require('./lib/hook-state-dir.cjs').hookStateDir();
-    if (!fs.existsSync(d)) fs.mkdirSync(d, { recursive: true });
-    fs.appendFileSync(p.join(d, 'hook-log.jsonl'),
-      JSON.stringify({ ts: new Date().toISOString(), hook: 'session', status: 'crash', error: e.message }) + '\n');
-  } catch (_) {}
+} catch (error) {
+  logCrash(error);
   process.exit(0);
 }

package/src/claude/hooks/spec-gate.cjs

@@ -16,32 +16,7 @@
 const fs = require('fs');
 const path = require('path');
 const { runtimeDirName, runtimeDir, runtimePath } = require('./lib/runtime-dir.cjs');
-
-function projectRoot(payload = {}) {
-  const configured = typeof process.env.CLAUDE_PROJECT_DIR === 'string'
-    ? process.env.CLAUDE_PROJECT_DIR.trim()
-    : '';
-  if (configured) {
-    try { return fs.realpathSync(path.resolve(configured)); } catch { /* continue */ }
-  }
-
-  const installedRoot = path.resolve(__dirname, '..', '..');
-  const installedHook = runtimePath(installedRoot, 'hooks', path.basename(__filename));
-  if (fs.existsSync(installedHook)) return installedRoot;
-
-  const sourceFixture = typeof process.env.PROJECT_ROOT === 'string'
-    ? process.env.PROJECT_ROOT.trim()
-    : '';
-  if (sourceFixture) {
-    try { return fs.realpathSync(path.resolve(sourceFixture)); } catch { /* continue */ }
-  }
-
-  const legacy = typeof payload.cwd === 'string' ? payload.cwd.trim() : '';
-  if (legacy) {
-    try { return fs.realpathSync(path.resolve(legacy)); } catch { /* continue */ }
-  }
-  try { return fs.realpathSync(process.cwd()); } catch { return path.resolve(process.cwd()); }
-}
+const { projectRoot } = require('./lib/project-root.cjs');
 
 function logCrash(error) {
   try {
@@ -68,6 +43,7 @@ function sessionIdentity(payload) {
   return candidates.find((value) => typeof value === 'string' && value.trim() !== '') || null;
 }
 
+let hasDoneTasks = false;
 try {
   const policyPath = path.join(__dirname, '..', 'scripts', 'workflow-policy.cjs');
 
@@ -132,6 +108,8 @@ try {
   }
   if (!resolved) process.exit(0);
   if (resolved.layoutKind === 'process-v3-completed-set') {
+    hasDoneTasks = resolved.candidates.some(candidate =>
+      Object.values(candidate.taskRegistry || {}).some(task => task?.status === 'done'));
     const configuredGate = runtime.spec?.completion_gate;
     if (configuredGate !== undefined && configuredGate !== true) {
       emitBlock('Completion gate: runtime.spec.completion_gate is a worker-writable flag, not an authorization; no completion-gate bypass is supported. Remove the flag and satisfy the gate.');
@@ -178,6 +156,7 @@ try {
 
   const featureName = resolved.featureName;
   const specsPath = resolved.specsDir;
+  hasDoneTasks = Object.values(resolved.taskRegistry || {}).some(task => task?.status === 'done');
   const runtimeContext = POLICY.deriveRuntimeContext({
     projectRoot: baseDir,
     specsRoot: specsPath,
@@ -250,6 +229,10 @@ try {
   process.exit(0);
 
 } catch (e) {
+  if (e.code === 'no_git_history') {
+    if (hasDoneTasks) emitBlock('Completion gate: repo has no commits yet; create the first commit, then record Base/Head after it.');
+    process.exit(0);
+  }
   logCrash(e);
   emitBlock(`Completion gate controlled failure: ${e.message}. Completion is blocked until the hook is repaired.`);
   process.exit(0);

package/src/claude/hooks/spec-state.cjs

@@ -13,6 +13,8 @@
 
 const fs = require('fs');
 const path = require('path');
+const { projectRoot } = require('./lib/project-root.cjs');
+const { packetAt, namedPackets, explicitFailure, touchedPaths } = require('./lib/spec-touch.cjs');
 const { runtimeDirName, runtimeDir, runtimePath } = require('./lib/runtime-dir.cjs');
 
 function logCrash(error) {
@@ -40,44 +42,6 @@ function sessionIdentity(payload) {
   return candidates.find((value) => typeof value === 'string' && value.length > 0) || null;
 }
 
-function canonicalPath(value) {
-  try { return fs.realpathSync(value); } catch { return null; }
-}
-
-/** Real path of `value`, resolving its deepest existing ancestor (the file may not exist yet). */
-function canonicalTarget(value) {
-  if (typeof value !== 'string' || !value) return null;
-  let current = path.resolve(value);
-  const rest = [];
-  while (!fs.existsSync(current)) {
-    const parent = path.dirname(current);
-    if (parent === current) return null;
-    rest.unshift(path.basename(current));
-    current = parent;
-  }
-  const real = canonicalPath(current);
-  return real ? path.join(real, ...rest) : null;
-}
-
-function escapeRegExp(text) {
-  return text.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-}
-
-/**
- * Packets the prompt names: `specs/<name>`, a `/cf:<command> <name>` token, or the bare
- * name when it carries `-`, `_` or a digit. A plain word such as `docs` must use `specs/`,
- * so an ordinary sentence does not touch a packet.
- */
-function packetsNamedIn(text, names) {
-  if (typeof text !== 'string' || !text) return [];
-  return names.filter((name) => {
-    const n = escapeRegExp(name);
-    if (new RegExp(`(^|[^\\w-])specs/${n}(?![\\w-])`).test(text)) return true;
-    if (new RegExp(`/cf:[\\w-]+\\s+(?:specs/)?${n}(?![\\w-])`).test(text)) return true;
-    return /[-_0-9]/.test(name) && new RegExp(`(^|[^\\w/-])${n}(?![\\w-])`).test(text);
-  });
-}
-
 try {
   // ── Main ──────────────────────────────────────────────────────────────────
 
@@ -94,6 +58,7 @@ try {
   let RECEIPT;
   try {
     POLICY = require(path.join(__dirname, '..', 'scripts', 'workflow-policy.cjs'));
+    require(path.join(__dirname, '..', 'scripts', 'provenance.cjs')).enableSnapshotMemo();
     RESOLVER = require(path.join(__dirname, '..', 'scripts', 'spec-resolver.cjs'));
     RECEIPT = require(path.join(__dirname, '..', 'scripts', 'spec-receipt.cjs'));
     if (typeof RESOLVER.resolveWorkflowCandidate !== 'function') throw new Error('shared spec resolver has no resolveWorkflowCandidate function');
@@ -103,10 +68,12 @@ try {
     process.exit(0);
   }
 
+  const baseDir = projectRoot(payload);
+
   // Read runtime configuration if exists
   let runtime = {};
   try {
-    const p = runtimePath(cwd, 'runtime.json');
+    const p = runtimePath(baseDir, 'runtime.json');
     if (fs.existsSync(p)) runtime = JSON.parse(fs.readFileSync(p, 'utf8'));
   } catch { /* ignore */ }
 
@@ -114,20 +81,17 @@ try {
   // (The Stop completion gate has its own toggle: spec.completion_gate.)
   if (runtime.spec && runtime.spec.tollgate === false) process.exit(0);
 
-  // Same rule as spec-gate: an installed hook trusts its own location over the environment.
-  const installedRoot = path.basename(path.resolve(__dirname, '..')).startsWith('.') ? path.resolve(__dirname, '..', '..') : null;
-  const baseDir   = installedRoot || process.env.PROJECT_ROOT || cwd;
   const explicitFeature = payload.featureName || payload.feature || payload.explicitFeature || null;
-  const explicitPath = payload.specPath || payload.spec_path || payload.featurePath || null;
+  const explicitPath = payload.explicitPath || payload.specPath || payload.spec_path || payload.featurePath || null;
 
-  // ── Per-session touch set (Claude only) ───────────────────────────────────
-  // Several sessions can share one checkout. On Claude the tollgate speaks only about a
-  // packet this session touched. omp and Codex run their own copies, and grok sends
-  // `sessionId` before normalization, so all three keep the old behaviour.
+  // ── Per-session touch set (Claude and omp) ────────────────────────────────
+  // Several sessions can share one checkout. On Claude and omp the tollgate speaks only
+  // about a packet this session touched. Codex runs its own copy, and grok sends
+  // `sessionId` before normalization, so both keep the old behaviour.
   const claudeSession = rawPayload && typeof rawPayload.session_id === 'string' && rawPayload.session_id
     ? rawPayload.session_id
     : null;
-  const touchFilter = runtimeDirName() === '.claude' && claudeSession !== null;
+  const touchFilter = ['.claude', '.omp'].includes(runtimeDirName()) && claudeSession !== null;
   const touchFile = touchFilter
     ? path.join(
       require('./lib/hook-state-dir.cjs').hookStateDir(),
@@ -155,14 +119,10 @@ try {
 
   if (payload.hook_event_name === 'PostToolUse') {
     // Record only; no resolve, no git, no tollgate cache.
-    if (touchFilter && specsRoot && /^(Edit|Write|MultiEdit)$/.test(payload.tool_name || '')) {
-      const realRoot = canonicalPath(specsRoot);
-      const realTarget = canonicalTarget(payload.tool_input && payload.tool_input.file_path);
-      if (realRoot && realTarget) {
-        const rel = path.relative(realRoot, realTarget);
-        const parts = rel.split(path.sep);
-        if (rel && parts[0] !== '..' && !path.isAbsolute(rel) && parts.length > 1) addTouched([parts[0]]);
-      }
+    // omp's ast_edit keeps its own name: aliasing it to Edit would lift the inspect scope check.
+    if (touchFilter && specsRoot && !explicitFailure(payload) && /^(Edit|Write|MultiEdit|ast_edit)$/.test(payload.tool_name || '')) {
+      const names = touchedPaths(payload).map((value) => packetAt(value, specsRoot, cwd)).filter(Boolean);
+      if (names.length) addTouched(names);
     }
     process.exit(0);
   }
@@ -204,12 +164,29 @@ try {
     try {
       packets = fs.readdirSync(specsRoot, { withFileTypes: true }).filter((e) => e.isDirectory()).map((e) => e.name);
     } catch { /* no specs root */ }
-    const named = packetsNamedIn(payload.prompt, packets);
+    const named = specsRoot ? namedPackets(payload.prompt || payload.user_prompt, packets, specsRoot, baseDir) : [];
     if (typeof explicitFeature === 'string' && explicitFeature) named.push(explicitFeature);
+    const fromPath = specsRoot ? packetAt(explicitPath, specsRoot, baseDir) : null;
+    if (fromPath) named.push(fromPath);
     if (named.length) addTouched(named);
   }
 
-  const resolved = RESOLVER.resolveWorkflowCandidate({ projectRoot: baseDir, runtime, explicitFeature, explicitPath });
+  let resolved = RESOLVER.resolveWorkflowCandidate({ projectRoot: baseDir, runtime, explicitFeature, explicitPath });
+  if (touchFilter && !explicitFeature && !explicitPath
+    && ['multiple_active', 'invalid_specs'].includes(resolved?.error)) {
+    const touched = readTouched();
+    const candidates = resolved.candidates || [];
+    if (!candidates.includes('<specs>') && !candidates.some(name => touched.has(name))) {
+      const selected = [...touched].map(name => RESOLVER.resolveWorkflowCandidate({
+        projectRoot: baseDir, runtime, explicitFeature: name,
+      }));
+      resolved = selected.find(candidate => candidate?.error);
+      const active = selected.filter(candidate => candidate && !candidate.error && !candidate.allTasksDone);
+      if (!resolved) resolved = active.length > 1
+        ? { error: 'multiple_active', candidates: active.map(candidate => candidate.featureName) }
+        : active[0] || null;
+    }
+  }
 
   if (!resolved) {
     process.exit(0); // No active spec, do nothing
@@ -299,7 +276,10 @@ try {
     done: taskCounts.done || 0,
     total: taskEntries.length,
   });
-  const cacheFile = path.join(require('./lib/hook-state-dir.cjs').hookStateDir(), 'tollgate-last.txt');
+  const cacheName = touchFilter
+    ? `tollgate-last-${require('crypto').createHash('sha256').update(claudeSession).digest('hex').slice(0, 16)}.txt`
+    : 'tollgate-last.txt';
+  const cacheFile = path.join(require('./lib/hook-state-dir.cjs').hookStateDir(), cacheName);
 
   let lastKey = '';
   if (stateKey) {
@@ -335,12 +315,17 @@ try {
   }
   lines.push('- Sync each flat task `Status:` only after verified work; task proof belongs in that task\'s inline `## Receipt`.');
   lines.push(`- Workflow source: \`specs/${featureName}/plan.md\`; Stop re-checks every done receipt, binding Base/Head to the runtime only while a committed task file no longer matches its committed bytes.`);
+  lines.push('- Hooks revalidate receipt bytes but never grant approval.');
   lines.push('');
 
   console.log(lines.join('\n'));
   process.exit(0);
 
 } catch (e) {
+  if (e.code === 'no_git_history') {
+    console.log('Repo has no commits yet; create the first commit, then record Base/Head after it.');
+    process.exit(0);
+  }
   logCrash(e);
   emitControlledFailure(e.message);
   process.exit(0);