stim 1.4.0 → 1.5.0

package/dist/{worktree-DWNx4tUg.mjs → worktree-DJnBbQZ9.mjs}

@@ -1,5 +1,5 @@
 import { t as getExecutor } from "./exec-CyylIdq9.mjs";
-import { g as loadConfig, u as getConfigDir } from "./config-6vdGngKa.mjs";
+import { g as loadConfig, u as getConfigDir } from "./config-DMP7L7H6.mjs";
 import { accessSync, chmodSync, constants, lstatSync, mkdirSync, mkdtempSync, readdirSync, realpathSync, rmSync, statSync } from "node:fs";
 import { basename, dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
 import { chmodSync as chmodSync$1, existsSync as existsSync$1, lstatSync as lstatSync$1, mkdirSync as mkdirSync$1, readFileSync as readFileSync$1, readdirSync as readdirSync$1, realpathSync as realpathSync$1, utimesSync } from "fs";
@@ -103,19 +103,6 @@ function gitCommonDir(cwd) {
 	]);
 	return out ? out.trim() : null;
 }
-function isMainWorkingTree(path) {
-	const out = getExecutor().runFileQuiet("git", [
-		"-C",
-		path,
-		"rev-parse",
-		"--path-format=absolute",
-		"--git-dir",
-		"--git-common-dir"
-	]);
-	if (!out) return false;
-	const [gitDir, commonDir] = out.trim().split("\n").map((line) => line.trim());
-	return Boolean(gitDir) && gitDir === commonDir;
-}
 function repoRoot(cwd) {
 	const out = getExecutor().runFileQuiet("git", [
 		"-C",
@@ -159,16 +146,15 @@ function warmWorktreePaths(cwd) {
 	const currentRoot = repoRoot(cwd);
 	if (!currentRoot) throw new Error("Not a git repository.");
 	const target = realpathSync$1(currentRoot);
-	if (isMainWorkingTree(target)) throw new Error("Run stim worktree warm from a linked worktree, not the source checkout.");
-	const entries = listWorktrees(target);
-	const current = entries.find((entry) => canonicalPath(entry.path) === target);
-	const main = entries.find((entry) => isMainWorkingTree(entry.path));
-	if (!current || !main) throw new Error("Could not identify the linked worktree and its source checkout.");
-	const root = realpathSync$1(main.path);
+	const source = resolveSourceCheckout(target);
+	if ("refusal" in source) throw new Error(source.refusal);
+	if (!source.entries.find((entry) => canonicalPath(entry.path) === target)) throw new Error("Could not identify the linked worktree and its source checkout.");
+	const root = realpathSync$1(source.path);
+	if (root === target) throw new Error("Run stim worktree warm from a linked worktree, not the source checkout.");
 	const sourceRoot = repoRoot(root);
 	const sourceCommon = gitCommonDir(root);
 	const targetCommon = gitCommonDir(target);
-	if (root === target || !sourceRoot || realpathSync$1(sourceRoot) !== root || !sourceCommon || !targetCommon || realpathSync$1(sourceCommon) !== realpathSync$1(targetCommon)) throw new Error("Could not verify that the source checkout belongs to this linked worktree.");
+	if (!sourceRoot || realpathSync$1(sourceRoot) !== root || !sourceCommon || !targetCommon || realpathSync$1(sourceCommon) !== realpathSync$1(targetCommon)) throw new Error("Could not verify that the source checkout belongs to this linked worktree.");
 	return {
 		root,
 		target,
@@ -556,6 +542,7 @@ function parseWorktrees(out) {
 		current = { path: line.slice(9) };
 	} else if (line.startsWith("branch ")) current.branch = line.slice(7).replace("refs/heads/", "");
 	else if (line === "prunable" || line.startsWith("prunable ")) current.prunable = true;
+	else if (line === "bare") current.bare = true;
 	if (current.path) entries.push(current);
 	return entries;
 }
@@ -569,5 +556,45 @@ function listWorktrees(cwd) {
 	]);
 	return out ? parseWorktrees(out) : [];
 }
+function selectSourceCheckout(entries, bareHead) {
+	const first = entries[0];
+	if (!first) return { refusal: "Git lists no worktrees for this repository." };
+	if (!first.bare) return { path: first.path };
+	const bare = first.path;
+	const checkouts = entries.filter((entry) => !entry.bare && !entry.prunable);
+	const listed = checkouts.map((entry) => `${entry.branch ?? "detached"} (${entry.path})`).join(", ") || "none";
+	const pointHead = `  git -C ${bare} symbolic-ref HEAD refs/heads/<branch>`;
+	if (!bareHead) return { refusal: `The bare repository at ${bare} has a detached HEAD, so Stim cannot tell which worktree is the source checkout. Point HEAD at the source branch, then retry:\n${pointHead}\nChecked-out branches: ${listed}` };
+	const matches = checkouts.filter((entry) => entry.branch === bareHead);
+	const [only] = matches;
+	if (only && matches.length === 1) return { path: only.path };
+	if (!only) {
+		const stale = entries.find((entry) => entry.prunable && entry.branch === bareHead);
+		const beside = checkouts[0] ? dirname$1(checkouts[0].path) : bare;
+		return { refusal: `The bare repository at ${bare} points HEAD at ${bareHead}, but no worktree has ${bareHead} checked out, so Stim has no source checkout to copy from. ${stale ? `Its worktree at ${stale.path} is missing. Recreate it, then retry:\n  git -C ${bare} worktree prune\n  git -C ${bare} worktree add ${stale.path} ${bareHead}\n` : `Create one, then retry:\n  git -C ${bare} worktree add ${join$1(beside, bareHead)} ${bareHead}\n`}Or point HEAD at a branch that is checked out (${listed}):\n${pointHead}` };
+	}
+	return { refusal: `The bare repository at ${bare} points HEAD at ${bareHead}, which is checked out in more than one worktree: ${matches.map((entry) => entry.path).join(", ")}. Remove the extra worktrees, or point HEAD at a branch checked out once, then retry:\n${pointHead}` };
+}
+function bareHeadBranch(bare) {
+	const out = getExecutor().runFileQuiet("git", [
+		"-C",
+		bare,
+		"symbolic-ref",
+		"--quiet",
+		"HEAD"
+	])?.trim();
+	return out?.startsWith("refs/heads/") ? out.slice(11) : null;
+}
+function sourceCheckoutOf(entries) {
+	const first = entries[0];
+	return selectSourceCheckout(entries, first?.bare ? bareHeadBranch(first.path) : null);
+}
+function resolveSourceCheckout(cwd) {
+	const entries = listWorktrees(cwd);
+	return {
+		entries,
+		...sourceCheckoutOf(entries)
+	};
+}
 //#endregion
-export { makeTemporaryDirectory as C, filesystemDevice as S, temporaryRoot as T, repoRoot as _, dirtyFingerprintFiles as a, unpushedCommits as b, hasRemote as c, isPodInstallChurn as d, listWorktrees as f, removeWorktree as g, readWorktreeExclude as h, depsOutOfSync as i, hasUncommittedWork as l, podsOutOfSync as m, cloneIgnoredEntries as n, dirtyPaths as o, locallyKnownUpstream as p, deleteBranch as r, gitCommonDir as s, branchExists as t, isMainWorkingTree as u, resolveFullRef as v, removeTemporaryEntry as w, warmWorktreePaths as x, restoreFile as y };
+export { filesystemDevice as C, temporaryRoot as E, warmWorktreePaths as S, removeTemporaryEntry as T, resolveFullRef as _, dirtyFingerprintFiles as a, sourceCheckoutOf as b, hasRemote as c, listWorktrees as d, locallyKnownUpstream as f, repoRoot as g, removeWorktree as h, depsOutOfSync as i, hasUncommittedWork as l, readWorktreeExclude as m, cloneIgnoredEntries as n, dirtyPaths as o, podsOutOfSync as p, deleteBranch as r, gitCommonDir as s, branchExists as t, isPodInstallChurn as u, resolveSourceCheckout as v, makeTemporaryDirectory as w, unpushedCommits as x, restoreFile as y };

package/dist/{xcode-D9tVItl-.mjs → xcode-BqDeRkpT.mjs}

@@ -1,10 +1,10 @@
 import { t as getExecutor } from "./exec-CyylIdq9.mjs";
-import { r as register } from "./cache-manifest-D02TpYjA.mjs";
-import { d as sharedCompilationCache, m as workspaceDerivedData } from "./workspace-state-Do1e2mOH.mjs";
+import { r as register } from "./cache-manifest-uoOKhgUD.mjs";
+import { d as sharedCompilationCache, m as workspaceDerivedData } from "./workspace-state-WVwWw_hB.mjs";
 import { t as createLineReader } from "./process-output-C7IlIzd7.mjs";
 import { a as formatElapsed, l as phaseLine } from "./command-output-BuIb_ZOI.mjs";
-import { U as resolveOptimizations } from "./settings-DwfltIXQ.mjs";
-import { t as cleanLine } from "./server-expo-D4P7iTvf.mjs";
+import { U as resolveOptimizations } from "./settings-kO2ZqIKy.mjs";
+import { t as cleanLine } from "./server-expo-Ds8_mfng.mjs";
 import { existsSync, readFileSync, readdirSync, statSync } from "node:fs";
 import { createHash } from "node:crypto";
 import { basename, isAbsolute, join, relative, resolve, sep } from "node:path";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "stim",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "Stim: fast, isolated React Native environments for coding agents",
   "keywords": [
     "agent",
@@ -42,15 +42,15 @@
   },
   "dependencies": {
     "@expo/fingerprint": "^0.20.10",
-    "@stim-cli/cache": "^1.4.0",
-    "@stim-cli/core": "^1.4.0",
-    "@stim-cli/metro": "^1.4.0",
+    "@stim-cli/cache": "^1.5.0",
+    "@stim-cli/core": "^1.5.0",
+    "@stim-cli/metro": "^1.5.0",
     "chalk": "^5.4.1",
     "commander": "^13.1.0",
     "ws": "^8.21.3"
   },
   "devDependencies": {
-    "@stim-cli/expo-build-cache": "1.4.0",
+    "@stim-cli/expo-build-cache": "1.5.0",
     "@types/ws": "^8.18.1",
     "unique-pid": "0.1.1"
   },

package/shim/expo-metro-config.cjs

@@ -6,7 +6,6 @@ const path = require('node:path');
 const { createRequire } = require('node:module');
 const { pathToFileURL } = require('node:url');
 const { bundleResponseMiddleware } = require('./bundle-response.cjs');
-const { applyMetroCacheGeneration } = require('./metro-cache-generation.cjs');
 
 const projectRoot = process.env.STIM_PROJECT_ROOT;
 const storeRoot = process.env.STIM_METRO_STORE;
@@ -125,24 +124,19 @@ function appendStore(config, defaultConfig) {
   const server = { ...defaultConfig.server, ...output.server };
   const enhanceMiddleware = server.enhanceMiddleware;
 
-  const observed = applyMetroCacheGeneration(
-    {
-      ...output,
-      cacheVersion: output.cacheVersion ?? defaultConfig.cacheVersion,
-      server: {
-        ...server,
-        enhanceMiddleware(middleware, metroServer) {
-          const enhanced = enhanceMiddleware ? enhanceMiddleware(middleware, metroServer) : middleware;
-          const observe = bundleResponseMiddleware((record) =>
-            process.stderr.write(`stim-bundle-response: ${JSON.stringify(record)}\n`),
-          );
-          return (req, res, next) => observe(req, res, () => enhanced(req, res, next));
-        },
+  const observed = {
+    ...output,
+    server: {
+      ...server,
+      enhanceMiddleware(middleware, metroServer) {
+        const enhanced = enhanceMiddleware ? enhanceMiddleware(middleware, metroServer) : middleware;
+        const observe = bundleResponseMiddleware((record) =>
+          process.stderr.write(`stim-bundle-response: ${JSON.stringify(record)}\n`),
+        );
+        return (req, res, next) => observe(req, res, () => enhanced(req, res, next));
       },
     },
-    process.env.STIM_METRO_CACHE_GENERATION,
-    process.env.STIM_METRO_FILE_MAP,
-  );
+  };
   if (!storeRoot) return observed;
   return {
     ...observed,

package/dist/server-expo-Dho5Raiw.mjs

@@ -1,2 +0,0 @@
-import { p as startExpoServer } from "./server-expo-D4P7iTvf.mjs";
-export { startExpoServer };

package/shim/metro-cache-generation.cjs

@@ -1,20 +0,0 @@
-'use strict';
-
-const { createHash } = require('node:crypto');
-const { mkdirSync } = require('node:fs');
-const { join } = require('node:path');
-
-function applyMetroCacheGeneration(config, generation, directory) {
-  if (!generation) return config;
-  const fileMapCacheDirectory = join(directory, generation);
-  mkdirSync(fileMapCacheDirectory, { recursive: true });
-  return {
-    ...config,
-    cacheVersion: createHash('sha256')
-      .update(JSON.stringify([config.cacheVersion ?? '1.0', generation]))
-      .digest('hex'),
-    fileMapCacheDirectory,
-  };
-}
-
-module.exports = { applyMetroCacheGeneration };

package/shim/metro-cache-generation.d.cts

@@ -1,5 +0,0 @@
-export function applyMetroCacheGeneration<T extends { cacheVersion?: string }>(
-  config: T,
-  generation: string | undefined,
-  directory: string,
-): T;