teamshare-bridge 0.22.9 → 0.22.10

package/dist/lib/git/git-discovery.d.ts

@@ -20,11 +20,30 @@ export declare function findGitRoot(startDir: string, maxLevels?: number): strin
  * fast path). Otherwise recursively scans children up to `maxDepth` levels.
  */
 export declare function findAllGitRoots(startDir: string, maxDepth?: number): string[];
+/** True for a well-known main line, ignoring any `origin/` prefix. */
+export declare function isMainlineBranchName(name: string | null | undefined): boolean;
 /**
- * Detect whether the current HEAD is on the default branch (main/master).
- * Used to prevent agents from committing directly to main — only worktrees
- * should produce commits. Returns the current branch and the detected
- * default branch name for reporting.
+ * True when committing onto (or merging into) `branch` would touch a branch a
+ * HUMAN maintains: a well-known main line, the repo's detected default, or
+ * whatever is checked out right now.
+ */
+export declare function isProtectedIntegrationTarget(branch: string | null | undefined, opts?: {
+    detectedDefault?: string | null;
+    checkedOut?: string | null;
+}): boolean;
+/**
+ * Is the working tree sitting on a branch an agent must not commit to?
+ *
+ * Detection alone is not enough. `origin/HEAD` is often unset (cloned with
+ * `--single-branch`, or a local-only repo), and the old fallback was:
+ *
+ *     defaultBranch = mainExists.ok ? "main" : masterExists.ok ? "master" : "main";
+ *
+ * which only consulted `origin/*` and, when neither existed, GUESSED `main`.
+ * On a local-only repo whose default is `master`, `onDefault` came back false
+ * for a developer working on `master` - and the commit + push went straight to
+ * their branch. A developer on `develop` was invisible to this function
+ * entirely.
  */
 export declare function isOnDefaultBranch(gitRoot: string): {
     onDefault: boolean;

package/dist/lib/git/git-discovery.js

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findGitRoot = findGitRoot;
 exports.findAllGitRoots = findAllGitRoots;
+exports.isMainlineBranchName = isMainlineBranchName;
+exports.isProtectedIntegrationTarget = isProtectedIntegrationTarget;
 exports.isOnDefaultBranch = isOnDefaultBranch;
 exports.isWorktreeDir = isWorktreeDir;
 exports.currentBranchOf = currentBranchOf;
@@ -164,6 +166,55 @@ function findAllGitRoots(startDir, maxDepth = 3) {
  * should produce commits. Returns the current branch and the detected
  * default branch name for reporting.
  */
+/**
+ * Branch names the automation must never treat as "just another branch".
+ *
+ * Shared by the integration-merge guard (`lib/orchestrator/worktree.ts`) and
+ * the commit guard below, so the two cannot drift: a merge refused while a
+ * commit is allowed would be a hole with a confusing shape.
+ */
+const MAINLINE_NAMES_RE = /^(main|master|develop|trunk|stable)$/i;
+const MAINLINE_PREFIX_RE = /^(release|hotfix)\//i;
+/** True for a well-known main line, ignoring any `origin/` prefix. */
+function isMainlineBranchName(name) {
+    if (!name)
+        return false;
+    const bare = String(name).replace(/^origin\//, '');
+    return MAINLINE_NAMES_RE.test(bare) || MAINLINE_PREFIX_RE.test(bare);
+}
+/**
+ * True when committing onto (or merging into) `branch` would touch a branch a
+ * HUMAN maintains: a well-known main line, the repo's detected default, or
+ * whatever is checked out right now.
+ */
+function isProtectedIntegrationTarget(branch, opts = {}) {
+    if (!branch)
+        return false;
+    const bare = String(branch).replace(/^origin\//, '');
+    if (isMainlineBranchName(bare))
+        return true;
+    if (opts.detectedDefault && bare === String(opts.detectedDefault).replace(/^origin\//, '')) {
+        return true;
+    }
+    if (opts.checkedOut && bare === String(opts.checkedOut).replace(/^origin\//, '')) {
+        return true;
+    }
+    return false;
+}
+/**
+ * Is the working tree sitting on a branch an agent must not commit to?
+ *
+ * Detection alone is not enough. `origin/HEAD` is often unset (cloned with
+ * `--single-branch`, or a local-only repo), and the old fallback was:
+ *
+ *     defaultBranch = mainExists.ok ? "main" : masterExists.ok ? "master" : "main";
+ *
+ * which only consulted `origin/*` and, when neither existed, GUESSED `main`.
+ * On a local-only repo whose default is `master`, `onDefault` came back false
+ * for a developer working on `master` - and the commit + push went straight to
+ * their branch. A developer on `develop` was invisible to this function
+ * entirely.
+ */
 function isOnDefaultBranch(gitRoot) {
     const currentBranch = (0, git_core_1.git)(gitRoot, ["rev-parse", "--abbrev-ref", "HEAD"]).out || "";
     // Try origin/HEAD first, then fall back to common defaults.
@@ -178,27 +229,24 @@ function isOnDefaultBranch(gitRoot) {
         defaultBranch = parts[parts.length - 1] || "";
     }
     if (!defaultBranch) {
-        // Check which of main/master exists on origin.
-        const mainExists = (0, git_core_1.git)(gitRoot, [
-            "rev-parse",
-            "--verify",
-            "--quiet",
-            "origin/main",
-        ]);
-        const masterExists = (0, git_core_1.git)(gitRoot, [
-            "rev-parse",
-            "--verify",
-            "--quiet",
-            "origin/master",
-        ]);
-        defaultBranch = mainExists.ok
-            ? "main"
-            : masterExists.ok
-                ? "master"
-                : "main";
+        // LOCAL branches matter as much as origin's: a repo with no remote, or one
+        // cloned before `origin/HEAD` existed, still has a default.
+        for (const candidate of ["main", "master"]) {
+            const exists = (0, git_core_1.git)(gitRoot, ["rev-parse", "--verify", "--quiet", candidate]);
+            if (exists.ok) {
+                defaultBranch = candidate;
+                break;
+            }
+        }
+    }
+    if (!defaultBranch) {
+        // Only an unborn repo reaches here; there is no branch to protect yet.
+        defaultBranch = "main";
     }
     return {
-        onDefault: currentBranch === defaultBranch,
+        // Two independent reasons: it IS the default, or it is a name no agent
+        // should ever write to even when detection failed to identify it as such.
+        onDefault: currentBranch === defaultBranch || isMainlineBranchName(currentBranch),
         currentBranch,
         defaultBranch,
     };

package/dist/lib/git/git-discovery.js.map

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

package/dist/lib/git/git-finalize.js

@@ -295,6 +295,29 @@ async function commitRemainingChanges(cwd, prepared, opts) {
         return out;
     }
     const policy = opts.policy ?? "pr";
+    // EXCLUSIVE WORKSPACE LOCK (2026-10) - the same one `finalizeRunGit` takes.
+    //
+    // This is the safety-net commit that runs on the exception path, where the
+    // normal finalize never got to finish - so it was the one writer with NO
+    // lock, racing a retry's `prepareRunGit` branch checkout. Two sessions in a
+    // `autoWorktree: false` linked folder could both reach here; git's own
+    // `index.lock` serialises the index but not the branch switch.
+    const handle = await (0, repo_lock_1.acquireWsLock)({ kind: "dir", path: cwd }, "exclusive", {
+        agentId: opts.agentName,
+        taskId: opts.taskId,
+        projectId: opts.projectId ?? undefined,
+        label: "git safety commit",
+    }, {
+        waitMs: git_prepare_1.GIT_LOCK_WAIT_MS,
+        pollMs: 1000,
+        onWaiting: () => opts.log("[git] workspace busy - waiting to commit safely..."),
+    });
+    if (!handle) {
+        opts.log("[git] workspace stayed busy - safety commit skipped, changes left uncommitted in the working tree", "stderr");
+        out.gitLine = "skipped: workspace busy (changes left in tree)";
+        out.lines.push("Git: **not committed** - another session held this folder past the wait limit.", "Changes are SAFE in the working tree; commit manually or re-run.");
+        return out;
+    }
     try {
         const gitRoots = (0, mirror_1.resolveRunRepos)(cwd);
         let totalChanged = 0;
@@ -332,9 +355,28 @@ async function commitRemainingChanges(cwd, prepared, opts) {
                         "--quiet",
                         branch,
                     ]);
-                    const startPoint = existing.ok
+                    let startPoint = existing.ok
                         ? ""
                         : (0, git_branch_1.startPointFor)(gitRoot, opts, false);
+                    // STRAY-COMMIT SAFETY (2026-10) - the guard `finalizeRunGitUnlocked`
+                    // already had at :174 and this path was missing.
+                    //
+                    // `checkout -B <branch> <startPoint>` does not merely create the
+                    // branch, it RESETS it to the start point. When HEAD carries commits
+                    // the start point does not (an agent commit, or a chain-warm
+                    // checkout), the branch pointer moves BACKWARDS and those commits are
+                    // left reachable only through the reflog. Branch from HEAD instead.
+                    if (!existing.ok && startPoint) {
+                        const ahead = (0, git_core_1.git)(gitRoot, [
+                            "rev-list",
+                            "--count",
+                            `${startPoint}..HEAD`,
+                        ]);
+                        if (ahead.ok && (parseInt(ahead.out, 10) || 0) > 0) {
+                            opts.log(`[git] ${repoName}HEAD is ahead of ${startPoint} - branching from HEAD (keeping local commits)`);
+                            startPoint = "";
+                        }
+                    }
                     const co = existing.ok
                         ? (0, git_core_1.git)(gitRoot, ["checkout", branch])
                         : startPoint
@@ -408,6 +450,16 @@ async function commitRemainingChanges(cwd, prepared, opts) {
         const reason = err instanceof Error ? err.message.slice(0, 120) : String(err);
         out.lines.push(`Git: safety commit error - ${reason}`);
     }
+    finally {
+        (0, repo_lock_1.releaseWsLock)(handle);
+        (0, bus_1.publishEvent)({
+            type: "lock.released",
+            dir: cwd,
+            agentId: opts.agentName,
+            taskId: opts.taskId,
+            note: "git safety commit",
+        });
+    }
     return out;
 }
 async function tryOpenPr(cwd, out, ctx) {

package/dist/lib/git/git-finalize.js.map

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

package/dist/lib/git/index-recovery.js

@@ -225,6 +225,76 @@ function dumpUnmergedBlobs(gitRoot, entries) {
         return undefined;
     }
 }
+/** Porcelain v1 path field: `XY <path>`, or `XY <old> -> <new>` for renames. */
+function porcelainPath(line) {
+    const rest = line.slice(3);
+    const arrow = rest.indexOf(' -> ');
+    const raw = arrow >= 0 ? rest.slice(arrow + 4) : rest;
+    return raw.startsWith('"') && raw.endsWith('"') ? raw.slice(1, -1) : raw;
+}
+/**
+ * Copy every dirty path OUTSIDE the conflict into
+ * `<gitDir>/teamshare-index-recovery/<ts>-dirty/` before a destructive step.
+ *
+ * ── WHY THIS EXISTS ──────────────────────────────────────────────────────────
+ *
+ * `recoverBlockedIndex` ends in `git merge --abort`, falling back to
+ * `git reset --hard HEAD`. Both rewrite the WORKING TREE, not just the index.
+ * The backup it took (`dumpUnmergedBlobs`) covers only `unmergedFiles` - the
+ * conflicted paths - so a developer with uncommitted work in OTHER files had it
+ * destroyed with nothing to recover from. This ran before the run's own
+ * `stashRepo` could protect anything, and the `[git-index-recovered]` comment
+ * it left behind said only "unmerged file(s) rolled back", so it read as though
+ * nothing else had been touched.
+ *
+ * Returns:
+ *  - `{ paths: [] }` when there is nothing beyond the conflict to protect,
+ *  - `{ dir, paths }` when the extra dirt was snapshotted,
+ *  - `undefined` when the status could not be read or the copy failed - the
+ *    caller must then REFUSE to reset, because we can no longer say what the
+ *    reset would destroy.
+ */
+function snapshotExtraDirty(gitRoot, unmergedFiles) {
+    try {
+        const status = (0, git_core_1.git)(gitRoot, ['status', '--porcelain']);
+        if (!status.ok)
+            return undefined;
+        const extra = status.out
+            .split('\n')
+            .filter((l) => l.trim())
+            .map(porcelainPath)
+            .filter((p) => p && !unmergedFiles.includes(p));
+        if (extra.length === 0)
+            return { paths: [] };
+        const gd = (0, git_core_1.git)(gitRoot, ['rev-parse', '--git-dir']);
+        if (!gd.ok || !gd.out)
+            return undefined;
+        const gitDir = (0, node_path_1.isAbsolute)(gd.out) ? gd.out : (0, node_path_1.resolve)(gitRoot, gd.out);
+        const dir = (0, node_path_1.join)(gitDir, 'teamshare-index-recovery', `${Date.now()}-dirty`);
+        (0, node_fs_1.mkdirSync)(dir, { recursive: true });
+        const manifest = [];
+        for (const p of extra) {
+            const safe = p.replace(/[\\/]/g, '__');
+            try {
+                // The CURRENT on-disk bytes: that is exactly what `reset --hard`
+                // would overwrite. Deleted paths have nothing to copy; `tracked.diff`
+                // below records them instead.
+                (0, node_fs_1.writeFileSync)((0, node_path_1.join)(dir, `worktree_${safe}`), (0, node_fs_1.readFileSync)((0, node_path_1.join)(gitRoot, p)));
+                manifest.push(p);
+            }
+            catch {
+                manifest.push(`${p} (absent on disk - restorable from the diff)`);
+            }
+        }
+        const diff = (0, git_core_1.git)(gitRoot, ['diff', 'HEAD'], 60_000);
+        (0, node_fs_1.writeFileSync)((0, node_path_1.join)(dir, 'tracked.diff'), diff.ok ? `${diff.out}\n` : '', 'utf8');
+        (0, node_fs_1.writeFileSync)((0, node_path_1.join)(dir, 'manifest.txt'), `${manifest.join('\n')}\n`, 'utf8');
+        return { dir, paths: extra };
+    }
+    catch {
+        return undefined;
+    }
+}
 function manualCommandsFor(name, kind) {
     const cmds = [
         `cd ${name}`,
@@ -290,6 +360,21 @@ function recoverBlockedIndex(gitRoot, opts) {
     if (!(0, git_core_1.git)(gitRoot, ['rev-parse', '--verify', '--quiet', 'HEAD']).ok) {
         return block('repository has no HEAD to reset to');
     }
+    // 2b. Snapshot EVERY dirty path outside the conflict (2026-10).
+    //
+    // The stage-blob dump above covers `unmergedFiles` ONLY. The reset at step 3
+    // rewrites the working tree, so any tracked edit the developer had in OTHER
+    // files was destroyed with no backup at all - and this runs BEFORE the run's
+    // own `stashRepo`, so nothing else could have caught it either. A snapshot we
+    // cannot take is a refusal, not a warning: if we no longer know what the
+    // reset will overwrite, the reset does not happen.
+    const extraDirty = snapshotExtraDirty(gitRoot, blocker.unmergedFiles);
+    if (extraDirty === undefined) {
+        return block('could not snapshot uncommitted changes outside the conflict - refusing to reset a tree we cannot describe');
+    }
+    if (extraDirty.paths.length > 0) {
+        log(`[git-index] ${name}snapshotted ${extraDirty.paths.length} dirty path(s) outside the conflict to ${extraDirty.dir} before touching the index`, 'stderr');
+    }
     // 3. Clear the index: merge --abort first, reset --hard HEAD as fallback.
     const abort = (0, git_core_1.git)(gitRoot, ['merge', '--abort']);
     let cleared = abort.ok && unmergedEntries(gitRoot).length === 0;
@@ -309,7 +394,11 @@ function recoverBlockedIndex(gitRoot, opts) {
         .filter((s) => blocker.unmergedFiles.some((f) => s.files.includes(f)))
         .map((s) => s.ref);
     log(`[git-index] ${name}recovered blocked index (${blocker.kind}); ` +
-        `${blocker.unmergedFiles.length} unmerged file(s) rolled back; stash entries untouched`);
+        `${blocker.unmergedFiles.length} unmerged file(s) rolled back` +
+        (extraDirty.paths.length > 0
+            ? `; ${extraDirty.paths.length} other dirty file(s) preserved at ${extraDirty.dir}`
+            : '') +
+        '; stash entries untouched');
     return {
         ...base,
         status: 'recovered',
@@ -317,6 +406,7 @@ function recoverBlockedIndex(gitRoot, opts) {
         backup: [
             ...covering.map((s) => `stash ${s.tag} (${s.ref}) - retained, never modified`),
             ...(dumpDir ? [`stage blobs: ${dumpDir}`] : []),
+            ...(extraDirty.dir ? [`dirty tree snapshot: ${extraDirty.dir}`] : []),
         ],
         dumpDir,
     };

package/dist/lib/git/index-recovery.js.map

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

package/dist/lib/harness/agy-pty.d.ts

@@ -6,7 +6,7 @@ export interface PtyRunOpts {
     args?: string[];
     cwd?: string;
     env?: NodeJS.ProcessEnv;
-    /** Kill after this many minutes WITH NO output (idle timeout); resolves exit code 124. Resets on every output chunk - active sessions never get killed. */
+    /** Kill after this many minutes WITH NO output (idle timeout); resolves exit code 124. The timer is armed when the child spawns, so a process that never prints at all is still bounded; once output starts it resets on every chunk - active sessions never get killed. */
     timeoutMin?: number;
     /** Called per output line. A pty has no separate stderr - level is always 'stdout'. */
     onLine?: (line: string, level: 'stdout' | 'stderr') => void;

package/dist/lib/harness/agy-pty.js

@@ -78,13 +78,28 @@ function runAgyPty(opts) {
             done = true;
             if (killTimer)
                 clearTimeout(killTimer);
-            const tail = clean(lineBuf);
-            if (tail.trim())
-                opts.onLine?.(tail, 'stdout');
+            // A consumer callback that throws must not stop the promise settling -
+            // otherwise the caller keeps the agent lock, task claim and presence row.
+            try {
+                const tail = clean(lineBuf);
+                if (tail.trim())
+                    opts.onLine?.(tail, 'stdout');
+            }
+            catch {
+                /* ignore */
+            }
             resolve({ code, output: clean(output) });
         };
         const timeoutMs = Math.max(1, opts.timeoutMin ?? 60) * 60_000;
-        // Idle-reset timer: NO hard ceiling. Only starts on first output.
+        // Idle-reset timer, ARMED AT SPAWN (2026-10) rather than on first output.
+        // The old comment here said "Only starts on first output" - which meant a
+        // child that produced NOTHING and never exited was immortal: the promise
+        // never settled, so the caller (which holds the agent lock, the task
+        // claim, the presence row and the mirror lease in its `finally`) never
+        // released them. An expired OAuth token waiting for interactive re-auth
+        // is exactly that state, and it wedged an agent for the 24 h lock TTL.
+        // Once output starts, the same timer keeps resetting on every chunk, so a
+        // session that keeps working is never killed.
         let killTimer = null;
         const startIdleTimer = () => {
             if (killTimer)
@@ -97,6 +112,7 @@ function runAgyPty(opts) {
                 finish(124);
             }, timeoutMs);
         };
+        startIdleTimer();
         const dataHandler = term.onData.bind(term);
         dataHandler((data) => {
             // Reset idle timer on each output — active sessions never get killed.

package/dist/lib/harness/agy-pty.js.map

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