svamp-cli 0.2.175 → 0.2.177

package/dist/scheduler-DweevMw_.mjs

@@ -0,0 +1,93 @@
+import { spawn } from 'node:child_process';
+import { m as resolveProjectRoot, v as cronMatches } from './run-21-bMHCc.mjs';
+import { l as listWorkflows, b as workflowCrons, w as workflowSteps } from './store-BPL__e4D.mjs';
+import 'os';
+import 'fs/promises';
+import 'fs';
+import 'path';
+import 'url';
+import 'child_process';
+import 'crypto';
+import 'node:crypto';
+import 'node:fs';
+import 'util';
+import 'node:path';
+import 'node:events';
+import 'node:os';
+import '@agentclientprotocol/sdk';
+import '@modelcontextprotocol/sdk/client/index.js';
+import '@modelcontextprotocol/sdk/client/stdio.js';
+import '@modelcontextprotocol/sdk/types.js';
+import 'zod';
+import 'node:fs/promises';
+import 'node:util';
+import 'yaml';
+
+function defaultRunStep(root, command, log) {
+  try {
+    const child = spawn("sh", ["-c", command], { cwd: root, detached: true, stdio: "ignore" });
+    child.on("error", (e) => log?.(`[workflow] step spawn error in ${root}: ${e.message}`));
+    child.unref();
+  } catch (e) {
+    log?.(`[workflow] step spawn threw in ${root}: ${e?.message || e}`);
+  }
+}
+function cronMatchesSafe(expr, date) {
+  try {
+    return cronMatches(expr, date);
+  } catch {
+    return false;
+  }
+}
+class WorkflowScheduler {
+  constructor(deps) {
+    this.deps = deps;
+  }
+  // Wall-clock minute we last processed, so multiple sub-minute ticks fire a workflow at most once
+  // per minute (cron granularity is one minute).
+  lastMinuteKey = null;
+  static minuteKey(d) {
+    return `${d.getFullYear()}-${d.getMonth()}-${d.getDate()}-${d.getHours()}-${d.getMinutes()}`;
+  }
+  /** Fire all scheduled workflows whose cron matches `now`. Returns the names fired (for tests/logs). */
+  tick(now) {
+    const key = WorkflowScheduler.minuteKey(now);
+    if (key === this.lastMinuteKey) return [];
+    this.lastMinuteKey = key;
+    const fired = [];
+    const seen = /* @__PURE__ */ new Set();
+    for (const dir of this.deps.projectRoots()) {
+      let root;
+      try {
+        root = resolveProjectRoot(dir);
+      } catch {
+        continue;
+      }
+      if (seen.has(root)) continue;
+      seen.add(root);
+      let workflows;
+      try {
+        workflows = listWorkflows(root);
+      } catch {
+        continue;
+      }
+      for (const wf of workflows) {
+        const crons = workflowCrons(wf);
+        if (!crons.length) continue;
+        if (crons.some((c) => cronMatchesSafe(c, now))) {
+          this.fire(root, wf);
+          fired.push(wf.name);
+        }
+      }
+    }
+    return fired;
+  }
+  fire(root, wf) {
+    const steps = workflowSteps(wf);
+    this.deps.log?.(`[workflow] schedule fired "${wf.name}" (${steps.length} step${steps.length === 1 ? "" : "s"}) in ${root}`);
+    const run = this.deps.runStep || ((r, c) => defaultRunStep(r, c, this.deps.log));
+    for (const step of steps) run(root, step.run);
+  }
+}
+
+export { WorkflowScheduler, cronMatchesSafe };

package/dist/{serveCommands-C6l8yA9_.mjs → serveCommands-BZmiAjxi.mjs}

