@clipboard-health/groundcrew 4.2.3 → 4.2.4

package/dist/lib/launchCommand.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"launchCommand.d.ts","sourceRoot":"","sources":["../../src/lib/launchCommand.ts"],"names":[],"mappings":"AAGA,OAAO,EAAsB,KAAK,WAAW,EAAE,KAAK,eAAe,EAAE,MAAM,aAAa,CAAC;AAGzF,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAE9C;;;;;;;;;GASG;AACH,wBAAgB,6BAA6B,CAAC,OAAO,GAAE,MAAwB,GAAG,MAAM,CAcvF;AAID;;;GAGG;AACH,eAAO,MAAM,aAAa,mFACwD,CAAC;AAiCnF,UAAU,sBAAsB;IAC9B,UAAU,EAAE,eAAe,CAAC;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB;;;;;;OAMG;IACH,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC;;;;OAIG;IACH,MAAM,EAAE,WAAW,CAAC;IACpB;;;;;OAKG;IACH,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAClC;AAED;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,sBAAsB,GAAG,MAAM,CAK7E"}
+{"version":3,"file":"launchCommand.d.ts","sourceRoot":"","sources":["../../src/lib/launchCommand.ts"],"names":[],"mappings":"AAGA,OAAO,EAAsB,KAAK,WAAW,EAAE,KAAK,eAAe,EAAE,MAAM,aAAa,CAAC;AAGzF,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAE9C;;;;;;;;;GASG;AACH,wBAAgB,6BAA6B,CAAC,OAAO,GAAE,MAAwB,GAAG,MAAM,CAcvF;AAID;;;GAGG;AACH,eAAO,MAAM,aAAa,mFACwD,CAAC;AAiCnF,UAAU,sBAAsB;IAC9B,UAAU,EAAE,eAAe,CAAC;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB;;;;;;OAMG;IACH,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC;;;;OAIG;IACH,MAAM,EAAE,WAAW,CAAC;IACpB;;;;;OAKG;IACH,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAClC;AAED;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,sBAAsB,GAAG,MAAM,CAQ7E"}

package/dist/lib/launchCommand.js

@@ -65,20 +65,35 @@ export function buildLaunchCommand(arguments_) {
     if (arguments_.runner === "sdx") {
         return buildSdxLaunchCommand(arguments_);
     }
-    return buildHostLaunchCommand(arguments_);
+    if (shouldWrapWithSafehouse(arguments_)) {
+        return buildSafehouseLaunchCommand(arguments_);
+    }
+    return buildUnwrappedHostLaunchCommand(arguments_);
 }
