tines 0.0.115 → 0.0.117

package/dist/index.js

@@ -3547,8 +3547,8 @@ var selfRef = () => ({ kind: "self-ref" });
 function str(v) {
   return v === null || v === void 0 ? "" : String(v);
 }
-function joinChanged(v, sep) {
-  return Array.isArray(v) ? v.join(sep) : "";
+function joinChanged(v, sep2) {
+  return Array.isArray(v) ? v.join(sep2) : "";
 }
 function action(type) {
   return type.split(".")[1] ?? type;
@@ -4204,11 +4204,11 @@ function assertNewStatesHavePrompts(states, prompts) {
   }
 }
 function parseScheduleRef(ref) {
-  const sep = ref.indexOf("/");
-  if (sep < 1 || sep === ref.length - 1) {
+  const sep2 = ref.indexOf("/");
+  if (sep2 < 1 || sep2 === ref.length - 1) {
     throw new CliError(`schedule reference must look like <project>/<name>, got "${ref}"`);
   }
-  return { project: ref.slice(0, sep), name: ref.slice(sep + 1) };
+  return { project: ref.slice(0, sep2), name: ref.slice(sep2 + 1) };
 }
 function parseIssueRef(ref) {
   const match = ref.match(/^(.+)\/(\d+)$/);
@@ -4216,12 +4216,12 @@ function parseIssueRef(ref) {
   return { project: match[1], number: Number.parseInt(match[2], 10) };
 }
 function parseFileSpec(spec) {
-  const sep = spec.indexOf("=");
-  if (sep < 1 || sep === spec.length - 1) {
+  const sep2 = spec.indexOf("=");
+  if (sep2 < 1 || sep2 === spec.length - 1) {
     throw new CliError(`--file must look like <path>=@<local-file>, got "${spec}"`);
   }
-  const path2 = spec.slice(0, sep);
-  const source = spec.slice(sep + 1);
+  const path2 = spec.slice(0, sep2);
+  const source = spec.slice(sep2 + 1);
   if (!source.startsWith("@")) {
     throw new CliError(
       `skill file content always comes from a local file: --file ${path2}=@<local-file>`
@@ -4235,10 +4235,10 @@ function parseFileSpec(spec) {
   }
 }
 function parseTargetSpec(spec) {
-  const sep = spec.lastIndexOf(":");
-  if (sep === -1) return { name: spec };
-  const name2 = spec.slice(0, sep);
-  const tier = spec.slice(sep + 1);
+  const sep2 = spec.lastIndexOf(":");
+  if (sep2 === -1) return { name: spec };
+  const name2 = spec.slice(0, sep2);
+  const tier = spec.slice(sep2 + 1);
   if (!name2) throw new CliError(`target must look like <runner>[:tier], got "${spec}"`);
   if (!MODEL_TIERS.includes(tier)) {
     throw new CliError(`unknown tier "${tier}" in "${spec}" (tiers: ${MODEL_TIERS.join(", ")})`);
@@ -4421,12 +4421,12 @@ async function resolveIssue(api, ref) {
   return api.getIssueByNumber(proj.id, number);
 }
 async function resolveStateFlag(api, ref) {
-  const sep = ref.indexOf("/");
-  if (sep < 1 || sep === ref.length - 1) {
+  const sep2 = ref.indexOf("/");
+  if (sep2 < 1 || sep2 === ref.length - 1) {
     die(`--state must look like <workflow>/<state>, got "${ref}"`);
   }
-  const workflow = await resolveWorkflow(api, ref.slice(0, sep));
-  const stateRef = ref.slice(sep + 1);
+  const workflow = await resolveWorkflow(api, ref.slice(0, sep2));
+  const stateRef = ref.slice(sep2 + 1);
   const state = workflow.states.find((s) => s.name === stateRef) ?? workflow.states.find((s) => s.id === stateRef);
   if (!state) {
     die(
@@ -5964,6 +5964,7 @@ import {
   existsSync as existsSync4,
   mkdirSync as mkdirSync4,
   readFileSync as readFileSync9,
+  realpathSync,
   rmSync as rmSync2,
   statSync as statSync3,
   unlinkSync as unlinkSync2,
@@ -6085,7 +6086,7 @@ import { existsSync as existsSync3, mkdirSync as mkdirSync3, readFileSync as rea
 import { dirname as dirname3, join as join3 } from "node:path";
 
 // src/daemon/support.ts
-import { delimiter } from "node:path";
+import { delimiter, sep } from "node:path";
 var HARNESS_KINDS = ["claude_code", "codex", "custom"];
 var KEEP_WORKSPACES_MODES = ["never", "failed", "always"];
 function keepWorkspace(mode, outcome) {
@@ -6333,6 +6334,14 @@ var CliRefresher = class {
   cached = AMBIENT_CLI;
   lastAttempt = null;
   inFlight = null;
+  /**
+   * Resolves once no install is in flight, starting none. A daemon about to
+   * exit for a self-update waits on this so it never restarts into a
+   * half-extracted prefix.
+   */
+  settled() {
+    return this.inFlight ? this.inFlight.then(() => void 0) : Promise.resolve();
+  }
   /** The current CLI, refreshing first when the TTL elapsed. Never rejects. */
   ensure() {
     if (this.inFlight) return this.inFlight;
@@ -6349,6 +6358,26 @@ var CliRefresher = class {
     return this.inFlight;
   }
 };
+function isNewerVersion(candidate, current) {
+  const parse = (v) => /^\d+(\.\d+)*$/.test(v) ? v.split(".").map(Number) : null;
+  const a = parse(candidate);
+  const b = parse(current);
+  if (!a || !b) return false;
+  for (let i = 0; i < Math.max(a.length, b.length); i++) {
+    const x = a[i] ?? 0;
+    const y = b[i] ?? 0;
+    if (x !== y) return x > y;
+  }
+  return false;
+}
+function pendingSelfUpdate(cli, running) {
+  if (cli.source === "ambient" || !cli.version) return null;
+  return isNewerVersion(cli.version, running) ? cli.version : null;
+}
+function pathWithin(path2, dir) {
+  const root = dir.endsWith(sep) ? dir : dir + sep;
+  return path2.startsWith(root);
+}
 function buildSpawnEnv(base, opts) {
   const env = {
     ...base,
@@ -6688,7 +6717,28 @@ async function runDaemon(opts) {
   const refresher = new CliRefresher(() => installAgentCli({ configDir: opts.configDir, log }), {
     ttlMs: CLI_REFRESH_TTL_MS
   });
-  const ensureCli = () => opts.cliRefresh ? refresher.ensure() : Promise.resolve(AMBIENT_CLI);
+  const prefix = agentCliPrefix(opts.configDir);
+  const selfPath = realpathOrNull(process.argv[1]);
+  const managedInstall = selfPath !== null && pathWithin(selfPath, realpathOrNull(prefix) ?? prefix);
+  const selfUpdate = opts.selfUpdate && opts.cliRefresh && managedInstall;
+  if (opts.selfUpdate && opts.cliRefresh) {
+    log(
+      managedInstall ? `self-update: on \u2014 this daemon (tines ${DAEMON_VERSION}) runs from ${prefix} and will restart once idle after a newer release is installed there` : `self-update: off \u2014 this daemon (tines ${DAEMON_VERSION}) runs from ${selfPath ?? process.argv[1] ?? "?"}, not ${prefix}; launch it from ${join5(prefix, "node_modules", ".bin", "tines")} to have refreshes apply on restart (docs/runner-daemon.md)`
+    );
+  }
+  let pendingUpdate = null;
+  const noteCli = (cli) => {
+    if (!selfUpdate || pendingUpdate) return cli;
+    const newer = pendingSelfUpdate(cli, DAEMON_VERSION);
+    if (newer) {
+      pendingUpdate = newer;
+      log(
+        `tines ${newer} is installed in ${prefix} (this daemon is ${DAEMON_VERSION}); draining \u2014 no new runs accepted, restarting once the in-flight ones finish`
+      );
+    }
+    return cli;
+  };
+  const ensureCli = () => opts.cliRefresh ? refresher.ensure().then(noteCli) : Promise.resolve(AMBIENT_CLI);
   const cliLabel = (cli) => cli.source === "ambient" ? `ambient PATH (${opts.cliRefresh ? "refresh failed" : "refresh disabled"})` : `tines ${cli.version ?? "unknown"} (daemon-managed${cli.source === "stale" ? ", last-good copy" : ""})`;
   log(`agent CLI: ${cliLabel(await ensureCli())}`);
   const table2 = new RunTable(
@@ -6946,7 +6996,11 @@ async function runDaemon(opts) {
     try {
       const res = await client2.pollRunner(creds.runner_id, {
         owned_runs: table2.ids(),
-        max_concurrent: opts.maxConcurrent
+        max_concurrent: opts.maxConcurrent,
+        // Stated on every poll while pending; absent otherwise, which
+        // the server reads as "not draining" — so a daemon that died
+        // mid-drain cannot pin its runner shut past its relaunch.
+        ...pendingUpdate ? { draining: true } : {}
       });
       failures = 0;
       for (const runId of res.cancels) killWithoutFinish(runId);
@@ -6958,6 +7012,14 @@ async function runDaemon(opts) {
         }
         void launch(assignment);
       }
+      if (selfUpdate && !pendingUpdate) void ensureCli();
+      if (pendingUpdate && res.assignments.length === 0 && table2.size === 0) {
+        await refresher.settled();
+        log(
+          `exiting to restart as tines ${pendingUpdate} \u2014 the service manager relaunches this daemon (KeepAlive / Restart=always)`
+        );
+        process.exit(0);
+      }
     } catch (err) {
       if (err instanceof ApiError && err.status === 401) {
         for (const run of table2.values()) {
@@ -6988,6 +7050,14 @@ async function runDaemon(opts) {
 function message2(err) {
   return err instanceof Error ? err.message : String(err);
 }
+function realpathOrNull(path2) {
+  if (!path2) return null;
+  try {
+    return realpathSync(path2);
+  } catch {
+    return null;
+  }
+}
 function runGit(args, cwd, batcher) {
   return new Promise((resolve) => {
     const child = spawn2("git", args, { cwd, stdio: ["ignore", "pipe", "pipe"] });
@@ -7239,6 +7309,9 @@ function register8(program3) {
     ).option(
       "--no-cli-refresh",
       "do not install/refresh the agent-facing tines CLI from npm (harnesses use the ambient PATH)"
+    ).option(
+      "--no-self-update",
+      "do not exit for the service manager to relaunch a newer daemon (only applies when launched from the daemon-managed prefix)"
     ).option(
       "--keep-workspaces <mode>",
       "keep settled runs' workspaces for debugging: never | failed | always",
@@ -7294,6 +7367,7 @@ function register8(program3) {
         pollIntervalMs: opts.pollInterval * 1e3,
         configDir: defaultConfigDir(),
         cliRefresh: opts.cliRefresh,
+        selfUpdate: opts.selfUpdate,
         keepWorkspaces,
         keepWorkspacesForHours: opts.keepWorkspacesFor,
         keepWorkspacesMax: opts.keepWorkspacesMax
@@ -7683,12 +7757,12 @@ function register10(program3) {
     const api = client(opts);
     const overrides = {};
     for (const spec of opts.state) {
-      const sep = spec.lastIndexOf("=");
-      if (sep < 1 || sep === spec.length - 1) {
+      const sep2 = spec.lastIndexOf("=");
+      if (sep2 < 1 || sep2 === spec.length - 1) {
         die(`--state must look like <workflow>/<state>=<n>, got "${spec}"`);
       }
-      const limit = Number.parseInt(spec.slice(sep + 1), 10);
-      const { state } = await resolveStateFlag(api, spec.slice(0, sep));
+      const limit = Number.parseInt(spec.slice(sep2 + 1), 10);
+      const { state } = await resolveStateFlag(api, spec.slice(0, sep2));
       overrides[state.id] = limit;
     }
     const settings = await api.updateSupervisorSettings({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tines",
-  "version": "0.0.115",
+  "version": "0.0.117",
   "description": "CLI for Tines, an orchestration layer for AI agents",
   "repository": {
     "type": "git",