@clipboard-health/groundcrew 1.12.1 → 1.12.2

package/README.md

@@ -102,7 +102,7 @@ This installs the `crew` binary. `@clipboard-health/clearance` is pulled in tran
 
    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.
 
-   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, checks out the requested branch (creating it from the base branch when it does not exist on origin), 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.
+   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.
 
    ```bash
    op run --env-file "${XDG_CONFIG_HOME:-$HOME/.config}/groundcrew/op.env" -- \

package/dist/commands/remoteSetup.d.ts

@@ -22,6 +22,7 @@ export interface RemoteBootstrapOptions {
     repository: string;
     owner: string;
     baseBranch: string;
+    gitRemote?: string;
     secretNames: string[];
     shouldRequireSelectedSecrets: boolean;
     shouldUseSecrets: boolean;

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

@@ -1 +1 @@
-{"version":3,"file":"remoteSetup.d.ts","sourceRoot":"","sources":["../../src/commands/remoteSetup.ts"],"names":[],"mappings":"AAyBA,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,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,4BAA4B,EAAE,OAAO,CAAC;IACtC,gBAAgB,EAAE,OAAO,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,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;AAy0BD,wBAAsB,yBAAyB,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC,CA6B9F;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":"AAyBA,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,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,4BAA4B,EAAE,OAAO,CAAC;IACtC,gBAAgB,EAAE,OAAO,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAaD,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;AAw1BD,wBAAsB,yBAAyB,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC,CAiC9F;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"}

package/dist/commands/remoteSetup.js

@@ -14,7 +14,7 @@ const KNOWN_MCP_SERVER_URLS = {
 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_REPOSITORY_OWNER = "ClipboardHealth";
-const DEFAULT_BASE_BRANCH = "main";
+const DEFAULT_GIT_REMOTE = "origin";
 const DATADOG_PUP_VERSION = "0.63.0";
 const DATADOG_OAUTH_CALLBACK_PORT = 8000;
 const DATADOG_AUTH_STATUS_RETRY_ATTEMPTS = 5;
@@ -52,7 +52,7 @@ function usage() {
         "",
         "Bootstrap options:",
         "  --branch <branch>           Checkout/create a ticket branch before installing deps",
-        "  --base <branch>             Base branch used when creating a missing branch (default: main)",
+        "  --base <branch>             Base branch used when creating a missing branch (default: git.defaultBranch)",
         "  --owner <owner>             GitHub owner for bare repo names (default: ClipboardHealth)",
         "  --secret <env-name>         Forward one required build secret; repeat for multiple",
         "  --no-secrets                Do not forward NPM_TOKEN/BUF_TOKEN even if present",
@@ -233,7 +233,7 @@ function parseBootstrapArguments(argv) {
     }
     validateRepository(repository);
     let owner = DEFAULT_REPOSITORY_OWNER;
-    let baseBranch = DEFAULT_BASE_BRANCH;
+    let baseBranch;
     let branchName;
     let shouldUseSecrets = true;
     let shouldRequireSelectedSecrets = false;
@@ -276,10 +276,10 @@ function parseBootstrapArguments(argv) {
         runnerName,
         repository,
         owner,
-        baseBranch,
         secretNames: selectedSecretNames.length > 0 ? selectedSecretNames : [...BUILD_SECRET_NAMES],
         shouldRequireSelectedSecrets,
         shouldUseSecrets,
+        ...(baseBranch === undefined ? {} : { baseBranch }),
         ...(branchName === undefined ? {} : { branchName }),
     };
 }
@@ -634,34 +634,46 @@ function repositoryDirectoryName(repository) {
 function remoteBootstrapCommand(options) {
     const slug = repositorySlug(options);
     const directoryName = repositoryDirectoryName(options.repository);
+    const baseRef = `${options.gitRemote}/${options.baseBranch}`;
     const unsetSecretsLine = options.secretNames.length === 0 ? ":" : `unset ${options.secretNames.join(" ")}`;
     const checkoutLines = options.branchName === undefined
-        ? [
-            `git checkout -B ${shellSingleQuote(options.baseBranch)} ${shellSingleQuote(`origin/${options.baseBranch}`)}`,
-        ]
+        ? [`git checkout -B ${shellSingleQuote(options.baseBranch)} ${shellSingleQuote(baseRef)}`]
         : [
-            `if git show-ref --verify --quiet ${shellSingleQuote(`refs/remotes/origin/${options.branchName}`)}; then`,
-            `  git checkout -B ${shellSingleQuote(options.branchName)} ${shellSingleQuote(`origin/${options.branchName}`)}`,
+            `if git show-ref --verify --quiet ${shellSingleQuote(`refs/remotes/${options.gitRemote}/${options.branchName}`)}; then`,
+            `  git checkout -B ${shellSingleQuote(options.branchName)} ${shellSingleQuote(`${options.gitRemote}/${options.branchName}`)}`,
             "else",
-            `  git checkout -B ${shellSingleQuote(options.branchName)} ${shellSingleQuote(`origin/${options.baseBranch}`)}`,
+            `  git checkout -B ${shellSingleQuote(options.branchName)} ${shellSingleQuote(baseRef)}`,
             "fi",
         ];
     return [
         "set -euo pipefail",
         `cleanup() { rm -f ${shellSingleQuote(REMOTE_SECRETS_FILE)}; ${unsetSecretsLine}; }`,
         "trap cleanup EXIT",
+        `git_remote=${shellSingleQuote(options.gitRemote)}`,
         'mkdir -p "$HOME/dev"',
         `repo_dir="$HOME/dev/${directoryName}"`,
         'if [ ! -d "$repo_dir/.git" ]; then',
         `  gh repo clone ${shellSingleQuote(slug)} "$repo_dir"`,
         "fi",
         'cd "$repo_dir"',
-        "git fetch origin --prune",
+        'if ! git remote get-url "$git_remote" >/dev/null 2>&1; then',
+        '  origin_url="$(git remote get-url origin)"',
+        '  git remote add "$git_remote" "$origin_url"',
+        "fi",
+        'git fetch "$git_remote" --prune',
         ...checkoutLines,
         `if [ -f ${shellSingleQuote(REMOTE_SECRETS_FILE)} ]; then set -a && . ${shellSingleQuote(REMOTE_SECRETS_FILE)} && set +a; fi`,
         DEFAULT_REMOTE_SETUP_COMMAND,
     ].join("\n");
 }
+async function resolveBootstrapOptions(options) {
+    const config = await loadConfig();
+    return {
+        ...options,
+        baseBranch: options.baseBranch ?? config.git.defaultBranch,
+        gitRemote: config.git.remote,
+    };
+}
 function noSecretCleanup() {
     // No staged secrets file was created.
 }
@@ -697,12 +709,16 @@ function stageBuildSecrets(options) {
     };
 }
 export async function bootstrapRemoteRepository(options) {
+    const bootstrapOptions = {
+        ...options,
+        gitRemote: options.gitRemote ?? DEFAULT_GIT_REMOTE,
+    };
     const config = remoteConfigWithRunnerName(options.runnerName);
     const provider = providerFor(config);
     if (!(await provider.runnerExists(config))) {
         throw new Error(`Remote runner ${options.runnerName} does not exist. Run crew remote setup first.`);
     }
-    const stagedSecrets = stageBuildSecrets(options);
+    const stagedSecrets = stageBuildSecrets(bootstrapOptions);
     try {
         if (stagedSecrets.names.length > 0) {
             log(`Forwarding build secret names for setup only: ${stagedSecrets.names.join(", ")}`);
@@ -710,11 +726,11 @@ export async function bootstrapRemoteRepository(options) {
         const files = stagedSecrets.filePath === undefined
             ? []
             : [{ localPath: stagedSecrets.filePath, remotePath: REMOTE_SECRETS_FILE }];
-        log(`Bootstrapping ${repositorySlug(options)} in ${options.runnerName}`);
+        log(`Bootstrapping ${repositorySlug(bootstrapOptions)} in ${options.runnerName}`);
         await provider.runCommand({
             config,
             files,
-            remoteArguments: ["bash", "-lc", remoteBootstrapCommand(options)],
+            remoteArguments: ["bash", "-lc", remoteBootstrapCommand(bootstrapOptions)],
             options: { stdio: "inherit", timeoutMs: 0 },
         });
     }
@@ -790,7 +806,7 @@ export async function remoteCli(argv) {
         return;
     }
     if (action === "bootstrap") {
-        await bootstrapRemoteRepository(parseBootstrapArguments(rest));
+        await bootstrapRemoteRepository(await resolveBootstrapOptions(parseBootstrapArguments(rest)));
         return;
     }
     if (action === "sessions") {

package/dist/lib/spriteRemoteRunnerProvider.d.ts

@@ -30,6 +30,7 @@ interface RemoteWorktreeCreateArguments {
     ticket: string;
     branchName: string;
     baseBranch: string;
+    gitRemote: string;
     signal?: AbortSignal;
 }
 interface RemoteWorktreeLocation {

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

@@ -105,6 +105,9 @@ function worktreeTicketComponent(ticket) {
 }
 function spriteCreateWorktreeCommand(arguments_) {
     const slug = repositorySlug(arguments_.owner, arguments_.repository);
+    const branchRemoteRef = `refs/remotes/${arguments_.gitRemote}/${arguments_.branchName}`;
+    const branchRef = `${arguments_.gitRemote}/${arguments_.branchName}`;
+    const baseRef = `${arguments_.gitRemote}/${arguments_.baseBranch}`;
     return [
         "set -euo pipefail",
         `repo_root=${shellSingleQuote(arguments_.repoRoot)}`,
@@ -112,20 +115,27 @@ function spriteCreateWorktreeCommand(arguments_) {
         `repo_dir=${shellSingleQuote(arguments_.repoDir)}`,
         `worktree_dir=${shellSingleQuote(arguments_.worktreeDir)}`,
         `branch=${shellSingleQuote(arguments_.branchName)}`,
-        `base_branch=${shellSingleQuote(arguments_.baseBranch)}`,
+        `git_remote=${shellSingleQuote(arguments_.gitRemote)}`,
+        `branch_remote_ref=${shellSingleQuote(branchRemoteRef)}`,
+        `branch_ref=${shellSingleQuote(branchRef)}`,
+        `base_ref=${shellSingleQuote(baseRef)}`,
         'mkdir -p "$repo_root" "$worktree_root"',
         'if [ ! -d "$repo_dir/.git" ]; then',
         `  gh repo clone ${shellSingleQuote(slug)} "$repo_dir"`,
         "fi",
-        'git -C "$repo_dir" fetch origin --prune',
+        'if ! git -C "$repo_dir" remote get-url "$git_remote" >/dev/null 2>&1; then',
+        '  origin_url="$(git -C "$repo_dir" remote get-url origin)"',
+        '  git -C "$repo_dir" remote add "$git_remote" "$origin_url"',
+        "fi",
+        'git -C "$repo_dir" fetch "$git_remote" --prune',
         'if [ -e "$worktree_dir" ]; then',
         '  echo "Remote worktree already exists: $worktree_dir" >&2',
         "  exit 1",
         "fi",
-        'if git -C "$repo_dir" show-ref --verify --quiet "refs/remotes/origin/$branch"; then',
-        '  git -C "$repo_dir" worktree add -B "$branch" "$worktree_dir" "origin/$branch"',
+        'if git -C "$repo_dir" show-ref --verify --quiet "$branch_remote_ref"; then',
+        '  git -C "$repo_dir" worktree add -B "$branch" "$worktree_dir" "$branch_ref"',
         "else",
-        '  git -C "$repo_dir" worktree add -b "$branch" "$worktree_dir" "origin/$base_branch"',
+        '  git -C "$repo_dir" worktree add -b "$branch" "$worktree_dir" "$base_ref"',
         "fi",
     ].join("\n");
 }
@@ -306,7 +316,7 @@ export const spriteRemoteRunnerProvider = {
         });
     },
     async createWorktree(arguments_) {
-        const { config, repository, ticket, branchName, baseBranch, signal } = arguments_;
+        const { config, repository, ticket, branchName, baseBranch, gitRemote, signal } = arguments_;
         const remoteRepositoryName = repositoryDirectoryName(config.owner, repository);
         const remoteRepoDir = remotePathJoin(config.repoRoot, remoteRepositoryName);
         const remoteWorktreeDir = remotePathJoin(config.worktreeRoot, `${remoteRepositoryName}-${worktreeTicketComponent(ticket)}`);
@@ -324,6 +334,7 @@ export const spriteRemoteRunnerProvider = {
                 worktreeDir: remoteWorktreeDir,
                 branchName,
                 baseBranch,
+                gitRemote,
                 repoRoot: config.repoRoot,
                 worktreeRoot: config.worktreeRoot,
             }),

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;AAyYD,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;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"}

package/dist/lib/worktrees.js

@@ -198,6 +198,23 @@ function stateBaseDir() {
 function remoteStateFilePath() {
     return resolve(stateBaseDir(), "groundcrew", "remote-worktrees.json");
 }
+function normalizeRemoteStateNamespacePath(path) {
+    const normalized = path.replace(/\/+$/u, "");
+    return normalized.length === 0 ? "/" : normalized;
+}
+function remoteStateNamespaceFor(config) {
+    return JSON.stringify({
+        version: 1,
+        projectDir: resolve(config.workspace.projectDir),
+        remote: {
+            provider: config.remote.provider,
+            runnerName: config.remote.runnerName,
+            owner: config.remote.owner,
+            repoRoot: normalizeRemoteStateNamespacePath(config.remote.repoRoot),
+            worktreeRoot: normalizeRemoteStateNamespacePath(config.remote.worktreeRoot),
+        },
+    });
+}
 function isRemoteEntry(value) {
     if (typeof value !== "object" || value === null) {
         return false;
@@ -210,7 +227,8 @@ function isRemoteEntry(value) {
         entry.kind === "remote" &&
         isRemoteRunnerProviderName(entry.remoteProvider) &&
         typeof entry.remoteRunnerName === "string" &&
-        typeof entry.remoteRepoDir === "string");
+        typeof entry.remoteRepoDir === "string" &&
+        (entry.remoteStateNamespace === undefined || typeof entry.remoteStateNamespace === "string"));
 }
 function readRemoteEntries() {
     try {
@@ -238,8 +256,41 @@ function writeRemoteEntries(entries) {
         }
     }
 }
-function upsertRemoteEntry(entry) {
-    writeRemoteEntries([...readRemoteEntries(), entry]);
+function remoteStateEntryFor(namespace, entry) {
+    return { ...entry, remoteStateNamespace: namespace };
+}
+function remoteStateEntryMatchesNamespace(namespace, entry) {
+    // Legacy records have no project/config identity. Keep them on disk, but do
+    // not expose them to cleanup paths that could remove another config's remote
+    // worktree.
+    return entry.remoteStateNamespace === namespace;
+}
+function remoteStateEntryMatchesWorktree(namespace, candidate, entry) {
+    return (candidate.remoteStateNamespace === namespace &&
+        candidate.repository === entry.repository &&
+        candidate.ticket === entry.ticket &&
+        candidate.dir === entry.dir &&
+        candidate.kind === "remote");
+}
+function worktreeEntryFromRemoteState(entry) {
+    return {
+        repository: entry.repository,
+        ticket: entry.ticket,
+        branchName: entry.branchName,
+        dir: entry.dir,
+        kind: entry.kind,
+        remoteProvider: entry.remoteProvider,
+        remoteRunnerName: entry.remoteRunnerName,
+        remoteRepoDir: entry.remoteRepoDir,
+    };
+}
+function upsertRemoteEntry(config, entry) {
+    const namespace = remoteStateNamespaceFor(config);
+    const stateEntry = remoteStateEntryFor(namespace, entry);
+    writeRemoteEntries([
+        ...readRemoteEntries().filter((candidate) => !remoteStateEntryMatchesWorktree(namespace, candidate, entry)),
+        stateEntry,
+    ]);
 }
 function removeTemporaryRemoteStateFileBestEffort(path) {
     try {
@@ -250,11 +301,9 @@ function removeTemporaryRemoteStateFileBestEffort(path) {
         log(`Temporary remote state file cleanup skipped: ${errorMessage(error)}`);
     }
 }
-function deleteRemoteEntry(entry) {
-    writeRemoteEntries(readRemoteEntries().filter((candidate) => !(candidate.repository === entry.repository &&
-        candidate.ticket === entry.ticket &&
-        candidate.dir === entry.dir &&
-        candidate.kind === "remote")));
+function deleteRemoteEntry(config, entry) {
+    const namespace = remoteStateNamespaceFor(config);
+    writeRemoteEntries(readRemoteEntries().filter((candidate) => !remoteStateEntryMatchesWorktree(namespace, candidate, entry)));
 }
 function remoteProviderFor(config, entry) {
     return getRemoteRunnerProvider(entry?.remoteProvider ?? config.remote.provider);
@@ -284,6 +333,7 @@ const remoteWorktreeAdapter = {
             ticket: spec.ticket,
             branchName: base.branchName,
             baseBranch: config.git.defaultBranch,
+            gitRemote: config.git.remote,
             ...signalProperty(signal),
         });
         const entry = {
@@ -297,7 +347,7 @@ const remoteWorktreeAdapter = {
             remoteRepoDir,
         };
         try {
-            upsertRemoteEntry(entry);
+            upsertRemoteEntry(config, entry);
         }
         catch (error) {
             await removeCreatedRemoteWorktreeBestEffort({
@@ -311,7 +361,11 @@ const remoteWorktreeAdapter = {
         return entry;
     },
     list(config) {
-        return readRemoteEntries().filter((entry) => config.workspace.knownRepositories.includes(entry.repository));
+        const namespace = remoteStateNamespaceFor(config);
+        return readRemoteEntries()
+            .filter((entry) => remoteStateEntryMatchesNamespace(namespace, entry))
+            .filter((entry) => config.workspace.knownRepositories.includes(entry.repository))
+            .map(worktreeEntryFromRemoteState);
     },
     async remove(config, entry, options) {
         log(`Removing remote worktree ${entry.dir}${options.force ? " (--force)" : ""}...`);
@@ -326,7 +380,7 @@ const remoteWorktreeAdapter = {
             force: options.force,
             ...signalProperty(options.signal),
         });
-        deleteRemoteEntry(entry);
+        deleteRemoteEntry(config, entry);
     },
 };
 function adapterForEntry(entry) {

package/package.json

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