opencode-swarm 7.186.8 → 7.187.0

package/dist/cli/{worktree-collision-ownership-7ctmpqx6.js → worktree-collision-ownership-3tqkw81h.js}

@@ -6,38 +6,37 @@ import {
   WORKTREE_PROVISIONING_OWNER_LEASE_MS,
   removeWorktreeProvisioningOwner,
   scanWorktreeProvisioningOwnersForRecovery
-} from "./index-sjwpvte3.js";
+} from "./index-a8gvszr2.js";
 import {
   scanWorktreeMergeFailuresForRecovery
 } from "./index-zsrtt42s.js";
 import {
   scanDelegationFallbacksForRecovery,
   scanDelegationsForRecovery
-} from "./index-tw513bvn.js";
-import"./index-znc71e1c.js";
+} from "./index-xs96nry2.js";
+import"./index-bejxkee0.js";
 import"./index-2s7dvzff.js";
-import"./index-extgtmxm.js";
-import"./index-n1szkmbz.js";
-import"./index-0k283qtq.js";
+import"./index-m1qy7f1e.js";
+import"./index-cc1vzq4m.js";
+import"./index-9hag235h.js";
 import"./index-ry16d01s.js";
 import"./index-rdm3px0g.js";
 import"./index-7pmbnjvj.js";
-import"./index-06pcq86m.js";
-import"./index-pntrhnj8.js";
+import"./index-c8ffgcvz.js";
+import"./index-krqq8kbq.js";
 import"./index-vzm6zre7.js";
 import"./index-ae75rja9.js";
-import"./index-gsqmefdg.js";
-import"./index-227te5a7.js";
-import"./index-mr86ywsj.js";
+import"./index-rm676s0p.js";
+import"./index-t3hcd6zz.js";
+import"./index-0yj79yk1.js";
 import"./index-t7hmqgjy.js";
-import"./index-xdjwefa5.js";
+import"./index-jtncfvhe.js";
 import {
   canonicalRootKeyFresh
-} from "./index-mc72pk74.js";
-import"./index-c1ggtmpm.js";
+} from "./index-fzpt2djt.js";
 import"./index-ejhxgyvm.js";
 import"./index-7g4c7s5r.js";
-import"./index-e4hy4des.js";
+import"./index-r6e8syr3.js";
 import"./index-zxdawwc7.js";
 import"./index-bk5tah7q.js";
 import"./index-gknz3bv1.js";

package/dist/cli/{worktree-isolation-2c1hvct4.js → worktree-isolation-0rrjqypt.js}

@@ -21,76 +21,75 @@ import {
   sanitizeWorktreeTaskId,
   standardWorktreeByCallID,
   standardWorktreeSerializationSessions
-} from "./index-qc1x5vvb.js";
-import"./index-kg4yp11g.js";
-import"./index-ha4r51k4.js";
-import"./index-n5ekzhad.js";
-import"./index-7bxssqaf.js";
-import"./index-x5mkva6s.js";
-import"./index-k55ep5se.js";
+} from "./index-akt0arnt.js";
+import"./index-b2je0z0t.js";
+import"./index-bbqxt1p5.js";
+import"./index-sztx0vyt.js";
+import"./index-vx8a8w3b.js";
+import"./index-dypmvvga.js";
+import"./index-df2p0k0s.js";
 import"./index-txdagbh7.js";
-import"./index-q8dj8b88.js";
+import"./index-v08ksq0b.js";
 import"./index-rdec0y3z.js";
-import"./index-t6na8zpb.js";
-import"./index-dbwpcjhw.js";
-import"./index-e47fhj4k.js";
-import"./index-c5x4yzt6.js";
-import"./index-84wt7q5y.js";
-import"./index-0qpa53jg.js";
+import"./index-r7gt2w1b.js";
+import"./index-pymr99as.js";
+import"./index-2wgvjwpr.js";
+import"./index-knbjtqwt.js";
+import"./index-mf19yqss.js";
+import"./index-ycz8z2db.js";
 import"./index-cjapb4hy.js";
-import"./index-sjwpvte3.js";
+import"./index-a8gvszr2.js";
 import"./index-pt7h91zc.js";
 import"./index-q7sjgr1y.js";
