@clipboard-health/groundcrew 1.12.5 → 1.12.6

package/README.md

@@ -84,7 +84,7 @@ This installs the `crew` binary. `@clipboard-health/clearance` is pulled in tran
 
    Watch `${XDG_CACHE_HOME:-$HOME/.cache}/clearance/clearance.log` for `DENY` lines and add only the domains your agents actually need.
 
-7. **Optional: prepare a remote runner.** The current remote provider is Sprite, so setup is intentionally explicit: choose which agent CLIs and MCP servers to authenticate. `--mcp` only adds the servers you name; it does not attempt to authenticate every MCP server visible in your Claude account.
+7. **Optional: prepare a remote runner.** The current remote provider is Sprite, so setup is intentionally explicit: choose which agent CLIs to authenticate and which MCP servers to add. `--mcp` adds and authenticates only the servers you name; it does not attempt to authenticate every MCP server visible in your Claude account.
 
    ```bash
    crew remote setup crew-claude-1 \
@@ -100,7 +100,7 @@ This installs the `crew` binary. `@clipboard-health/clearance` is pulled in tran
      --checkpoint
    ```
 
-   Known MCP aliases are `linear`, `slack`, and `notion`. For another HTTP MCP server, pass `--mcp name=https://example.com/mcp`. The command creates the remote runner if needed, prepares `~/dev`, configures Git, runs selected auth flows, adds selected MCP servers to Claude Code, and then opens Claude so you can run `/mcp` and authenticate only those selected servers. With the Sprite provider, `--copy-local-codex-auth` copies `${CODEX_HOME:-$HOME/.codex}/auth.json` into `/home/sprite/.codex/auth.json` and then verifies `codex login status`; it never prints the file contents. `--datadog` installs a pinned `pup` release in the remote runner, verifies its checksum, installs the `dd-pup` guidance for Claude and Codex, verifies `pup auth status`, and when auth is missing temporarily runs `sprite proxy` for the OAuth callback while `pup auth login --read-only` runs in the remote runner. Open the Datadog URL printed by `pup` if your terminal does not open it automatically. Use `--skip-mcp-auth` when you only want to add MCP definitions, and run the `/mcp` step later.
+   Known MCP aliases are `linear`, `slack`, and `notion`. For another HTTP MCP server, pass `--mcp name=https://example.com/mcp`. The command creates the remote runner if needed, prepares `~/dev`, configures Git, runs selected auth flows, and adds selected MCP servers to Claude Code. With the Sprite provider, `--claude` detects Claude Code's dynamic localhost OAuth callback port inside the remote runner and temporarily runs `sprite proxy` for that port while login runs. Selected MCP servers authenticate through one interactive Claude Code session by default, and when combined with `--claude`, setup skips the separate headless Claude login and uses that one session for both Claude login and MCP auth while forwarding Claude localhost callback ports. `--copy-local-codex-auth` copies `${CODEX_HOME:-$HOME/.codex}/auth.json` into `/home/sprite/.codex/auth.json` and then verifies `codex login status`; it never prints the file contents. `--datadog` installs a pinned `pup` release in the remote runner, verifies its checksum, installs the `dd-pup` guidance for Claude and Codex, verifies `pup auth status`, and when auth is missing temporarily runs `sprite proxy` for the OAuth callback while `pup auth login --read-only` runs in the remote runner. Open the Datadog URL printed by `pup` if your terminal does not open it automatically.
 
    Repo setup is separate from runner setup and should run after the ticket branch exists, immediately before launching an agent. It clones/fetches the repo in the remote runner using `git.remote`, checks out the requested branch (creating it from the base branch when it does not exist on that remote), forwards only build-time secrets for the dependency install, removes the temporary secret file, clears those env vars, and then exits. It uses groundcrew's remote setup command.
 

package/dist/commands/remoteSetup.d.ts

