Merge branch 'main' into agents/daily/style-agent-7331917025368212480

src/lock-ops.mjs

@@ -8,12 +8,11 @@ import {
   KIND_APP_DATA,
   MS_PER_SECOND,
 } from './constants.mjs';
-import { nowUnix } from './utils.mjs';
+import { nowUnix, relayListLabel } from './utils.mjs';
 import { defaultHealthManager, buildRelayHealthConfig, RelayHealthManager } from './relay-health-manager.mjs';
 import { publishLock, LockPublisher } from './lock-publisher.mjs';
 import {
   withTimeout,
-  relayListLabel,
   mergeRelayList,
   secureRandom,
 } from './lock-utils.mjs';

src/lock-publisher.mjs

@@ -1,4 +1,4 @@
-import { randomUUID } from 'node:crypto';
+import { randomUUID, randomInt } from 'node:crypto';
 import { SimplePool } from 'nostr-tools/pool';
 import {
   getPublishTimeoutMs,
@@ -6,13 +6,8 @@ import {
   getRelayFallbacks,
   getMinActiveRelayPool,
 } from './torch-config.mjs';
+import { mergeRelayList, relayListLabel, withTimeout } from './utils.mjs';
 import { defaultHealthManager, buildRelayHealthConfig } from './relay-health-manager.mjs';
-import {
-  withTimeout,
-  mergeRelayList,
-  relayListLabel,
-  secureRandom,
-} from './lock-utils.mjs';
 
 const PUBLISH_ERROR_CODES = {
   TIMEOUT: 'publish_timeout',
@@ -105,7 +100,11 @@ function isTransientPublishCategory(category) {
   ].includes(category);
 }
 
-export { secureRandom };
+const MAX_RANDOM = 281474976710655; // 2**48 - 1
+
+export function secureRandom() {
+  return randomInt(0, MAX_RANDOM) / MAX_RANDOM;
+}
 
 function calculateBackoffDelayMs(attemptNumber, baseMs, capMs, randomFn = secureRandom) {
   const maxDelay = Math.min(capMs, baseMs * (2 ** Math.max(0, attemptNumber - 1)));

src/lock-utils.mjs

@@ -51,15 +51,6 @@ export async function getCompletedAgents(cadence, logDir, deps) {
   return completed;
 }
 
-export function withTimeout(promise, timeoutMs, timeoutMessage) {
-  let timeoutHandle;
-  const timeoutPromise = new Promise((_, reject) => {
-    timeoutHandle = setTimeout(() => reject(new Error(timeoutMessage)), timeoutMs);
-  });
-  return Promise.race([promise, timeoutPromise]).finally(() => {
-    if (timeoutHandle) clearTimeout(timeoutHandle);
-  });
-}
 
 const MAX_RANDOM = 281474976710655; // 2**48 - 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 './lock-utils.mjs';
+import { withTimeout } from './utils.mjs';
 
 const PROBE_KIND = 27235;
 

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

@@ -9,7 +9,6 @@
 - [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.

src/utils.mjs

@@ -55,3 +55,13 @@ export function ensureDir(dir) {
 export function relayListLabel(relays) {
   return relays.join(', ');
 }
+
+export function withTimeout(promise, timeoutMs, timeoutMessage = 'Operation timed out') {
+  let timeoutHandle;
+  const timeoutPromise = new Promise((_, reject) => {
+    timeoutHandle = setTimeout(() => reject(new Error(timeoutMessage)), timeoutMs);
+  });
+  return Promise.race([promise, timeoutPromise]).finally(() => {
+    if (timeoutHandle) clearTimeout(timeoutHandle);
+  });
+}

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

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

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

@@ -1,18 +0,0 @@
----
-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/utils-async.test.mjs

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

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

@@ -1,14 +0,0 @@
-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,7 +18,8 @@
   },
   "dashboard": {
     "defaultCadenceView": "daily",
-    "defaultStatusView": "active"
+    "defaultStatusView": "active",
+    "auth": "admin:password"
   },
   "scheduler": {
     "firstPromptByCadence": {