Merge branch 'main' into fix/lock-utils-imports-13445229136005844691

src/cmd-rollback.mjs

@@ -1,18 +1,31 @@
-import { rollbackPrompt, listPromptVersions } from './services/governance/index.js';
+import {
+  rollbackPrompt as _rollbackPrompt,
+  listPromptVersions as _listPromptVersions
+} from './services/governance/index.js';
 import { ExitError } from './errors.mjs';
 
-export async function cmdRollback(target, strategy, { list = false } = {}) {
+export async function cmdRollback(target, strategy, options = {}, deps = {}) {
+  // Backwards compatibility: if options is destructured directly
+  const { list = false } = options;
+
+  const {
+    rollbackPrompt = _rollbackPrompt,
+    listPromptVersions = _listPromptVersions,
+    log = console.log,
+    error = console.error
+  } = deps;
+
   if (!target) {
-    console.error('Usage: torch-lock rollback --target <path> [--strategy <hash|latest>] [--list]');
+    error('Usage: torch-lock rollback --target <path> [--strategy <hash|latest>] [--list]');
     throw new ExitError(1, 'Missing target');
   }
 
   if (list) {
     try {
       const versions = await listPromptVersions(target);
-      console.log(JSON.stringify(versions, null, 2));
+      log(JSON.stringify(versions, null, 2));
     } catch (e) {
-      console.error(`Failed to list versions: ${e.message}`);
+      error(`Failed to list versions: ${e.message}`);
       throw new ExitError(1, 'List versions failed');
     }
     return;
@@ -22,9 +35,9 @@ export async function cmdRollback(target, strategy, { list = false } = {}) {
 
   try {
     const result = await rollbackPrompt(target, effectiveStrategy);
-    console.log(JSON.stringify(result, null, 2));
+    log(JSON.stringify(result, null, 2));
   } catch (e) {
-    console.error(`Rollback failed: ${e.message}`);
+    error(`Rollback failed: ${e.message}`);
     throw new ExitError(1, 'Rollback failed');
   }
 }

src/lock-publisher.mjs

@@ -100,11 +100,7 @@ function isTransientPublishCategory(category) {
   ].includes(category);
 }
 
-const MAX_RANDOM = 281474976710655; // 2**48 - 1
-
-export function secureRandom() {
-  return randomInt(0, MAX_RANDOM) / MAX_RANDOM;
-}
+export { secureRandom };
 
 function calculateBackoffDelayMs(attemptNumber, baseMs, capMs, randomFn = secureRandom) {
   const maxDelay = Math.min(capMs, baseMs * (2 ** Math.max(0, attemptNumber - 1)));

src/relay-health.mjs

@@ -4,7 +4,7 @@ import WebSocket from 'ws';
 import { finalizeEvent, generateSecretKey, getPublicKey } from 'nostr-tools/pure';
 import { getNamespace, getRelays } from './torch-config.mjs';
 import { MS_PER_SECOND } from './constants.mjs';
-import { withTimeout } from './utils.mjs';
+import { withTimeout } from './lock-utils.mjs';
 
 const PROBE_KIND = 27235;
 

src/todo/TODO_2026-02-20T03-00-00Z.md

@@ -9,6 +9,7 @@
 - [x] Update `README.md` to include `scheduler:daily`, `scheduler:weekly`, and `lock:complete`.
 - [x] Update `TORCH.md` to include `scheduler:daily`, `scheduler:weekly`, and `lock:complete`.
 - [x] Verify updated commands run correctly (where applicable/safe).
+  - Fixed syntax errors and circular dependencies in `src/lock-ops.mjs`, `src/lock-utils.mjs`, `src/lock-publisher.mjs`, and `src/relay-health.mjs` that were preventing commands from running.
 
 ## Blocked
 - None.

task-logs/daily/.scheduler-run-state.json

@@ -0,0 +1,4 @@
+{
+  "run_date": "2026-02-20",
+  "lock_deferral": null
+}

task-logs/daily/2026-02-20T21-46-47Z__scheduler-update-agent__failed.md

@@ -0,0 +1,18 @@
+---
+cadence: daily
+agent: scheduler-update-agent
+status: failed
+reason: 'Prompt/handoff execution failed'
+detail: 'Handoff callback failed.'
+created_at: 2026-02-20T21:46:47.102Z
+timestamp: 2026-02-20T21:46:47.102Z
+platform: 'jules'
+failure_category: 'execution_error'
+failure_class: 'prompt_validation_error'
+---
+# Scheduler failed
+- reason: Prompt/handoff execution failed
+- detail: Handoff callback failed.
+- platform: jules
+- failure_category: execution_error
+- failure_class: prompt_validation_error

test/cmd-rollback.test.mjs

@@ -0,0 +1,95 @@
+import { describe, it } from 'node:test';
+import assert from 'node:assert';
+import { cmdRollback } from '../src/cmd-rollback.mjs';
+import { ExitError } from '../src/errors.mjs';
+
+describe('cmdRollback', () => {
+  it('should throw ExitError if target is missing', async () => {
+    const deps = {
+      error: () => {},
+    };
+    await assert.rejects(
+      async () => cmdRollback(undefined, undefined, {}, deps),
+      (err) => err instanceof ExitError && err.code === 1 && err.message === 'Missing target'
+    );
+  });
+
+  it('should list versions when list option is true', async () => {
+    const logs = [];
+    const mockVersions = [{ hash: 'abc', archivedAt: '2023-01-01' }];
+    const deps = {
+      listPromptVersions: async (target) => {
+        assert.strictEqual(target, 'foo.md');
+        return mockVersions;
+      },
+      log: (msg) => logs.push(msg),
+      error: () => {},
+    };
+
+    await cmdRollback('foo.md', undefined, { list: true }, deps);
+    assert.strictEqual(logs.length, 1);
+    assert.deepStrictEqual(JSON.parse(logs[0]), mockVersions);
+  });
+
+  it('should throw ExitError if list versions fails', async () => {
+     const deps = {
+      listPromptVersions: async () => { throw new Error('fail'); },
+      log: () => {},
+      error: () => {}, // suppress error output
+    };
+
+    await assert.rejects(
+      async () => cmdRollback('foo.md', undefined, { list: true }, deps),
+      (err) => err instanceof ExitError && err.code === 1 && err.message === 'List versions failed'
+    );
+  });
+
+  it('should rollback to latest if strategy is missing', async () => {
+    const logs = [];
+    const mockResult = { success: true, restored: 'HEAD' };
+    const deps = {
+      rollbackPrompt: async (target, strategy) => {
+        assert.strictEqual(target, 'foo.md');
+        assert.strictEqual(strategy, 'latest');
+        return mockResult;
+      },
+      log: (msg) => logs.push(msg),
+      error: () => {},
+    };
+
+    await cmdRollback('foo.md', undefined, {}, deps);
+    assert.strictEqual(logs.length, 1);
+    assert.deepStrictEqual(JSON.parse(logs[0]), mockResult);
+  });
+
+  it('should rollback to specific strategy', async () => {
+    const logs = [];
+    const mockResult = { success: true, restored: 'hash123' };
+    const deps = {
+      rollbackPrompt: async (target, strategy) => {
+        assert.strictEqual(target, 'foo.md');
+        assert.strictEqual(strategy, 'hash123');
+        return mockResult;
+      },
+      log: (msg) => logs.push(msg),
+      error: () => {},
+    };
+
+    await cmdRollback('foo.md', 'hash123', {}, deps);
+    assert.strictEqual(logs.length, 1);
+    assert.deepStrictEqual(JSON.parse(logs[0]), mockResult);
+  });
+
+  it('should throw ExitError if rollback fails', async () => {
+    const deps = {
+      rollbackPrompt: async () => { throw new Error('fail'); },
+      log: () => {},
+      error: () => {},
+    };
+
+    await assert.rejects(
+      async () => cmdRollback('foo.md', 'latest', {}, deps),
+      (err) => err instanceof ExitError && err.message === 'Rollback failed'
+    );
+  });
+});

test/utils-async.test.mjs

@@ -1,6 +1,6 @@
 import { describe, it } from 'node:test';
 import assert from 'node:assert';
-import { withTimeout } from '../src/utils.mjs';
+import { withTimeout } from '../src/lock-utils.mjs';
 
 describe('Async Utilities', () => {
   describe('withTimeout', () => {

test/verify-example-config-security.test.mjs

@@ -0,0 +1,14 @@
+import test from 'node:test';
+import assert from 'node:assert';
+import fs from 'node:fs';
+import path from 'node:path';
+
+test('torch-config.example.json Security', () => {
+  const configPath = path.resolve('torch-config.example.json');
+  const content = fs.readFileSync(configPath, 'utf8');
+  const config = JSON.parse(content);
+
+  if (config.dashboard) {
+      assert.strictEqual(config.dashboard.auth, undefined, 'Example config should not contain auth field');
+  }
+});

torch-config.example.json

@@ -18,8 +18,7 @@
   },
   "dashboard": {
     "defaultCadenceView": "daily",
-    "defaultStatusView": "active",
-    "auth": "admin:password"
+    "defaultStatusView": "active"
   },
   "scheduler": {
     "firstPromptByCadence": {