opencode-swarm 7.165.0 → 7.166.1

package/dist/git/pr.d.ts

@@ -1,5 +1,6 @@
 import * as child_process from 'node:child_process';
-import { resolveGhBinary } from '../tools/gh-evidence.js';
+import { resolveGhExecutable } from '../utils/gh-executable.js';
+import { resolveGitExecutable } from '../utils/git-executable.js';
 import { readLaneEnvFileFromDiskSync } from './branch.js';
 export declare const GIT_TIMEOUT_MS = 30000;
 /**
@@ -71,7 +72,8 @@ export declare const _internals: {
     spawnSync: typeof __spawnSyncSeam.spawnSync;
     readLaneEnvFileFromDiskSync: typeof readLaneEnvFileFromDiskSync;
     getMergeGroupRun: typeof getMergeGroupRun;
-    resolveGhBinary: typeof resolveGhBinary;
+    resolveGhExecutable: typeof resolveGhExecutable;
+    resolveGitExecutable: typeof resolveGitExecutable;
 };
 /**
  * Check if gh CLI is available
@@ -113,13 +115,6 @@ export interface PRStatusResult {
         detailsUrl?: string;
     }>;
 }
-export interface PRCheckResult {
-    name: string;
-    bucket: string;
-    state: string;
-    startedAt: string | null;
-    completedAt: string | null;
-}
 export interface PRCommentResult {
     id: string;
     author: string;
@@ -138,28 +133,33 @@ export interface ReviewStateResult {
     /** Number of requesting reviewers (non-zero means reviews are still pending). */
     reviewRequestCount: number;
 }
+/** All per-PR data one poll cycle needs, in two gh spawns. */
+export interface PRPollSnapshot {
+    status: PRStatusResult;
+    comments: PRCommentResult[];
+    merge: MergeStateResult;
+    review: ReviewStateResult;
+}
 /**
- * Fetch PR status via gh pr view --json
- */
-export declare function getPRStatus(prNumber: number, repoFullName: string, cwd: string): Promise<PRStatusResult>;
-/**
- * Fetch CI check results via gh pr checks --json
- */
-export declare function getPRChecks(prNumber: number, repoFullName: string, cwd: string): Promise<PRCheckResult[]>;
-/**
- * Fetch PR comments since a given timestamp via gh api
- * Returns both issue comments and pull request review comments, merged together
- */
-export declare function getPRComments(prNumber: number, repoFullName: string, cwd: string, since?: string): Promise<PRCommentResult[]>;
-/**
- * Fetch merge state (mergeable + mergeStateStatus) via gh pr view --json
+ * Fetch status, merge state, review state and conversation (issue) comments
+ * with ONE `gh pr view --json` call. Previously this was three near-duplicate
+ * pr-view spawns (status/merge/review) plus two gh api spawns per PR per poll.
+ *
+ * `comments[].id` from pr-view is the GraphQL node id, NOT the numeric
+ * database id the REST endpoints return. The numeric id is recovered from the
+ * comment permalink (`#issuecomment-<id>` suffix, verified equal to the REST
+ * id on gh >= 2.92) so `lastCommentId` markers written by earlier versions
+ * keep matching; the node id remains the defensive fallback (a warn is
+ * logged if it ever fires — fallback ids change the marker space).
  */
-export declare function getMergeState(prNumber: number, repoFullName: string, cwd: string): Promise<MergeStateResult>;
+export declare function getPRPollSnapshot(prNumber: number, repoFullName: string, cwd: string): Promise<PRPollSnapshot>;
 /**
- * Fetch the current review state for a PR using `gh pr view --json reviewDecision,reviewRequests`.
- * Uses async ghExecAsync to avoid blocking the event loop.
+ * Fetch inline pull-request review comments via gh api — the review half of
+ * the old two-endpoint getPRComments (the issue-comment half now rides the
+ * pr-view snapshot). Inline review comments have no `gh pr view --json`
+ * equivalent, so this stays the second spawn of the poll cycle.
  */
-export declare function getPRReviewState(prNumber: number, repoFullName: string, cwd: string): Promise<ReviewStateResult>;
+export declare function getPRReviewComments(prNumber: number, repoFullName: string, cwd: string): Promise<PRCommentResult[]>;
 /**
  * Result of fetching a GitHub Actions run for a PR's merge group.
  */

package/dist/git/safe-ref.d.ts

