opencode-swarm 7.134.2 → 7.134.3

package/.opencode/skills/swarm-pr-feedback/SKILL.md

@@ -29,9 +29,12 @@ ledger row is marked FIXED, and no PR is published until all three gates pass on
 the current diff. There is no speed, efficiency, or time exception. See
 "Mandatory Gates" below for the full protocol.
 
-When the work starts from a prior `swarm-pr-review` run, ingest the review's
-handoff artifact (for example
-`.swarm/pr-review/<run_id>/feedback-handoff.md` or `.json`) before triage.
+When the work starts from a prior Profile-A `swarm-pr-review` run, use the exact
+user command `/swarm pr-feedback <PR_URL> continue from
+.swarm/pr-review/<run_id>/feedback-handoff.json`. The controller validates the
+terminal review and artifact before atomically creating an unbound feedback
+gate; the artifact alone is not write authorization. Profiles B/C ingest their
+task-workspace handoff directly before triage.
 Carry forward the original review finding IDs, classifications, reviewer/critic
 provenance, and any operational blockers instead of renumbering them as new
 discoveries.
@@ -175,6 +178,10 @@ tree:
   stashes untracked files; move or remove those manually, or abort the checkout.
   Without the controller, surface dirty tracked state to the user or abort the
   checkout — do not blind-stash.
+- Treat `recovery-required` and `indeterminate` controller results as terminal
+  for the current attempt: report the typed `required_action`, abort/clear any
+  already-active gate, and stop. Only `stashable` permits one preparation call;
+  retry only when the controller explicitly returns `retryable: true`.
 - **Check out the head branch locally before dispatching feedback lanes.** Feedback verification reads the working-tree
   filesystem (`Read`/`Glob`/`Grep`), and fixes must land on the PR branch — without a
   checkout you would verify and patch the base branch's code instead. Record the

package/.opencode/skills/swarm-pr-review/SKILL.md

@@ -36,9 +36,11 @@ path substituted for `<handoff_artifact_path>`:
 
 `<run_id>` is a stable identifier for this review run, such as
 `pr-<number>-<YYYYMMDDHHMMSS>` or the existing review artifact run ID when one
-was already created. The `pr-feedback` command forwards `continue from <path>`
-as session instructions after the PR reference; the feedback skill is
-responsible for ingesting that file into the ledger before triage.
+was already created. Under Profile A, the exact command is parsed mechanically:
+the controller validates the terminal review, the bounded handoff artifact, and
+its provenance before atomically replacing the review gate with an unbound
+feedback gate. Extra trailing text is not permitted on this continuation form.
+Profiles B/C ingest their task-workspace artifact through the skill-managed path.
 
 Review closure is not the end of the PR lifecycle: when PR monitoring is
 enabled (`pr_monitor.enabled`), the PR remains subscribed and monitored under
@@ -211,6 +213,12 @@ Before launching explorers (Phase 3), perform this exact standalone sequence:
    contract. Without the controller (Profiles B/C), do not blind-stash over
    dirty state: surface tracked changes to the user, or abort. Do not issue
    `git stash` through shell.
+   Treat the controller's Git-state result as final for this attempt: `clean`
+   proceeds, `stashable` permits exactly one checkout-preparation call, and
+   `recovery-required` or `indeterminate` means report the typed
+   `required_action`, abort/clear any already-active gate, and stop. Retry only
+   when the controller explicitly returns `retryable: true`; never fight an
+   unmerged index or in-progress Git operation with repeated stash attempts.
 3. Fetch the PR head as one standalone command, for example
    `git fetch origin refs/pull/<N>/head`. Do not compose fetch and checkout.
 3a. Fetch the base branch as its own standalone command, for example

package/README.md

