runspec-node 0.8.0 → 0.9.0

package/src/loader.ts

@@ -1,6 +1,6 @@
 import * as fs from 'fs';
 import { parse as parseTOML } from 'smol-toml';
-import type { RawConfig, RawSpec, ScriptSpec, ArgSpec, GroupSpec, JumpHostConfig } from './models';
+import type { RawConfig, RawSpec, ScriptSpec, ArgSpec, GroupSpec, JumpHostConfig, LoggingConfig } from './models';
 
 export function loadRaw(configPath: string): RawSpec {
   const content = fs.readFileSync(configPath, 'utf-8');
@@ -30,6 +30,23 @@ function normaliseConfig(raw: Record<string, unknown>): RawConfig {
     lang: raw['lang'] as string | undefined,
     version: String(raw['version'] ?? '1'),
     jumpHosts,
+    logging: normaliseLogging(raw['logging'] as Record<string, unknown> | undefined),
+  };
+}
+
+const VALID_LOG_LEVELS = new Set(['debug', 'info', 'warning', 'error', 'critical']);
+
+function normaliseLogging(raw: Record<string, unknown> | undefined): LoggingConfig | undefined {
+  if (raw === undefined) return undefined;
+  const level = String(raw['level'] ?? 'info').toLowerCase();
+  if (!VALID_LOG_LEVELS.has(level)) {
+    const sorted = [...VALID_LOG_LEVELS].sort().join(', ');
+    throw new Error(`✗  [config.logging] level must be one of: ${sorted}. Got: ${JSON.stringify(level)}`);
+  }
+  return {
+    level,
+    rotate: String(raw['rotate'] ?? 'midnight'),
+    keep: Number(raw['keep'] ?? 7),
   };
 }
 

package/src/logging_setup.ts