@@ -11,7 +11,6 @@ export interface RemoteSetupOptions {
     shouldCopyLocalCodexAuth?: boolean;
     shouldSetupDatadog?: boolean;
     shouldAuthenticateGithub: boolean;
-    shouldAuthenticateMcp: boolean;
     shouldCheckpoint: boolean;
     checkpointComment: string;
     gitName?: string;

package/dist/commands/remoteSetup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"remoteSetup.d.ts","sourceRoot":"","sources":["../../src/commands/remoteSetup.ts"],"names":[],"mappings":"AAKA,OAAO,EAGL,KAAK,kBAAkB,EACxB,MAAM,kBAAkB,CAAC;AAkB1B,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,kBAAkB;IACjC,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,OAAO,CAAC;IACtB,wBAAwB,EAAE,OAAO,CAAC;IAClC,uBAAuB,EAAE,OAAO,CAAC;IACjC,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,wBAAwB,EAAE,OAAO,CAAC;IAClC,qBAAqB,EAAE,OAAO,CAAC;IAC/B,gBAAgB,EAAE,OAAO,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,SAAS,EAAE,CAAC;CACzB;AAED,MAAM,WAAW,sBAAsB;IACrC,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,kBAAkB,CAAC;IAClC,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,4BAA4B,EAAE,OAAO,CAAC;IACtC,gBAAgB,EAAE,OAAO,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAiBD,MAAM,WAAW,qBAAqB;IACpC,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,oBAAoB;IACnC,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,sBAAsB;IACrC,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AA02BD,wBAAsB,yBAAyB,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC,CAsC9F;AAUD,wBAAsB,kBAAkB,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,CAItF;AAED,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAGrF;AAED,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,CAItF;AAED,wBAAsB,2BAA2B,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC,CAGhG;AAYD,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAgClF;AAED,wBAAsB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CA2B7D"}
+{"version":3,"file":"remoteSetup.d.ts","sourceRoot":"","sources":["../../src/commands/remoteSetup.ts"],"names":[],"mappings":"AAIA,OAAO,EAGL,KAAK,kBAAkB,EACxB,MAAM,kBAAkB,CAAC;AAkB1B,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,kBAAkB;IACjC,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,OAAO,CAAC;IACtB,wBAAwB,EAAE,OAAO,CAAC;IAClC,uBAAuB,EAAE,OAAO,CAAC;IACjC,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,wBAAwB,EAAE,OAAO,CAAC;IAClC,gBAAgB,EAAE,OAAO,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,SAAS,EAAE,CAAC;CACzB;AAED,MAAM,WAAW,sBAAsB;IACrC,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,kBAAkB,CAAC;IAClC,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,4BAA4B,EAAE,OAAO,CAAC;IACtC,gBAAgB,EAAE,OAAO,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAiBD,MAAM,WAAW,qBAAqB;IACpC,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,oBAAoB;IACnC,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,sBAAsB;IACrC,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAilCD,wBAAsB,yBAAyB,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC,CAsC9F;AAUD,wBAAsB,kBAAkB,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,CAItF;AAED,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAGrF;AAED,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,CAItF;AAED,wBAAsB,2BAA2B,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC,CAGhG;AAYD,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAqClF;AAED,wBAAsB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CA2B7D"}

package/dist/commands/remoteSetup.js