@@ -0,0 +1,51 @@
+/**
+ * Fail-closed guard for git ref arguments (issue #2476 AC3, source issue
+ * #2265).
+ *
+ * Defect class: a repository- or caller-derived ref interpolated into a git
+ * argv position can BEGIN WITH A DASH and be parsed by git as an OPTION. A
+ * hostile remote can advertise `refs/heads/--evil` (`git update-ref` bypasses
+ * `check-ref-format`; a plain `git clone` propagates it), so `git checkout
+ * --evil` exits 129 with "unknown option" and a branch literally named
+ * `--force` makes `git checkout --force` SILENTLY DESTRUCTIVE.
+ *
+ * Guard placement is per-command, settled empirically against git 2.x (see
+ * `.agents/issue-traces/2476-harden-trust-boundaries/02-reproduction.md` R3):
+ *
+ * - `branch -d -- <name>` and `push <remote> -- <refspec>` accept a literal
+ *   `--` end-of-options separator with IDENTICAL semantics for benign names
+ *   and fail-closed behavior for hostile ones — those sinks insert `--`.
+ * - `checkout`, `checkout -b <new> <start>`, `rev-parse --verify`,
+ *   `rev-parse --abbrev-ref <b>@{upstream}`, `reset --hard`, `log <range>`,
+ *   `diff <base> HEAD`, and `branch --merged <target>` REGRESS benign
+ *   behavior when a leading `--` is inserted (pathspec/malformed-object
+ *   errors) — those sinks use this validation guard instead.
+ *
+ * The predicate is deliberately minimal — NOT the full check-ref-format
+ * grammar — so `origin/main`, `HEAD`, `feature/x`, SHAs, and each side of an
+ * `a..b` range all pass while any dash-leading side is rejected. This mirrors
+ * the in-repo validator family (`isSafeGitRef` in ci-simulate.ts,
+ * `isSafeGitRevisionToken` in workspace-snapshot.ts, `isSafeGitRefToken` in
+ * pr-workflow-gate.ts), which this module centralizes for the src/git sinks.
+ */
+/** Typed, fail-closed rejection of an option-injectable git ref. */
+export declare class UnsafeGitRefError extends Error {
+    readonly ref: string;
+    readonly context: string;
+    constructor(ref: string, context: string);
+}
+/**
+ * True when `value` is safe to interpolate into a git argv ref position:
+ * non-empty, and no `..`-separated side starts with "-". Empty/odd `..`
+ * sides are deliberately NOT rejected here (a name like `../../x` is not an
+ * option-injection risk; git itself rejects it as an invalid ref, and the
+ * pre-existing adversarial contract in tests/unit/git/branch.adversarial
+ * pins pass-through for those shapes) — only dash-leading sides are.
+ */
+export declare function isSafeGitRefArg(value: string): boolean;
+/**
+ * Fail-closed form of {@link isSafeGitRefArg}: returns `value` unchanged when
+ * safe, throws {@link UnsafeGitRefError} otherwise. `context` names the
+ * caller/sink so the error is actionable (e.g. "createBranch checkout").
+ */
+export declare function assertSafeGitRefArg(value: string, context: string): string;

package/dist/hooks/context-capsule-inject.d.ts

@@ -23,6 +23,7 @@ import type { PluginConfig } from '../config/index.js';
 import { buildCapsule } from '../context-map/capsule-builder.js';
 import { saveCapsule } from '../context-map/capsule-persistence.js';
 import { recordTelemetry } from '../context-map/telemetry.js';
+import { measureCitedFileTokens, recordContextSourceAttribution } from '../services/context-attribution.js';
 import type { AgentSessionState } from '../state.js';
 import type { CapsuleDelegationReason } from '../types/context-capsule.js';
 /**
@@ -58,6 +59,8 @@ export declare const _internals: {
     buildCapsule: typeof buildCapsule;
     recordTelemetry: typeof recordTelemetry;
     saveCapsule: typeof saveCapsule;
+    measureCitedFileTokens: typeof measureCitedFileTokens;
+    recordContextSourceAttribution: typeof recordContextSourceAttribution;
     getActiveAgent: (sessionID: string) => string | undefined;
     getSession: (sessionID: string) => AgentSessionState | undefined;
     getCurrentTaskId: (sessionID: string) => string | null;

package/dist/index.d.ts

@@ -12,7 +12,12 @@ import { ensureSwarmGitExcluded } from './utils/gitignore-warning';
  * unit testing of the cap invariant; used by the heartbeat throttle and
  * delegation-telemetry pairing paths below.
  */
-export declare function capSessionMap<K, V>(map: Map<K, V>, max: number): void;
+export declare function capSessionMap<K, V>(map: Map<K, V>, max: number, 
+/** #2482 / #2244: the just-inserted key must never evict itself (a re-set
+ * entry keeps its ORIGINAL insertion position, so without this guard the
+ * fresh entry can be the oldest and evict itself at the cap — mirroring
+ * the stored-input-args guard). */
+justInserted?: K): void;
 /** @internal — test-only: clears delegation-telemetry pairing state so one
  * test's unconsumed entries (e.g. a before with no matching after) cannot
  * leak into the next. Mirrors resetTelemetryForTesting / resetSwarmState. */