@@ -0,0 +1,291 @@
+/**
+ * Configure a lightweight logger from [config.logging]. Zero new deps — uses
+ * only Node stdlib (fs, path, os). Call configureLogging() once from parse();
+ * runnables call getLogger(name) to obtain a named Logger.
+ */
+
+import * as fs from 'fs';
+import * as path from 'path';
+import * as os from 'os';
+import type { LoggingConfig } from './models';
+
+// ── internal state ────────────────────────────────────────────────────────────
+
+let _configured = false;
+const _loggers = new Map<string, Logger>();
+const _handlers: Handler[] = [];
+
+// ── level map ─────────────────────────────────────────────────────────────────
+
+const LEVEL_NUM: Record<string, number> = {
+  debug: 10, info: 20, warning: 30, error: 40, critical: 50,
+};
+
+const LEVEL_LABEL: Record<number, string> = {
+  10: 'DEBUG', 20: 'INFO', 30: 'WARNING', 40: 'ERROR', 50: 'CRITICAL',
+};
+
+// ── sensitive data redaction ──────────────────────────────────────────────────
+
+const SENSITIVE: Array<[RegExp, string]> = [
+  [/(password|passwd|pwd)\s*[=:]\s*\S+/gi, '$1=[REDACTED]'],
+  [/(token|api[_-]?key|secret)\s*[=:]\s*\S+/gi, '$1=[REDACTED]'],
+  [/Authorization:\s*(Bearer|Basic)\s+\S+/gi, 'Authorization: $1 [REDACTED]'],
+  [/https?:\/\/[^:@\s]+:[^@\s]+@/g, 'https://[REDACTED]@'],
+  [/"(password|token|api_key|secret)"\s*:\s*"[^"]*"/gi, '"$1": "[REDACTED]"'],
+  [/(password|passwd|token)=([^&\s"]+)/gi, '$1=[REDACTED]'],
+];
+
+function redact(msg: string): string {
+  try {
+    for (const [pattern, replacement] of SENSITIVE) {
+      msg = msg.replace(pattern, replacement);
+    }
+  } catch {
+    // never disrupt logging on redaction errors
+  }
+  return msg;
+}
+
+// ── log record & handler ──────────────────────────────────────────────────────
+
+interface LogRecord {
+  ts: Date;
+  levelNum: number;
+  loggerName: string;
+  message: string;
+  error?: Error;
+}
+
+interface Handler {
+  level: number;
+  emit(record: LogRecord): void;
+}
+
+// ── Logger ────────────────────────────────────────────────────────────────────
+
+export class Logger {
+  constructor(private readonly name: string) {}
+
+  debug(msg: string, error?: Error): void { this._emit(10, msg, error); }
+  info(msg: string, error?: Error): void { this._emit(20, msg, error); }
+  warning(msg: string, error?: Error): void { this._emit(30, msg, error); }
+  warn(msg: string, error?: Error): void { this._emit(30, msg, error); }
+  error(msg: string, error?: Error): void { this._emit(40, msg, error); }
+  critical(msg: string, error?: Error): void { this._emit(50, msg, error); }
+
+  private _emit(levelNum: number, message: string, error?: Error): void {
+    if (_handlers.length === 0) return;
+    const record: LogRecord = { ts: new Date(), levelNum, loggerName: this.name, message: redact(message), error };
+    for (const h of _handlers) {
+      if (levelNum >= h.level) h.emit(record);
+    }
+  }
+}
+
+export function getLogger(name: string): Logger {
+  let logger = _loggers.get(name);
+  if (!logger) {
+    logger = new Logger(name);
+    _loggers.set(name, logger);
+  }
+  return logger;
+}
+
+// ── formatters ────────────────────────────────────────────────────────────────
+
+function formatJson(record: LogRecord): string {
+  const obj: Record<string, unknown> = {
+    ts: record.ts.toISOString(),
+    level: LEVEL_LABEL[record.levelNum] ?? String(record.levelNum),
+    logger: record.loggerName,
+    message: record.message,
+  };
+  if (record.error) obj['exc'] = record.error.stack ?? record.error.message;
+  return JSON.stringify(obj);
+}
+
+function formatHuman(record: LogRecord, showTracebacks: boolean): string {
+  const hh = String(record.ts.getHours()).padStart(2, '0');
+  const mm = String(record.ts.getMinutes()).padStart(2, '0');
+  const ss = String(record.ts.getSeconds()).padStart(2, '0');
+  const time = `${hh}:${mm}:${ss}`;
+  const label = (LEVEL_LABEL[record.levelNum] ?? String(record.levelNum)).padEnd(8);
+  let line = `${time} ${label} ${record.loggerName}: ${record.message}`;
+  if (showTracebacks && record.error) line += `\n${record.error.stack ?? record.error.message}`;
+  return line;
+}
+
+// ── console handler ───────────────────────────────────────────────────────────
+
+class ConsoleHandler implements Handler {
+  constructor(public readonly level: number, private readonly showTracebacks: boolean) {}
+
+  emit(record: LogRecord): void {
+    try {
+      process.stderr.write(formatHuman(record, this.showTracebacks) + '\n');
+    } catch {
+      // never disrupt
+    }
+  }
+}
+
+// ── rotating file handlers ────────────────────────────────────────────────────
+
+function doRotate(logPath: string, keep: number): void {
+  for (let i = keep; i >= 1; i--) {
+    const src = `${logPath}.${i}`;
+    if (i === keep) {
+      try { fs.unlinkSync(src); } catch { /* already gone */ }
+    } else {
+      try { fs.renameSync(src, `${logPath}.${i + 1}`); } catch { /* missing backup */ }
+    }
+  }
+  try { fs.renameSync(logPath, `${logPath}.1`); } catch { /* current file missing */ }
+}
+
+class SizeRotatingFileHandler implements Handler {
+  readonly level = 10; // always DEBUG
+
+  constructor(
+    private readonly logPath: string,
+    private readonly maxBytes: number,
+    private readonly keep: number,
+  ) {}
+
+  emit(record: LogRecord): void {
+    try {
+      this._rotateIfNeeded();
+      fs.appendFileSync(this.logPath, formatJson(record) + '\n', 'utf-8');
+    } catch {
+      // never disrupt
+    }
+  }
+
+  private _rotateIfNeeded(): void {
+    try {
+      if (fs.statSync(this.logPath).size < this.maxBytes) return;
+    } catch {
+      return; // file doesn't exist yet
+    }
+    doRotate(this.logPath, this.keep);
+  }
+}
+
+function _periodForDate(d: Date, when: 'daily' | 'midnight' | 'weekly'): string {
+  if (when === 'weekly') {
+    const tmp = new Date(Date.UTC(d.getFullYear(), d.getMonth(), d.getDate()));
+    const day = tmp.getUTCDay() || 7;
+    tmp.setUTCDate(tmp.getUTCDate() + 4 - day);
+    const yearStart = new Date(Date.UTC(tmp.getUTCFullYear(), 0, 1));
+    const week = Math.ceil(((tmp.getTime() - yearStart.getTime()) / 86400000 + 1) / 7);
+    return `${tmp.getUTCFullYear()}-W${week}`;
+  }
+  return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
+}
+
+class TimedRotatingFileHandler implements Handler {
+  readonly level = 10;
+
+  constructor(
+    private readonly logPath: string,
+    private readonly when: 'daily' | 'midnight' | 'weekly',
+    private readonly keep: number,
+  ) {}
+
+  emit(record: LogRecord): void {
+    try {
+      this._rotateIfNeeded();
+      fs.appendFileSync(this.logPath, formatJson(record) + '\n', 'utf-8');
+    } catch {
+      // never disrupt
+    }
+  }
+
+  private _rotateIfNeeded(): void {
+    let filePeriod: string;
+    try {
+      filePeriod = _periodForDate(fs.statSync(this.logPath).mtime, this.when);
+    } catch {
+      return; // file doesn't exist yet
+    }
+    if (filePeriod === _periodForDate(new Date(), this.when)) return;
+    doRotate(this.logPath, this.keep);
+  }
+}
+
+// ── size/rotate parser ────────────────────────────────────────────────────────
+
+const SIZE_RE = /^(\d+(?:\.\d+)?)\s*(KB|MB|GB)$/i;
+const SIZE_MULT: Record<string, number> = { KB: 1024, MB: 1024 ** 2, GB: 1024 ** 3 };
+const TIMED_KEYS = new Set(['daily', 'midnight', 'weekly']);
+
+function makeFileHandler(logPath: string, rotate: string, keep: number): Handler {
+  const sizeMatch = SIZE_RE.exec(rotate);
+  if (sizeMatch) {
+    const maxBytes = Math.round(parseFloat(sizeMatch[1]) * SIZE_MULT[sizeMatch[2].toUpperCase()]);
+    return new SizeRotatingFileHandler(logPath, maxBytes, keep);
+  }
+  const when = rotate.toLowerCase();
+  if (TIMED_KEYS.has(when)) {
+    return new TimedRotatingFileHandler(logPath, when as 'daily' | 'midnight' | 'weekly', keep);
+  }
+  throw new Error(
+    `✗  [config.logging] rotate ${JSON.stringify(rotate)} not recognised.\n` +
+    `   Valid: '10 MB', '100 KB', '1 GB', 'daily', 'midnight', 'weekly'`,
+  );
+}
+
+// ── log dir resolution ────────────────────────────────────────────────────────
+
+function resolveLogDir(configPath: string): string {
+  const candidate = path.join(path.dirname(configPath), 'logs');
+  try {
+    fs.mkdirSync(candidate, { recursive: true });
+    const probe = path.join(candidate, '.wtest');
+    fs.writeFileSync(probe, '');
+    fs.unlinkSync(probe);
+    return candidate;
+  } catch {
+    const fallback = path.join(os.homedir(), 'logs');
+    fs.mkdirSync(fallback, { recursive: true });
+    return fallback;
+  }
+}
+
+// ── public: configureLogging ──────────────────────────────────────────────────
+
+export interface ConfigureLoggingOptions {
+  logCfg: LoggingConfig | undefined;
+  agent: boolean;
+  runnableName: string;
+  configPath: string;
+  logLevelOverride?: string;
+}
+
+export function configureLogging(opts: ConfigureLoggingOptions): void {
+  if (!opts.logCfg || _configured) return;
+
+  const effectiveLevelName = opts.logLevelOverride ?? opts.logCfg.level;
+  const effectiveLevel = LEVEL_NUM[effectiveLevelName] ?? LEVEL_NUM['info'];
+
+  if (!opts.agent) {
+    _handlers.push(new ConsoleHandler(effectiveLevel, effectiveLevelName === 'debug'));
+  }
+
+  const logDir = resolveLogDir(opts.configPath);
+  const logPath = path.join(logDir, `${opts.runnableName}.log`);
+  _handlers.push(makeFileHandler(logPath, opts.logCfg.rotate, opts.logCfg.keep));
+
+  _configured = true;
+}
+
+// ── test helper ───────────────────────────────────────────────────────────────
+
+export function _resetForTest(): void {
+  _configured = false;
+  _loggers.clear();
+  _handlers.length = 0;
+}
+
+export { _periodForDate };

package/src/models.ts

@@ -8,11 +8,18 @@ export interface JumpHostConfig {
   sshOptions?: string[];
 }
 
+export interface LoggingConfig {
+  level: string;
+  rotate: string;
+  keep: number;
+}
+
 export interface RawConfig {
   autonomyDefault: string;
   lang?: string;
   version: string;
   jumpHosts: Record<string, JumpHostConfig>;
+  logging?: LoggingConfig;
 }
 
 export interface ArgSpec {
@@ -71,4 +78,5 @@ export interface ParsedArgs {
   readonly __runspec_spec__: ScriptSpec;
   readonly runspec_command: string | undefined;
   readonly runspec_command_path: string[];
+  readonly runspec_prefix: string;
 }

package/src/parser.ts

@@ -5,6 +5,7 @@ import { inferScript, effectiveAutonomy } from './inference';
 import { coerce } from './types';
 import { validateArgs, validateGroups, raiseIfErrors } from './validator';
 import { RunSpecError } from './errors';
+import { configureLogging } from './logging_setup';
 import type { ParsedArgs, ScriptSpec, ArgSpec } from './models';
 
 export interface ParseOptions {
@@ -30,7 +31,27 @@ export function parse(opts: ParseOptions = {}): ParsedArgs {
     throw new RunSpecError(`✗  Runnable '${name}' not found.\n   Available: ${available}\n   Config: ${configPath}`);
   }
 
-  const rawScript = inferScript(raw.runnables[name], config.autonomyDefault);
+  let rawScript = inferScript(raw.runnables[name], config.autonomyDefault);
+
+  // Auto-inject --log-level when [config.logging] is present
+  if (config.logging && !('log-level' in rawScript.args)) {
+    rawScript = {
+      ...rawScript,
+      args: {
+        ...rawScript.args,
+        'log-level': {
+          name: 'log-level',
+          type: 'choice',
+          options: ['debug', 'info', 'warning', 'error', 'critical'],
+          default: config.logging.level,
+          required: false,
+          description: 'Override the console log level for this invocation.',
+          multiple: false,
+          env: 'RUNSPEC_LOG_LEVEL',
+        },
+      },
+    };
+  }
 
   let argv = argvOverride ?? process.argv.slice(2);
   let activeScript = rawScript;
@@ -65,6 +86,22 @@ export function parse(opts: ParseOptions = {}): ParsedArgs {
 
   const agent = ['1', 'true', 'yes'].includes((process.env['RUNSPEC_AGENT'] ?? '').toLowerCase());
 
+  const logLevelOverride = config.logging
+    ? (coercedValues['log_level'] as string | undefined) ?? undefined
+    : undefined;
+
+  try {
+    configureLogging({
+      logCfg: config.logging,
+      agent,
+      runnableName: name,
+      configPath,
+      logLevelOverride,
+    });
+  } catch (e) {
+    throw new RunSpecError((e as Error).message);
+  }
+
   return {
     ...coercedValues,
     __runspec_agent__: agent,
@@ -75,6 +112,7 @@ export function parse(opts: ParseOptions = {}): ParsedArgs {
     __runspec_spec__: activeScript,
     get runspec_command() { return commandPath.length > 0 ? commandPath[commandPath.length - 1] : undefined; },
     get runspec_command_path() { return commandPath; },
+    get runspec_prefix() { return path.dirname(configPath); },
   } as ParsedArgs;
 }
 

package/tests/test_loader.test.ts

@@ -132,3 +132,56 @@ test('autonomy-default falls back to confirm', () => {
   const raw = loadRaw(file);
   expect(raw.config.autonomyDefault).toBe('confirm');
 });
+
+// ── [config.logging] ──────────────────────────────────────────────────────────
+
+test('normalises [config.logging] with defaults', () => {
+  const dir = tmpDir();
+  const file = path.join(dir, 'runspec.toml');
+  fs.writeFileSync(file, `
+[config.logging]
+level = "info"
+
+[greet]
+description = "hi"
+`);
+  const raw = loadRaw(file);
+  expect(raw.config.logging).toEqual({ level: 'info', rotate: 'midnight', keep: 7 });
+});
+
+test('normalises [config.logging] all fields', () => {
+  const dir = tmpDir();
+  const file = path.join(dir, 'runspec.toml');
+  fs.writeFileSync(file, `
+[config.logging]
+level  = "debug"
+rotate = "10 MB"
+keep   = 3
+
+[greet]
+description = "hi"
+`);
+  const raw = loadRaw(file);
+  expect(raw.config.logging).toEqual({ level: 'debug', rotate: '10 MB', keep: 3 });
+});
+
+test('logging is undefined when section absent', () => {
+  const dir = tmpDir();
+  const file = path.join(dir, 'runspec.toml');
+  fs.writeFileSync(file, `[greet]\ndescription = "hi"\n`);
+  const raw = loadRaw(file);
+  expect(raw.config.logging).toBeUndefined();
+});
+
+test('throws on invalid log level', () => {
+  const dir = tmpDir();
+  const file = path.join(dir, 'runspec.toml');
+  fs.writeFileSync(file, `
+[config.logging]
+level = "verbose"
+
+[greet]
+description = "hi"
+`);
+  expect(() => loadRaw(file)).toThrow('[config.logging]');
+});