@stringsync/splates 0.0.46 → 0.0.47

package/index.js

@@ -12,11 +12,11 @@ import { assets } from "@stringsync/splates-server/server";
 import { NodeFs } from "webappwiz/system";
 
 // splates.ts
-import { DEFAULT_PORT } from "@stringsync/splates-server";
+import { DEFAULT_PORT as DEFAULT_PORT2 } from "@stringsync/splates-server";
 import { agents } from "@stringsync/splates-server/agents";
 import { attach } from "@stringsync/splates-server/artifacts";
 import { commaList as commaList4 } from "@stringsync/splates-server/comma-list";
-import { exits, fail as fail5 } from "@stringsync/splates-server/exit";
+import { exits, fail as fail6 } from "@stringsync/splates-server/exit";
 import { DEFAULT_COUNT, log as showLog } from "@stringsync/splates-server/log";
 import { merge } from "@stringsync/splates-server/merge";
 import { portsLs } from "@stringsync/splates-server/ports";
@@ -270,13 +270,20 @@ splatesBudget.command("end").description("end a raise now, by the number `show`
 
 // coordinator.ts
 import {
-  CoordinatorBox
+  CoordinatorBox,
+  keepCarriedCreds,
+  machineMove
 } from "@stringsync/splates-server/coordinator";
-import { RUNNING } from "@stringsync/splates-server/server";
+import { SYSTEM_STORES as SYSTEM_STORES2 } from "@stringsync/splates-server/creds";
+import { fail as fail3 } from "@stringsync/splates-server/exit";
+import {
+  DEFAULT_PORT,
+  RUNNING
+} from "@stringsync/splates-server/server";
 import { cli as cli3 } from "webappwiz/cmd";
 import { z as z4 } from "zod";
 var splatesCoordinator = cli3("coordinator").description("the always-on box in your own Hetzner Cloud account that `splates server` moves onto, made through Pulumi with the token and state the Cloud workers setup readied: a CPX21 in Ashburn with Hetzner's daily backups, reached by SSH alone");
-splatesCoordinator.command("up").description("make the coordinator's box, or bring it to its program, with splates of this release installed for the user splates and an SSH key splates makes under ~/.splates/coordinator; run again, it changes only what is not so already. The box serves nothing until the coordinator moves onto it").option("json", z4.boolean(), { default: false, description: "emit JSON" }).action(async (opts, ctx) => {
+splatesCoordinator.command("up").description("make the coordinator's box, or bring it to its program, with splates of this release installed for the user splates and an SSH key splates makes under ~/.splates/coordinator; run again, it changes only what is not so already. The box serves nothing until `splates coordinator move`").option("json", z4.boolean(), { default: false, description: "emit JSON" }).action(async (opts, ctx) => {
   ctx.log.info("making the coordinator's box; its first boot takes minutes");
   print(ctx, await box(ctx).up(), opts.json);
 });
@@ -292,6 +299,51 @@ splatesCoordinator.command("remove").description("destroy the coordinator's box
   await box(ctx).remove();
   ctx.log.info("removed the coordinator's box");
 });
+splatesCoordinator.command("move").description("move the coordinator onto its box, over SSH. First it checks what the move needs, brings the box's splates to this release, and gives each project a clone there with a deploy key of its own; until GitHub lets each key push trunk, it prints each key with where to add it, with write access, and exits `blocked`: add them and run it again. Then it asks every agent of this machine's `splates server` to checkpoint and stops it, carries the coordinator's records and creds to the box, starts `splates server` there for good under systemd, with the saved tunnel, and joins this machine to it as a worker, kept up by a LaunchAgent, where each task carries on in its worktree here. This machine's records go aside, kept, and its `splates` reaches the box from then on").option("dry-run", z4.boolean(), {
+  default: false,
+  description: "stop once the box is ready, before this machine's server stops or anything here changes"
+}).option("dev", z4.string(), {
+  default: `http://localhost:${DEFAULT_PORT}`,
+  description: "this machine's `splates server`, which the move stops"
+}).action(async (opts, ctx) => {
+  const moved = await machineMove({
+    ps: ctx.ps,
+    fs: ctx.fs,
+    log: ctx.log,
+    version: RUNNING,
+    dev: opts.dev,
+    stores: ctx.secrets ?? SYSTEM_STORES2,
+    ...ctx.fetch === undefined ? {} : { fetch: ctx.fetch }
+  }).run({ dryRun: opts["dry-run"] });
+  if (moved.status === "keys") {
+    fail3("blocked", [
+      'GitHub does not let these deploy keys push yet. Add each to its repository with "Allow write access" ticked, then move again:',
+      ...moved.keys.flatMap(({ slug, key, add }) => [
+        "",
+        `  ${slug}${add === null ? "" : `: ${add}`}`,
+        `  ${key}`
+      ])
+    ].join(`
+`), { keys: moved.keys });
+  }
+  if (moved.status === "ready") {
+    ctx.log.info(`the box is ready to coordinate ${moved.projects.join(", ")} through ${moved.host}: move again without --dry-run`);
+    return;
+  }
+  ctx.log.info([
+    `the coordinator runs on the box: https://${moved.host}`,
+    `this machine is its worker ${ctx.ps.hostname}, kept up by ${moved.worker}`,
+    `its own records are kept aside in ${moved.aside} and each project's .git/splates.moved`
+  ].join(`
+`));
+});
+splatesCoordinator.command("keep-creds").description("keep the creds `splates coordinator move` sends on stdin in this machine's stores, as the box does when the coordinator moves onto it").action(async (_opts, ctx) => {
+  const kept = await keepCarriedCreds({
+    stores: ctx.secrets ?? SYSTEM_STORES2,
+    sent: await Bun.stdin.text()
+  });
+  ctx.log.info(`kept ${kept} creds`);
+});
 function box(ctx) {
   return new CoordinatorBox({ version: RUNNING, ps: ctx.ps, fs: ctx.fs });
 }
@@ -310,7 +362,7 @@ function print(ctx, standing, json) {
 
 // creds.ts
 import { DEFAULT_TIMEOUT } from "@stringsync/splates-server/creds";
-import { fail as fail3 } from "@stringsync/splates-server/exit";
+import { fail as fail4 } from "@stringsync/splates-server/exit";
 import { repository as repository2 } from "@stringsync/splates-server/records";
 import { untilAfter } from "@stringsync/splates-server/tasks";
 import { cli as cli4 } from "webappwiz/cmd";
@@ -356,7 +408,7 @@ splatesCreds.command("wait").use(repository2({ needs: "own" })).description("blo
   await ctx.journal.waiting("creds wait", null, { name: opts.name, until: untilAfter(timeout) }, async () => {
     const ended = await ctx.creds.wait(opts.name, { timeout });
     if (ended === "dismissed") {
-      fail3("dismissed", `${opts.name} was dismissed: carry on without it, or ask the person why`, { name: opts.name });
+      fail4("dismissed", `${opts.name} was dismissed: carry on without it, or ask the person why`, { name: opts.name });
     }
   });
   ctx.log.info(`${color.green("saved")} ${opts.name}`);
@@ -468,7 +520,7 @@ splatesQueue.command("move").description("move an agent waiting for a slot to an
 
 // setup.ts
 import { dirname } from "node:path";
-import { SYSTEM_STORES as SYSTEM_STORES2 } from "@stringsync/splates-server/creds";
+import { SYSTEM_STORES as SYSTEM_STORES3 } from "@stringsync/splates-server/creds";
 import { splatesHome as splatesHome2 } from "@stringsync/splates-server/models";
 import { Projects } from "@stringsync/splates-server/projects";
 import {
@@ -510,7 +562,7 @@ async function setup(deps, opts) {
   printStep(log, step);
 }
 async function setupOf(deps) {
-  const { fs, ps, secrets = SYSTEM_STORES2, fetch } = deps;
+  const { fs, ps, secrets = SYSTEM_STORES3, fetch } = deps;
   const root = deps.project === undefined ? await repoRoot(ps) : (await Projects.ofMachine(deps).named(deps.project)).root;
   return new Setup({
     fs,
@@ -633,7 +685,7 @@ import {
   todoUpdate
 } from "@stringsync/splates-server/board";
 import { commaList as commaList3 } from "@stringsync/splates-server/comma-list";
-import { fail as fail4 } from "@stringsync/splates-server/exit";
+import { fail as fail5 } from "@stringsync/splates-server/exit";
 import { repository as repository5 } from "@stringsync/splates-server/records";
 import {
   DEFAULT_TIMEOUT as DEFAULT_TIMEOUT2,
@@ -669,7 +721,7 @@ splatesTodo.command("add").use(repository5({ needs: "todos" })).description("not
   description: "with --agent: the thinking level, one the agent offers (default: the agent's own)"
 }).action(async (opts, ctx) => {
   if (ctx.elsewhere !== null && opts.lane !== "") {
-    fail4("not_granted", "a todo from another project goes in its untriaged lane, for whoever orchestrates it there to place: leave --lane off", { subject: opts.subject });
+    fail5("not_granted", "a todo from another project goes in its untriaged lane, for whoever orchestrates it there to place: leave --lane off", { subject: opts.subject });
   }
   const from = await here(ctx);
   const assignee = await assigneeIn(ctx, opts.agent, opts.model, opts.effort);
@@ -1042,10 +1094,10 @@ splates.command("add").use(repository7({ needs: "tasks" })).description("start a
   description: "with --agent: hand it out though you have as many tasks out to agents as agentsPerAgent (splates.config.ts) allows; only when the person explicitly asked for more at once"
 }).action(async (opts, ctx) => {
   if (opts.agent === "" && (opts.model !== "" || opts.effort !== "" || opts.prompt !== "" || opts["over-capacity"])) {
-    fail5("usage", "--model, --effort, --prompt and --over-capacity go with --agent", { task: opts.task });
+    fail6("usage", "--model, --effort, --prompt and --over-capacity go with --agent", { task: opts.task });
   }
   if (opts.goal.trim() === "" && opts.todo === "") {
-    fail5("usage", `say what done means: \`splates add ${opts.task} --goal "<one or two lines>"\`, or take todos with --todo`, { task: opts.task });
+    fail6("usage", `say what done means: \`splates add ${opts.task} --goal "<one or two lines>"\`, or take todos with --todo`, { task: opts.task });
   }
   const dispatch = opts.agent === "" ? undefined : {
     agent: opts.agent,
@@ -1124,7 +1176,7 @@ splates.command("log").use(repository7({ needs: "read" })).description("show wha
   description: "how many entries to show"
 }).option("json", z13.boolean(), { default: false, description: "emit JSON" }).action((opts, ctx) => showLog(ctx, { count: opts.count, json: opts.json }));
 splates.command("server").description("serve every splates project on this machine as a web page, from wherever it is run: the page picks the project it shows, adds one by its path, running `splates init` there, and shows its todos and tasks, where todos can be added, updated, reordered or removed; it brings each project's records forward as it opens it").option("port", z13.coerce.number(), {
-  default: DEFAULT_PORT,
+  default: DEFAULT_PORT2,
   description: "port to listen on, or the next open one above it"
 }).option("allow-hosts", z13.string(), {
   default: "",
@@ -1151,17 +1203,18 @@ splates.command("server").description("serve every splates project on this machi
   default: false,
   description: "serve this checkout's splates at https://<word>.<zone>, a slot of its own on the zone `splates tunnel setup` uses, behind the same Access policy, so several run side by side and a phone opens each by name: a task's worktree keeps its word, as fox, until the task merges or is removed, which stops its server; run again, it stops the tree's last server first. Refused in a splates repository's main tree, which every agent shares. A slot keeps its own projects in ~/.splates/slots/<word>, apart from yours, starting with a throwaway project there; not with the tunnel and Access flags"
 }).action((opts, ctx) => serveDev(ctx, opts));
-splates.command("ports").description("list the ports tasks serve, found by the running `splates server` as an editor finds ports to forward: each port a process in a task's worktree, or under its agent, listens on, with its link through the ports host `splates server --ports-host` saved, behind Cloudflare Access, and its link on this machine; give the user both").arg("task", z13.string(), {
+splates.command("ports").description("list the ports tasks serve, found by the running `splates server` as an editor finds ports to forward: each port a process in a task's worktree, or under its agent, listens on, with its link through the ports host `splates server --ports-host` saved, behind Cloudflare Access, and its link on this machine, which on a worker whose coordinator runs elsewhere only that worker's own ports have; give the user both").arg("task", z13.string(), {
   default: "",
   description: "only this task's ports; every task's by default"
 }).option("dev", z13.string(), {
   default: "",
-  description: "the `splates server` to ask, a URL such as http://localhost:4310; by default the one an agent runs under, from SPLATES_DEV, else this machine's on its default port"
+  description: "the `splates server` to ask, a URL such as http://localhost:4310; by default the one an agent runs under, from SPLATES_DEV, else the coordinator this machine's worker relays to, else this machine's on its default port"
 }).option("json", z13.boolean(), { default: false, description: "emit JSON" }).action((opts, ctx) => portsLs({
   task: opts.task,
   dev: opts.dev,
   json: opts.json,
   log: ctx.log,
+  fs: ctx.fs,
   ps: ctx.ps,
   send: ctx.fetch
 }));
@@ -1181,10 +1234,10 @@ splates.command("setup").description("set splates up on this machine, one step a
   description: "with a step: ask for it again"
 }).action(async (opts, ctx) => {
   if (opts.step === "" && (opts.skip || opts.unskip)) {
-    fail5("usage", "--skip and --unskip name a step", {});
+    fail6("usage", "--skip and --unskip name a step", {});
   }
   if (opts.skip && opts.unskip) {
-    fail5("usage", "--skip or --unskip, not both", { step: opts.step });
+    fail6("usage", "--skip or --unskip, not both", { step: opts.step });
   }
   await setup(ctx, opts);
 });

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@stringsync/splates",
-	"version": "0.0.46",
+	"version": "0.0.47",
 	"description": "Runs several AI coding agents on one repository at once, each in its own git worktree",
 	"license": "MIT",
 	"author": "stringsync LLC",
@@ -17,7 +17,7 @@
 		"access": "public"
 	},
 	"dependencies": {
-		"@stringsync/splates-server": "^0.0.46",
+		"@stringsync/splates-server": "^0.0.47",
 		"webappwiz": "0.0.46",
 		"zod": "^4.4.3"
 	},