-function buildHostLaunchCommand(arguments_) {
+/**
+ * The Safehouse wrap applies only when `runner === "safehouse"` and `cmd` does
+ * not already invoke `safehouse` itself. A `safehouse …` cmd owns its own
+ * sandbox flags, and we can't splice setup into a command we don't control, so
+ * those (and the `none` runner) fall through to the unwrapped host path.
+ */
+function shouldWrapWithSafehouse(arguments_) {
+    if (arguments_.runner !== "safehouse") {
+        return false;
+    }
+    return !/^safehouse(\s|$)/.test(arguments_.definition.cmd);
+}
+/**
+ * Unsandboxed host launch (`runner === "none"`, or a `safehouse …` cmd that
+ * brings its own wrap). Setup, secret sourcing, and the agent all run on the
+ * host shell because there is no groundcrew-managed sandbox to run them inside.
+ */
+function buildUnwrappedHostLaunchCommand(arguments_) {
     const promptDir = dirname(arguments_.promptFile);
     const agentCmd = renderAgentCommand({
         agentCmd: arguments_.definition.cmd,
         worktreeDir: arguments_.worktreeDir,
         sandboxName: "",
     });
-    const wrapped = wrapAgentForHostRunner({
-        runner: arguments_.runner,
-        rawCmd: arguments_.definition.cmd,
-        agentCmd,
-    });
     const lines = [`cd ${shellSingleQuote(arguments_.worktreeDir)}`];
     if (arguments_.secretsFile !== undefined) {
         lines.push(sourceSecretsLine(arguments_.secretsFile));
@@ -87,28 +102,40 @@ function buildHostLaunchCommand(arguments_) {
     if (arguments_.secretsFile !== undefined) {
         lines.push(unsetSecretsLine());
     }
-    lines.push(`_p=$(cat ${shellSingleQuote(arguments_.promptFile)})`, `rm -rf ${shellSingleQuote(promptDir)}`, `exec ${wrapped} "$_p"`);
+    lines.push(`_p=$(cat ${shellSingleQuote(arguments_.promptFile)})`, `rm -rf ${shellSingleQuote(promptDir)}`, `exec ${agentCmd} "$_p"`);
     return lines.join(" && ");
 }
-function wrapAgentForHostRunner(arguments_) {
-    if (arguments_.runner === "none") {
-        return arguments_.agentCmd;
-    }
-    // buildLaunchCommand routes `sdx` through buildSdxLaunchCommand, so the
-    // only remaining shape here is `safehouse`. Treat the explicit branch as
-    // the safehouse wrap to keep this function readable; the `sdx` arm exists
-    // only to satisfy TS's exhaustiveness checker.
-    /* v8 ignore next 3 @preserve -- buildLaunchCommand short-circuits sdx before calling this helper */
-    if (arguments_.runner === "sdx") {
-        return arguments_.agentCmd;
+/**
+ * Safehouse launch. Setup runs *inside* the `safehouse-clearance` wrap (mirroring
+ * the sdx runner) so the repo's `.groundcrew/setup.sh` and its `npm install` are
+ * filesystem-isolated and egress-restricted, rather than running on the bare host.
+ *
+ * Build secrets are sourced into the host launch shell so Safehouse can forward
+ * them into the sandbox via `--env-pass` (Safehouse's `--env=FILE` mode otherwise
+ * strips them); they're `unset` inside the wrap after setup so the agent process
+ * never inherits them. The host keeps only `cd`, the prompt read, and the wrap exec.
+ */
+function buildSafehouseLaunchCommand(arguments_) {
+    const promptDir = dirname(arguments_.promptFile);
+    const agentCmd = renderAgentCommand({
+        agentCmd: arguments_.definition.cmd,
+        worktreeDir: arguments_.worktreeDir,
+        sandboxName: "",
+    });
+    const innerParts = [setupWithStatusReporting(SETUP_COMMAND)];
+    if (arguments_.secretsFile !== undefined) {
+        innerParts.push(unsetSecretsLine());
     }
-    // safehouse: skip the wrap if `cmd` already starts with `safehouse` so
-    // legacy configs don't double-wrap.
-    const cmdStartsWithSafehouse = /^safehouse(\s|$)/.test(arguments_.rawCmd);
-    if (cmdStartsWithSafehouse) {
-        return arguments_.agentCmd;
+    innerParts.push(`exec ${agentCmd} "$@"`);
+    const innerCommand = innerParts.join("; ");
+    // Trailing space keeps the flag and `sh` separated; empty when no secrets.
+    const envPassFlag = arguments_.secretsFile === undefined ? "" : `--env-pass=${BUILD_SECRET_NAMES.join(",")} `;
+    const lines = [`cd ${shellSingleQuote(arguments_.worktreeDir)}`];
+    if (arguments_.secretsFile !== undefined) {
+        lines.push(sourceSecretsLine(arguments_.secretsFile));
     }
-    return [shellSingleQuote(SAFEHOUSE_CLEARANCE_WRAPPER_PATH), arguments_.agentCmd].join(" ");
+    lines.push(`_p=$(cat ${shellSingleQuote(arguments_.promptFile)})`, `rm -rf ${shellSingleQuote(promptDir)}`, `exec ${shellSingleQuote(SAFEHOUSE_CLEARANCE_WRAPPER_PATH)} ${envPassFlag}sh -lc ${shellSingleQuote(innerCommand)} sh "$_p"`);
+    return lines.join(" && ");
 }
 function buildSdxLaunchCommand(arguments_) {
     /* v8 ignore next 5 @preserve -- setupWorkspace passes sandboxName + sandbox config when picking sdx; missing fields are programmer errors */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clipboard-health/groundcrew",
-  "version": "4.2.3",
+  "version": "4.2.4",
   "description": "Linear-driven orchestrator that launches AI coding agents in git worktrees, with workspace lifecycle and usage tracking.",
   "keywords": [
     "agent",