spacecode 2.14.3 → 2.14.4

package/dist/repl.mjs

@@ -6375,9 +6375,9 @@ var init_trust = __esm({
 });
 
 // ../agent/src/import/source-changes.ts
-function fingerprintSources(files, hash) {
+function fingerprintSources(files, hash2) {
   const fingerprint = {};
-  for (const [path13, content] of Object.entries(files)) fingerprint[path13] = hash(content);
+  for (const [path13, content] of Object.entries(files)) fingerprint[path13] = hash2(content);
   return fingerprint;
 }
 function diffSources(before, after) {
@@ -6397,8 +6397,8 @@ var init_source_changes = __esm({
 });
 
 // ../agent/src/import/mcp-tool-cache.ts
-function serverCacheKey(def, hash) {
-  return hash(JSON.stringify([def.name, def.command, def.args, [...def.envNames].sort()]));
+function serverCacheKey(def, hash2) {
+  return hash2(JSON.stringify([def.name, def.command, def.args, [...def.envNames].sort()]));
 }
 function cleanTool(raw) {
   if (!isPlainObject(raw) || typeof raw.name !== "string" || raw.name === "" || typeof raw.description !== "string" || !isPlainObject(raw.inputSchema)) return null;
@@ -7817,9 +7817,9 @@ function formatAdaptReport(r, before, replaced) {
 }
 async function adaptInstructions(deps, original) {
   const { client, log } = deps;
-  const hash = await sha12(original);
+  const hash2 = await sha12(original);
   const current = await client.get("instructions", "global");
-  const marker = adaptedMarker(hash);
+  const marker = adaptedMarker(hash2);
   const existingOrig = await client.get("instructions", "global.orig");
   if (current && existingOrig && existingOrig.content === original && current.description === marker) {
     log("  unchanged  instructions/global (already adapted from this source)");
@@ -7886,7 +7886,7 @@ var init_import_adapt = __esm({
     "use strict";
     init_src();
     EXCERPT_CHARS = 1e3;
-    adaptedMarker = (hash) => `adapted-from:${hash}`;
+    adaptedMarker = (hash2) => `adapted-from:${hash2}`;
   }
 });
 
@@ -104991,14 +104991,15 @@ async function must(shell, cmd, what) {
   if (r.exitCode !== 0) throw new Error(`${what} failed: ${r.stderr.trim() || `exit ${r.exitCode}`}`);
   return r.stdout.trim();
 }
-async function createTaskWorktree(shell, cwd2, runId, taskId, attempt) {
+async function createTaskWorktree(shell, cwd2, base, runId, taskId, attempt, warn = () => {
+}) {
   const top = await must(shell, `cd ${q2(cwd2)} && git rev-parse --show-toplevel`, "finding the repository root");
-  const gitDir = await must(shell, `cd ${q2(cwd2)} && git rev-parse --absolute-git-dir`, "finding the git directory");
-  const base = await must(shell, `cd ${q2(top)} && git stash create`, "snapshotting the working tree") || "HEAD";
-  const root = `${gitDir}/spacecode-core`;
-  await shell(`find ${q2(root)} -mindepth 2 -maxdepth 2 -type d -name 'wt-*' -mmin +1440 2>/dev/null | while read -r w; do git -C ${q2(top)} worktree remove --force "$w" >/dev/null 2>&1; done; git -C ${q2(top)} worktree prune`);
+  const commit = await must(shell, `cd ${q2(top)} && git stash create`, "snapshotting the working tree") || "HEAD";
+  const root = `${base}/${safe(top.slice(top.lastIndexOf("/") + 1))}-${hash(top)}`;
+  const sweep = await shell(`find ${q2(root)} -mindepth 2 -maxdepth 2 -type d -name 'wt-*' -mmin +1440 2>/dev/null | while read -r w; do git -C ${q2(top)} worktree remove --force "$w" >/dev/null 2>&1; done; git -C ${q2(top)} worktree prune`);
+  if (sweep.exitCode !== 0) warn(`stale worktree sweep failed: ${sweep.stderr.trim().slice(0, 200) || `exit ${sweep.exitCode}`}`);
   const dir = `${root}/${safe(runId)}/wt-${safe(taskId)}-${attempt}`;
-  await must(shell, `git -C ${q2(top)} worktree add --detach ${q2(dir)} ${q2(base)}`, "creating the task worktree");
+  await must(shell, `git -C ${q2(top)} worktree add --detach ${q2(dir)} ${q2(commit)}`, "creating the task worktree");
   const found = await must(shell, `cd ${q2(top)} && find . -maxdepth 4 -name node_modules -type d -prune -not -path './.git/*'`, "listing dependency folders");
   for (const line of found.split("\n")) {
     const rel = line.trim().replace(/^\.\//, "");
@@ -105016,12 +105017,17 @@ async function removeTaskWorktree(shell, top, dir) {
     return err instanceof Error ? err.message : String(err);
   }
 }
-var q2, safe;
+var q2, safe, hash;
 var init_worktree = __esm({
   "src/core/worktree.ts"() {
     "use strict";
     q2 = (s) => `'${s.replace(/'/g, `'\\''`)}'`;
     safe = (s) => s.replace(/[^A-Za-z0-9_.-]/g, "_");
+    hash = (s) => {
+      let h = 5381;
+      for (let i = 0; i < s.length; i++) h = (h << 5) + h + s.charCodeAt(i) >>> 0;
+      return h.toString(16);
+    };
   }
 });
 
@@ -105034,7 +105040,7 @@ function localPipelineDeps(d, job) {
   const deps = {
     sandbox: { exec: shell, writeFile: (path13, content) => d.writeFile(path13, content) },
     setup: async () => {
-      const wt = await createTaskWorktree(shell, d.cwd, d.runId, job.taskId, job.attempt);
+      const wt = await createTaskWorktree(shell, d.cwd, d.worktreeBase, d.runId, job.taskId, job.attempt, (message) => d.log(message, { runId: d.runId, taskId: job.taskId }));
       created = wt;
       return wt.dir;
     },
@@ -105228,6 +105234,7 @@ var init_core_turn = __esm({
 import { execFile as execFile4 } from "node:child_process";
 import { mkdir as mkdir6, writeFile as writeFile6 } from "node:fs/promises";
 import { join as join15 } from "node:path";
+import { tmpdir } from "node:os";
 async function repoIsPublic(url, fetchFn = fetch) {
   const hit = visibility.get(url);
   if (hit !== void 0) return hit;
@@ -105305,6 +105312,7 @@ async function runCoreForRepl(o) {
     const { deps, cleanup } = localPipelineDeps(
       {
         cwd: o.cwd,
+        worktreeBase: join15(tmpdir(), "spacecode-core"),
         runId,
         backendUrl: backendUrl(o.env),
         apiKey: o.apiKey,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spacecode",
-  "version": "2.14.3",
+  "version": "2.14.4",
   "description": "SpaceCode - launch cloud dev environments with AI coding agents",
   "license": "MIT",
   "type": "commonjs",