opencode-swarm 7.144.4 → 7.144.6

package/dist/cli/{worktree-isolation-canf3rj8.js → worktree-isolation-awpkp0yh.js}

@@ -20,62 +20,63 @@ import {
   sanitizeWorktreeTaskId,
   standardWorktreeByCallID,
   standardWorktreeSerializationSessions
-} from "./index-q4ed1jk7.js";
-import"./index-d12jd5mn.js";
-import"./index-h98t1m88.js";
-import"./index-az8etqpp.js";
+} from "./index-42ezdzam.js";
+import"./index-dj8cah6s.js";
+import"./index-01nhedm7.js";
+import"./index-fgdhf6a5.js";
 import"./index-134d35c1.js";
-import"./index-b6e016tv.js";
-import"./index-1csyxv0f.js";
-import"./index-fqcjragy.js";
+import"./index-abtrcs16.js";
+import"./index-6z5jtf7d.js";
+import"./index-wknz5c8q.js";
 import"./index-y8552snf.js";
-import"./index-nckg4gxb.js";
+import"./index-h5krb653.js";
 import"./index-70ha9e09.js";
 import"./index-c8s9a3zh.js";
 import"./index-9ss2m4rs.js";
-import"./index-74hpm6sh.js";
-import"./index-bt9aa01f.js";
-import"./index-zb0xcz9t.js";
-import"./index-x6tp0hfr.js";
-import"./index-yts89pqg.js";
-import"./index-dty5qgk2.js";
+import"./index-f36ybbsv.js";
+import"./index-hkdgkkhb.js";
+import"./index-vngs0meh.js";
+import"./index-n06653nr.js";
+import"./index-bac12jpv.js";
+import"./index-vdha477y.js";
 import"./index-rtry5xyf.js";
 import"./index-zsrtt42s.js";
-import"./index-jabkn643.js";
-import"./index-k3cxyk66.js";
-import"./index-cz25e8xp.js";
-import"./index-8j0va7jp.js";
-import"./index-pw83zgny.js";
-import"./index-z6v7kwpa.js";
+import"./index-n4hwcsbd.js";
+import"./index-cwtpqm5f.js";
+import"./index-sqe3nqh5.js";
+import"./index-tq89td7b.js";
+import"./index-dvybg11w.js";
+import"./index-q6bhmyxb.js";
 import"./index-556ja8an.js";
 import"./index-7sy3aa9m.js";
 import"./index-wx8zdh4a.js";
-import"./index-8fwhhayc.js";
-import"./index-q1exe2b3.js";
-import"./index-03pv47h2.js";
-import"./index-4w5qdbk7.js";
+import"./index-b44qqqt2.js";
+import"./index-zy7f84cs.js";
+import"./index-ec1kywxg.js";
+import"./index-zde2mkmg.js";
 import {
   resolveWorktreeIsolationConfig
-} from "./index-psvxq93b.js";
+} from "./index-ckq719fr.js";
 import"./index-gprxjmm7.js";
 import"./index-n832052r.js";
-import"./index-rn0eq85g.js";
+import"./index-fv0s19g9.js";
 import"./index-z6xqpmqg.js";
-import"./index-9qq7c18c.js";
-import"./index-y8j8ehc8.js";
-import"./index-4rhhvd1a.js";
+import"./index-ytzz6pq1.js";
+import"./index-68mqwvf5.js";
 import"./index-v3y3qg48.js";
+import"./index-9e6fdz2h.js";
+import"./index-4rhhvd1a.js";
 import"./index-zjygnfay.js";
 import"./index-ae75rja9.js";
-import"./index-ywn7vtxp.js";
-import"./index-mazgg5s2.js";
+import"./index-h1p08s3n.js";
+import"./index-9s8drsf9.js";
 import"./index-ed5ykebp.js";
 import"./index-bk5tah7q.js";
 import"./index-f9vvg5xb.js";
 import"./index-1jsmmx7y.js";
 import"./index-7g4c7s5r.js";
 import"./index-bpmtbmy9.js";
