tines 0.0.170 → 0.0.171

package/dist/index.js

@@ -4559,7 +4559,15 @@ function parseTargetSpec(spec) {
 }
 
 // src/config.ts
-import { existsSync, mkdirSync, readFileSync as readFileSync3, unlinkSync, writeFileSync } from "node:fs";
+import {
+  existsSync,
+  mkdirSync,
+  readFileSync as readFileSync3,
+  renameSync,
+  rmSync,
+  unlinkSync,
+  writeFileSync
+} from "node:fs";
 import { homedir } from "node:os";
 import { dirname, join } from "node:path";
 function defaultConfigDir() {
@@ -4575,8 +4583,15 @@ function readJsonFile(path2) {
 }
 function writeJsonFile(path2, value, { secret = false } = {}) {
   mkdirSync(dirname(path2), { recursive: true });
-  writeFileSync(path2, `${JSON.stringify(value, null, 2)}
+  const tmp = `${path2}.tmp-${process.pid}`;
+  try {
+    writeFileSync(tmp, `${JSON.stringify(value, null, 2)}
 `, secret ? { mode: 384 } : {});
+    renameSync(tmp, path2);
+  } catch (e) {
+    rmSync(tmp, { force: true });
+    throw e;
+  }
 }
 function configPath(dir = defaultConfigDir()) {
   return join(dir, "config.json");
@@ -6935,7 +6950,7 @@ import {
   mkdirSync as mkdirSync4,
   readFileSync as readFileSync9,
   realpathSync,
-  rmSync as rmSync2,
+  rmSync as rmSync3,
   statSync as statSync4,
   unlinkSync as unlinkSync2,
   writeFileSync as writeFileSync3
@@ -7436,7 +7451,7 @@ function buildHarnessInvocation(spec, input) {
         file: "sh",
         args: [
           "-c",
-          `claude -p --output-format stream-json --verbose${input.model ? ` --model ${shellQuote(input.model)}` : ""} < ${shellQuote(input.promptFile)}`
+          `claude -p${input.resumeSessionId ? ` --resume ${shellQuote(input.resumeSessionId)}` : ""} --output-format stream-json --verbose${input.model ? ` --model ${shellQuote(input.model)}` : ""} < ${shellQuote(input.promptFile)}`
         ]
       };
     case "codex":
@@ -7474,7 +7489,10 @@ function formatLaunchBanner(invocation, input, meta) {
     `model=${input.model ?? "(fixed)"}`,
     `timeout=${meta.timeoutMinutes}m`,
     `cli=${meta.cliVersion}`,
-    `workspace=${input.workspace}`
+    `workspace=${input.workspace}`,
+    // The one line that says a send-back reused a session rather than
+    // re-exploring the repository from zero.
+    ...input.resumeSessionId ? [`resumed=${meta.resumedFromRunId ?? input.resumeSessionId}`] : []
   ];
   return `$ ${formatLaunchCommand(invocation)}
 # tines runner: ${fields.join(" ")}
@@ -7538,7 +7556,7 @@ var RunTable = class {
   cleanup(run, outcome = "failed") {
     this.runs.delete(run.runId);
     this.effects.persist();
-    this.effects.release(run, { keep: this.keep(outcome), outcome });
+    this.effects.release(run, { keep: this.keep(outcome, run), outcome });
   }
   /**
    * Ends a run: flush logs, finish-report, clean up. On a run someone
@@ -7559,11 +7577,15 @@ var RunTable = class {
     run.settled = true;
     run.endNote ??= error;
     run.drain?.();
-    if (this.keep(status)) this.effects.noteKept?.(run);
+    if (this.keep(status, run)) this.effects.noteKept?.(run);
     await run.flush?.();
+    const keptBeforeFinish = this.keep(status, run);
     try {
       await this.effects.finish(run, status, error, judgment);
       this.effects.log(`run ${run.runId} finished: ${status}${error ? ` (${error})` : ""}`);
+      if (!keptBeforeFinish && this.keep(status, run)) {
+        this.effects.log(`run ${run.runId} workspace kept for resume at ${run.workspace}`);
+      }
     } catch (err) {
       this.effects.log(
         `finish report for run ${run.runId} not accepted: ${err instanceof Error ? err.message : String(err)}`
@@ -7818,7 +7840,7 @@ function message(err) {
 }
 
 // src/daemon/store.ts
-import { readdirSync as readdirSync2, readFileSync as readFileSync8, rmSync, statSync as statSync3 } from "node:fs";
+import { readdirSync as readdirSync2, readFileSync as readFileSync8, rmSync as rmSync2, statSync as statSync3 } from "node:fs";
 import { join as join4 } from "node:path";
 function credentialsKey(url, name2) {
   return `${url.replace(/\/+$/, "")}#${name2}`;
@@ -7919,7 +7941,7 @@ function pruneKeptWorkspaces(configDir, opts) {
   const removed = [];
   for (const entry of doomed) {
     try {
-      rmSync(entry.path, { recursive: true, force: true });
+      rmSync2(entry.path, { recursive: true, force: true });
       removed.push(entry);
     } catch {
     }
@@ -8017,7 +8039,7 @@ async function runDaemon(opts) {
   sweepKeptWorkspaces();
   const settleWorkspace = (workspace, keep, marker) => {
     if (!keep) {
-      rmSync2(workspace, { recursive: true, force: true });
+      rmSync3(workspace, { recursive: true, force: true });
       return;
     }
     if (!existsSync5(workspace)) return;
@@ -8091,13 +8113,19 @@ async function runDaemon(opts) {
     {
       finish: async (run, status, error, judgment) => {
         const summary = run.renderer?.summary();
-        await client2.finishRun(run.runId, {
+        const ended = await client2.finishRun(run.runId, {
           status,
           ...error ? { error } : {},
           ...judgment,
           usage: summary?.usage ?? { cost_source: "none" },
-          ...summary?.providerSessionId ? { provider_session_id: summary.providerSessionId } : {}
+          ...summary?.providerSessionId ? { provider_session_id: summary.providerSessionId } : {},
+          ...summary?.numTurns !== void 0 ? { turn_count: summary.numTurns } : {},
+          // The whole conversation's turns, which for a resumed run is
+          // more than this run's own: the size guard reads this one.
+          ...summary?.numTurns !== void 0 ? { conversation_turn_count: run.priorTurns + summary.numTurns } : {},
+          workspace_path: run.workspace
         });
+        if (ended?.resume_expires_at) run.keepForResume = true;
       },
       release: (run, { keep, outcome }) => {
         if (run.timeout) clearTimeout(run.timeout);
@@ -8126,7 +8154,11 @@ async function runDaemon(opts) {
       },
       log
     },
-    { keep: (outcome) => keepWorkspace(opts.keepWorkspaces, outcome) }
+    {
+      // A workspace the server retained for a resume is kept whatever the
+      // --keep-workspaces mode says; pruning still bounds it by age/count.
+      keep: (outcome, run) => run.keepForResume || keepWorkspace(opts.keepWorkspaces, outcome)
+    }
   );
   for (const orphan of loadDaemonState(statePath)) {
     if (pidAlive(orphan.pid)) {
@@ -8172,7 +8204,13 @@ async function runDaemon(opts) {
   const launch = async (assignment) => {
     const runId = assignment.run.id;
     if (table2.has(runId)) return;
-    const workspace = join5(workspacesDir(opts.configDir), runId);
+    const resume = assignment.resume && existsSync5(assignment.resume.workspace_path) ? assignment.resume : null;
+    if (assignment.resume && !resume) {
+      log(
+        `run ${runId}: resume workspace ${assignment.resume.workspace_path} is gone; launching fresh`
+      );
+    }
+    const workspace = resume ? resume.workspace_path : join5(workspacesDir(opts.configDir), runId);
     const issueLabel = assignment.run.issue_ref ? `${assignment.run.issue_ref.project_name}/${assignment.run.issue_ref.number}` : void 0;
     const run = {
       runId,
@@ -8182,6 +8220,8 @@ async function runDaemon(opts) {
       timedOut: false,
       settled: false,
       keyFingerprint: assignment.run_key.slice(0, 14),
+      priorTurns: resume?.prior_turn_count ?? 0,
+      keepForResume: false,
       batcher: new LogBatcher(
         (chunk, seq) => client2.appendRunLog(runId, { chunk, seq }).then(() => {
         }),
@@ -8191,26 +8231,32 @@ async function runDaemon(opts) {
     run.flush = () => run.batcher.flush();
     table2.track(run);
     log(
-      `run ${runId} assigned (issue ${issueLabel ?? assignment.run.issue_id}); materializing workspace`
+      resume ? `run ${runId} assigned (issue ${issueLabel ?? assignment.run.issue_id}); resuming run ${resume.previous_run_id} in ${workspace}` : `run ${runId} assigned (issue ${issueLabel ?? assignment.run.issue_id}); materializing workspace`
     );
     try {
-      rmSync2(workspace, { recursive: true, force: true });
-      mkdirSync4(workspace, { recursive: true });
+      if (!resume) {
+        rmSync3(workspace, { recursive: true, force: true });
+        mkdirSync4(workspace, { recursive: true });
+      } else {
+        rmSync3(join5(workspace, "kept.json"), { force: true });
+      }
       writeFileSync3(join5(workspace, "prompt.md"), `${assignment.prompt}
 `);
-      for (const skill of assignment.bundle.skills) {
-        for (const file of skill.files) {
-          const target = join5(workspace, "skills", skill.name, file.path);
-          mkdirSync4(dirname4(target), { recursive: true });
-          writeFileSync3(target, file.content);
+      if (!resume)
+        for (const skill of assignment.bundle.skills) {
+          for (const file of skill.files) {
+            const target = join5(workspace, "skills", skill.name, file.path);
+            mkdirSync4(dirname4(target), { recursive: true });
+            writeFileSync3(target, file.content);
+          }
         }
-      }
-      writeFileSync3(
-        join5(workspace, "repos.json"),
-        `${JSON.stringify(assignment.bundle.repos, null, 2)}
+      if (!resume)
+        writeFileSync3(
+          join5(workspace, "repos.json"),
+          `${JSON.stringify(assignment.bundle.repos, null, 2)}
 `
-      );
-      for (const repo of assignment.bundle.repos) {
+        );
+      for (const repo of resume ? [] : assignment.bundle.repos) {
         if (run.settled) return table2.cleanup(run);
         const args = [
           "clone",
@@ -8242,7 +8288,8 @@ async function runDaemon(opts) {
         workspace,
         promptFile: join5(workspace, "prompt.md"),
         prompt: assignment.prompt,
-        model: assignment.run.model
+        model: assignment.run.model,
+        ...resume ? { resumeSessionId: resume.provider_session_id } : {}
       };
       const invocation = buildHarnessInvocation(
         { harness: opts.harness, command: opts.command },
@@ -8252,7 +8299,8 @@ async function runDaemon(opts) {
         formatLaunchBanner(invocation, harnessInput, {
           harness: opts.harness,
           timeoutMinutes: assignment.timeout_minutes,
-          cliVersion: DAEMON_VERSION
+          cliVersion: DAEMON_VERSION,
+          ...resume ? { resumedFromRunId: resume.previous_run_id } : {}
         })
       );
       const child = spawn2(invocation.file, invocation.args, {

package/package.json

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