@rulemetric/hooks 0.16.0 → 0.17.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rulemetric/hooks",
-  "version": "0.16.0",
+  "version": "0.17.0",
   "publishConfig": {
     "access": "public"
   },

package/scripts/_log.sh

@@ -3,7 +3,7 @@
 # Appends JSON lines to $TMPDIR/rulemetric/hook.log
 # Never fails — all writes guarded with || true
 
-if ! command -v jq >/dev/null 2>&1; then
+if ! command -v jq >/dev/null 2>&1 || [ ! -x "$(command -v jq)" ]; then
   _rulemetric_log_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
   # npm normalises tarball file modes to 0644, so the bundled shim arrives
   # NON-EXECUTABLE from a published install — `command -v jq` then never finds

package/scripts/scoped-live.mjs

@@ -52,8 +52,13 @@ export function observeEnvironment(root) {
   for (const file of ['settings.json', 'CLAUDE.md']) context(join(homedir(), '.claude', file));
   const userConfig = join(homedir(), '.claude.json');
   context(userConfig);
-  if (contextHashes[userConfig]) contextHashes[userConfig] = hash(JSON.stringify(stableClaudeConfig(JSON.parse(readFileSync(userConfig, 'utf8')), resolve(root))));
+  const config = contextHashes[userConfig] ? JSON.parse(readFileSync(userConfig, 'utf8')) : null;
+  if (config) contextHashes[userConfig] = hash(JSON.stringify(stableClaudeConfig(config, resolve(root))));
+  const runtimeStateHash = config ? hash(JSON.stringify(Object.fromEntries(
+    ['cachedDynamicConfigs', 'cachedGrowthBookFeatures', 'cachedStatsigGates', 'cachedExperimentFeatures', 'cachedExperimentData'].map(key => [key, config[key] ?? null]),
+  ))) : null;
   return {
+    runtimeStateHash,
     harnessVersion: execFileSync('claude', ['--version'], { encoding: 'utf8', timeout: 5000 }).trim(),
     repositoryRevision: execFileSync('git', ['rev-parse', 'HEAD'], { cwd: root, encoding: 'utf8', timeout: 5000 }).trim(),
     contextHashes: Object.fromEntries(Object.entries(contextHashes).sort(([a], [b]) => a.localeCompare(b))),
@@ -63,7 +68,7 @@ export function observeEnvironment(root) {
 // .claude.json mixes session counters/history with configuration. Retain only
 // configuration here; settings files are separately hashed in full above.
 export function stableClaudeConfig(config, root) {
-  const keys = ['mcpServers', 'mcpContextUris', 'allowedTools', 'enabledMcpjsonServers', 'disabledMcpjsonServers', 'disabledMcpServers', 'hasClaudeMdExternalIncludesApproved', 'claudeInChromeDefaultEnabled', 'cachedDynamicConfigs', 'cachedGrowthBookFeatures', 'cachedStatsigGates', 'cachedExperimentFeatures', 'cachedExperimentData'];
+  const keys = ['mcpServers', 'mcpContextUris', 'allowedTools', 'enabledMcpjsonServers', 'disabledMcpjsonServers', 'disabledMcpServers', 'hasClaudeMdExternalIncludesApproved', 'claudeInChromeDefaultEnabled'];
   const pick = object => Object.fromEntries(keys.map(key => [key, object?.[key] ?? null]));
   return { global: pick(config), project: pick(config.projects?.[root]) };
 }
@@ -110,14 +115,33 @@ export async function runScopedHook(mode, sessionId, root, model, transcriptPath
     const response = await fetch(`${api}/api${path}`, { method: body ? 'POST' : 'GET',
       headers: { Authorization: `Bearer ${token}`, 'Content-Type': 'application/json' },
       ...(body ? { body: JSON.stringify(body) } : {}), signal: AbortSignal.timeout(5000) });
-    if (!response.ok) throw new Error(`Scoped ${mode} refused (${response.status})`);
+    if (!response.ok) {
+      const detail = await response.text();
+      throw new Error(`Scoped ${mode} refused (${response.status}): ${detail.slice(0, 1000)}`);
+    }
     return response.json();
   };
   const { confirmation } = await request(`/scoped-live-confirmations/${id}/contract`);
   const protocol = confirmation.protocol;
   const environment = protocol.verification ? observeEnvironment(root) : undefined;
   if (mode === 'start') {
-    const configurationHash = environment ? hash(JSON.stringify(protocol.research?.enrollment === 'prospective-launches' ? { ...environment, repositoryRevision: protocol.verification.environment.repositoryRevision } : environment)) : process.env.RULEMETRIC_SCOPED_CONFIGURATION_HASH;
+    if (!model && protocol.research?.enrollment === 'prospective-launches') {
+      // SessionStart's model is optional. A requested model is not an observed
+      // outcome: retain the launch pin and verify actual transcript models later.
+      const requested = process.env.RULEMETRIC_SCOPED_REQUESTED_MODEL;
+      if (requested && requested === protocol.model) model = requested;
+      else {
+        // Compatibility for already-queued launches from workers without the pin env.
+        const jobs = await request('/launch-jobs?limit=100');
+        const launch = jobs.find(job => job.tool === 'claude_code' && ['claimed', 'running'].includes(job.status)
+          && job.config?.projectPath === root && job.config?.scopedConfirmation?.id === id
+          && job.config?.scopedConfirmation?.taskId === taskId && job.config?.model === protocol.model);
+        model = launch?.config.model;
+      }
+      if (!model) throw new Error('SessionStart omitted model and no matching claimed launch model is available');
+      process.stderr.write('[rulemetric] Enrollment uses the requested launch model; actual model remains subject to transcript verification.\n');
+    }
+    const configurationHash = environment ? hash(JSON.stringify({ harnessVersion: environment.harnessVersion, repositoryRevision: protocol.research?.enrollment === 'prospective-launches' ? protocol.verification.environment.repositoryRevision : environment.repositoryRevision, contextHashes: environment.contextHashes })) : process.env.RULEMETRIC_SCOPED_CONFIGURATION_HASH;
     const rendered = await request(`/scoped-live-confirmations/${id}/hook-render`, { taskId, externalSessionId: sessionId, model, projectPath: root, configurationHash, environment, collectorVersion: 2 });
     const content = Buffer.from(rendered.contentBase64, 'base64');
     if (hash(content) !== rendered.deliveryHash) throw new Error('Scoped delivery hash mismatch');