-import"./index-5dgg9vhz.js";
-import"./index-xgsy3hzf.js";
+import"./index-hvr82s1t.js";
+import"./index-d6kvatwp.js";
 import"./index-6b295cas.js";
 import"./index-9nyqt3kb.js";
-import"./index-mtb763x4.js";
+import"./index-1vvr69ka.js";
 import"./index-zsrtt42s.js";
-import"./index-c12cz80m.js";
-import"./index-4y6pndcf.js";
-import"./index-144jx1jn.js";
+import"./index-cppqxjw9.js";
+import"./index-evy5yrsw.js";
+import"./index-pts38j6x.js";
 import"./index-g4fs6z4e.js";
-import"./index-tw513bvn.js";
-import"./index-e6tjg7t9.js";
-import"./index-znc71e1c.js";
+import"./index-xs96nry2.js";
+import"./index-6ersmqjd.js";
+import"./index-bejxkee0.js";
 import"./index-2s7dvzff.js";
-import"./index-agm6hegf.js";
-import"./index-7pstt3w2.js";
+import"./index-zzxnssy3.js";
+import"./index-pfpnzf6w.js";
 import"./index-rtry5xyf.js";
 import {
   resolveWorktreeIsolationConfig
-} from "./index-prksynjw.js";
+} from "./index-ta48pe8j.js";
 import"./index-kbkk7vnh.js";
 import"./index-0725jpp7.js";
-import"./index-7ae4sgp4.js";
-import"./index-2nbws8bd.js";
-import"./index-zcpd36zm.js";
-import"./index-extgtmxm.js";
-import"./index-n1szkmbz.js";
-import"./index-0k283qtq.js";
+import"./index-ectvhv8e.js";
+import"./index-5m56c5r6.js";
+import"./index-ww8payq9.js";
+import"./index-m1qy7f1e.js";
+import"./index-cc1vzq4m.js";
+import"./index-9hag235h.js";
 import"./index-ry16d01s.js";
 import"./index-rdm3px0g.js";
 import"./index-7pmbnjvj.js";
-import"./index-06pcq86m.js";
-import"./index-pntrhnj8.js";
+import"./index-c8ffgcvz.js";
+import"./index-krqq8kbq.js";
 import"./index-vzm6zre7.js";
 import"./index-ae75rja9.js";
-import"./index-gsqmefdg.js";
-import"./index-227te5a7.js";
-import"./index-mr86ywsj.js";
+import"./index-rm676s0p.js";
+import"./index-t3hcd6zz.js";
+import"./index-0yj79yk1.js";
 import"./index-t7hmqgjy.js";
-import"./index-xdjwefa5.js";
-import"./index-mc72pk74.js";
-import"./index-c1ggtmpm.js";
+import"./index-jtncfvhe.js";
+import"./index-fzpt2djt.js";
 import"./index-ejhxgyvm.js";
 import"./index-7g4c7s5r.js";
-import"./index-e4hy4des.js";
+import"./index-r6e8syr3.js";
 import"./index-gx2vp8gx.js";
-import"./index-cvwkjnr5.js";
+import"./index-469xmpd6.js";
 import"./index-zxdawwc7.js";
-import"./index-616pp1nq.js";
-import"./index-03z05sbb.js";
+import"./index-qzgfheb4.js";
+import"./index-yw1g78v9.js";
 import"./index-bk5tah7q.js";
 import"./index-gknz3bv1.js";
 import"./index-zpsr8rpc.js";

package/dist/commands/registry.d.ts

