nofax 0.2.0 → 0.2.2

package/src/protocol.mjs

@@ -1,108 +1,108 @@
-import { randomBytes } from 'node:crypto';
-
-const SECRET_KEY = /(?:^|[_-])(token|password|passwd|secret|api[_-]?key|authorization|cookie|credential|private[_-]?key)(?:$|[_-])/i;
-const MAX_STRING = 500;
-const MAX_DEPTH = 5;
-const MAX_ARRAY = 20;
-const MAX_OBJECT_KEYS = 30;
-const MAX_SUMMARY = 2200;
-const MAX_RESPONSE_TEXT = 2000;
-
-function randomBase64Url(bytes) {
-  return randomBytes(bytes).toString('base64url');
-}
-
-export function createRequestId() {
-  return `nfx_${randomBase64Url(18)}`;
-}
-
-export function createResponseTopic() {
-  return `nofax_r_${randomBase64Url(24)}`;
-}
-
-export function createPhoneTopic() {
-  return `nofax_${randomBase64Url(24)}`;
-}
-
-function boundString(value) {
-  if (value.length <= MAX_STRING) return value;
-  return `${value.slice(0, MAX_STRING)}…[truncated]`;
-}
-
-export function redactAndBound(value, options = {}) {
-  const seen = options.seen ?? new WeakSet();
-  const depth = options.depth ?? 0;
-
-  if (value === null || value === undefined) return value;
-  if (typeof value === 'string') return boundString(value);
-  if (typeof value === 'number' || typeof value === 'boolean') return value;
-  if (typeof value === 'bigint') return value.toString();
-  if (typeof value === 'function' || typeof value === 'symbol') return `[${typeof value}]`;
-  if (depth >= MAX_DEPTH) return '[MAX_DEPTH]';
-  if (typeof value !== 'object') return boundString(String(value));
-
-  if (seen.has(value)) return '[CIRCULAR]';
-  seen.add(value);
-
-  if (Array.isArray(value)) {
-    return value.slice(0, MAX_ARRAY).map((item) => redactAndBound(item, { seen, depth: depth + 1 }));
-  }
-
-  const out = {};
-  for (const [key, child] of Object.entries(value).slice(0, MAX_OBJECT_KEYS)) {
-    out[key] = SECRET_KEY.test(key)
-      ? '[REDACTED]'
-      : redactAndBound(child, { seen, depth: depth + 1 });
-  }
-  return out;
-}
-
-function serializeBounded(value) {
-  let serialized;
-  try {
-    serialized = JSON.stringify(redactAndBound(value), null, 2);
-  } catch {
-    serialized = '[unserializable]';
-  }
-  if (serialized.length <= 1400) return serialized;
-  return `${serialized.slice(0, 1400)}\n…[truncated]`;
-}
-
-export function buildAgentSummary({ source, toolName, cwd, toolInput, message }) {
-  const lines = [];
-  if (source) lines.push(`Source: ${boundString(String(source))}`);
-  if (toolName) lines.push(`Tool: ${boundString(String(toolName))}`);
-  if (cwd) lines.push(`Working directory: ${boundString(String(cwd))}`);
-  if (message) lines.push('', boundString(String(message)));
-  if (toolInput !== undefined) lines.push('', 'Request:', serializeBounded(toolInput));
-  const result = lines.join('\n').trim();
-  if (result.length <= MAX_SUMMARY) return result;
-  return `${result.slice(0, MAX_SUMMARY - 14)}\n…[truncated]`;
-}
-
-export function parseResponseMessage(message, { requestId, allowed }) {
-  if (typeof message !== 'string') return null;
-  let parsed;
-  try {
-    parsed = JSON.parse(message);
-  } catch {
-    return null;
-  }
-  if (!parsed || parsed.v !== 1 || parsed.requestId !== requestId || typeof parsed.decision !== 'string') {
-    return null;
-  }
-  if (!allowed.includes(parsed.decision)) return null;
-
-  if (parsed.decision === 'refine') {
-    if (typeof parsed.text !== 'string') return null;
-    const text = parsed.text.trim();
-    if (!text) return null;
-    return { decision: 'refine', text: boundString(text).slice(0, MAX_RESPONSE_TEXT) };
-  }
-
-  return { decision: parsed.decision };
-}
-
-export function parseDecisionMessage(message, { requestId, allowed }) {
-  return parseResponseMessage(message, { requestId, allowed })?.decision ?? null;
-}
+import { randomBytes } from 'node:crypto';
+
+const SECRET_KEY = /(?:^|[_-])(token|password|passwd|secret|api[_-]?key|authorization|cookie|credential|private[_-]?key)(?:$|[_-])/i;
+const MAX_STRING = 500;
+const MAX_DEPTH = 5;
+const MAX_ARRAY = 20;
+const MAX_OBJECT_KEYS = 30;
+const MAX_SUMMARY = 2200;
+const MAX_RESPONSE_TEXT = 2000;
+
+function randomBase64Url(bytes) {
+  return randomBytes(bytes).toString('base64url');
+}
+
+export function createRequestId() {
+  return `nfx_${randomBase64Url(18)}`;
+}
+
+export function createResponseTopic() {
+  return `nofax_r_${randomBase64Url(24)}`;
+}
+
+export function createPhoneTopic() {
+  return `nofax_${randomBase64Url(24)}`;
+}
+
+function boundString(value) {
+  if (value.length <= MAX_STRING) return value;
+  return `${value.slice(0, MAX_STRING)}…[truncated]`;
+}
+
+export function redactAndBound(value, options = {}) {
+  const seen = options.seen ?? new WeakSet();
+  const depth = options.depth ?? 0;
+
+  if (value === null || value === undefined) return value;
+  if (typeof value === 'string') return boundString(value);
+  if (typeof value === 'number' || typeof value === 'boolean') return value;
+  if (typeof value === 'bigint') return value.toString();
+  if (typeof value === 'function' || typeof value === 'symbol') return `[${typeof value}]`;
+  if (depth >= MAX_DEPTH) return '[MAX_DEPTH]';
+  if (typeof value !== 'object') return boundString(String(value));
+
+  if (seen.has(value)) return '[CIRCULAR]';
+  seen.add(value);
+
+  if (Array.isArray(value)) {
+    return value.slice(0, MAX_ARRAY).map((item) => redactAndBound(item, { seen, depth: depth + 1 }));
+  }
+
+  const out = {};
+  for (const [key, child] of Object.entries(value).slice(0, MAX_OBJECT_KEYS)) {
+    out[key] = SECRET_KEY.test(key)
+      ? '[REDACTED]'
+      : redactAndBound(child, { seen, depth: depth + 1 });
+  }
+  return out;
+}
+
+function serializeBounded(value) {
+  let serialized;
+  try {
+    serialized = JSON.stringify(redactAndBound(value), null, 2);
+  } catch {
+    serialized = '[unserializable]';
+  }
+  if (serialized.length <= 1400) return serialized;
+  return `${serialized.slice(0, 1400)}\n…[truncated]`;
+}
+
+export function buildAgentSummary({ source, toolName, cwd, toolInput, message }) {
+  const lines = [];
+  if (source) lines.push(`Source: ${boundString(String(source))}`);
+  if (toolName) lines.push(`Tool: ${boundString(String(toolName))}`);
+  if (cwd) lines.push(`Working directory: ${boundString(String(cwd))}`);
+  if (message) lines.push('', boundString(String(message)));
+  if (toolInput !== undefined) lines.push('', 'Request:', serializeBounded(toolInput));
+  const result = lines.join('\n').trim();
+  if (result.length <= MAX_SUMMARY) return result;
+  return `${result.slice(0, MAX_SUMMARY - 14)}\n…[truncated]`;
+}
+
+export function parseResponseMessage(message, { requestId, allowed }) {
+  if (typeof message !== 'string') return null;
+  let parsed;
+  try {
+    parsed = JSON.parse(message);
+  } catch {
+    return null;
+  }
+  if (!parsed || parsed.v !== 1 || parsed.requestId !== requestId || typeof parsed.decision !== 'string') {
+    return null;
+  }
+  if (!allowed.includes(parsed.decision)) return null;
+
+  if (parsed.decision === 'refine') {
+    if (typeof parsed.text !== 'string') return null;
+    const text = parsed.text.trim();
+    if (!text) return null;
+    return { decision: 'refine', text: boundString(text).slice(0, MAX_RESPONSE_TEXT) };
+  }
+
+  return { decision: parsed.decision };
+}
+
+export function parseDecisionMessage(message, { requestId, allowed }) {
+  return parseResponseMessage(message, { requestId, allowed })?.decision ?? null;
+}