@@ -1,20 +1,20 @@
 import { existsSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
 import { homedir, tmpdir } from "node:os";
 import { join, resolve } from "node:path";
-import { setTimeout as sleep } from "node:timers/promises";
 import { DEFAULT_REMOTE_SETUP_COMMAND, loadConfig, } from "../lib/config.js";
 import { shellSingleQuote } from "../lib/shell.js";
 import { getRemoteRunnerProvider, remotePathJoin, remoteConfigWithRunnerName, remoteRepositoryDirectoryName, remoteRepositorySlug, } from "../lib/spriteRemoteRunnerProvider.js";
-import { log, readEnvironmentVariable, writeOutput } from "../lib/util.js";
+import { errorMessage, log, readEnvironmentVariable, writeOutput } from "../lib/util.js";
 const KNOWN_MCP_SERVER_URLS = {
     linear: "https://mcp.linear.app/mcp",
     slack: "https://mcp.slack.com/mcp",
     notion: "https://mcp.notion.com/mcp",
 };
 const DEFAULT_CHECKPOINT_COMMENT = "groundcrew remote runner baseline: selected agent auth, git identity, and MCP config";
-const CLAUDE_SUBSCRIPTION_LOGIN_FLAG = ["--claude", "ai"].join("");
 const DEFAULT_GIT_REMOTE = "origin";
 const BOOTSTRAP_SECRET_FLAGS_CONFLICT_MESSAGE = "--secret and --no-secrets are mutually exclusive. Use --secret to forward selected build secrets or --no-secrets to disable secret forwarding.";
+const CLAUDE_AUTH_CALLBACK_PORT_RETRY_ATTEMPTS = 80;
+const CLAUDE_AUTH_CALLBACK_PORT_RETRY_DELAY_MS = 250;
 const DATADOG_PUP_VERSION = "0.63.0";
 const DATADOG_OAUTH_CALLBACK_PORT = 8000;
 const DATADOG_AUTH_STATUS_RETRY_ATTEMPTS = 5;
@@ -22,6 +22,11 @@ const DATADOG_AUTH_STATUS_RETRY_DELAY_MS = 250;
 const REMOTE_SECRETS_FILE = "/tmp/groundcrew-build-secrets.env";
 const REMOTE_CODEX_AUTH_UPLOAD_FILE = "/tmp/groundcrew-codex-auth.json";
 const REMOTE_CODEX_AUTH_FILE = "/home/sprite/.codex/auth.json";
+async function sleep(milliseconds) {
+    await new Promise((_resolve) => {
+        setTimeout(_resolve, milliseconds);
+    });
+}
 function usage() {
     return [
         "Usage:",
@@ -38,9 +43,8 @@ function usage() {
         "  --copy-local-codex-auth     With --codex, copy local CODEX_HOME auth.json into the remote runner",
         "  --datadog                   Install pup, add dd-pup skills, and authenticate Datadog",
         "  --github                    Authenticate gh for GitHub PRs",
-        "  --mcp <alias|name=url>      Add/authenticate one MCP server; repeat for multiple",
+        "  --mcp <alias|name=url>      Add one MCP server; repeat for multiple",
         "                              Known aliases: linear, slack, notion",
-        "  --skip-mcp-auth             Add selected MCP servers but do not launch Claude /mcp",
         "  --git-name <name>           Set git user.name inside the remote runner",
         "  --git-email <email>         Set git user.email inside the remote runner",
         "  --checkpoint                Create a provider checkpoint after setup",
@@ -142,7 +146,6 @@ function parseArguments(argv) {
     let shouldCopyLocalCodexAuth = false;
     let shouldSetupDatadog = false;
     let shouldAuthenticateGithub = false;
-    let shouldAuthenticateMcp = true;
     let shouldCheckpoint = false;
     let checkpointComment = DEFAULT_CHECKPOINT_COMMENT;
     let gitName;
@@ -177,10 +180,6 @@ function parseArguments(argv) {
             index += 1;
             continue;
         }
-        if (argument === "--skip-mcp-auth") {
-            shouldAuthenticateMcp = false;
-            continue;
-        }
         if (argument === "--git-name") {
             gitName = requireValue(argv, index, "--git-name");
             index += 1;
@@ -215,7 +214,6 @@ function parseArguments(argv) {
         shouldCopyLocalCodexAuth,
         shouldSetupDatadog,
         shouldAuthenticateGithub,
-        shouldAuthenticateMcp,
         shouldCheckpoint,
         checkpointComment,
         mcpServers,
@@ -418,10 +416,185 @@ async function authenticateClaude(provider, config) {
         return;
     }
     log("Starting Claude subscription auth inside the remote runner");
-    await provider.runTtyCommand({
+    writeOutput();
+    writeOutput("Claude OAuth will run inside the remote runner.");
+    writeOutput("Groundcrew will forward the localhost callback port after Claude opens it.");
+    writeOutput();
+    const controller = new AbortController();
+    let isLoginComplete = false;
+    let loginError;
+    const login = provider
+        .runTtyCommand({
         config,
-        remoteArguments: ["claude", "auth", "login", CLAUDE_SUBSCRIPTION_LOGIN_FLAG],
+        remoteArguments: ["claude", "auth", "login"],
+        options: { signal: controller.signal },
+    })
+        .then(() => {
+        isLoginComplete = true;
+        return null;
+    }, (error) => {
+        isLoginComplete = true;
+        loginError = new Error(String(error), { cause: error });
+        return null;
     });
+    let proxy;
+    try {
+        const callbackPort = await waitForClaudeCallbackPort({
+            provider,
+            config,
+            isLoginComplete: () => isLoginComplete,
+        });
+        if (callbackPort !== undefined) {
+            writeOutput(`Groundcrew is forwarding local port ${callbackPort} to the remote Claude callback server.`);
+            proxy = await provider.startPortProxy(config, callbackPort);
+        }
+        await login;
+        if (loginError !== undefined) {
+            throw new Error(loginError.message, { cause: loginError });
+        }
+    }
+    finally {
+        if (proxy !== undefined) {
+            await closePortProxyBestEffort(proxy);
+        }
+        if (!isLoginComplete) {
+            controller.abort();
+            await login;
+        }
+    }
+}
+async function waitForClaudeCallbackPort(arguments_) {
+    for (let attempt = 1; attempt <= CLAUDE_AUTH_CALLBACK_PORT_RETRY_ATTEMPTS; attempt += 1) {
+        if (arguments_.isLoginComplete()) {
+            return undefined;
+        }
+        // oxlint-disable-next-line no-await-in-loop -- bounded polling detects Claude's dynamic localhost callback port.
+        const callbackPort = await detectClaudeCallbackPort(arguments_.provider, arguments_.config);
+        if (callbackPort !== undefined) {
+            return callbackPort;
+        }
+        if (arguments_.isLoginComplete()) {
+            return undefined;
+        }
+        if (attempt < CLAUDE_AUTH_CALLBACK_PORT_RETRY_ATTEMPTS) {
+            // oxlint-disable-next-line no-await-in-loop -- retries are intentionally spaced while auth starts.
+            await sleep(CLAUDE_AUTH_CALLBACK_PORT_RETRY_DELAY_MS);
+        }
+    }
+    throw new Error("Timed out waiting for Claude to open its OAuth callback port inside the remote runner.");
+}
+async function detectClaudeCallbackPort(provider, config) {
+    const output = await provider.runCommand({
+        config,
+        remoteArguments: ["bash", "-lc", claudeCallbackPortProbeCommand()],
+    });
+    return parseClaudeCallbackPorts(String(output)).at(0);
+}
+async function detectClaudeCallbackPorts(provider, config) {
+    const output = await provider.runCommand({
+        config,
+        remoteArguments: ["bash", "-lc", claudeCallbackPortProbeCommand()],
+    });
+    return parseClaudeCallbackPorts(String(output));
+}
+function claudeCallbackPortProbeCommand() {
+    return "ss --no-header --listening --tcp --processes --numeric 2>/dev/null | grep claude || true";
+}
+function parseClaudeCallbackPorts(output) {
+    const ports = [];
+    for (const line of output.split("\n")) {
+        const localAddress = line.trim().split(/\s+/).at(3);
+        if (localAddress === undefined || !line.includes("claude")) {
+            continue;
+        }
+        const match = /:(\d+)$/.exec(localAddress);
+        if (match === null) {
+            continue;
+        }
+        const port = Number(match[1]);
+        if (Number.isInteger(port) && port > 0 && !ports.includes(port)) {
+            ports.push(port);
+        }
+    }
+    return ports;
+}
+async function runClaudeTtyCommandWithOptionalCallbackProxy(arguments_) {
+    const { provider, config, remoteArguments } = arguments_;
+    const controller = new AbortController();
+    const proxies = new Map();
+    let isCommandComplete = false;
+    let commandError;
+    let watcherError;
+    const command = provider
+        .runTtyCommand({ config, remoteArguments, options: { signal: controller.signal } })
+        .then(() => {
+        isCommandComplete = true;
+        return null;
+    }, (error) => {
+        isCommandComplete = true;
+        commandError = new Error(String(error), { cause: error });
+        return null;
+    });
+    const watcher = watchClaudeCallbackPorts({
+        provider,
+        config,
+        isCommandComplete: () => isCommandComplete,
+        proxies,
+    }).catch((error) => {
+        if (isCommandComplete) {
+            return;
+        }
+        watcherError = new Error(String(error), { cause: error });
+        controller.abort();
+    });
+    try {
+        await command;
+        await watcher;
+        if (watcherError !== undefined) {
+            throw new Error(watcherError.message, { cause: watcherError });
+        }
+        if (commandError !== undefined) {
+            throw new Error(commandError.message, { cause: commandError });
+        }
+    }
+    finally {
+        isCommandComplete = true;
+        await watcher;
+        await closeClaudeCallbackProxies(proxies);
+    }
+}
+async function watchClaudeCallbackPorts(arguments_) {
+    while (!arguments_.isCommandComplete()) {
+        // oxlint-disable-next-line no-await-in-loop -- interactive Claude can open localhost callbacks at any point during MCP auth.
+        const callbackPorts = await detectClaudeCallbackPorts(arguments_.provider, arguments_.config);
+        for (const callbackPort of callbackPorts) {
+            if (arguments_.proxies.has(callbackPort)) {
+                continue;
+            }
+            writeOutput(`Groundcrew is forwarding local port ${callbackPort} to the remote Claude callback server.`);
+            // oxlint-disable-next-line no-await-in-loop -- proxies must bind distinct local ports one at a time.
+            const proxy = await arguments_.provider.startPortProxy(arguments_.config, callbackPort);
+            arguments_.proxies.set(callbackPort, proxy);
+        }
+        if (!arguments_.isCommandComplete()) {
+            // oxlint-disable-next-line no-await-in-loop -- polling stays active only while the user is in Claude.
+            await sleep(CLAUDE_AUTH_CALLBACK_PORT_RETRY_DELAY_MS);
+        }
+    }
+}
+async function closeClaudeCallbackProxies(proxies) {
+    for (const proxy of proxies.values()) {
+        // oxlint-disable-next-line no-await-in-loop -- close proxy subprocesses deterministically before returning.
+        await closePortProxyBestEffort(proxy);
+    }
+}
+async function closePortProxyBestEffort(proxy) {
+    try {
+        await proxy.close();
+    }
+    catch (error) {
+        log(`Port proxy close failed; continuing cleanup: ${errorMessage(error)}`);
+    }
 }
 function localCodexAuthFile() {
     const codexHome = readEnvironmentVariable("CODEX_HOME");
@@ -506,7 +679,7 @@ async function installDatadogPup(provider, config) {
     log(`Installing Datadog pup ${DATADOG_PUP_VERSION} inside the remote runner`);
     await provider.runCommand({
         config,
-        remoteArguments: ["bash", "-lc", datadogPupInstallCommand()],
+        remoteArguments: ["bash", "-c", datadogPupInstallCommand()],
     });
 }
 async function installDatadogPupSkills(provider, config) {
@@ -603,7 +776,7 @@ async function addMcpServer(arguments_) {
 }
 async function authenticateMcpServers(arguments_) {
     const { provider, config, options } = arguments_;
-    if (options.mcpServers.length === 0 || !options.shouldAuthenticateMcp) {
+    if (!shouldAuthenticateMcpInteractively(options)) {
         return;
     }
     writeOutput();
@@ -611,14 +784,19 @@ async function authenticateMcpServers(arguments_) {
     for (const server of options.mcpServers) {
         writeOutput(`  - ${server.name}`);
     }
+    writeOutput("Groundcrew will forward Claude localhost callback ports while this session is open.");
     writeOutput("Inside Claude, run /mcp, select each listed server, choose Authenticate, then /exit.");
     writeOutput("If the browser redirects to localhost and cannot connect, paste that callback URL into Claude when prompted.");
     writeOutput();
-    await provider.runTtyCommand({
+    await runClaudeTtyCommandWithOptionalCallbackProxy({
+        provider,
         config,
         remoteArguments: ["claude", "--permission-mode", "auto"],
     });
 }
+function shouldAuthenticateMcpInteractively(options) {
+    return options.mcpServers.length > 0;
+}
 async function checkpoint(arguments_) {
     const { provider, config, options } = arguments_;
     if (!options.shouldCheckpoint) {
@@ -799,9 +977,13 @@ export async function setupRemoteRunner(options) {
     if (options.shouldAuthenticateGithub) {
         await authenticateGithub(provider, config);
     }
-    if (options.shouldAuthenticateClaude) {
+    const shouldUseInteractiveClaudeForMcpAuth = shouldAuthenticateMcpInteractively(options);
+    if (options.shouldAuthenticateClaude && !shouldUseInteractiveClaudeForMcpAuth) {
         await authenticateClaude(provider, config);
     }
+    else if (options.shouldAuthenticateClaude && shouldUseInteractiveClaudeForMcpAuth) {
+        log("Skipping separate Claude subscription auth; interactive MCP auth will handle Claude login if needed.");
+    }
     if (options.shouldAuthenticateCodex) {
         await authenticateCodex({
             provider,

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

@@ -1 +1 @@
-{"version":3,"file":"spriteRemoteRunnerProvider.d.ts","sourceRoot":"","sources":["../../src/lib/spriteRemoteRunnerProvider.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"spriteRemoteRunnerProvider.d.ts","sourceRoot":"","sources":["../../src/lib/spriteRemoteRunnerProvider.ts"],"names":[],"mappings":"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"}

package/dist/lib/spriteRemoteRunnerProvider.js

@@ -143,22 +143,31 @@ function spriteRemoveWorktreeCommand(entry, force) {
     if (entry.remoteRepoDir === undefined) {
         throw new Error(`Remote worktree entry missing remoteRepoDir: ${entry.dir}`);
     }
-    const removeArguments = [
-        "git",
-        "-C",
-        shellSingleQuote(entry.remoteRepoDir),
-        "worktree",
-        "remove",
-    ];
-    if (force) {
-        removeArguments.push("--force");
-    }
-    removeArguments.push(shellSingleQuote(entry.dir));
+    const forceFlag = force ? " --force" : "";
+    const missingRepositoryLines = force
+        ? [
+            '  echo "Remote repository missing; removing stale remote worktree directory: $worktree_dir" >&2',
+            '  rm -rf -- "$worktree_dir"',
+            "  exit 0",
+        ]
+        : ['  echo "Remote repository missing: $repo_dir" >&2', "  exit 1"];
     return [
         "set -euo pipefail",
-        removeArguments.join(" "),
-        `git -C ${shellSingleQuote(entry.remoteRepoDir)} branch -D ${shellSingleQuote(entry.branchName)} || true`,
-        `git -C ${shellSingleQuote(entry.remoteRepoDir)} worktree prune`,
+        `repo_dir=${shellSingleQuote(entry.remoteRepoDir)}`,
+        `worktree_dir=${shellSingleQuote(entry.dir)}`,
+        `branch=${shellSingleQuote(entry.branchName)}`,
+        'if ! git -C "$repo_dir" rev-parse --git-dir >/dev/null 2>&1; then',
+        ...missingRepositoryLines,
+        "fi",
+        'if [ ! -e "$worktree_dir" ]; then',
+        '  echo "Remote worktree directory not found; pruning stale refs: $worktree_dir" >&2',
+        '  git -C "$repo_dir" worktree prune',
+        '  git -C "$repo_dir" branch -D "$branch" || true',
+        "  exit 0",
+        "fi",
+        `git -C "$repo_dir" worktree remove${forceFlag} "$worktree_dir"`,
+        'git -C "$repo_dir" branch -D "$branch" || true',
+        'git -C "$repo_dir" worktree prune',
     ].join("\n");
 }
 async function spriteRunnerExists(config) {
@@ -352,7 +361,7 @@ export const spriteRemoteRunnerProvider = {
             entry.remoteRunnerName,
             "--",
             "bash",
-            "-lc",
+            "-c",
             spriteRemoveWorktreeCommand(entry, force),
         ], longRunningCommandOptions(signal));
     },

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

@@ -1 +1 @@
-{"version":3,"file":"worktrees.d.ts","sourceRoot":"","sources":["../../src/lib/worktrees.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAiBH,OAAO,EAA8B,KAAK,cAAc,EAAE,KAAK,eAAe,EAAE,MAAM,aAAa,CAAC;AAMpG,OAAO,EAAE,KAAK,cAAc,EAAc,MAAM,iBAAiB,CAAC;AAIlE,MAAM,MAAM,YAAY,GAAG,MAAM,GAAG,QAAQ,CAAC;AAE7C,MAAM,WAAW,aAAa;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,sDAAsD;IACtD,MAAM,EAAE,MAAM,CAAC;IACf,+CAA+C;IAC/C,UAAU,EAAE,MAAM,CAAC;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,YAAY,CAAC;IACnB,mCAAmC;IACnC,cAAc,CAAC,EAAE,cAAc,CAAC,QAAQ,CAAC,CAAC,UAAU,CAAC,CAAC;IACtD,mCAAmC;IACnC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,mCAAmC;IACnC,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,YAAY;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,eAAe,CAAC;CAC1B;AAaD,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAE1D;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAW7E;AAgdD,4FAA4F;AAC5F,iBAAS,IAAI,CAAC,MAAM,EAAE,cAAc,GAAG,aAAa,EAAE,CAErD;AAED,iBAAS,YAAY,CAAC,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,GAAG,aAAa,EAAE,CAE7E;AAED,iBAAS,YAAY,CACnB,MAAM,EAAE,cAAc,EACtB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,GACjB,aAAa,GAAG,SAAS,CAI3B;AAED,iBAAe,MAAM,CACnB,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,YAAY,EAClB,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,aAAa,CAAC,CAUxB;AAED,iBAAe,MAAM,CACnB,MAAM,EAAE,cAAc,EACtB,KAAK,EAAE,aAAa,EACpB,OAAO,CAAC,EAAE;IAAE,KAAK,CAAC,EAAE,OAAO,CAAC;IAAC,MAAM,CAAC,EAAE,WAAW,CAAA;CAAE,GAClD,OAAO,CAAC,IAAI,CAAC,CAKf;AAED,MAAM,MAAM,YAAY,GAAG,iBAAiB,GAAG,iBAAiB,CAAC;AAEjE,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,aAAa,CAAC;IACrB,IAAI,EAAE,YAAY,CAAC;IACnB,KAAK,EAAE,OAAO,CAAC;CAChB;AAED,MAAM,WAAW,cAAc;IAC7B,+DAA+D;IAC/D,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,sCAAsC;IACtC,OAAO,EAAE,aAAa,EAAE,CAAC;IACzB,wDAAwD;IACxD,QAAQ,EAAE,eAAe,EAAE,CAAC;IAC5B,cAAc,EAAE,cAAc,CAAC;CAChC;AAKD,iBAAe,QAAQ,CACrB,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,SAAS,aAAa,EAAE,EACjC,OAAO,CAAC,EAAE;IAAE,KAAK,CAAC,EAAE,OAAO,CAAC;IAAC,MAAM,CAAC,EAAE,WAAW,CAAA;CAAE,GAClD,OAAO,CAAC,cAAc,CAAC,CAkDzB;AAED,eAAO,MAAM,SAAS;;;;;;;CAOrB,CAAC"}
+{"version":3,"file":"worktrees.d.ts","sourceRoot":"","sources":["../../src/lib/worktrees.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAiBH,OAAO,EAA8B,KAAK,cAAc,EAAE,KAAK,eAAe,EAAE,MAAM,aAAa,CAAC;AAMpG,OAAO,EAAE,KAAK,cAAc,EAAc,MAAM,iBAAiB,CAAC;AAIlE,MAAM,MAAM,YAAY,GAAG,MAAM,GAAG,QAAQ,CAAC;AAE7C,MAAM,WAAW,aAAa;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,sDAAsD;IACtD,MAAM,EAAE,MAAM,CAAC;IACf,+CAA+C;IAC/C,UAAU,EAAE,MAAM,CAAC;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,YAAY,CAAC;IACnB,mCAAmC;IACnC,cAAc,CAAC,EAAE,cAAc,CAAC,QAAQ,CAAC,CAAC,UAAU,CAAC,CAAC;IACtD,mCAAmC;IACnC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,mCAAmC;IACnC,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,YAAY;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,eAAe,CAAC;CAC1B;AAaD,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAE1D;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAW7E;AAkfD,4FAA4F;AAC5F,iBAAS,IAAI,CAAC,MAAM,EAAE,cAAc,GAAG,aAAa,EAAE,CAErD;AAED,iBAAS,YAAY,CAAC,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,GAAG,aAAa,EAAE,CAE7E;AAED,iBAAS,YAAY,CACnB,MAAM,EAAE,cAAc,EACtB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,GACjB,aAAa,GAAG,SAAS,CAI3B;AAED,iBAAe,MAAM,CACnB,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,YAAY,EAClB,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,aAAa,CAAC,CAUxB;AAED,iBAAe,MAAM,CACnB,MAAM,EAAE,cAAc,EACtB,KAAK,EAAE,aAAa,EACpB,OAAO,CAAC,EAAE;IAAE,KAAK,CAAC,EAAE,OAAO,CAAC;IAAC,MAAM,CAAC,EAAE,WAAW,CAAA;CAAE,GAClD,OAAO,CAAC,IAAI,CAAC,CAKf;AAED,MAAM,MAAM,YAAY,GAAG,iBAAiB,GAAG,iBAAiB,CAAC;AAEjE,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,aAAa,CAAC;IACrB,IAAI,EAAE,YAAY,CAAC;IACnB,KAAK,EAAE,OAAO,CAAC;CAChB;AAED,MAAM,WAAW,cAAc;IAC7B,+DAA+D;IAC/D,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,sCAAsC;IACtC,OAAO,EAAE,aAAa,EAAE,CAAC;IACzB,wDAAwD;IACxD,QAAQ,EAAE,eAAe,EAAE,CAAC;IAC5B,cAAc,EAAE,cAAc,CAAC;CAChC;AAKD,iBAAe,QAAQ,CACrB,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,SAAS,aAAa,EAAE,EACjC,OAAO,CAAC,EAAE;IAAE,KAAK,CAAC,EAAE,OAAO,CAAC;IAAC,MAAM,CAAC,EAAE,WAAW,CAAA;CAAE,GAClD,OAAO,CAAC,cAAc,CAAC,CAkDzB;AAED,eAAO,MAAM,SAAS;;;;;;;CAOrB,CAAC"}

package/dist/lib/worktrees.js

@@ -308,6 +308,15 @@ function deleteRemoteEntry(config, entry) {
 function remoteProviderFor(config, entry) {
     return getRemoteRunnerProvider(entry?.remoteProvider ?? config.remote.provider);
 }
+async function remoteRunnerExistsAfterCleanupFailure(arguments_) {
+    try {
+        return await arguments_.provider.runnerExists(arguments_.remoteConfig);
+    }
+    catch (error) {
+        log(`Remote runner availability check failed after cleanup error: ${errorMessage(error)}; keeping local state for retry.`);
+        throw arguments_.cleanupError;
+    }
+}
 async function removeCreatedRemoteWorktreeBestEffort(arguments_) {
     try {
         log(`Rolling back remote worktree ${arguments_.entry.dir} after local state persistence failed...`);
@@ -369,17 +378,33 @@ const remoteWorktreeAdapter = {
     },
     async remove(config, entry, options) {
         log(`Removing remote worktree ${entry.dir}${options.force ? " (--force)" : ""}...`);
+        const provider = remoteProviderFor(config, entry);
         const remoteConfig = {
             ...config.remote,
             provider: entry.remoteProvider ?? config.remote.provider,
             runnerName: entry.remoteRunnerName ?? config.remote.runnerName,
         };
-        await remoteProviderFor(config, entry).removeWorktree({
-            config: remoteConfig,
-            entry,
-            force: options.force,
-            ...signalProperty(options.signal),
-        });
+        try {
+            await provider.removeWorktree({
+                config: remoteConfig,
+                entry,
+                force: options.force,
+                ...signalProperty(options.signal),
+            });
+        }
+        catch (error) {
+            if (options.signal?.aborted === true || !options.force) {
+                throw error;
+            }
+            if (await remoteRunnerExistsAfterCleanupFailure({
+                provider,
+                remoteConfig,
+                cleanupError: error,
+            })) {
+                throw error;
+            }
+            log(`Remote runner ${remoteConfig.runnerName} not found; deleting stale local remote worktree record.`);
+        }
         deleteRemoteEntry(config, entry);
     },
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clipboard-health/groundcrew",
-  "version": "1.12.5",
+  "version": "1.12.6",
   "description": "Linear-driven orchestrator that launches AI coding agents in git worktrees, with workspace lifecycle, remote runners, and usage tracking.",
   "keywords": [
     "agent",
@@ -47,9 +47,10 @@
   "scripts": {
     "architecture:check": "depcruise src bin configExample.ts vitest.config.ts",
     "build": "tsgo --build --force tsconfig.lib.json",
+    "build:dev": "tsgo --build tsconfig.lib.json",
     "cpd": "jscpd .",
-    "crew": "node ./bin/run.js",
-    "crew:op": "op run --env-file \"${XDG_CONFIG_HOME:-$HOME/.config}/groundcrew/op.env\" -- node ./bin/run.js",
+    "crew": "node --run build:dev && node ./bin/run.js",
+    "crew:op": "node --run build:dev && op run --env-file \"${XDG_CONFIG_HOME:-$HOME/.config}/groundcrew/op.env\" -- node ./bin/run.js",
     "format": "oxfmt",
     "format:check": "oxfmt --check",
     "hook:pre-commit": "lint-staged",