@@ -1093,8 +1093,8 @@ export declare const COMMAND_REGISTRY: {
     readonly rollback: {
         readonly handler: (ctx: CommandContext) => Promise<string>;
         readonly description: "Restore swarm state or project files to a checkpoint";
-        readonly details: "Restores legacy .swarm/ phase checkpoints from checkpoints/phase-<N> when present. Otherwise restores named git checkpoints from .swarm/checkpoints.json by label or list number. Writes rollback event to events.jsonl. Without an argument, lists available checkpoints.";
-        readonly args: "<phase-number|label|list-number>";
+        readonly details: "Restores legacy .swarm/ phase checkpoints from checkpoints/phase-<N> when present; otherwise named git checkpoints from .swarm/checkpoints.json. SAFETY (#2946): a restore that would DESTROY uncommitted work previews first and issues a 15-minute --confirm token; re-run with that token (or --yes) to execute. Every executing restore backs up the destroyed bytes to .swarm/rollback-backups/ (newest 5). Clean trees stay single-call. Bare invocation lists checkpoints.";
+        readonly args: "<phase-number|label|list-number> [--confirm <token>] [--yes]";
         readonly category: "utility";
         readonly toolPolicy: "restricted";
     };
@@ -1353,8 +1353,8 @@ export declare const COMMAND_REGISTRY: {
     readonly checkpoint: {
         readonly handler: (ctx: CommandContext) => Promise<string>;
         readonly description: "Manage project checkpoints [save|restore|delete|list] <label>";
-        readonly details: "save: creates named git checkpoint. restore: hard-resets tracked files to the checkpoint. delete: removes named checkpoint metadata. list: shows all checkpoints with timestamps. All subcommands require a label except list.";
-        readonly args: "<save|restore|delete|list> <label>";
+        readonly details: "save: creates named git checkpoint. restore: hard-resets tracked files to the checkpoint; when uncommitted tracked work would be destroyed it previews first and requires the --confirm token from that preview (or --yes to confirm in one step); destroyed bytes are backed up to .swarm/rollback-backups/ (#2946). delete: removes checkpoint metadata. list: shows all checkpoints with timestamps. All subcommands require a label except list.";
+        readonly args: "<save|restore|delete|list> <label> [--confirm <token>] [--yes]";
         readonly category: "utility";
         readonly clashesWithNativeCcCommand: "/checkpoint";
         readonly toolPolicy: "restricted";

package/dist/commands/reset-backup.d.ts

@@ -13,11 +13,14 @@ export interface ResetBackupResult {
 }
 /** How many backup directories to retain under .swarm/reset-backups/. */
 export declare const RESET_BACKUP_RETENTION = 5;
+/** Which `.swarm/` subdirectory a backup family lands under (#2946). */
+export type ResetBackupsRoot = 'reset-backups' | 'rollback-backups';
 /**
  * Copy the swarm-state entries a reset is about to delete into a durable,
- * timestamped directory under `.swarm/reset-backups/` BEFORE deletion, so the
- * user can recover by copying the files back. The backup directory is not part
- * of any reset deletion set, so it survives the reset.
+ * timestamped directory under `.swarm/reset-backups/` (or
+ * `.swarm/rollback-backups/` for rollback restores, #2946) BEFORE deletion,
+ * so the user can recover by copying the files back. The backup directory is
+ * not part of any reset deletion set, so it survives the reset.
  *
  * This deliberately does NOT use the git checkpoint tool: that tool excludes
  * `.swarm/` (`git add ... :!.swarm/`) — i.e. it excludes exactly the state a
@@ -26,7 +29,19 @@ export declare const RESET_BACKUP_RETENTION = 5;
  * non-surprising backup. (#1692)
  *
  * @param directory  project root (contains `.swarm/`)
- * @param kind       backup label prefix ('reset' | 'reset-session')
+ * @param kind       backup label prefix ('reset' | 'reset-session' | 'rollback')
  * @param relEntries entries relative to `.swarm/` to back up (files or dirs)
+ * @param opts       backups root override (rollback restores use 'rollback-backups')
  */
-export declare function backupSwarmStateBeforeReset(directory: string, kind: 'reset' | 'reset-session', relEntries: string[]): ResetBackupResult;
+export declare function backupSwarmStateBeforeReset(directory: string, kind: 'reset' | 'reset-session' | 'rollback', relEntries: string[], opts?: {
+    backupsRoot?: ResetBackupsRoot;
+}): ResetBackupResult;
+/**
+ * Back up the current bytes of each dirty tracked file a git-checkpoint
+ * rollback is about to destroy via `git reset --hard` (#2946). Files are
+ * copied by their REPO-RELATIVE paths into
+ * `.swarm/rollback-backups/rollback-git-<ISO>/tracked/<repo-rel-path>`, so a
+ * confirmed rollback is recoverable by copying the files back. Fail-open by
+ * contract (same as the swarm-state backup): per-entry failures are warnings.
+ */
+export declare function backupTrackedChangesBeforeRollback(directory: string, repoRelPaths: string[]): ResetBackupResult;

package/dist/commands/rollback-gate.d.ts

@@ -0,0 +1,73 @@
+import type { PurgeCandidate } from './destructive-purge';
+/** Destructive-surface kind for the git checkpoint restore path. */
+export declare const ROLLBACK_GIT_KIND = "swarm-rollback-git";
+/** Destructive-surface kind for the legacy phase-overwrite restore path. */
+export declare const ROLLBACK_PHASE_KIND = "swarm-rollback-phase";
+/**
+ * Test seam for the rollback gate (simulate git-status read failures without
+ * spawning real git). Mirrors `_closeGateInternals.runGit`.
+ */
+export declare const _rollbackGateInternals: {
+    runGit: (args: string[], cwd: string) => string | null;
+    runGitBuffered: (args: string[], cwd: string) => string | null;
+};
+/**
+ * A real git repository root: `.git` is a linked-worktree/submodule pointer
+ * file, or a directory carrying the HEAD ref every repository has. Bare
+ * `.git` marker directories — accepted project roots per #2127 — are not
+ * repositories; git tracks nothing there.
+ */
+export declare function isRealGitRepository(directory: string): boolean;
+/**
+ * Parse `git status --porcelain -z` output into repo-relative tracked-dirty
+ * paths. The -z form is NUL-terminated and NEVER quotes paths (core.quotepath
+ * quoting — which mangles non-ASCII names into C-escaped octal and would
+ * silently break both the preview and the pre-restore backup — does not
+ * apply). Untracked ('??') entries survive `git reset --hard`; every other
+ * porcelain code is tracked work the reset would discard. Rename/copy
+ * records carry the ORIG_PATH as the next NUL token (#2508: both sides at
+ * risk), so each side is listed. R/C may sit in EITHER status column — the
+ * second column for worktree-only renames created via `git add -N`
+ * (intent-to-add) — so the test must not anchor to the first column, or the
+ * ORIG_PATH token of an R/C-initial file (README.md, CHANGELOG.md, …) is
+ * misread as the start of a new record and swallows the next real entry.
+ */
+export declare function parseTrackedDirtyPaths(statusOutput: string): string[];
+/**
+ * Paths that live in the restore TARGET tree but are NOT in the current
+ * index while a file sits on disk at that path. `git reset --hard` silently
+ * overwrites exactly these untracked (or since-ignored) files when it
+ * materializes the target tree, so they belong in the destruction scope
+ * alongside tracked-dirty paths (#2976 review F-1). Returns [] when either
+ * listing cannot be read — the tracked-dirty gate above still applies, and
+ * the caller's unreadable-status refusal covers real-repo failures.
+ */
+export declare function untrackedPathsInTargetTree(directory: string, targetSha: string): string[];
+/**
+ * The git-kind candidate set: the absolute paths of tracked-dirty files that
+ * `git reset --hard` would destroy. This is the ONLY derivation for
+ * ROLLBACK_GIT_KIND — the tool sink re-derives it from {label, directory}
+ * alone, so the command layer must not add anything to the set.
+ */
+export declare function trackedDirtyCandidates(directory: string, dirtyRelPaths: string[]): PurgeCandidate[];
+/**
+ * The legacy-phase-kind candidate set: absolute paths of live `.swarm/`
+ * entries the checkpoint copy loop would overwrite.
+ */
+export declare function swarmOverwriteCandidates(directory: string, overwriteRelPaths: string[]): PurgeCandidate[];
+/**
+ * Measure the destruction scope for a git checkpoint restore. When
+ * `targetSha` is provided, files that are untracked (or since-ignored) on
+ * disk but tracked in the TARGET tree are included: `git reset --hard`
+ * overwrites them silently, so they are part of the destruction set
+ * (#2976 review F-1). `unreadable` means git status could not be read
+ * inside a real repository — callers must fail closed on it (never treat
+ * it as a clean tree). A non-git or bare-marker root returns an empty
+ * dirty set: nothing tracked to destroy.
+ */
+export declare function measureGitDestruction(directory: string, targetSha?: string): {
+    kind: 'ok';
+    dirtyRelPaths: string[];
+} | {
+    kind: 'unreadable';
+};