@inthedark/wb 0.0.5 → 0.0.6

package/StoreCommandRunner.mjs

@@ -8,6 +8,7 @@ import { fileURLToPath } from "node:url";
 
 const MAX_OUTPUT_BYTES = 1024 * 1024;
 const PACKAGED_WB = path.join(path.dirname(fileURLToPath(import.meta.url)), "wb");
+const DANGEROUS_ACCESS = "DANGEROUSLY_ACCESS_ENV_VARS";
 
 export default class StoreCommandRunner {
   constructor({ maxOutputBytes = MAX_OUTPUT_BYTES, packagedWb = PACKAGED_WB } = {}) {
@@ -19,9 +20,16 @@ export default class StoreCommandRunner {
   async run(argv, { signal } = {}) {
     signal?.throwIfAborted();
     // `wb` means this package's own bootstrap so lookups work without PATH setup.
-    const [executable, ...args] = argv[0] === "wb" ? [process.execPath, this.packagedWb, ...argv.slice(1)] : argv;
+    const packaged = argv[0] === "wb";
+    const [executable, ...args] = packaged ? [process.execPath, this.packagedWb, ...argv.slice(1)] : argv;
     return await new Promise((resolve, reject) => {
-      const child = spawn(executable, args, { shell: false, signal, stdio: ["ignore", "pipe", "ignore"], windowsHide: true });
+      const child = spawn(executable, args, {
+        env: packaged ? { ...process.env, [DANGEROUS_ACCESS]: "1" } : process.env,
+        shell: false,
+        signal,
+        stdio: ["ignore", "pipe", "ignore"],
+        windowsHide: true,
+      });
       const chunks = [];
       let length = 0;
       let overflow = false;

package/WorkbenchBootstrap.mjs

@@ -19,6 +19,7 @@ export default class WorkbenchBootstrap {
     home = os.homedir(),
     packageRoot = path.dirname(fileURLToPath(import.meta.url)),
     environment = process.env,
+    platform = process.platform,
     prompt = new WorkbenchInstallPrompt(),
     commands = new WorkbenchBootstrapCommand({ environment }),
     toolchain = new WorkbenchToolchain({ home, environment, commands }),
@@ -28,6 +29,7 @@ export default class WorkbenchBootstrap {
     this.home = home;
     this.packageRoot = packageRoot;
     this.environment = environment;
+    this.platform = platform;
     this.prompt = prompt;
     this.commands = commands;
     this.toolchain = toolchain;
@@ -94,47 +96,6 @@ export default class WorkbenchBootstrap {
     }
   }
 
-  async discardIncomplete(record) {
-    const root = path.resolve(record.root);
-    if (root !== record.root || !["wb", "workbench"].includes(path.basename(root).toLowerCase())) {
-      throw new Error(`Cannot verify failed install destination ${record.root}; it was preserved.`);
-    }
-    let stat;
-    try { stat = await fs.lstat(root); }
-    catch (error) {
-      if (error.code !== "ENOENT") throw error;
-      await fs.unlink(this.registry);
-      return;
-    }
-    if (!stat.isDirectory() || stat.isSymbolicLink()) {
-      throw new Error(`Failed install destination ${root} is not an ordinary directory; it was preserved.`);
-    }
-    if (await fs.realpath(root) !== root) {
-      throw new Error(`Failed install destination ${root} resolves elsewhere; it was preserved.`);
-    }
-    if ((await fs.readdir(root)).length) {
-      if (!await this.checkoutExists(root)) {
-        throw new Error(`Failed install destination ${root} is not a complete Workbench checkout; it was preserved.`);
-      }
-      const git = await fs.lstat(path.join(root, ".git")).catch(error => {
-        if (error.code === "ENOENT") return null;
-        throw error;
-      });
-      if (!git?.isDirectory() || git.isSymbolicLink()) {
-        throw new Error(`Failed install destination ${root} is not a regular Git clone; it was preserved.`);
-      }
-      let changes = "";
-      await this.commands.run("git", ["status", "--porcelain=v1", "--untracked-files=all"], {
-        cwd: root,
-        output: { write: bytes => { changes += bytes.toString(); } },
-        errorOutput: { write() {} },
-      });
-      if (changes.trim()) throw new Error(`Failed install destination ${root} has changes; it was preserved.`);
-    }
-    await fs.rm(root, { recursive: true });
-    await fs.unlink(this.registry);
-  }
-
   async run(args) {
     const managed = this.environment.WORKBENCH_THREAD_ID || this.environment.CODEX_THREAD_ID;
     const view = args[0] === "view" && (args.length === 1 || args.length === 2 && ["daemon", "app"].includes(args[1]));
@@ -159,7 +120,7 @@ export default class WorkbenchBootstrap {
     await this.requireTool("bash");
     const warning = installed?.phase === "ready"
       ? `\nNote: Previous installation at ${installed.root} no longer exists and will be recreated.`
-      : installed ? `\nNote: Incomplete install attempt at ${installed.root} will be removed.` : "";
+      : installed ? `\nResuming incomplete install at ${installed.root}.` : "";
     const choice = await this.prompt.choose(
       `Workbench is not installed. This command will provision a private Vite+ toolchain if needed, clone the repository, run build commands, and register wb through your package manager. Continue?${warning}`,
       ["Let's go!", "Cancel"],
@@ -194,33 +155,25 @@ export default class WorkbenchBootstrap {
       if (latest?.root !== installed?.root || latest?.phase !== installed?.phase) {
         throw new Error("The selected Workbench installation changed while setup was open. Run wb again.");
       }
-      if (latest && latest.phase !== "ready") await this.discardIncomplete(latest);
-      await this.requireEmptyDestination(root);
+      const resume = latest?.root === root && await this.checkoutExists(root);
+      if (!resume) await this.requireEmptyDestination(root);
+      // Recording before provisioning keeps the chosen location as the next default if anything fails.
+      await this.writeInstallation({ version: 1, root, phase: resume ? "setup" : "cloning" });
       await this.registration.prepare();
       await this.toolchain.ensure();
-      let record = { version: 1, root, phase: "cloning" };
-      await this.writeInstallation(record);
       await this.prompt.withHeader(async () => {
-        this.write(`Installing Workbench at ${root}\n`);
-        try {
+        this.write(`${resume ? "Resuming" : "Installing"} Workbench at ${root}\n`);
+        if (!resume) {
           // Install sandboxes substitute a local snapshot; ordinary installs clone the public repository.
           const repository = this.environment.WORKBENCH_INSTALL_REPOSITORY || "https://github.com/ErisInTheDark/workbench.git";
           await this.commands.run("git", ["clone", "--progress", "--branch", "main", "--single-branch", repository, root]);
           if (!await this.checkoutExists(root)) throw new Error("Clone did not produce a Workbench checkout.");
-          record = { ...record, phase: "setup" };
-          await this.writeInstallation(record);
-          await this.commands.run(process.execPath, [path.join(root, "scripts", "install.mjs"), "--prepare"], { cwd: root });
-          await this.registration.register(root);
-        } catch (error) {
-          try { await this.discardIncomplete(record); }
-          catch (cleanupError) {
-            throw new Error(`${error.message} Incomplete checkout was preserved at ${root}: ${cleanupError.message}`, { cause: error });
-          }
-          throw error;
+          await this.writeInstallation({ version: 1, root, phase: "setup" });
         }
+        await this.commands.run(process.execPath, [path.join(root, "scripts", "install.mjs"), "--prepare"], { cwd: root });
+        await this.registration.register(root);
       });
-      record = { ...record, phase: "ready" };
-      await this.writeInstallation(record);
+      await this.writeInstallation({ version: 1, root, phase: "ready" });
     } finally {
       // Closing the connection also releases the OS lock after normal completion;
       // process death releases it without a stale PID or lock-file recovery path.

package/index.mjs

@@ -17,10 +17,6 @@ function warnDefault(message) {
   process.emitWarning(message, "WorkbenchStoreWarning");
 }
 
-function isManagedAgentProcess() {
-  return Boolean(process.env.WORKBENCH_THREAD_ID?.trim() || process.env.CODEX_THREAD_ID?.trim());
-}
-
 function stripTerminalLineEnding(value) {
   return value.endsWith("\r\n") ? value.slice(0, -2) : value.endsWith("\n") ? value.slice(0, -1) : value;
 }
@@ -58,10 +54,6 @@ async function resolveReferences(parsed, definitions, { runner, signal, warn })
     }
   }
   if (!lookups.size) return parsed;
-  if (isManagedAgentProcess()) {
-    warn("Store lookups are disabled in Workbench-managed agent processes. Store references were left unchanged.");
-    return parsed;
-  }
   const results = new Map(await Promise.all(Array.from(lookups, async ([id, lookup]) => {
     const result = await runner.run(lookup.argv, { signal });
     if (!result.ok) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inthedark/wb",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "type": "module",
   "repository": {
     "type": "git",