@haposoft/cafekit 0.18.0 → 0.18.2

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

@@ -25,9 +25,16 @@ function cacheFile(projectRoot, sessionId) {
   return path.join(hookStateDir(projectRoot), `tollgate-${key}.txt`);
 }
 
+let mutationObserver = false;
 try {
   const payload = readPayload();
+  mutationObserver = payload?.hook_event_name === 'PostToolUse';
   if (!payload) process.exit(0);
+  const context = getHookContext(payload);
+  const { touchSession } = require('./lib/spec-session-touch.cjs');
+  const touch = touchSession(payload, context);
+  // Mutation observers only persist paths. They must not inspect packet state or proof.
+  if (payload.hook_event_name === 'PostToolUse') process.exit(0);
   const loaded = loadSharedPolicy();
   if (!loaded.policy) {
     logCrash('spec-state', loaded.error);
@@ -35,22 +42,57 @@ try {
     process.exit(0);
   }
   const POLICY = loaded.policy;
+  require(path.join(path.dirname(loaded.path), 'provenance.cjs')).enableSnapshotMemo();
   const receiptLoaded = loadSharedReceipt();
   if (!receiptLoaded.receipt) throw receiptLoaded.error;
   const RECEIPT = receiptLoaded.receipt;
-  const { projectRoot, runtime } = getHookContext(payload);
+  const { projectRoot, runtime } = context;
   if (runtime.spec?.tollgate === false) process.exit(0);
-  const { resolveWorkflowCandidate } = require('./lib/spec-utils.cjs');
-  const explicitFeature = payload.featureName || payload.feature || payload.explicitFeature || null;
-  const explicitPath = payload.specPath || payload.spec_path || payload.featurePath || null;
-  const resolved = resolveWorkflowCandidate(projectRoot, runtime, explicitFeature, explicitPath);
+  const { findLegacyPackets, resolveWorkflowCandidate } = require('./lib/spec-utils.cjs');
+  const sessionId = touch.sessionId;
+  // A legacy packet (a specs/<x>/ directory without plan.md that the old flow left
+  // behind) is no longer read. Say so once per session instead of on every prompt.
+  const legacyPackets = findLegacyPackets(projectRoot, runtime);
+  if (legacyPackets.length > 0) {
+    const noticeFile = sessionId
+      ? path.join(hookStateDir(projectRoot), `legacy-notice-${crypto.createHash('sha256').update(String(sessionId)).digest('hex').slice(0, 16)}.json`)
+      : null;
+    let noticed = [];
+    if (noticeFile) {
+      try { noticed = JSON.parse(fs.readFileSync(noticeFile, 'utf8')); } catch { noticed = []; }
+      if (!Array.isArray(noticed)) noticed = [];
+    }
+    const fresh = legacyPackets.filter((name) => !noticed.includes(name));
+    for (const name of fresh) {
+      process.stdout.write(`> ⚠️ \`specs/${name}\` is a legacy Specs packet without plan.md; CafeKit no longer reads it. Move ongoing work to a process-first plan.md packet.\n`);
+    }
+    if (noticeFile && fresh.length > 0) {
+      try { atomicWrite(noticeFile, `${JSON.stringify([...noticed, ...fresh].sort())}\n`); } catch { /* repeats the notice */ }
+    }
+  }
+  const explicitFeature = payload.explicitFeature ?? payload.featureName ?? payload.feature ?? null;
+  const explicitPath = payload.explicitPath ?? payload.specPath ?? payload.spec_path ?? payload.featurePath ?? null;
+  const hasExplicit = explicitFeature !== null || explicitPath !== null;
+  if (sessionId && !hasExplicit && touch.touched.length === 0) process.exit(0);
+  let resolved;
+  if (sessionId && !hasExplicit) {
+    const names = touch.names.length ? touch.names : touch.touched;
+    const candidates = names.map((name) => resolveWorkflowCandidate(projectRoot, runtime, name, null));
+    resolved = candidates.find((candidate) => candidate?.error);
+    const active = candidates.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;
+  } else {
+    resolved = resolveWorkflowCandidate(projectRoot, runtime, explicitFeature, explicitPath);
+  }
   if (!resolved) process.exit(0);
   if (resolved.error === 'multiple_active') {
     process.stdout.write(`> ⚠️ Multiple active specs detected: ${resolved.candidates.join(', ')}. Provide explicit feature target or resolve ambiguity. Tollgate paused.\n`);
     process.exit(0);
   }
   if (resolved.error === 'invalid_specs') {
-    process.stdout.write(`> ⚠️ Invalid spec JSON detected: ${resolved.candidates.join(', ')}. ${resolved.reason}. Fix or remove malformed spec.json. Tollgate paused.\n`);
+    process.stdout.write(`> ⚠️ Invalid workflow packet detected: ${resolved.candidates.join(', ')}. ${resolved.reason}. Fix the packet's plan.md or task files. Tollgate paused.\n`);
     process.exit(0);
   }
   if (resolved.error === 'explicit_not_found' || resolved.error === 'explicit_malformed') {
@@ -60,18 +102,16 @@ try {
   }
   if (resolved.error) process.exit(0);
   const active = resolved;
-  const processWorkflow = active.layoutKind === 'process-v3';
   const runtimeContext = POLICY.deriveRuntimeContext({
     projectRoot,
     specsRoot: active.specsDir,
-    specFile: active.stateFile || active.specFile || path.join(active.specsDir, active.featureName, 'spec.json'),
+    specFile: active.stateFile,
     featureName: active.featureName,
-    runtimeSession: payload.session_id || payload.sessionId || payload.sessionID || payload.session?.id,
+    runtimeSession: sessionId,
   });
 
-  const phase = active.phase || active.spec?.current_phase || active.spec?.phase || 'unknown';
-  const taskRegistry = active.taskRegistry || active.spec?.task_registry || {};
-  const flashTasks = POLICY.flashState(taskRegistry);
+  const phase = active.phase || 'unknown';
+  const taskRegistry = active.taskRegistry || {};
   const tasks = Object.entries(taskRegistry);
   const counts = tasks.reduce((result, [, task]) => {
     const status = task?.status || 'pending';
@@ -79,13 +119,7 @@ try {
     return result;
   }, {});
   const featureDir = path.join(active.specsDir, active.featureName);
-  const statuses = new Map(tasks.map(([taskPath, task]) => [
-    taskPath,
-    task?.status || 'pending'
-  ]));
-  const dependencyProof = processWorkflow
-    ? RECEIPT.workflowDependencyProofState(featureDir, taskRegistry, runtimeContext, POLICY)
-    : {};
+  const dependencyProof = RECEIPT.workflowDependencyProofState(featureDir, taskRegistry, runtimeContext, POLICY);
   const taskState = tasks.map(([taskPath, task]) => [
     taskPath,
     task?.status || 'pending',
@@ -101,12 +135,8 @@ try {
   const next = tasks.find(([, task]) => (
     active.queueReady !== false
     && (task?.status || 'pending') === 'pending'
-    && (task?.dependencies || []).every((dependency) => (
-      processWorkflow ? dependencyProof[dependency]?.eligible === true : statuses.get(dependency) === 'done'
-    ))
+    && (task?.dependencies || []).every((dependency) => dependencyProof[dependency]?.eligible === true)
   ));
-  const featureReceiptPresent = !processWorkflow
-    && RECEIPT.safeRead(featureDir, 'feature-receipt.md').status === 'ok';
   const stateKey = JSON.stringify({
     project_root: runtimeContext.project_root,
     specs_root: runtimeContext.specs_root,
@@ -124,14 +154,13 @@ try {
     proof_state: proofState,
     done: counts.done || 0,
     total: tasks.length,
-    feature_receipt_present: featureReceiptPresent,
   });
   const cache = cacheFile(projectRoot, runtimeContext.runtime_session);
   let previous = '';
   try { previous = fs.readFileSync(cache, 'utf8').trim(); } catch { /* first run */ }
 
   if (previous === stateKey) {
-    const migration = processWorkflow && active.queueReady === false
+    const migration = active.queueReady === false
       ? ' Add `Specs-Contract: process-first-ready-v1` after the plan title before tasks can enter Next.'
       : '';
     process.stdout.write(
@@ -145,30 +174,23 @@ try {
   const lines = [
     `### Spec state changed: \`${active.featureName}\``,
     `- Phase: \`${phase}\` | Tasks: ${counts.done || 0} done / ${tasks.length} total`
+      + (tasks.length > 0 ? ` (${counts.in_progress || 0} in_progress, ${counts.pending || 0} pending, ${counts.blocked || 0} blocked)` : '')
   ];
   if (next) lines.push(`- Next unblocked: \`${next[0]}\``);
-  if (flashTasks.length > 0) {
-    lines.push(`- Flash verification pending: ${flashTasks.map((taskPath) => `\`${taskPath}\``).join(', ')}. A PASS proof keeps the persisted task in_progress until explicit sync-finalize.`);
-  }
-  if (processWorkflow) {
-    if (active.queueReady === false) {
-      lines.push('- Migration required: add `Specs-Contract: process-first-ready-v1` after the plan title before tasks can enter Next.');
-    }
-    lines.push(
-      '- Sync each flat task `Status:` only after verified work; task proof belongs in that task\'s inline `## Receipt`.',
-      `- Workflow source: \`specs/${active.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.`,
-      '- Hooks revalidate receipt bytes but never grant approval.'
-    );
-  } else {
-    lines.push(
-      '- Sync `spec.json` and task Markdown status only after verified work; task proof belongs in `receipts/<task-basename>.md`.',
-      `- Create \`feature-receipt.md\` once after final integration proof${featureReceiptPresent ? ' (present)' : ' (not required before closeout)'}.`,
-      `- Validate with \`node .codex/scripts/validate-spec-output.cjs specs/${active.featureName}\`.`,
-      '- Hooks revalidate receipt bytes but never grant approval.'
-    );
+  if (active.queueReady === false) {
+    lines.push('- Migration required: add `Specs-Contract: process-first-ready-v1` after the plan title before tasks can enter Next.');
   }
+  lines.push(
+    '- Sync each flat task `Status:` only after verified work; task proof belongs in that task\'s inline `## Receipt`.',
+    `- Workflow source: \`specs/${active.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.`,
+    '- Hooks revalidate receipt bytes but never grant approval.'
+  );
   process.stdout.write(`${lines.join('\n')}\n`);
 } catch (error) {
+  if (error.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('spec-state', error);
-  emitControlledFailure(error.message);
+  if (!mutationObserver) emitControlledFailure(error.message);
 }

package/src/codex/hooks/state.cjs

@@ -3,6 +3,7 @@
 
 const fs = require('fs');
 const path = require('path');
+const { containsSecretKeyword } = require('./lib/secret-keywords.cjs');
 const {
   getHookContext,
   logCrash,
@@ -34,6 +35,11 @@ function summary(value, limit = 600) {
   return clean.length > limit ? `${clean.slice(0, limit)}…` : clean;
 }
 
+function assistantSummary(value) {
+  const text = summary(value, Number.MAX_SAFE_INTEGER);
+  return containsSecretKeyword(text) ? '[omitted: possible secret]' : summary(text);
+}
+
 function normalizeTodos(items) {
   if (!Array.isArray(items)) return [];
   return items.map((item, index) => ({
@@ -74,11 +80,24 @@ function isTrackedTool(toolName) {
   const name = String(toolName || '').toLowerCase();
   return name === 'agent'
     || name === 'spawn_agent'
+    || name === 'collaborationspawn_agent'
     || name === 'update_plan'
     || name.includes('task')
     || name.includes('todo');
 }
 
+function hasPriorContent(text) {
+  const filler = [
+    /^#{1,6}\s/,
+    /^<!--.*-->$/,
+    /^- \((?:No completed tasks recorded|No pending tasks recorded|All tasks completed|No file changes detected)\)$/,
+    /^- Completed at \d{2}:\d{2}:\d{2}$/,
+    /^- Completed without a result message\.$/,
+  ];
+  return text.split('\n').map((line) => line.trim())
+    .some((line) => line && !filler.some((pattern) => pattern.test(line)));
+}
+
 function loadPrevious(projectRoot, sessionId) {
   try {
     const dir = stateDir(projectRoot, sessionId);
@@ -87,7 +106,9 @@ function loadPrevious(projectRoot, sessionId) {
     if (!fs.existsSync(file)) return '';
     const text = fs.readFileSync(file, 'utf8');
     const generated = text.match(/<!-- Generated: (.+?) -->/)?.[1];
-    if (!generated || Date.now() - Date.parse(generated) > EXPIRY_MS) return '';
+    const timestamp = Date.parse(generated);
+    if (!generated || !Number.isFinite(timestamp) || Date.now() - timestamp > EXPIRY_MS) return '';
+    if (!hasPriorContent(text)) return '';
     return text;
   } catch {
     return '';
@@ -118,7 +139,7 @@ try {
       const data = readData(dir);
       const input = payload.tool_input || {};
       const response = payload.tool_response;
-      updateTaskState(data, input, response);
+      if (!['spawn_agent', 'collaborationspawn_agent'].includes(String(toolName).toLowerCase())) updateTaskState(data, input, response);
       data.lastToolEvent = `${toolName}: ${summary(response) || summary(input)}`.slice(0, 700);
       refreshGit(data, projectRoot);
       writeData(dir, data);
@@ -135,7 +156,7 @@ try {
       data.agentResults.push({
         id,
         type: String(payload.agent_type || 'unknown'),
-        message: summary(payload.last_assistant_message)
+        message: assistantSummary(payload.last_assistant_message)
       });
       refreshGit(data, projectRoot);
       writeData(dir, data);
@@ -147,7 +168,7 @@ try {
   if (event === 'Stop') {
     withStateLock(projectRoot, sessionId, (dir) => {
       const data = readData(dir);
-      data.lastAssistant = summary(payload.last_assistant_message);
+      data.lastAssistant = assistantSummary(payload.last_assistant_message);
       refreshGit(data, projectRoot);
       writeData(dir, data);
       archive(dir);

package/src/codex/hooks.json

@@ -10,11 +10,6 @@
             "command": "node \".codex/hooks/session.cjs\"",
             "commandWindows": "node \".codex/hooks/session.cjs\""
           },
-          {
-            "type": "command",
-            "command": "node \".codex/hooks/docs-sync.cjs\"",
-            "commandWindows": "node \".codex/hooks/docs-sync.cjs\""
-          },
           {
             "type": "command",
             "command": "node \".codex/hooks/state.cjs\"",
@@ -23,6 +18,18 @@
         ]
       }
     ],
+    "PreCompact": [
+      {
+        "matcher": "auto|manual",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "node \".codex/hooks/precompact.cjs\"",
+            "commandWindows": "node \".codex/hooks/precompact.cjs\""
+          }
+        ]
+      }
+    ],
     "SubagentStart": [
       {
         "matcher": "*",
@@ -57,13 +64,18 @@
             "type": "command",
             "command": "node \".codex/hooks/spec-state.cjs\"",
             "commandWindows": "node \".codex/hooks/spec-state.cjs\""
+          },
+          {
+            "type": "command",
+            "command": "node \".codex/hooks/ask-guard.cjs\"",
+            "commandWindows": "node \".codex/hooks/ask-guard.cjs\""
           }
         ]
       }
     ],
     "PreToolUse": [
       {
-        "matcher": "Bash|exec_command|apply_patch|Edit|Write|Read|Glob|Grep|mcp__.*|shell",
+        "matcher": "Bash|exec_command|shell|apply_patch|mcp__.*|collaborationspawn_agent|collaborationwait_agent",
         "hooks": [
           {
             "type": "command",
@@ -76,11 +88,21 @@
             "commandWindows": "node \".codex/hooks/inspect-block.cjs\""
           }
         ]
+      },
+      {
+        "matcher": "apply_patch",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "node \".codex/hooks/ask-guard.cjs\"",
+            "commandWindows": "node \".codex/hooks/ask-guard.cjs\""
+          }
+        ]
       }
     ],
     "PostToolUse": [
       {
-        "matcher": "Agent|spawn_agent|update_plan|task|Task|TodoWrite",
+        "matcher": "collaborationspawn_agent|Agent|spawn_agent|update_plan",
         "hooks": [
           {
             "type": "command",
@@ -88,6 +110,16 @@
             "commandWindows": "node \".codex/hooks/state.cjs\""
           }
         ]
+      },
+      {
+        "matcher": "apply_patch",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "node \".codex/hooks/spec-state.cjs\"",
+            "commandWindows": "node \".codex/hooks/spec-state.cjs\""
+          }
+        ]
       }
     ],
     "Stop": [

package/src/codex/rules/hook-protocols.md

@@ -5,16 +5,22 @@ Hooks are instruction boundaries. Do not bypass or work around them.
 ## Privacy Block Hook
 
 Codex cannot pause a blocked tool call for an interactive permission question.
-CafeKit therefore denies the sensitive access and emits one exact approval
-phrase tied to the current session, requested path, tool, and expiry.
+CafeKit denies sensitive access and offers a short reply and an exact fallback
+phrase. A grant is reusable for one hour in the same session for exactly the
+approved paths; it is not tied to a tool.
 
 Required flow:
 
 1. Stop the blocked access and show the user the hook's reason.
-2. Ask the user to send the exact approval phrase if they want one retry.
-3. Do not write, repeat as a user message, or otherwise simulate that phrase.
-4. Retry only after a later real user prompt exactly matches it.
-5. Use the resulting token once, only for the originally blocked operation.
+2. Ask one privacy question as the only question at the end of the turn, naming
+   exactly the files shown in the denial. Do not add any other yes/no question.
+3. Explain that the user's very next message may be `y`, `yes`, or `có` only
+   while exactly one request is pending; any other reply cancels the shortcut.
+   The exact `APPROVE CAFEKIT PRIVACY <id>` prompt remains the fallback.
+4. Never send, repeat as a user message, or simulate either a short approval or
+   the exact fallback phrase. Wait for a real user prompt and the approval hook.
+5. After approval, tell the user which paths were just granted before reading
+   them. Access only those exact paths during the one-hour session grant.
 
 Never use another command, path, encoding, subprocess, or side channel to read a
 privacy-blocked file without that explicit approval.
@@ -24,6 +30,7 @@ privacy-blocked file without that explicit approval.
 - If a hook reports state drift, run the appropriate sync or audit flow before continuing.
 - If a hook rejects task completion, keep the task `in_progress` or `blocked` until proof exists.
 - Do not mark a task `done` unless the matching task file contains a valid verification receipt.
+- Read `state-sync.md` for the receipt contract.
 
 ## Hook Failure Handling
 

package/src/common/AGENTS.md

@@ -33,17 +33,11 @@ Do the work yourself when it takes a handful of tool calls. Delegate genuinely i
 - Runtime-specific instructions live in that runtime's own managed block, not in `CORE`.
 - In a combined install, consume `CORE` plus your native block only. Ignore managed blocks not owned by your runtime. If ownership is unclear, treat the file as `CORE`-only (fail-safe).
 
-## Commands
+## Project notes
 
-<!-- Add project-specific install, test, lint, and build commands here. Keep commands executable. -->
-
-## Do not touch
-
-<!-- List files, directories, generated artifacts, or secrets that tasks must leave unchanged. -->
-
-## Slow or expensive
-
-<!-- Note commands, environments, or operations that need explicit planning before running. -->
+Write project-specific commands, files tasks must leave unchanged, and slow or
+expensive operations after the `CAFEKIT CORE END` marker. Everything between the
+CafeKit markers is replaced on every install.
 
 ## Language Consistency <!-- cafekit:lang -->
 

package/src/omp/extensions/cafekit-bridge.mjs

@@ -38,16 +38,16 @@ export const BRIDGE_TIMEOUT_MS = 8000;
  * Mirrors src/claude/settings/settings.json; `omp-bridge.test.js` fails if the two drift.
  */
 export const DISPATCH = {
-  session_start:          { event: 'SessionStart',     hooks: ['session.cjs', 'docs-sync.cjs', 'state.cjs'] },
+  session_start:          { event: 'SessionStart',     hooks: ['session.cjs', 'state.cjs'] },
   session_compact:        { event: 'SessionStart',     hooks: ['session.cjs'], source: 'compact' },
   session_before_compact: { event: 'PreCompact',       hooks: ['precompact.cjs'] },
   input:                  { event: 'UserPromptSubmit', hooks: ['secret-output-guardrail.cjs', 'rules.cjs', 'spec-state.cjs'] },
   tool_call:              { event: 'PreToolUse',       hooks: ['privacy-block.cjs', 'inspect-block.cjs'] },
-  tool_result:            { event: 'PostToolUse',      hooks: ['state.cjs'] },
+  tool_result:            { event: 'PostToolUse',      hooks: ['state.cjs', 'spec-state.cjs'] },
   session_stop:           { event: 'Stop',             hooks: ['spec-gate.cjs', 'state.cjs'] },
 };
 
-/** One id per extension load. omp loads an extension once per session, so this is per-session. */
+/** Fallback id per extension load, for an omp whose context has no session manager. */
 const SESSION_ID = `omp-${randomUUID()}`;
 
 export function hooksDir() {
@@ -55,13 +55,21 @@ export function hooksDir() {
   return path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..', 'hooks');
 }
 
+function sessionIdFrom(ctx) {
+  try {
+    const id = ctx?.sessionManager?.getSessionId?.();
+    return typeof id === 'string' && id ? id : null;
+  } catch { return null; }
+}
+
 /** Build the Claude-shaped payload a CafeKit hook reads on stdin. */
 export function shapePayload(kind, event, ctx) {
   const entry = DISPATCH[kind];
   const cwd = ctx?.cwd || process.cwd();
   const payload = {
     hook_event_name: entry.event,
-    session_id: event?.session_id || SESSION_ID,
+    // omp's own id first: session_stop carries it, and touch and state must stay in one place.
+    session_id: event?.session_id || sessionIdFrom(ctx) || SESSION_ID,
     cwd,
   };
   switch (kind) {