@@ -54,7 +54,7 @@ async function handleServeCommand() {
   }
 }
 async function serveAdd(args, machineId) {
-  const { connectAndGetMachine } = await import('./commands-BssfhM-2.mjs');
+  const { connectAndGetMachine } = await import('./commands-B4u6CUWH.mjs');
   const pos = positionalArgs(args);
   const name = pos[0];
   if (!name) {
@@ -93,7 +93,7 @@ async function serveAdd(args, machineId) {
   }
 }
 async function serveApply(args, machineId) {
-  const { connectAndGetMachine } = await import('./commands-BssfhM-2.mjs');
+  const { connectAndGetMachine } = await import('./commands-B4u6CUWH.mjs');
   const fs = await import('fs');
   const yaml = await import('yaml');
   const file = positionalArgs(args)[0];
@@ -182,7 +182,7 @@ async function serveApply(args, machineId) {
   }
 }
 async function serveRemove(args, machineId) {
-  const { connectAndGetMachine } = await import('./commands-BssfhM-2.mjs');
+  const { connectAndGetMachine } = await import('./commands-B4u6CUWH.mjs');
   const pos = positionalArgs(args);
   const name = pos[0];
   if (!name) {
@@ -202,7 +202,7 @@ async function serveRemove(args, machineId) {
   }
 }
 async function serveList(args, machineId) {
-  const { connectAndGetMachine } = await import('./commands-BssfhM-2.mjs');
+  const { connectAndGetMachine } = await import('./commands-B4u6CUWH.mjs');
   const all = hasFlag(args, "--all", "-a");
   const json = hasFlag(args, "--json");
   const sessionId = getFlag(args, "--session");
@@ -235,7 +235,7 @@ async function serveList(args, machineId) {
   }
 }
 async function serveInfo(machineId) {
-  const { connectAndGetMachine } = await import('./commands-BssfhM-2.mjs');
+  const { connectAndGetMachine } = await import('./commands-B4u6CUWH.mjs');
   const { machine, server } = await connectAndGetMachine(machineId);
   try {
     const info = await machine.serveInfo();

package/dist/{serveManager-B_Bj1AF4.mjs → serveManager-AbWv-Akt.mjs}

@@ -4,7 +4,7 @@ import * as fs from 'fs';
 import * as http from 'http';
 import * as net from 'net';
 import * as path from 'path';
-import { k as getHyphaServerUrl, S as ServeAuth, l as hasCookieToken } from './run-Buov6wz-.mjs';
+import { k as getHyphaServerUrl, S as ServeAuth, l as hasCookieToken } from './run-21-bMHCc.mjs';
 import 'os';
 import 'fs/promises';
 import 'url';
@@ -733,7 +733,7 @@ class ServeManager {
     const mount = this.mounts.get(mountName);
     const subdomainOverride = mount?.access === "link" && mount.linkToken ? /* @__PURE__ */ new Map([[this.port, buildLinkSubdomain(subdomainSafe, mount.linkToken)]]) : void 0;
     try {
-      const { FrpcTunnel } = await import('./frpc-BDZgTsi8.mjs');
+      const { FrpcTunnel } = await import('./frpc-yc5-4EUe.mjs');
       let tunnel;
       tunnel = new FrpcTunnel({
         name: tunnelName,

package/dist/{sideband-BYiyQgZR.mjs → sideband-CzzHtakf.mjs}

@@ -1,4 +1,4 @@
-import { y as READ_ONLY_TOOLS, z as loadMachineContext, A as buildMachineInstructions, B as machineToolsForRole, C as buildMachineTools } from './run-Buov6wz-.mjs';
+import { R as READ_ONLY_TOOLS, y as loadMachineContext, z as buildMachineInstructions, A as machineToolsForRole, B as buildMachineTools } from './run-21-bMHCc.mjs';
 import 'node:child_process';
 import 'os';
 import 'fs/promises';

package/dist/store-BPL__e4D.mjs

@@ -0,0 +1,125 @@
+import { existsSync, unlinkSync, readFileSync, readdirSync, mkdirSync, writeFileSync, renameSync } from 'node:fs';
+import { join } from 'node:path';
+import { parse, stringify } from 'yaml';
+
+function workflowSteps(wf) {
+  return Object.values(wf.jobs || {}).flatMap((j) => j?.steps || []);
+}
+function workflowCrons(wf) {
+  return (wf.on?.schedule || []).map((s) => s?.cron).filter((c) => !!c);
+}
+function workflowsDir(projectRoot) {
+  return join(projectRoot, ".svamp", "workflows");
+}
+function workflowPath(projectRoot, name) {
+  return join(workflowsDir(projectRoot), `${name}.yaml`);
+}
+function normalizeOn(on) {
+  if (!on || typeof on !== "object") {
+    return void 0;
+  }
+  const out = {};
+  if (Array.isArray(on.schedule)) {
+    const sched = on.schedule.map((s) => ({ cron: String(s?.cron ?? s ?? "") })).filter((s) => s.cron);
+    if (sched.length) out.schedule = sched;
+  } else if (typeof on.schedule === "string" && on.schedule.trim()) {
+    out.schedule = [{ cron: on.schedule.trim() }];
+  }
+  if ("workflow_dispatch" in on || on.dispatch === true) out.workflow_dispatch = true;
+  if (typeof on.channel === "string" && on.channel) out.channel = on.channel;
+  if (Array.isArray(on.issue) && on.issue.length) out.issue = on.issue.map(String);
+  return Object.keys(out).length ? out : void 0;
+}
+function normalizeJobs(jobs) {
+  if (Array.isArray(jobs)) {
+    const steps = jobs.map((j) => ({ run: String(j?.run ?? "") })).filter((s) => s.run);
+    return steps.length ? { run: { steps } } : {};
+  }
+  if (jobs && typeof jobs === "object") {
+    const out = {};
+    for (const [id, job] of Object.entries(jobs)) {
+      const rawSteps = Array.isArray(job?.steps) ? job.steps : job?.run ? [{ run: job.run }] : [];
+      const steps = rawSteps.map((s) => ({ run: String(s?.run ?? ""), ...s?.name ? { name: String(s.name) } : {} })).filter((s) => s.run);
+      if (steps.length) out[String(id)] = { steps };
+    }
+    return out;
+  }
+  return {};
+}
+function parseWorkflow(content) {
+  try {
+    const o = parse(content);
+    if (!o || typeof o !== "object" || !o.name) return null;
+    return {
+      name: String(o.name),
+      on: normalizeOn(o.on),
+      jobs: normalizeJobs(o.jobs),
+      session: o.session ?? null
+    };
+  } catch {
+    return null;
+  }
+}
+function serializeWorkflow(wf) {
+  const clean = { name: wf.name };
+  if (wf.session) clean.session = wf.session;
+  const on = {};
+  if (wf.on?.schedule?.length) on.schedule = wf.on.schedule.map((s) => ({ cron: s.cron }));
+  if (wf.on?.workflow_dispatch) on.workflow_dispatch = {};
+  if (wf.on?.channel) on.channel = wf.on.channel;
+  if (wf.on?.issue?.length) on.issue = wf.on.issue;
+  if (Object.keys(on).length) clean.on = on;
+  const jobs = {};
+  for (const [id, job] of Object.entries(wf.jobs || {})) {
+    jobs[id] = { steps: (job.steps || []).map((s) => s.name ? { name: s.name, run: s.run } : { run: s.run }) };
+  }
+  clean.jobs = Object.keys(jobs).length ? jobs : { run: { steps: [] } };
+  return stringify(clean);
+}
+function listWorkflows(projectRoot) {
+  const dir = workflowsDir(projectRoot);
+  if (!existsSync(dir)) return [];
+  const out = [];
+  for (const name of readdirSync(dir)) {
+    if (!name.endsWith(".yaml") && !name.endsWith(".yml")) continue;
+    try {
+      const wf = parseWorkflow(readFileSync(join(dir, name), "utf-8"));
+      if (wf) out.push(wf);
+    } catch {
+    }
+  }
+  return out.sort((a, b) => a.name.localeCompare(b.name));
+}
+function getWorkflow(projectRoot, name) {
+  const p = workflowPath(projectRoot, name);
+  if (!existsSync(p)) return null;
+  try {
+    return parseWorkflow(readFileSync(p, "utf-8"));
+  } catch {
+    return null;
+  }
+}
+function rawWorkflow(projectRoot, name) {
+  const p = workflowPath(projectRoot, name);
+  return existsSync(p) ? readFileSync(p, "utf-8") : null;
+}
+function saveWorkflow(projectRoot, wf) {
+  const dir = workflowsDir(projectRoot);
+  mkdirSync(dir, { recursive: true });
+  const path = workflowPath(projectRoot, wf.name);
+  const tmp = `${path}.tmp-${process.pid}`;
+  writeFileSync(tmp, serializeWorkflow(wf));
+  renameSync(tmp, path);
+}
+function removeWorkflow(projectRoot, name) {
+  const p = workflowPath(projectRoot, name);
+  if (!existsSync(p)) return false;
+  try {
+    unlinkSync(p);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+export { rawWorkflow as a, workflowCrons as b, getWorkflow as g, listWorkflows as l, removeWorkflow as r, saveWorkflow as s, workflowSteps as w };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svamp-cli",
-  "version": "0.2.175",
+  "version": "0.2.177",
   "description": "Svamp CLI — AI workspace daemon on Hypha Cloud",
   "author": "Amun AI AB",
   "license": "SEE LICENSE IN LICENSE",
@@ -20,7 +20,7 @@
   "scripts": {
     "build": "rm -rf dist bin/skills && mkdir -p bin/skills && cp -r ../../skills/artifact bin/skills/artifact && cp -r ../../skills/loop bin/skills/loop && cp -r ../../skills/crew bin/skills/crew && tsc --noEmit && pkgroll",
     "typecheck": "tsc --noEmit",
-    "test": "npx tsx test/test-context-window.mjs && npx tsx test/test-ratelimit-retry.mjs && npx tsx test/test-instance-config.mjs && npx tsx test/test-authorize.mjs && npx tsx test/test-normalize-allowed-user.mjs && npx tsx test/test-share-url.mjs && npx tsx test/test-update-sharing-normalization.mjs && npx tsx test/test-sharing-notify-sync.mjs && npx tsx test/test-staged-homes-sweep.mjs && npx tsx test/test-session-helpers.mjs && npx tsx test/test-cli-routing.mjs && npx tsx test/test-security-context.mjs && npx tsx test/test-isolation-decision.mjs && npx tsx test/test-loop-activation.mjs && npx tsx test/test-message-helpers.mjs && npx tsx test/test-agent-config.mjs && npx tsx test/test-wrap-command.mjs && npx tsx test/test-credential-staging.mjs && npx tsx test/test-claude-auth.mjs && npx tsx test/test-output-formatters.mjs && npx tsx test/test-inbox-guard.mjs && npx tsx test/test-auto-topic.mjs && npx tsx test/test-project-info.mjs && npx tsx test/test-agent-types.mjs && npx tsx test/test-transport.mjs && npx tsx test/test-session-update-handlers.mjs && npx tsx test/test-session-scanner.mjs && npx tsx test/test-hypha-client.mjs && npx tsx test/test-hook-settings.mjs && npx tsx test/test-session-service-logic.mjs && npx tsx test/test-daemon-persistence.mjs && npx tsx test/test-detect-isolation.mjs && npx tsx test/test-machine-service-logic.mjs && npx tsx test/test-interactive-helpers.mjs && npx tsx test/test-codex-backend.mjs && npx tsx test/test-acp-backend.mjs && npx tsx test/test-acp-bridge.mjs && npx tsx test/test-hook-server.mjs && npx tsx test/test-session-commands.mjs && npx tsx test/test-interactive-console.mjs && npx tsx test/test-session-messages.mjs && npx tsx test/test-session-send-query.mjs && npx tsx test/test-skills.mjs && npx tsx test/test-agent-grouping.mjs && npx tsx test/test-machine-list-directory.mjs && npx tsx test/test-service-commands.mjs && npx tsx test/test-supervisor.mjs && npx tsx test/test-supervisor-lock.mjs && node test/test-supervisor-restart.mjs && npx tsx test/test-clear-detection.mjs && npx tsx test/test-session-consolidation.mjs && npx tsx test/test-inbox.mjs && npx tsx test/test-inbox-cross-machine.mjs && npx tsx test/test-issue-store.mjs && npx tsx test/test-issue-close-gate.mjs && npx tsx test/test-issue-rpc.mjs && npx tsx test/test-workflow-store.mjs && npx tsx test/test-workflow-rpc.mjs && npx tsx test/test-serve-link-subdomain.mjs && npx tsx test/test-short-id.mjs && npx tsx test/test-transcript-edit.mjs && npx tsx test/test-edit-history.mjs && npx tsx test/test-friendly-name.mjs && npx tsx test/test-session-rpc-dispatch.mjs && npx tsx test/test-sandbox-cli.mjs && npx tsx test/test-serve-manager.mjs && npx tsx test/test-serve-stability.mjs && npx tsx test/test-frpc-e2e.mjs --unit-only && npx tsx test/test-frpc-status.mjs && node test/pinnedClaudeCode.test.mjs && node test/fleet.test.mjs && npx tsx test/test-routine.mjs && npx tsx test/test-routine-rpc.mjs && npx tsx test/test-session-file.mjs && npx tsx test/test-channel-rpc.mjs && npx tsx test/test-wise-agent.mjs && npx tsx test/test-channel-agent.mjs && npx tsx test/test-channels-service.mjs && npx tsx test/test-channel-async-reply.mjs && npx tsx test/test-channel-binding.mjs && npx tsx test/test-channel-identity.mjs && npx tsx test/test-shared-session-identity.mjs && npx tsx test/test-wise-agent-auth.mjs && npx tsx test/test-channel-http.mjs && npx tsx test/test-wise-voice.mjs && npx tsx test/test-wise-headless.mjs && npx tsx test/test-wise-machine.mjs && npx tsx test/test-crew-merge.mjs && npx tsx test/test-crew-verdict-routing.mjs",
+    "test": "npx tsx test/test-context-window.mjs && npx tsx test/test-ratelimit-retry.mjs && npx tsx test/test-instance-config.mjs && npx tsx test/test-authorize.mjs && npx tsx test/test-normalize-allowed-user.mjs && npx tsx test/test-share-url.mjs && npx tsx test/test-update-sharing-normalization.mjs && npx tsx test/test-sharing-notify-sync.mjs && npx tsx test/test-staged-homes-sweep.mjs && npx tsx test/test-session-helpers.mjs && npx tsx test/test-cli-routing.mjs && npx tsx test/test-security-context.mjs && npx tsx test/test-isolation-decision.mjs && npx tsx test/test-loop-activation.mjs && npx tsx test/test-message-helpers.mjs && npx tsx test/test-agent-config.mjs && npx tsx test/test-wrap-command.mjs && npx tsx test/test-credential-staging.mjs && npx tsx test/test-claude-auth.mjs && npx tsx test/test-output-formatters.mjs && npx tsx test/test-inbox-guard.mjs && npx tsx test/test-auto-topic.mjs && npx tsx test/test-project-info.mjs && npx tsx test/test-agent-types.mjs && npx tsx test/test-transport.mjs && npx tsx test/test-session-update-handlers.mjs && npx tsx test/test-session-scanner.mjs && npx tsx test/test-hypha-client.mjs && npx tsx test/test-hook-settings.mjs && npx tsx test/test-session-service-logic.mjs && npx tsx test/test-daemon-persistence.mjs && npx tsx test/test-detect-isolation.mjs && npx tsx test/test-machine-service-logic.mjs && npx tsx test/test-interactive-helpers.mjs && npx tsx test/test-codex-backend.mjs && npx tsx test/test-acp-backend.mjs && npx tsx test/test-acp-bridge.mjs && npx tsx test/test-hook-server.mjs && npx tsx test/test-session-commands.mjs && npx tsx test/test-interactive-console.mjs && npx tsx test/test-session-messages.mjs && npx tsx test/test-session-send-query.mjs && npx tsx test/test-skills.mjs && npx tsx test/test-agent-grouping.mjs && npx tsx test/test-machine-list-directory.mjs && npx tsx test/test-service-commands.mjs && npx tsx test/test-supervisor.mjs && npx tsx test/test-supervisor-lock.mjs && node test/test-supervisor-restart.mjs && npx tsx test/test-clear-detection.mjs && npx tsx test/test-session-consolidation.mjs && npx tsx test/test-inbox.mjs && npx tsx test/test-inbox-cross-machine.mjs && npx tsx test/test-issue-store.mjs && npx tsx test/test-issue-close-gate.mjs && npx tsx test/test-issue-rpc.mjs && npx tsx test/test-workflow-store.mjs && npx tsx test/test-workflow-rpc.mjs && npx tsx test/test-workflow-scheduler.mjs && npx tsx test/test-serve-link-subdomain.mjs && npx tsx test/test-short-id.mjs && npx tsx test/test-transcript-edit.mjs && npx tsx test/test-edit-history.mjs && npx tsx test/test-friendly-name.mjs && npx tsx test/test-session-rpc-dispatch.mjs && npx tsx test/test-sandbox-cli.mjs && npx tsx test/test-serve-manager.mjs && npx tsx test/test-serve-stability.mjs && npx tsx test/test-frpc-e2e.mjs --unit-only && npx tsx test/test-frpc-status.mjs && node test/pinnedClaudeCode.test.mjs && node test/fleet.test.mjs && npx tsx test/test-session-file.mjs && npx tsx test/test-channel-rpc.mjs && npx tsx test/test-wise-agent.mjs && npx tsx test/test-channel-agent.mjs && npx tsx test/test-channels-service.mjs && npx tsx test/test-channel-async-reply.mjs && npx tsx test/test-channel-binding.mjs && npx tsx test/test-channel-identity.mjs && npx tsx test/test-shared-session-identity.mjs && npx tsx test/test-wise-agent-auth.mjs && npx tsx test/test-channel-http.mjs && npx tsx test/test-wise-voice.mjs && npx tsx test/test-wise-headless.mjs && npx tsx test/test-wise-machine.mjs && npx tsx test/test-crew-merge.mjs && npx tsx test/test-crew-verdict-routing.mjs",
     "test:hypha": "node --no-warnings test/test-hypha-service.mjs",
     "dev": "tsx src/cli.ts",
     "dev:daemon": "tsx src/cli.ts daemon start-sync",

package/bin/skills/loop/bin/routine-cli.mjs

@@ -1,121 +0,0 @@
-#!/usr/bin/env node
-// routine-cli.mjs — manage + run routines.
-//   add/list/remove/enable/disable/run-now  — CRUD + manual fire
-//   serve [--port N]                         — scheduler tick + webhook HTTP server
-//
-// Delivery uses the svamp CLI: a fired routine becomes a message (or loop
-// kickoff) into the bound session via `svamp session send`.
-import { execFileSync } from 'node:child_process';
-import { createServer } from 'node:http';
-import { dirname, join, resolve } from 'node:path';
-import { fileURLToPath } from 'node:url';
-import { RoutineStore } from './routine-store.mjs';
-import { RoutineRunner } from './routine-runner.mjs';
-
-const HERE = dirname(fileURLToPath(import.meta.url));
-const LOOP_INIT = join(HERE, 'loop-init.mjs');
-
-function parseArgs(argv) {
-  const a = { _: [] };
-  for (let i = 0; i < argv.length; i++) {
-    const t = argv[i];
-    if (t.startsWith('--')) a[t.slice(2)] = (argv[i + 1] && !argv[i + 1].startsWith('--')) ? argv[++i] : true;
-    else a._.push(t);
-  }
-  return a;
-}
-
-// ---- real delivery via svamp CLI ---------------------------------------
-async function cliDeliver({ routine, resolved }) {
-  const sid = routine.session_id;
-  if (resolved.kind === 'message') {
-    execFileSync('svamp', ['session', 'send', sid, resolved.text], { stdio: 'pipe' });
-    return;
-  }
-  // loop action: set up the loop in the project dir, then kick the session.
-  const dir = routine.action.loop?.dir || routine.dir;
-  if (dir) {
-    const initArgs = [LOOP_INIT, resolve(dir), '--task', resolved.task || routine.action.loop?.task || '(task)'];
-    if (routine.action.loop?.oracle) initArgs.push('--oracle', routine.action.loop.oracle);
-    initArgs.push('--evaluator', routine.action.loop?.evaluator || 'off');
-    execFileSync(process.execPath, initArgs, { stdio: 'pipe' });
-  }
-  execFileSync('svamp', ['session', 'send', sid,
-    `Begin the loop (LOOP MODE). Task: ${resolved.task}. Iterate until the gate lets you stop.`], { stdio: 'pipe' });
-}
-
-function buildRoutineFromArgs(a) {
-  const r = { session_id: a.session, name: a.name || 'routine', overlap: a.overlap || 'queue' };
-  if (a.schedule) r.trigger = { type: 'schedule', cron: a.schedule, missed: a.missed || 'skip', tz: a.tz };
-  else if (a.webhook || a.api) r.trigger = { type: a.api ? 'api' : 'webhook', methods: a.get ? ['GET'] : ['GET', 'POST'], public: !!a.public };
-  else r.trigger = { type: 'manual' };
-  if (a.loop) r.action = { kind: 'loop', task_template: a.task || '', loop: { dir: a.dir, oracle: a.oracle, evaluator: a.evaluator || 'off' } };
-  else r.action = { kind: 'message', template: a.message || a.task || 'run' };
-  return r;
-}
-
-async function main() {
-  const a = parseArgs(process.argv.slice(2));
-  const cmd = a._[0];
-  const store = new RoutineStore();
-  const runner = new RoutineRunner({ store, deliver: cliDeliver, log: console.error });
-
-  switch (cmd) {
-    case 'add': {
-      if (!a.session) { console.error('--session <id> required'); process.exit(1); }
-      const r = store.save(buildRoutineFromArgs(a));
-      console.log(`✅ added routine ${r.id} (${r.name}) trigger=${r.trigger.type} action=${r.action.kind}`);
-      if (r.trigger.key) console.log(`   webhook key: ${r.trigger.key}`);
-      break;
-    }
-    case 'list': {
-      const rs = store.list();
-      if (a.json) { console.log(JSON.stringify(rs, null, 2)); break; }
-      if (!rs.length) { console.log('(no routines)'); break; }
-      for (const r of rs) console.log(`${r.enabled ? '●' : '○'} ${r.id}  ${r.name}  [${r.trigger.type}${r.trigger.cron ? ' ' + r.trigger.cron : ''}] -> ${r.action.kind}  session=${r.session_id}`);
-      break;
-    }
-    case 'remove': ok(store.remove(a._[1]), `removed ${a._[1]}`); break;
-    case 'enable': store.setEnabled(a._[1], true); console.log(`enabled ${a._[1]}`); break;
-    case 'disable': store.setEnabled(a._[1], false); console.log(`disabled ${a._[1]}`); break;
-    case 'run-now': console.log(JSON.stringify(await runner.runNow(a._[1], {}), null, 2)); break;
-    case 'serve': await serve(runner, store, Number(a.port) || 8722); break;
-    default:
-      console.log(`usage: routine-cli <add|list|remove|enable|disable|run-now|serve>
-  add --session <id> --name <n> [--schedule "*/5 * * * *" [--missed catchup]] [--webhook|--api [--get] [--public]] (--message "..." | --loop --dir <path> --task "..." [--oracle "cmd"])
-  serve [--port 8722]`);
-  }
-  function ok(c, m) { console.log(c ? '✅ ' + m : '✗ ' + m); }
-}
-
-async function serve(runner, store, port) {
-  // catch up missed schedules, then tick every 20s (per-minute dedupe inside).
-  await runner.catchUp(new Date(Date.now() - 24 * 3600 * 1000), new Date());
-  const timer = setInterval(() => { runner.tick(new Date()).catch((e) => console.error('tick error', e)); }, 20000);
-
-  const server = createServer((req, res) => {
-    const u = new URL(req.url, `http://localhost:${port}`);
-    if (u.pathname === '/' || u.pathname === '/health') { res.writeHead(200).end('routines ok'); return; }
-    const m = u.pathname.match(/^\/routine\/([\w.-]+)$/);
-    if (!m) { res.writeHead(404).end('not found'); return; }
-    const id = m[1];
-    const key = u.searchParams.get('key');
-    const query = Object.fromEntries(u.searchParams.entries());
-    let chunks = '';
-    req.on('data', (c) => { chunks += c; if (chunks.length > 1e6) req.destroy(); });
-    req.on('end', async () => {
-      let body = {}; try { body = chunks ? JSON.parse(chunks) : {}; } catch {}
-      const result = await runner.webhook(id, { key, method: req.method, body, query });
-      res.writeHead(result.status || 200, { 'content-type': 'application/json' }).end(JSON.stringify(result));
-    });
-  });
-  server.listen(port, () => {
-    console.log(`🪝 routine server on http://localhost:${port}`);
-    console.log(`   webhook URL pattern: http://localhost:${port}/routine/<id>?key=<key>`);
-    console.log(`   expose publicly:  svamp service expose routines --port ${port}`);
-    console.log(`   scheduler: ticking every 20s`);
-  });
-  process.on('SIGINT', () => { clearInterval(timer); server.close(); process.exit(0); });
-}
-
-main().catch((e) => { console.error(e); process.exit(1); });

package/bin/skills/loop/bin/routine-runner.mjs

@@ -1,125 +0,0 @@
-#!/usr/bin/env node
-// routine-runner.mjs — fires routines (schedule tick / webhook / manual),
-// applies overlap + missed-run policies, and delivers the resolved action
-// (message | loop) via an injectable `deliver` fn. Pure logic; the actual
-// CLI delivery + timer + HTTP server live in routine-cli.mjs.
-import { cronMatches, renderTemplate, nextFire, inZone } from './routine-core.mjs';
-
-const minuteKey = (d) => `${d.getFullYear()}-${d.getMonth()}-${d.getDate()}-${d.getHours()}-${d.getMinutes()}`;
-
-export class RoutineRunner {
-  /** @param {{store, deliver:(ctx)=>Promise<any>, now?:()=>Date, onReplace?:(id)=>void, log?:Function}} o */
-  constructor({ store, deliver, now = () => new Date(), onReplace, log = () => {} }) {
-    this.store = store; this.deliver = deliver; this.now = now; this.onReplace = onReplace; this.log = log;
-    this.active = new Set();           // routine ids with an in-flight loop run
-    this._firedMinute = new Map();     // id -> minuteKey (in-memory dedupe within a process)
-  }
-
-  resolveAction(routine, payload = {}) {
-    const ctx = { ...payload, now: this.now().toISOString(), routine: { id: routine.id, name: routine.name } };
-    const a = routine.action;
-    if (a.kind === 'message') return { kind: 'message', text: renderTemplate(a.template, ctx) };
-    const task = renderTemplate(a.task_template || a.loop?.task || '', ctx);
-    return { kind: 'loop', task, loop: a.loop };
-  }
-
-  markDone(id) { this.active.delete(id); }
-
-  /** Deliveries counted today via a dedicated counter (NOT derived from the
-   * capped last_runs audit, which would undercount past 20 runs/day). */
-  _deliveredToday(routine) {
-    const today = this.now().toDateString();
-    return routine.daily && routine.daily.date === today ? routine.daily.n : 0;
-  }
-
-  /** Core fire path with overlap + daily-cap policy. via = 'schedule'|'webhook'|'api'|'manual'.
-   * NOTE: `active` guards genuinely CONCURRENT in-flight deliveries only — the runner
-   * cannot observe a spawned loop's full duration (delivery is fire-and-forget), so it
-   * is cleared once delivery returns. True loop-duration overlap needs a loop-state
-   * signal (future). `replace` calls onReplace (best-effort) then proceeds. */
-  async fire(routine, payload = {}, via = 'manual') {
-    if (!routine.enabled) return { skipped: 'disabled' };
-    // Defense-in-depth (also enforced at validate time): never run a loop action
-    // from a public/keyless webhook (unauthenticated task injection).
-    if (routine.action?.kind === 'loop' && (routine.trigger?.type === 'webhook' || routine.trigger?.type === 'api') && routine.trigger?.public)
-      return { skipped: 'forbidden (public webhook + loop)' };
-    const today = this.now().toDateString();
-    // Reserve a daily slot SYNCHRONOUSLY (before any await) so concurrent fires
-    // serialize on the JS event loop and cannot all read n=0 and over-deliver.
-    const r0 = this.store.get(routine.id) || routine;
-    const usedToday = (r0.daily && r0.daily.date === today) ? r0.daily.n : 0;
-    if (routine.daily_cap && usedToday >= routine.daily_cap) {
-      this.store.recordRun(routine.id, { via, delivered: routine.action.kind, outcome: 'skipped (daily cap)' });
-      return { skipped: 'daily_cap' };
-    }
-    if (this.active.has(routine.id)) {
-      if (routine.overlap === 'skip') { this.store.recordRun(routine.id, { via, delivered: routine.action.kind, outcome: 'skipped (busy)' }); return { skipped: 'busy' }; }
-      if (routine.overlap === 'replace') { try { this.onReplace?.(routine.id); } catch {} }
-      // 'queue'/'replace' -> proceed
-    }
-    this.active.add(routine.id);
-    if (routine.daily_cap) { r0.daily = { date: today, n: usedToday + 1 }; this.store.save(r0); } // reserve
-    const resolved = this.resolveAction(routine, payload);
-    let outcome = 'delivered';
-    try {
-      await this.deliver({ routine, action: routine.action, resolved, payload, via });
-    } catch (e) {
-      outcome = 'error: ' + (e?.message || e);
-      if (routine.daily_cap) { const rb = this.store.get(routine.id); if (rb?.daily?.date === today && rb.daily.n > 0) { rb.daily.n -= 1; this.store.save(rb); } } // roll back reservation
-    } finally { this.active.delete(routine.id); }
-    const r = this.store.get(routine.id) || routine;
-    r.last_fired_at = this.now().toISOString();
-    r.last_runs = [{ firedAt: r.last_fired_at, via, delivered: resolved.kind, outcome }, ...(r.last_runs || [])].slice(0, 20);
-    this.store.save(r);
-    return { fired: true, via, resolved, outcome };
-  }
-
-  /** Schedule tick — fire any matching schedule routine once per minute. */
-  async tick(date = this.now()) {
-    const results = [];
-    for (const r of this.store.list()) {
-      if (!r.enabled || r.trigger?.type !== 'schedule') continue;
-      if (!cronMatches(r.trigger.cron, inZone(date, r.trigger.tz))) continue;
-      const mk = minuteKey(date);
-      if (this._firedMinute.get(r.id) === mk) continue; // already fired this minute
-      this._firedMinute.set(r.id, mk);
-      results.push({ id: r.id, ...(await this.fire(r, { tick: date.toISOString() }, 'schedule')) });
-    }
-    return results;
-  }
-
-  /** Webhook/api fire: validate key + method, then fire with payload. */
-  async webhook(id, { key, method = 'POST', body = {}, query = {} } = {}) {
-    const r = this.store.get(id);
-    if (!r) return { status: 404, error: 'routine not found' };
-    if (r.trigger?.type !== 'webhook' && r.trigger?.type !== 'api') return { status: 400, error: 'not a webhook routine' };
-    if (!r.enabled) return { status: 409, error: 'routine disabled' };
-    if (!r.trigger.public && r.trigger.key && key !== r.trigger.key) return { status: 401, error: 'bad key' };
-    const methods = r.trigger.methods || ['GET', 'POST'];
-    if (!methods.includes(method)) return { status: 405, error: 'method not allowed' };
-    const res = await this.fire(r, { body, query }, r.trigger.type);
-    return { status: 200, ...res };
-  }
-
-  async runNow(id, payload = {}) {
-    const r = this.store.get(id);
-    if (!r) return { error: 'not found' };
-    return this.fire(r, payload, 'manual');
-  }
-
-  /** On startup, fire schedule routines whose time was missed while down (catchup). */
-  async catchUp(sinceDate, nowDate = this.now()) {
-    const results = [];
-    for (const r of this.store.list()) {
-      if (!r.enabled || r.trigger?.type !== 'schedule' || r.trigger.missed !== 'catchup') continue;
-      const deadlineMs = (r.trigger.deadline_sec || 3600) * 1000;
-      const since = new Date(Math.max(sinceDate.getTime(), nowDate.getTime() - deadlineMs));
-      const due = nextFire(r.trigger.cron, since, r.trigger.tz);   // first scheduled time after `since` (in the routine's tz)
-      if (due && due <= nowDate) {
-        const last = r.last_fired_at ? new Date(r.last_fired_at) : new Date(0);
-        if (last < due) results.push({ id: r.id, ...(await this.fire(r, { catchup: due.toISOString() }, 'schedule')) });
-      }
-    }
-    return results;
-  }
-}

package/bin/skills/loop/bin/routine-store.mjs

@@ -1,49 +0,0 @@
-#!/usr/bin/env node
-// routine-store.mjs — persistence + CRUD for routine specs.
-// Specs live as JSON files under a routines dir (default ~/.svamp/routines/),
-// one file per routine, atomic writes, restored on restart.
-import { mkdirSync, writeFileSync, renameSync, readdirSync, readFileSync, rmSync, existsSync } from 'node:fs';
-import { homedir } from 'node:os';
-import { join } from 'node:path';
-import { randomBytes } from 'node:crypto';
-import { validateRoutine } from './routine-core.mjs';
-
-export function defaultRoutinesDir() {
-  return process.env.SVAMP_ROUTINES_DIR || join(homedir(), '.svamp', 'routines');
-}
-const genId = () => 'rt_' + randomBytes(5).toString('hex');
-const genKey = () => randomBytes(18).toString('base64url');
-
-export class RoutineStore {
-  constructor(dir = defaultRoutinesDir()) { this.dir = dir; mkdirSync(dir, { recursive: true }); }
-  _path(id) { return join(this.dir, `${id}.json`); }
-
-  list() {
-    return readdirSync(this.dir).filter((f) => f.endsWith('.json')).map((f) => {
-      try { return JSON.parse(readFileSync(join(this.dir, f), 'utf8')); } catch { return null; }
-    }).filter(Boolean);
-  }
-  get(id) { try { return JSON.parse(readFileSync(this._path(id), 'utf8')); } catch { return null; } }
-
-  /** Create/update. Assigns id, key (for webhook/api), defaults; validates. */
-  save(routine) {
-    const r = { overlap: 'queue', enabled: true, last_runs: [], ...routine };
-    if (!r.id) r.id = genId();
-    if ((r.trigger?.type === 'webhook' || r.trigger?.type === 'api') && !r.trigger.key) r.trigger.key = genKey();
-    const errs = validateRoutine(r);
-    if (errs.length) throw new Error('invalid routine: ' + errs.join('; '));
-    const tmp = this._path(r.id) + '.tmp';
-    writeFileSync(tmp, JSON.stringify(r, null, 2));
-    renameSync(tmp, this._path(r.id));
-    return r;
-  }
-  remove(id) { const p = this._path(id); if (existsSync(p)) { rmSync(p); return true; } return false; }
-  setEnabled(id, enabled) { const r = this.get(id); if (!r) return null; r.enabled = enabled; return this.save(r); }
-
-  /** Append a capped run-history entry. */
-  recordRun(id, entry) {
-    const r = this.get(id); if (!r) return null;
-    r.last_runs = [{ firedAt: new Date().toISOString(), ...entry }, ...(r.last_runs || [])].slice(0, 20);
-    return this.save(r);
-  }
-}

package/bin/skills/loop/routines.process.yaml

@@ -1,20 +0,0 @@
-# Supervised routine server — run the scheduler + webhook dispatcher persistently.
-#   svamp process apply skills/loop/routines.process.yaml
-#   svamp service expose routines --port 8722   # public capability URLs
-# Adjust the absolute path to wherever the loop skill is installed.
-id: routines
-name: routines
-command: node
-args:
-  - "/Users/weio/workspace/hypha-cloud/skills/loop/bin/routine-cli.mjs"
-  - "serve"
-  - "--port"
-  - "8722"
-workdir: /Users/weio/workspace/hypha-cloud
-env:
-  SVAMP_ROUTINES_DIR: "/Users/weio/.svamp/routines"
-keepAlive: true
-probe:
-  type: http
-  port: 8722
-  path: /health