package/src/requests.mjs

@@ -1,120 +1,160 @@
-import { chmod, mkdir, readFile, readdir, rename, writeFile } from 'node:fs/promises';
-import { join } from 'node:path';
-import { resolveNofaxHome } from './config.mjs';
-
-const REQUEST_ID = /^nfx_[A-Za-z0-9_-]{20,80}$/;
-const RESPONSE_TOPIC = /^nofax_r_[A-Za-z0-9_-]{20,120}$/;
-const KINDS = new Set(['approval', 'choice', 'refinement']);
-const STATUSES = new Set(['pending', 'resolved']);
-
-function validateRequestId(value) {
-  if (typeof value !== 'string' || !REQUEST_ID.test(value)) throw new Error('NOFAX_REQUEST_ID_INVALID');
-  return value;
-}
-
-function validateRequest(input) {
-  if (!input || input.version !== 1) throw new Error('NOFAX_REQUEST_VERSION');
-  const requestId = validateRequestId(input.requestId);
-  if (!KINDS.has(input.kind)) throw new Error('NOFAX_REQUEST_KIND_INVALID');
-  if (typeof input.responseTopic !== 'string' || !RESPONSE_TOPIC.test(input.responseTopic)) throw new Error('NOFAX_RESPONSE_TOPIC_INVALID');
-  if (!Array.isArray(input.allowed) || input.allowed.length < 1 || input.allowed.length > 3 || input.allowed.some((value) => typeof value !== 'string' || !value || value.length > 80)) {
-    throw new Error('NOFAX_REQUEST_ALLOWED_INVALID');
-  }
-  if (!STATUSES.has(input.status)) throw new Error('NOFAX_REQUEST_STATUS_INVALID');
-  if (typeof input.createdAt !== 'string' || Number.isNaN(Date.parse(input.createdAt))) throw new Error('NOFAX_REQUEST_CREATED_AT_INVALID');
-  const base = {
-    version: 1,
-    requestId,
-    kind: input.kind,
-    responseTopic: input.responseTopic,
-    allowed: [...input.allowed],
-    status: input.status,
-    createdAt: input.createdAt
-  };
-  if (input.status === 'resolved') {
-    if (typeof input.resolvedAt !== 'string' || Number.isNaN(Date.parse(input.resolvedAt))) throw new Error('NOFAX_REQUEST_RESOLVED_AT_INVALID');
-    if (typeof input.decision !== 'string' || !input.allowed.includes(input.decision)) throw new Error('NOFAX_REQUEST_DECISION_INVALID');
-    base.resolvedAt = input.resolvedAt;
-    base.decision = input.decision;
-    if (input.text !== undefined) {
-      if (typeof input.text !== 'string' || !input.text.trim()) throw new Error('NOFAX_REQUEST_TEXT_INVALID');
-      base.text = input.text.trim().slice(0, 2000);
-    }
-  }
-  return base;
-}
-
-function paths({ home, env, requestId }) {
-  const root = resolveNofaxHome({ home, env });
-  const requestsRoot = join(root, 'requests');
-  return { requestsRoot, file: join(requestsRoot, `${validateRequestId(requestId)}.json`) };
-}
-
-async function atomicWrite(path, value) {
-  const temp = `${path}.tmp-${process.pid}-${Math.random().toString(16).slice(2)}`;
-  await writeFile(temp, `${JSON.stringify(value, null, 2)}\n`, { encoding: 'utf8', mode: 0o600 });
-  try { await chmod(temp, 0o600); } catch {}
-  await rename(temp, path);
-  try { await chmod(path, 0o600); } catch {}
-}
-
-export async function savePendingRequest({ home, env, request }) {
-  const normalized = validateRequest(request);
-  if (normalized.status !== 'pending') throw new Error('NOFAX_REQUEST_NOT_PENDING');
-  const { requestsRoot, file } = paths({ home, env, requestId: normalized.requestId });
-  await mkdir(requestsRoot, { recursive: true, mode: 0o700 });
-  await atomicWrite(file, normalized);
-  return normalized;
-}
-
-export async function loadRequest({ home, env, requestId }) {
-  const { file } = paths({ home, env, requestId });
-  try {
-    return validateRequest(JSON.parse(await readFile(file, 'utf8')));
-  } catch (error) {
-    if (error?.code === 'ENOENT') throw new Error('NOFAX_REQUEST_NOT_FOUND');
-    if (error instanceof SyntaxError) throw new Error('NOFAX_REQUEST_INVALID_JSON');
-    throw error;
-  }
-}
-
-export async function resolveRequest({ home, env, requestId, response, resolvedAt = new Date().toISOString() }) {
-  const current = await loadRequest({ home, env, requestId });
-  if (current.status === 'resolved') return current;
-  if (!response || typeof response.decision !== 'string' || !current.allowed.includes(response.decision)) throw new Error('NOFAX_REQUEST_DECISION_INVALID');
-  const resolved = validateRequest({
-    ...current,
-    status: 'resolved',
-    resolvedAt,
-    decision: response.decision,
-    ...(response.text === undefined ? {} : { text: response.text })
-  });
-  const { file } = paths({ home, env, requestId });
-  await atomicWrite(file, resolved);
-  return resolved;
-}
-
-export async function listPendingRequests({ home, env, limit = 20 } = {}) {
-  if (!Number.isInteger(limit) || limit < 1 || limit > 100) throw new Error('NOFAX_REQUEST_LIMIT_INVALID');
-  const root = resolveNofaxHome({ home, env });
-  const requestsRoot = join(root, 'requests');
-  let names;
-  try {
-    names = await readdir(requestsRoot);
-  } catch (error) {
-    if (error?.code === 'ENOENT') return [];
-    throw error;
-  }
-  const results = [];
-  for (const name of names.sort().reverse()) {
-    if (!name.endsWith('.json')) continue;
-    const requestId = name.slice(0, -5);
-    if (!REQUEST_ID.test(requestId)) continue;
-    try {
-      const request = await loadRequest({ home: root, requestId });
-      if (request.status === 'pending') results.push(request);
-    } catch {}
-    if (results.length >= limit) break;
-  }
-  return results;
-}
+import { chmod, link, mkdir, readFile, readdir, rename, unlink, writeFile } from 'node:fs/promises';
+import { join } from 'node:path';
+import { resolveNofaxHome } from './config.mjs';
+
+const REQUEST_ID = /^nfx_[A-Za-z0-9_-]{20,80}$/;
+const RESPONSE_TOPIC = /^nofax_r_[A-Za-z0-9_-]{20,120}$/;
+const KINDS = new Set(['approval', 'choice', 'refinement']);
+const STATUSES = new Set(['pending', 'resolved']);
+
+function validateRequestId(value) {
+  if (typeof value !== 'string' || !REQUEST_ID.test(value)) throw new Error('NOFAX_REQUEST_ID_INVALID');
+  return value;
+}
+
+function validateRequest(input) {
+  if (!input || input.version !== 1) throw new Error('NOFAX_REQUEST_VERSION');
+  const requestId = validateRequestId(input.requestId);
+  if (!KINDS.has(input.kind)) throw new Error('NOFAX_REQUEST_KIND_INVALID');
+  if (typeof input.responseTopic !== 'string' || !RESPONSE_TOPIC.test(input.responseTopic)) throw new Error('NOFAX_RESPONSE_TOPIC_INVALID');
+  if (!Array.isArray(input.allowed) || input.allowed.length < 1 || input.allowed.length > 3 || input.allowed.some((value) => typeof value !== 'string' || !value || value.length > 80)) {
+    throw new Error('NOFAX_REQUEST_ALLOWED_INVALID');
+  }
+  if (!STATUSES.has(input.status)) throw new Error('NOFAX_REQUEST_STATUS_INVALID');
+  if (typeof input.createdAt !== 'string' || Number.isNaN(Date.parse(input.createdAt))) throw new Error('NOFAX_REQUEST_CREATED_AT_INVALID');
+  const base = {
+    version: 1,
+    requestId,
+    kind: input.kind,
+    responseTopic: input.responseTopic,
+    allowed: [...input.allowed],
+    status: input.status,
+    createdAt: input.createdAt
+  };
+  if (input.status === 'resolved') {
+    if (typeof input.resolvedAt !== 'string' || Number.isNaN(Date.parse(input.resolvedAt))) throw new Error('NOFAX_REQUEST_RESOLVED_AT_INVALID');
+    if (typeof input.decision !== 'string' || !input.allowed.includes(input.decision)) throw new Error('NOFAX_REQUEST_DECISION_INVALID');
+    base.resolvedAt = input.resolvedAt;
+    base.decision = input.decision;
+    if (input.text !== undefined) {
+      if (typeof input.text !== 'string' || !input.text.trim()) throw new Error('NOFAX_REQUEST_TEXT_INVALID');
+      base.text = input.text.trim().slice(0, 2000);
+    }
+  }
+  return base;
+}
+
+function paths({ home, env, requestId }) {
+  const root = resolveNofaxHome({ home, env });
+  const requestsRoot = join(root, 'requests');
+  const normalizedRequestId = validateRequestId(requestId);
+  return {
+    requestsRoot,
+    file: join(requestsRoot, `${normalizedRequestId}.json`),
+    terminal: join(requestsRoot, `${normalizedRequestId}.terminal.json`)
+  };
+}
+
+async function atomicWrite(path, value) {
+  const temp = `${path}.tmp-${process.pid}-${Math.random().toString(16).slice(2)}`;
+  await writeFile(temp, `${JSON.stringify(value, null, 2)}\n`, { encoding: 'utf8', mode: 0o600 });
+  try { await chmod(temp, 0o600); } catch {}
+  await rename(temp, path);
+  try { await chmod(path, 0o600); } catch {}
+}
+
+async function loadTerminalClaim(path) {
+  try {
+    const terminal = validateRequest(JSON.parse(await readFile(path, 'utf8')));
+    if (terminal.status !== 'resolved') throw new Error('NOFAX_REQUEST_TERMINAL_INVALID');
+    return terminal;
+  } catch (error) {
+    if (error?.code === 'ENOENT') return null;
+    if (error instanceof SyntaxError) throw new Error('NOFAX_REQUEST_TERMINAL_INVALID_JSON');
+    throw error;
+  }
+}
+
+async function claimTerminal(path, value) {
+  const temp = `${path}.tmp-${process.pid}-${Math.random().toString(16).slice(2)}`;
+  await writeFile(temp, `${JSON.stringify(value, null, 2)}\n`, { encoding: 'utf8', mode: 0o600 });
+  try { await chmod(temp, 0o600); } catch {}
+
+  try {
+    await link(temp, path);
+    try { await chmod(path, 0o600); } catch {}
+    return true;
+  } catch (error) {
+    if (error?.code === 'EEXIST') return false;
+    throw error;
+  } finally {
+    try { await unlink(temp); } catch {}
+  }
+}
+
+export async function savePendingRequest({ home, env, request }) {
+  const normalized = validateRequest(request);
+  if (normalized.status !== 'pending') throw new Error('NOFAX_REQUEST_NOT_PENDING');
+  const { requestsRoot, file } = paths({ home, env, requestId: normalized.requestId });
+  await mkdir(requestsRoot, { recursive: true, mode: 0o700 });
+  await atomicWrite(file, normalized);
+  return normalized;
+}
+
+export async function loadRequest({ home, env, requestId }) {
+  const { file, terminal } = paths({ home, env, requestId });
+  try {
+    const current = validateRequest(JSON.parse(await readFile(file, 'utf8')));
+    if (current.status === 'resolved') return current;
+    const claimed = await loadTerminalClaim(terminal);
+    return claimed ?? current;
+  } catch (error) {
+    if (error?.code === 'ENOENT') throw new Error('NOFAX_REQUEST_NOT_FOUND');
+    if (error instanceof SyntaxError) throw new Error('NOFAX_REQUEST_INVALID_JSON');
+    throw error;
+  }
+}
+
+export async function resolveRequest({ home, env, requestId, response, resolvedAt = new Date().toISOString() }) {
+  const current = await loadRequest({ home, env, requestId });
+  if (current.status === 'resolved') return current;
+  if (!response || typeof response.decision !== 'string' || !current.allowed.includes(response.decision)) throw new Error('NOFAX_REQUEST_DECISION_INVALID');
+  const resolved = validateRequest({
+    ...current,
+    status: 'resolved',
+    resolvedAt,
+    decision: response.decision,
+    ...(response.text === undefined ? {} : { text: response.text })
+  });
+  const { file, terminal } = paths({ home, env, requestId });
+  if (!await claimTerminal(terminal, resolved)) {
+    return loadRequest({ home, env, requestId });
+  }
+  await atomicWrite(file, resolved);
+  return resolved;
+}
+
+export async function listPendingRequests({ home, env, limit = 20 } = {}) {
+  if (!Number.isInteger(limit) || limit < 1 || limit > 100) throw new Error('NOFAX_REQUEST_LIMIT_INVALID');
+  const root = resolveNofaxHome({ home, env });
+  const requestsRoot = join(root, 'requests');
+  let names;
+  try {
+    names = await readdir(requestsRoot);
+  } catch (error) {
+    if (error?.code === 'ENOENT') return [];
+    throw error;
+  }
+  const results = [];
+  for (const name of names.sort().reverse()) {
+    if (!name.endsWith('.json')) continue;
+    const requestId = name.slice(0, -5);
+    if (!REQUEST_ID.test(requestId)) continue;
+    try {
+      const request = await loadRequest({ home: root, requestId });
+      if (request.status === 'pending') results.push(request);
+    } catch {}
+    if (results.length >= limit) break;
+  }
+  return results;
+}