-import"./index-4nt52yr9.js";
+import"./index-zj6t9zgx.js";
 import"./index-zgwm4ryv.js";
 import"./index-a76rekgs.js";
 export {

package/dist/cli/{worktree-provisioning-owner-g24xd417.js → worktree-provisioning-owner-zzkjycp1.js}

@@ -5,12 +5,12 @@ import {
   recordWorktreeProvisioningOwner,
   removeWorktreeProvisioningOwner,
   scanWorktreeProvisioningOwnersForRecovery
-} from "./index-k3cxyk66.js";
-import"./index-rn0eq85g.js";
+} from "./index-cwtpqm5f.js";
+import"./index-fv0s19g9.js";
 import"./index-z6xqpmqg.js";
 import"./index-zjygnfay.js";
 import"./index-ed5ykebp.js";
-import"./index-4nt52yr9.js";
+import"./index-zj6t9zgx.js";
 import"./index-zgwm4ryv.js";
 import"./index-a76rekgs.js";
 export {

package/dist/commands/ci-simulate.d.ts

@@ -22,10 +22,12 @@
 import * as fs from 'node:fs';
 import { detectDefaultRemoteBranch, getDefaultBaseBranch } from '../git/branch.js';
 import { runExternalTool } from '../utils/external-tool-runner.js';
+import { resolveGitExecutable } from '../utils/git-executable.js';
 export declare const _internals: {
     runExternalTool: typeof runExternalTool;
     getDefaultBaseBranch: typeof getDefaultBaseBranch;
     detectDefaultRemoteBranch: typeof detectDefaultRemoteBranch;
+    resolveGitExecutable: typeof resolveGitExecutable;
     platform: string;
     osTmpdir: () => string;
     fs: {

package/dist/config/cache-paths.d.ts

@@ -63,3 +63,60 @@ export declare function getPluginCachePaths(): readonly string[];
  * be cleared during update/install to force a fresh resolution from npm.
  */
 export declare function getPluginLockFilePaths(): readonly string[];
+/**
+ * Anchored version-pinned cache leaf shape: `opencode-swarm@<semver>`, e.g.
+ * `opencode-swarm@7.143.1`, `opencode-swarm@1.2.3-rc.1`,
+ * `opencode-swarm@1.2.3+build.5`. Matches full `major.minor.patch` with
+ * optional pre-release and build-metadata segments (semver 2.0.0 grammar).
+ *
+ * Deliberately NOT a `startsWith('opencode-swarm@')` prefix test — that would
+ * admit a traversal payload like `opencode-swarm@../../..` as a "valid" leaf.
+ * The anchored `^...$` with only `[0-9A-Za-z.-]` permitted in the
+ * pre-release/build segments admits no path separator, NUL byte, whitespace,
+ * or non-ASCII character. Shared by the delete-time safety check
+ * (`isSafeCachePath` in `src/cli/index.ts`, applied AFTER canonicalization)
+ * and this module's own discovery function below, so both agree on exactly
+ * which leaves are "version-pinned opencode-swarm" without duplicating the
+ * pattern (issue #2236 RC3).
+ */
+export declare const VERSION_PINNED_LEAF: RegExp;
+/**
+ * Enumerate `packages/` parent directories for version-pinned opencode-swarm
+ * cache leaves (e.g. `opencode-swarm@7.143.1`) that {@link getPluginCachePaths}
+ * cannot discover — that list is fixed to the literal `opencode-swarm@latest`
+ * / `opencode-swarm` leaves, so a version-pinned OpenCode host install (issue
+ * #2236's reporter had `opencode-swarm@7.143.1`) is invisible to it.
+ *
+ * PERFORMS FILESYSTEM I/O (`readdirSync`). Callers MUST invoke this at
+ * COMMAND TIME only — never at module scope — to preserve AGENTS.md
+ * invariant 1 (plugin init must stay side-effect-minimal).
+ * {@link getPluginCachePaths} stays pure specifically so it can keep being
+ * called at module scope (`src/cli/index.ts:45`); this is the separate,
+ * impure counterpart invoked explicitly by `update()` (`src/cli/index.ts`)
+ * and the `/swarm diagnose` cache check (`src/services/diagnose-service.ts`).
+ *
+ * Returns full paths to matched entries. Does NOT apply the delete-time
+ * safety allowlist (`isSafeCachePath` in `src/cli/index.ts`) — callers that
+ * intend to delete a returned path MUST still run it through that check, and
+ * the check MUST run on the realpath-canonicalized string, exactly like every
+ * other cache-deletion call site.
+ */
+export declare function discoverVersionPinnedCachePaths(): string[];
+/**
+ * Resolve a cache path to its actual package root. Some OpenCode cache
+ * layouts nest the package under `<cachePath>/node_modules/opencode-swarm`;
+ * others ARE the package root directly. Shared by `evictPluginCaches`
+ * (`src/cli/index.ts`, to read the pre-deletion version) and the
+ * `/swarm diagnose` cache check (`src/services/diagnose-service.ts`) so both
+ * agree on where `package.json` lives for a given cache path, per issue
+ * #2236 RC3 ("don't duplicate the version-reading logic").
+ */
+export declare function resolveCachePackageRoot(cachePath: string): string;
+/**
+ * Best-effort read of the installed opencode-swarm version at a cache path.
+ * Returns `null` (never throws) if `package.json` is missing, unreadable, or
+ * unparsable — this feeds human-readable console/diagnostic reporting, not a
+ * safety decision, so a version that can't be determined must degrade
+ * gracefully rather than abort the caller's eviction/diagnosis loop.
+ */
+export declare function readCachePackageVersion(cachePath: string): string | null;

package/dist/config/evidence-schema.d.ts

@@ -220,10 +220,10 @@ export declare const RetrospectiveEvidenceSchema: z.ZodObject<{
     user_directives: z.ZodDefault<z.ZodArray<z.ZodObject<{
         directive: z.ZodString;
         category: z.ZodEnum<{
+            other: "other";
             process: "process";
             architecture: "architecture";
             tooling: "tooling";
-            other: "other";
             code_style: "code_style";
         }>;
         scope: z.ZodEnum<{
@@ -743,10 +743,10 @@ export declare const EvidenceSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
     user_directives: z.ZodDefault<z.ZodArray<z.ZodObject<{
         directive: z.ZodString;
         category: z.ZodEnum<{
+            other: "other";
             process: "process";
             architecture: "architecture";
             tooling: "tooling";
-            other: "other";
             code_style: "code_style";
         }>;
         scope: z.ZodEnum<{
@@ -1233,10 +1233,10 @@ export declare const EvidenceBundleSchema: z.ZodObject<{
         user_directives: z.ZodDefault<z.ZodArray<z.ZodObject<{
             directive: z.ZodString;
             category: z.ZodEnum<{
+                other: "other";
                 process: "process";
                 architecture: "architecture";
                 tooling: "tooling";
-                other: "other";
                 code_style: "code_style";
             }>;
             scope: z.ZodEnum<{

package/dist/config/schema.d.ts

@@ -462,6 +462,10 @@ export declare const DesignDocsConfigSchema: z.ZodObject<{
     language: z.ZodOptional<z.ZodString>;
 }, z.core.$strip>;
 export type DesignDocsConfig = z.infer<typeof DesignDocsConfigSchema>;
+export declare const GitConfigSchema: z.ZodObject<{
+    binary: z.ZodOptional<z.ZodString>;
+}, z.core.$strip>;
+export type GitConfig = z.infer<typeof GitConfigSchema>;
 export declare const UIReviewConfigSchema: z.ZodObject<{
     enabled: z.ZodDefault<z.ZodBoolean>;
     trigger_paths: z.ZodDefault<z.ZodArray<z.ZodString>>;
@@ -550,6 +554,7 @@ export declare const GuardrailsConfigSchema: z.ZodObject<{
     execution_stall_warn_calls: z.ZodDefault<z.ZodNumber>;
     execution_stall_stop_calls: z.ZodDefault<z.ZodNumber>;
     execution_stall_episode_minutes: z.ZodDefault<z.ZodNumber>;
+    sandbox_macos_enabled: z.ZodOptional<z.ZodBoolean>;
 }, z.core.$strip>;
 export type GuardrailsConfig = z.infer<typeof GuardrailsConfigSchema>;
 export declare const WatchdogConfigSchema: z.ZodObject<{
@@ -1917,6 +1922,7 @@ export declare const PluginConfigSchema: z.ZodObject<{
         execution_stall_warn_calls: z.ZodDefault<z.ZodNumber>;
         execution_stall_stop_calls: z.ZodDefault<z.ZodNumber>;
         execution_stall_episode_minutes: z.ZodDefault<z.ZodNumber>;
+        sandbox_macos_enabled: z.ZodOptional<z.ZodBoolean>;
     }, z.core.$strip>>;
     watchdog: z.ZodOptional<z.ZodObject<{
         scope_guard: z.ZodDefault<z.ZodBoolean>;
@@ -2046,6 +2052,9 @@ export declare const PluginConfigSchema: z.ZodObject<{
         out_dir: z.ZodDefault<z.ZodString>;
         language: z.ZodOptional<z.ZodString>;
     }, z.core.$strip>>;
+    git: z.ZodOptional<z.ZodObject<{
+        binary: z.ZodOptional<z.ZodString>;
+    }, z.core.$strip>>;
     ui_review: z.ZodOptional<z.ZodObject<{
         enabled: z.ZodDefault<z.ZodBoolean>;
         trigger_paths: z.ZodDefault<z.ZodArray<z.ZodString>>;

package/dist/git/branch.d.ts

@@ -1,4 +1,5 @@
 import * as child_process from 'node:child_process';
+import { resolveGitExecutable } from '../utils/git-executable.js';
 export type GitRepositoryStatus = {
     isRepo: true;
 } | {
@@ -201,5 +202,6 @@ export declare const _internals: {
     resetToMainAfterMerge: typeof resetToMainAfterMerge;
     spawnSync: typeof __spawnSyncSeam.spawnSync;
     readLaneEnvFileFromDiskSync: typeof readLaneEnvFileFromDiskSync;
+    resolveGitExecutable: typeof resolveGitExecutable;
 };
 export {};

package/dist/git/pr.d.ts

@@ -1,4 +1,5 @@
 import * as child_process from 'node:child_process';
+import { resolveGhBinary } from '../tools/gh-evidence.js';
 import { readLaneEnvFileFromDiskSync } from './branch.js';
 export declare const GIT_TIMEOUT_MS = 30000;
 /**
@@ -70,6 +71,7 @@ export declare const _internals: {
     spawnSync: typeof __spawnSyncSeam.spawnSync;
     readLaneEnvFileFromDiskSync: typeof readLaneEnvFileFromDiskSync;
     getMergeGroupRun: typeof getMergeGroupRun;
+    resolveGhBinary: typeof resolveGhBinary;
 };
 /**
  * Check if gh CLI is available

package/dist/hooks/delegation-gate/worktree-isolation.d.ts

@@ -11,6 +11,7 @@
 import type { PluginConfig, WorktreeIsolationConfig } from '../../config';
 import { tryAcquireLock } from '../../parallel/file-locks';
 import { bunSpawn } from '../../utils/bun-compat';
+import { resolveGitExecutable } from '../../utils/git-executable.js';
 import type { WorktreeHandle } from '../../worktree';
 import { attemptMergeBackFromDirty, cleanupOrphanedBranches, postMergeCleanup, provisionWorktree, pruneStaleWorktreeMetadata, removeWorktree, startupOrphanRecovery } from '../../worktree';
 import type { DirtyMergeOptions, MergeOperationProvenance } from '../../worktree/merge';
@@ -338,4 +339,10 @@ export declare const _internals: {
     isLaneOwnedByCurrentSession: typeof isLaneOwnedByCurrentSession;
     /** FR-001b: bunSpawn — exposed for test injection so collision check can be mocked. */
     bunSpawn: typeof bunSpawn;
+    /**
+     * Issue #2236 hardening (F1/F4/F5) — resolves the absolute git executable
+     * path instead of spawning the bare `'git'` name. Exposed for test
+     * injection following the `src/worktree/core.ts` convention.
+     */
+    resolveGitExecutable: typeof resolveGitExecutable;
 };

package/dist/hooks/diff-scope.d.ts

@@ -5,6 +5,7 @@
  * Never throws.
  */
 import { bunSpawn } from '../utils/bun-compat';
+import { resolveGitExecutable } from '../utils/git-executable.js';
 /**
  * Test-only dependency-injection seam — see `gitignore-warning.ts:_internals`
  * for the rationale (`mock.module` from `bun:test` leaks across files in
@@ -13,6 +14,12 @@ import { bunSpawn } from '../utils/bun-compat';
  */
 export declare const _internals: {
     bunSpawn: typeof bunSpawn;
+    /**
+     * Test seam for git binary resolution (issue #2236 hardening, lane C1b).
+     * This hook is not on the plugin init path, so the synchronous resolver
+     * is used (unlike `gitignore-warning.ts`, which must use the async one).
+     */
+    resolveGitExecutable: typeof resolveGitExecutable;
 };
 /**
  * Validate that git-changed files match the declared scope for a task.

package/dist/hooks/review-receipt-scope.d.ts

@@ -17,6 +17,7 @@
  */
 import * as child_process from 'node:child_process';
 import * as fs from 'node:fs';
+import { resolveGitExecutable } from '../utils/git-executable.js';
 export declare const REVIEWER_TASK_SCOPE_DESCRIPTION = "reviewer-task-files-v2";
 export declare const REVIEWER_TASK_SCOPE_HEADER = "opencode-swarm-reviewer-task-scope-v2";
 export interface ReviewerTaskScopeDeliveryEntry {
@@ -82,6 +83,12 @@ export declare function resolveReviewerScopeTaskId(directory: string, args: unkn
 export declare const _internals: {
     spawn: typeof child_process.spawn;
     realpath: typeof fs.promises.realpath;
+    /**
+     * Issue #2236 hardening (F1/F4/F5) — resolves the absolute git executable
+     * path instead of spawning the bare `'git'` name. Exposed for test
+     * injection following the `src/worktree/core.ts` convention.
+     */
+    resolveGitExecutable: typeof resolveGitExecutable;
 };
 /**
  * Build the exact reviewer-task manifest for a guardrails-observed file list.

package/dist/hooks/reviewer-scope-lifecycle.d.ts

@@ -1,4 +1,5 @@
 import * as child_process from 'node:child_process';
+import { resolveGitExecutable } from '../utils/git-executable.js';
 export type ReviewerScopeLifecycleTransition = 'coder_started' | 'coder_ready' | 'coder_no_change' | 'reviewer_claimed';
 /** Test-only dependency-injection seam for the no-change status probe. */
 export declare const _internals: {
@@ -6,6 +7,14 @@ export declare const _internals: {
     backoffMs?: number;
     /** Test-only deadline override for the bounded retry loop (ms). */
     retryDeadlineMs?: number;
+    /**
+     * Issue #2236 hardening (F1/F4/F5) — resolves the absolute git executable
+     * path instead of spawning the bare `'git'` name, which resolves against
+     * the PATH inside the child's env and can pick up an unintended binary.
+     * Exposed for test injection following the convention in
+     * `src/hooks/review-receipt-scope.ts`.
+     */
+    resolveGitExecutable: typeof resolveGitExecutable;
 };
 /** Run only after the complete blocking before-chain approved this Task call. */
 export declare function beginApprovedReviewerScopeLifecycle(input: {

package/dist/hooks/semantic-diff-injection.d.ts

@@ -13,6 +13,7 @@ import { computeASTDiff } from '../diff/ast-diff.js';
 import { classifyChanges } from '../diff/semantic-classifier.js';
 import { generateSummary, generateSummaryMarkdown } from '../diff/summary-generator.js';
 import { getImporters, normalizeGraphPath } from '../tools/repo-graph.js';
+import { resolveGitExecutable } from '../utils/git-executable.js';
 import { getCachedGraph, type RepoGraphInjectionOptions } from './repo-graph-injection.js';
 export declare const _internals: {
     execFile: typeof child_process.execFile;
@@ -25,7 +26,13 @@ export declare const _internals: {
     getCachedGraph: typeof getCachedGraph;
     getImporters: typeof getImporters;
     normalizeGraphPath: typeof normalizeGraphPath;
+    resolveGitExecutable: typeof resolveGitExecutable;
+    execGit: typeof execGit;
 };
+declare function execGit(directory: string, args: string[], options?: {
+    timeout?: number;
+    maxBuffer?: number;
+}): Promise<string>;
 /**
  * Build a semantic diff summary block for the given changed files.
  *
@@ -41,3 +48,4 @@ export declare const _internals: {
  * Returns null if no changes are detected or on failure.
  */
 export declare function buildSemanticDiffBlock(directory: string, changedFiles: string[], maxFiles?: number, repoGraphOptions?: RepoGraphInjectionOptions): Promise<string | null>;
+export {};