@@ -39,7 +39,7 @@ Most AI coding tools let one model write code and ask that same model whether th
 - 🔬 **External Skill Curation Pipeline** — Opt-in discovery, quarantine, evaluation, and promotion of external skill candidates from configured sources (disabled by default; enable via `external_skills.curation_enabled: true` in config). Includes 7 tools: `external_skill_discover`, `external_skill_list`, `external_skill_inspect`, `external_skill_promote`, `external_skill_reject`, `external_skill_delete`, `external_skill_revoke`. Candidates pass through a 3-gate validation pipeline before evaluation: **prompt injection scan** (12 regex patterns), **unsafe instruction scan** (25 patterns), and **provenance integrity check** (SHA-256, timestamp, URL, publisher, and hash verification).
 - 🔄 **Phase completion gates** — completion-verify and drift verifier gates enforced before phase completion
 - 🔁 **Resumable sessions** — all state saved to `.swarm/`; pick up any project any day
-- 🖥️ **PR Monitor** — GitHub PR subscription and background polling via `gh` CLI; delivers real-time CI, review, and merge status updates via the AutomationEventBus (FR-001, opt-in via `pr_monitor.enabled: true`). Subscribe with `/swarm pr subscribe <pr-url|owner/repo#N|N>`; unsubscribe with `/swarm pr unsubscribe <pr-url|owner/repo#N|N>`; check status with `/swarm pr status`. Enable `auto_pr_feedback: true` in `pr_monitor` config to inject `[MODE: PR_FEEDBACK pr="URL"]` on CI failures and merge conflicts automatically.
+- 🖥️ **PR Monitor** — GitHub PR subscription and background polling via `gh` CLI; delivers real-time CI, review, and merge status updates via the AutomationEventBus (FR-001, opt-in via `pr_monitor.enabled: true`). Subscribe with `/swarm pr subscribe <pr-url|owner/repo#N|N>`; unsubscribe with `/swarm pr unsubscribe <pr-url|owner/repo#N|N>`; check status with `/swarm pr status`. With `auto_pr_feedback: true`, CI failures and merge conflicts mechanically activate PR_FEEDBACK only when no other workflow owns the session; otherwise they are durably queued for a later round.
 - 🌐 **13 full language profiles** (TypeScript, JavaScript, Python, Go, Rust, Java, Kotlin, C/C++, C#, Ruby, Swift, Dart, PHP) with **tree-sitter parse validation across 20 grammars** (adds CSS, Bash, PowerShell, INI, Regex — and `.tsx` / `.c` aliases) — extending: see [docs/adding-a-language.md](docs/adding-a-language.md)
 - 🛡️ **Built-in security** — SAST, secrets scanning, dependency audit per task
 - 🔒 **Scope enforcement** — Validates write targets against declared scope with cross-process persistence, TTL expiry, and scope-aware destructive command blocking. **Handles both single-string and array-based path arguments** (`files[]`, `paths[]`, `targetFiles[]`) to prevent scope bypass via multi-file tool calls.

package/dist/background/pr-event-delivery.d.ts

@@ -22,8 +22,10 @@
  */
 import type { OpencodeClient } from '@opencode-ai/sdk';
 import type { PrMonitorConfig } from '../config/schema';
+import { activatePrWorkflow, readPrWorkflowGateState } from '../hooks/pr-workflow-gate';
 import { log } from '../utils';
 import { withTimeout } from '../utils/timeout';
+import { claimPrFeedbackMonitorEvents, readPrFeedbackMonitorQueue } from './pr-feedback-event-queue.js';
 /** A single formatted PR event handed over by pr-event-subscribers. */
 export interface FormattedPrEvent {
     /** Automation event type, e.g. 'pr.ci.failed'. */
@@ -36,6 +38,8 @@ export interface FormattedPrEvent {
     message: string;
     /** `[pr-monitor:<type>:<repo>#<n>]` — used for queue dedup. */
     dedupToken: string;
+    /** Lifecycle intake is durable but cannot enter the current workflow yet. */
+    disposition?: 'queued-for-later';
 }
 export interface PrEventDeliveryOptions {
     client: OpencodeClient;
@@ -93,6 +97,10 @@ declare function sendWakePrompt(sessionID: string, events: FormattedPrEvent[], m
 export declare const _internals: {
     sendWakePrompt: typeof sendWakePrompt;
     withTimeout: typeof withTimeout;
+    readPrWorkflowGateState: typeof readPrWorkflowGateState;
+    activatePrWorkflow: typeof activatePrWorkflow;
+    readPrFeedbackMonitorQueue: typeof readPrFeedbackMonitorQueue;
+    claimPrFeedbackMonitorEvents: typeof claimPrFeedbackMonitorEvents;
     wakePromptTimeoutMs: number;
     log: typeof log;
 };

package/dist/background/pr-event-subscribers.d.ts

@@ -24,10 +24,12 @@
  * are deduped by token inside the delivery queue.
  */
 import type { PrMonitorConfig } from '../config/schema';
+import { activatePrWorkflow, readPrWorkflowGateState } from '../hooks/pr-workflow-gate';
 import { getAgentSession } from '../state';
 import { log } from '../utils';
 import { getGlobalEventBus } from './event-bus';
 import { deliverPrActivity, isPrEventDeliveryRegistered } from './pr-event-delivery';
+import { enqueuePrFeedbackMonitorEvent } from './pr-feedback-event-queue.js';
 import { listActive, updateSnapshot } from './pr-subscriptions';
 export interface PrEventSubscriberOptions {
     directory: string;
@@ -43,6 +45,9 @@ export declare const _internals: {
     listActive: typeof listActive;
     updateSnapshot: typeof updateSnapshot;
     getAgentSession: typeof getAgentSession;
+    readPrWorkflowGateState: typeof readPrWorkflowGateState;
+    activatePrWorkflow: typeof activatePrWorkflow;
+    enqueuePrFeedbackMonitorEvent: typeof enqueuePrFeedbackMonitorEvent;
     deliverPrActivity: typeof deliverPrActivity;
     isPrEventDeliveryRegistered: typeof isPrEventDeliveryRegistered;
     scheduleClearUnaddressed: typeof scheduleClearUnaddressed;

package/dist/background/pr-feedback-event-queue.d.ts

@@ -0,0 +1,37 @@
+import * as fsp from 'node:fs/promises';
+export declare const MAX_PR_FEEDBACK_MONITOR_EVENTS = 20;
+export interface PrFeedbackMonitorEvent {
+    type: string;
+    repoFullName: string;
+    prNumber: number;
+    prUrl: string;
+    message: string;
+    dedupToken: string;
+    authorized: boolean;
+    queuedAt: string;
+    claimedWorkflowInstanceId?: string;
+    claimedAt?: string;
+}
+export interface PrFeedbackMonitorQueueRecord {
+    schemaVersion: 1;
+    revision: number;
+    sessionID: string;
+    events: PrFeedbackMonitorEvent[];
+}
+export declare function enqueuePrFeedbackMonitorEvent(directory: string, sessionID: string, event: Omit<PrFeedbackMonitorEvent, 'claimedWorkflowInstanceId' | 'claimedAt'>): Promise<PrFeedbackMonitorQueueRecord>;
+export declare function readPrFeedbackMonitorQueue(directory: string, sessionID: string): Promise<PrFeedbackMonitorQueueRecord | null>;
+export declare function claimPrFeedbackMonitorEvents(directory: string, sessionID: string, workflowInstanceId: string, prUrl: string, dedupTokens?: readonly string[]): Promise<PrFeedbackMonitorEvent[]>;
+export declare const _internals: {
+    queueRelativePath: typeof queueRelativePath;
+    queueLockRelativePath: typeof queueLockRelativePath;
+    resetQueueCache: () => void;
+    rename: typeof fsp.rename;
+    nowMs: () => number;
+    isProcessAlive: typeof isProcessAlive;
+    beforeQueueFileOpen: (() => Promise<void>) | undefined;
+    beforeQueueLockWrite: (() => Promise<void>) | undefined;
+};
+declare function isProcessAlive(pid: number): boolean;
+declare function queueRelativePath(sessionID: string): string;
+declare function queueLockRelativePath(sessionID: string): string;
+export {};

package/dist/background/workspace-snapshot.d.ts

@@ -111,15 +111,20 @@ export declare function resolvePrWorkflowRevisionDigest(directory: string, baseH
 export declare function resolvePrWorkflowRevisionDigestAsync(directory: string, baseHeadSha: string): Promise<string | null>;
 /** Parse `git status --porcelain=v1 -z`, including both sides of renames. */
 export declare function parsePorcelainPaths(output: string): string[] | null;
-interface PorcelainV2Snapshot {
+export interface PorcelainV2Snapshot {
     gitHead: string | null;
-    changedFiles: string[];
+    dirtyTrackedPaths: string[];
+    untrackedPaths: string[];
+    renameOrCopy: boolean;
+    unmergedPaths: string[];
+    unmergedCodes: string[];
+    dirtySubmodulePaths: string[];
 }
 /**
  * Parse the one-command `git status --porcelain=v2 --branch -z` snapshot used
  * by background evidence capture. A malformed or unknown record fails closed.
  */
-declare function parsePorcelainV2Snapshot(output: string): PorcelainV2Snapshot | null;
+export declare function parsePorcelainV2Snapshot(output: string): PorcelainV2Snapshot | null;
 export declare function captureWorkspaceSnapshot(directory: string, optionsOrScope?: string | null | CaptureWorkspaceSnapshotOptions, prHeadShaArg?: string | null): BackgroundWorkspaceSnapshot;
 /**
  * Conservatively derive final paths changed since a pre-task snapshot.

package/dist/cli/{config-doctor-wk7xzrma.js → config-doctor-yqwm2tfh.js}

@@ -12,8 +12,8 @@ import {
   shouldRunOnStartup,
   writeBackupArtifact,
   writeDoctorArtifact
-} from "./index-ss26e2d4.js";
-import"./index-v8m282zt.js";
+} from "./index-2b7sv71f.js";
+import"./index-tsmjmhnk.js";
 import"./index-bk5tah7q.js";
 import"./index-bpmtbmy9.js";
 import"./index-z6xqpmqg.js";

package/dist/cli/{curation-policy-npgspa14.js → curation-policy-x5m4x34n.js}

@@ -4,9 +4,9 @@ import {
   authorizeCuration,
   buildConfigFingerprintInput,
   readCohortConfigFingerprint
-} from "./index-ca44jww3.js";
+} from "./index-y3rj2jgb.js";
 import"./index-rtry5xyf.js";
-import"./index-asd9n0ms.js";
+import"./index-6wya5cqh.js";
 import"./index-ae75rja9.js";
 import"./index-cfkvc5q9.js";
 import"./index-dd7ttx8x.js";

package/dist/cli/{curator-llm-factory-tpc0qg6x.js → curator-llm-factory-24mjnh2y.js}

@@ -1,33 +1,33 @@
 // @bun
 import {
   createCuratorLLMDelegate
-} from "./index-cav39zjt.js";
+} from "./index-6kfqz0jw.js";
 import"./index-13xxjfhn.js";
-import"./index-0dszfjf3.js";
-import"./index-ss26e2d4.js";
+import"./index-yqvh2s4w.js";
+import"./index-2b7sv71f.js";
 import"./index-8fhg2nt2.js";
 import"./index-4905hd2m.js";
 import"./index-134d35c1.js";
-import"./index-njfcm1tn.js";
-import"./index-4cnwvmsm.js";
-import"./index-y8vqsm2g.js";
+import"./index-1mq8kmp6.js";
+import"./index-mgr951p8.js";
+import"./index-5f403c30.js";
 import"./index-vxv732ex.js";
 import"./index-c8s9a3zh.js";
 import"./index-9ss2m4rs.js";
 import"./index-wk1h5ec2.js";
 import"./index-1j3682j8.js";
-import"./index-a0nk83rk.js";
-import"./index-ca44jww3.js";
+import"./index-q3m6bpx2.js";
+import"./index-y3rj2jgb.js";
 import"./index-rtry5xyf.js";
-import"./index-x60gpbt5.js";
-import"./index-asd9n0ms.js";
+import"./index-rjngxx7q.js";
+import"./index-6wya5cqh.js";
 import"./index-ae75rja9.js";
 import"./index-cfkvc5q9.js";
 import"./index-dd7ttx8x.js";
-import"./index-n48xwynh.js";
+import"./index-ddxt327j.js";
 import"./index-k5jrywpr.js";
 import"./index-n832052r.js";
-import"./index-v8m282zt.js";
+import"./index-tsmjmhnk.js";
 import"./index-bk5tah7q.js";
 import"./index-8fwhhayc.js";
 import"./index-q1exe2b3.js";
@@ -49,7 +49,7 @@ import"./index-z6xqpmqg.js";
 import"./index-zjygnfay.js";
 import"./index-qe3v54nb.js";
 import"./index-zgwm4ryv.js";
-import"./index-h3k62043.js";
+import"./index-3nasn371.js";
 import"./index-a76rekgs.js";
 export {
   createCuratorLLMDelegate

package/dist/cli/{curator-njzxdyav.js → curator-thrwgwh1.js}

@@ -14,33 +14,33 @@ import {
   runCuratorInit,
   runCuratorPhase,
   writeCuratorSummary
-} from "./index-cav39zjt.js";
+} from "./index-6kfqz0jw.js";
 import"./index-13xxjfhn.js";
-import"./index-0dszfjf3.js";
-import"./index-ss26e2d4.js";
+import"./index-yqvh2s4w.js";
+import"./index-2b7sv71f.js";
 import"./index-8fhg2nt2.js";
 import"./index-4905hd2m.js";
 import"./index-134d35c1.js";
-import"./index-njfcm1tn.js";
-import"./index-4cnwvmsm.js";
-import"./index-y8vqsm2g.js";
+import"./index-1mq8kmp6.js";
+import"./index-mgr951p8.js";
+import"./index-5f403c30.js";
 import"./index-vxv732ex.js";
 import"./index-c8s9a3zh.js";
 import"./index-9ss2m4rs.js";
 import"./index-wk1h5ec2.js";
 import"./index-1j3682j8.js";
-import"./index-a0nk83rk.js";
-import"./index-ca44jww3.js";
+import"./index-q3m6bpx2.js";
+import"./index-y3rj2jgb.js";
 import"./index-rtry5xyf.js";
-import"./index-x60gpbt5.js";
-import"./index-asd9n0ms.js";
+import"./index-rjngxx7q.js";
+import"./index-6wya5cqh.js";
 import"./index-ae75rja9.js";
 import"./index-cfkvc5q9.js";
 import"./index-dd7ttx8x.js";
-import"./index-n48xwynh.js";
+import"./index-ddxt327j.js";
 import"./index-k5jrywpr.js";
 import"./index-n832052r.js";
-import"./index-v8m282zt.js";
+import"./index-tsmjmhnk.js";
 import"./index-bk5tah7q.js";
 import"./index-8fwhhayc.js";
 import"./index-q1exe2b3.js";
@@ -62,7 +62,7 @@ import"./index-z6xqpmqg.js";
 import"./index-zjygnfay.js";
 import"./index-qe3v54nb.js";
 import"./index-zgwm4ryv.js";
-import"./index-h3k62043.js";
+import"./index-3nasn371.js";
 import"./index-a76rekgs.js";
 export {
   writeCuratorSummary,

package/dist/cli/{guardrail-explain-75pr3e9z.js → guardrail-explain-nmfq71cm.js}

@@ -1,34 +1,34 @@
 // @bun
 import {
   handleGuardrailExplain
-} from "./index-9299e7d5.js";
-import"./index-cav39zjt.js";
+} from "./index-yaptf0hg.js";
+import"./index-6kfqz0jw.js";
 import"./index-13xxjfhn.js";
-import"./index-0dszfjf3.js";
-import"./index-ss26e2d4.js";
+import"./index-yqvh2s4w.js";
+import"./index-2b7sv71f.js";
 import"./index-8fhg2nt2.js";
 import"./index-4905hd2m.js";
 import"./index-134d35c1.js";
-import"./index-njfcm1tn.js";
-import"./index-4cnwvmsm.js";
-import"./index-y8vqsm2g.js";
+import"./index-1mq8kmp6.js";
+import"./index-mgr951p8.js";
+import"./index-5f403c30.js";
 import"./index-vxv732ex.js";
 import"./index-c8s9a3zh.js";
 import"./index-9ss2m4rs.js";
 import"./index-wk1h5ec2.js";
 import"./index-1j3682j8.js";
-import"./index-a0nk83rk.js";
-import"./index-ca44jww3.js";
+import"./index-q3m6bpx2.js";
+import"./index-y3rj2jgb.js";
 import"./index-rtry5xyf.js";
-import"./index-x60gpbt5.js";
-import"./index-asd9n0ms.js";
+import"./index-rjngxx7q.js";
+import"./index-6wya5cqh.js";
 import"./index-ae75rja9.js";
 import"./index-cfkvc5q9.js";
 import"./index-dd7ttx8x.js";
-import"./index-n48xwynh.js";
+import"./index-ddxt327j.js";
 import"./index-k5jrywpr.js";
 import"./index-n832052r.js";
-import"./index-v8m282zt.js";
+import"./index-tsmjmhnk.js";
 import"./index-bk5tah7q.js";
 import"./index-8fwhhayc.js";
 import"./index-q1exe2b3.js";
@@ -50,7 +50,7 @@ import"./index-z6xqpmqg.js";
 import"./index-zjygnfay.js";
 import"./index-qe3v54nb.js";
 import"./index-zgwm4ryv.js";
-import"./index-h3k62043.js";
+import"./index-3nasn371.js";
 import"./index-a76rekgs.js";
 export {
   handleGuardrailExplain

package/dist/cli/{guardrail-log-783svw0e.js → guardrail-log-2a61rz1w.js}

@@ -1,9 +1,9 @@
 // @bun
 import {
   handleGuardrailLog
-} from "./index-746ga67b.js";
-import"./index-0dszfjf3.js";
-import"./index-v8m282zt.js";
+} from "./index-8wktghbc.js";
+import"./index-yqvh2s4w.js";
+import"./index-tsmjmhnk.js";
 import"./index-bk5tah7q.js";
 import"./index-bpmtbmy9.js";
 import"./index-z6xqpmqg.js";

package/dist/cli/{hive-promoter-nrxjatdx.js → hive-promoter-2nkjjwgc.js}

@@ -7,35 +7,35 @@ import {
   isHiveEligible,
   promoteFromSwarm,
   promoteToHive
-} from "./index-cav39zjt.js";
+} from "./index-6kfqz0jw.js";
 import"./index-13xxjfhn.js";
-import"./index-0dszfjf3.js";
-import"./index-ss26e2d4.js";
+import"./index-yqvh2s4w.js";
+import"./index-2b7sv71f.js";
 import"./index-8fhg2nt2.js";
 import"./index-4905hd2m.js";
 import"./index-134d35c1.js";
-import"./index-njfcm1tn.js";
-import"./index-4cnwvmsm.js";
-import"./index-y8vqsm2g.js";
+import"./index-1mq8kmp6.js";
+import"./index-mgr951p8.js";
+import"./index-5f403c30.js";
 import"./index-vxv732ex.js";
 import"./index-c8s9a3zh.js";
 import"./index-9ss2m4rs.js";
 import"./index-wk1h5ec2.js";
 import"./index-1j3682j8.js";
-import"./index-a0nk83rk.js";
-import"./index-ca44jww3.js";
+import"./index-q3m6bpx2.js";
+import"./index-y3rj2jgb.js";
 import"./index-rtry5xyf.js";
 import {
   resolveHiveKnowledgePath
-} from "./index-x60gpbt5.js";
-import"./index-asd9n0ms.js";
+} from "./index-rjngxx7q.js";
+import"./index-6wya5cqh.js";
 import"./index-ae75rja9.js";
 import"./index-cfkvc5q9.js";
 import"./index-dd7ttx8x.js";
-import"./index-n48xwynh.js";
+import"./index-ddxt327j.js";
 import"./index-k5jrywpr.js";
 import"./index-n832052r.js";
-import"./index-v8m282zt.js";
+import"./index-tsmjmhnk.js";
 import"./index-bk5tah7q.js";
 import"./index-8fwhhayc.js";
 import"./index-q1exe2b3.js";
@@ -57,7 +57,7 @@ import"./index-z6xqpmqg.js";
 import"./index-zjygnfay.js";
 import"./index-qe3v54nb.js";
 import"./index-zgwm4ryv.js";
-import"./index-h3k62043.js";
+import"./index-3nasn371.js";
 import"./index-a76rekgs.js";
 export {
   resolveHiveKnowledgePath,

package/dist/cli/{index-njfcm1tn.js → index-1mq8kmp6.js}

@@ -2,18 +2,18 @@
 import {
   ALLOWED_SKILL_PATH_PREFIXES,
   validateSkillPath
-} from "./index-a0nk83rk.js";
+} from "./index-q3m6bpx2.js";
 import {
   computeOutcomeSignal,
   readKnowledge,
   resolveHiveKnowledgePath,
   resolveSwarmKnowledgePath,
   transactKnowledge
-} from "./index-x60gpbt5.js";
+} from "./index-rjngxx7q.js";
 import {
   effectiveRetrievalOutcomes,
   readKnowledgeCounterRollups
-} from "./index-asd9n0ms.js";
+} from "./index-6wya5cqh.js";
 import {
   init_knowledge_types,
   isActiveStatus

package/dist/cli/{index-ss26e2d4.js → index-2b7sv71f.js}

@@ -8,7 +8,7 @@ import {
   init_constants,
   init_schema,
   stripKnownSwarmPrefix
-} from "./index-v8m282zt.js";
+} from "./index-tsmjmhnk.js";
 import {
   log
 } from "./index-zgwm4ryv.js";

package/dist/cli/{index-h3k62043.js → index-3nasn371.js}

@@ -651,41 +651,71 @@ function parsePorcelainV2Snapshot(output) {
 `).match(/^# branch\.oid (.+)$/m);
   if (!oidMatch)
     return null;
-  const gitHead = /^[0-9a-f]{6,64}$/i.test(oidMatch[1]) ? oidMatch[1] : oidMatch[1] === "(initial)" ? null : null;
-  const paths = [];
+  if (!/^(?:[0-9a-f]{40}|[0-9a-f]{64})$/i.test(oidMatch[1]) && oidMatch[1] !== "(initial)") {
+    return null;
+  }
+  const gitHead = oidMatch[1] === "(initial)" ? null : oidMatch[1];
+  const dirtyTrackedPaths = [];
+  const untrackedPaths = [];
+  const unmergedPaths = [];
+  const unmergedCodes = [];
+  const dirtySubmodulePaths = [];
+  let renameOrCopy = false;
   for (let index = 0;index < records.length; index++) {
     const record = records[index];
     if (!record)
       continue;
     if (record.startsWith("? ")) {
-      paths.push(record.slice(2));
+      untrackedPaths.push(record.slice(2));
       continue;
     }
     if (record.startsWith("1 ")) {
+      const fields = record.split(" ");
       const changedPath = porcelainV2PathAfterFields(record, 8);
-      if (!changedPath)
+      if (!changedPath || !fields[2])
         return null;
-      paths.push(changedPath);
+      dirtyTrackedPaths.push(changedPath);
+      if (fields[2] !== "N...")
+        dirtySubmodulePaths.push(changedPath);
       continue;
     }
     if (record.startsWith("2 ")) {
+      const fields = record.split(" ");
       const changedPath = porcelainV2PathAfterFields(record, 9);
       const originalPath = records[++index];
-      if (!changedPath || !originalPath)
+      if (!changedPath || !originalPath || !fields[2])
         return null;
-      paths.push(changedPath, originalPath);
+      renameOrCopy = true;
+      dirtyTrackedPaths.push(changedPath, originalPath);
+      if (fields[2] !== "N...")
+        dirtySubmodulePaths.push(changedPath);
       continue;
     }
     if (record.startsWith("u ")) {
+      const fields = record.split(" ");
       const changedPath = porcelainV2PathAfterFields(record, 10);
-      if (!changedPath)
+      const unmergedCode = fields[1];
+      if (!changedPath || !fields[2] || !unmergedCode || !/^(?:DD|AU|UD|UA|DU|AA|UU)$/.test(unmergedCode)) {
         return null;
-      paths.push(changedPath);
+      }
+      unmergedPaths.push(changedPath);
+      unmergedCodes.push(unmergedCode);
+      dirtyTrackedPaths.push(changedPath);
+      if (fields[2] !== "N...")
+        dirtySubmodulePaths.push(changedPath);
       continue;
     }
     return null;
   }
-  return { gitHead, changedFiles: [...new Set(paths)] };
+  return {
+    gitHead,
+    dirtyTrackedPaths: [...new Set(dirtyTrackedPaths)],
+    untrackedPaths: [...new Set(untrackedPaths)],
+    renameOrCopy,
+    unmergedPaths: [...new Set(unmergedPaths)],
+    unmergedCodes: [...new Set(unmergedCodes)],
+    dirtySubmodulePaths: [...new Set(dirtySubmodulePaths)]
+  };
 }
 function porcelainV2PathAfterFields(record, fields) {
   let offset = 0;
@@ -722,7 +752,12 @@ function captureWorkspaceSnapshot(directory, optionsOrScope = null, prHeadShaArg
     directory: path.resolve(directory),
     gitHead: snapshot?.gitHead ?? null,
     dirtyHash: porcelain === null ? null : digest(porcelain),
-    changedFiles: snapshot?.changedFiles ?? null,
+    changedFiles: snapshot ? [
+      ...new Set([
+        ...snapshot.dirtyTrackedPaths,
+        ...snapshot.untrackedPaths
+      ])
+    ] : null,
     prHeadSha,
     scope
   };
@@ -790,4 +825,4 @@ var _internals = {
   parsePorcelainV2Snapshot
 };
 
-export { readGitTextAtRevision, resolveCurrentGitHead, resolveCurrentGitHeadAsync, resolveExactMergeBase, resolveExactMergeBaseAsync, resolvePrReviewDiffStats, resolvePrReviewDiffStatsAsync, resolveCurrentUpstreamRemoteRef, resolveCurrentUpstreamPushTarget, resolveCurrentUpstreamPushTargetAsync, resolveExactRemoteBranchHead, resolveExactRemoteBranchHeadAsync, resolveGitControlStateDigest, resolveGitControlStateDigestAsync, resolveIsWorkingTreeClean, resolveIsWorkingTreeCleanAsync, resolveCommitCountSince, resolveCommitCountSinceAsync, resolveIsExactSingleChildCommit, resolveIsExactSingleChildCommitAsync, resolveRemoteRefsContainingHead, resolveRemoteRefsContainingHeadAsync, resolvePrWorkflowRevisionDigest, resolvePrWorkflowRevisionDigestAsync, parsePorcelainPaths, captureWorkspaceSnapshot, changedFilesSinceSnapshot, workspaceSnapshotMatches, compareWorkspaceSnapshot, compareWorkspaceSnapshots, digest, _internals };
+export { readGitTextAtRevision, resolveCurrentGitHead, resolveCurrentGitHeadAsync, resolveExactMergeBase, resolveExactMergeBaseAsync, resolvePrReviewDiffStats, resolvePrReviewDiffStatsAsync, resolveCurrentUpstreamRemoteRef, resolveCurrentUpstreamPushTarget, resolveCurrentUpstreamPushTargetAsync, resolveExactRemoteBranchHead, resolveExactRemoteBranchHeadAsync, resolveGitControlStateDigest, resolveGitControlStateDigestAsync, resolveIsWorkingTreeClean, resolveIsWorkingTreeCleanAsync, resolveCommitCountSince, resolveCommitCountSinceAsync, resolveIsExactSingleChildCommit, resolveIsExactSingleChildCommitAsync, resolveRemoteRefsContainingHead, resolveRemoteRefsContainingHeadAsync, resolvePrWorkflowRevisionDigest, resolvePrWorkflowRevisionDigestAsync, parsePorcelainPaths, parsePorcelainV2Snapshot, captureWorkspaceSnapshot, changedFilesSinceSnapshot, workspaceSnapshotMatches, compareWorkspaceSnapshot, compareWorkspaceSnapshots, digest, _internals };

package/dist/cli/{index-y8vqsm2g.js → index-5f403c30.js}

@@ -2,7 +2,7 @@
 import {
   readKnowledge,
   transactKnowledge
-} from "./index-x60gpbt5.js";
+} from "./index-rjngxx7q.js";
 import {
   resolveKnowledgeStoreDir
 } from "./index-cfkvc5q9.js";