@primitive.ai/prim 0.1.0-alpha.92 → 0.1.0-alpha.94

package/dist/hook-runtime/hooks/post-rewrite.js

@@ -59,10 +59,10 @@ import {
   fstatSync as fstatSync2,
   lstatSync as lstatSync3,
   openSync as openSync4,
-  readFileSync as readFileSync9,
+  readFileSync as readFileSync10,
   unlinkSync as unlinkSync2
 } from "fs";
-import { basename as basename2, dirname as dirname8, isAbsolute as isAbsolute4, join as join10 } from "path";
+import { basename as basename3, dirname as dirname9, isAbsolute as isAbsolute4, join as join11 } from "path";
 import { fileURLToPath } from "url";
 
 // src/binding.ts
@@ -379,16 +379,16 @@ function resolveOrg(args) {
 import {
   appendFileSync,
   closeSync as closeSync2,
-  existsSync as existsSync4,
+  existsSync as existsSync5,
   fstatSync,
   mkdirSync as mkdirSync4,
   openSync as openSync2,
   opendirSync,
-  readFileSync as readFileSync5,
+  readFileSync as readFileSync6,
   readSync,
-  readdirSync
+  readdirSync as readdirSync2
 } from "fs";
-import { dirname as dirname5, join as join6 } from "path";
+import { dirname as dirname6, join as join7 } from "path";
 
 // src/client.ts
 import { createHash as createHash2 } from "crypto";
@@ -426,8 +426,19 @@ function getSiteUrlForEnvironment(primApiUrl) {
 }
 var CLI_MANAGEMENT_RESPONSE_MAX_BYTES = 2 * 1024 * 1024;
 
+// src/drain-progress.ts
+import {
+  chmodSync as chmodSync2,
+  existsSync as existsSync4,
+  readFileSync as readFileSync5,
+  readdirSync,
+  rmSync as rmSync4,
+  rmdirSync
+} from "fs";
+import { basename, dirname as dirname5, join as join6 } from "path";
+
 // src/journal.ts
-var JOURNAL_DIR = join6(primConfigDirectory(), "moves");
+var JOURNAL_DIR = join7(primConfigDirectory(), "moves");
 var UNBOUND_BUCKET = "_unbound";
 var JOURNAL_BASENAME = "journal.ndjson";
 var JOURNAL_STATS_SAMPLE_BYTES = 64 * 1024;
@@ -439,15 +450,15 @@ function envSlug(apiUrl) {
   return slug;
 }
 function currentEnvDir() {
-  return join6(JOURNAL_DIR, envSlug(getSiteUrl()));
+  return join7(JOURNAL_DIR, envSlug(getSiteUrl()));
 }
 var DIR_MODE = 448;
 var FILE_MODE = 384;
 var SAFE_BUCKET = /^[A-Za-z0-9_-]+$/;
 var RESERVED_BUCKETS = /* @__PURE__ */ new Set([UNBOUND_BUCKET, "_legacy"]);
 function appendMoveToPath(path, move) {
-  const dir = dirname5(path);
-  if (!existsSync4(dir)) {
+  const dir = dirname6(path);
+  if (!existsSync5(dir)) {
     mkdirSync4(dir, { recursive: true, mode: DIR_MODE });
   }
   appendFileSync(path, `${JSON.stringify(move)}
@@ -455,10 +466,10 @@ function appendMoveToPath(path, move) {
 }
 function bucketDir(orgId) {
   const safe = orgId !== void 0 && SAFE_BUCKET.test(orgId) && !RESERVED_BUCKETS.has(orgId);
-  return join6(currentEnvDir(), safe ? orgId : UNBOUND_BUCKET);
+  return join7(currentEnvDir(), safe ? orgId : UNBOUND_BUCKET);
 }
 function journalPath(orgId) {
-  return join6(bucketDir(orgId), JOURNAL_BASENAME);
+  return join7(bucketDir(orgId), JOURNAL_BASENAME);
 }
 function appendMove(move, orgId) {
   appendMoveToPath(journalPath(orgId), move);
@@ -467,15 +478,15 @@ var FLUSHING_PREFIX = `${JOURNAL_BASENAME}.flushing.`;
 
 // src/lib/activation.ts
 import { execFileSync as execFileSync2 } from "child_process";
-import { existsSync as existsSync5, readFileSync as readFileSync6 } from "fs";
+import { existsSync as existsSync6, readFileSync as readFileSync7 } from "fs";
 import { homedir as homedir2 } from "os";
-import { join as join7 } from "path";
+import { join as join8 } from "path";
 
 // src/lib/git.ts
 import { execFileSync } from "child_process";
 import { createHash as createHash3 } from "crypto";
 import { lstatSync, realpathSync } from "fs";
-import { basename, dirname as dirname6, isAbsolute as isAbsolute2, relative, resolve as resolve2, sep } from "path";
+import { basename as basename2, dirname as dirname7, isAbsolute as isAbsolute2, relative, resolve as resolve2, sep } from "path";
 var GIT_TIMEOUT_MS = 1e3;
 var GITHUB_OWNER_PATTERN = /^(?![A-Za-z0-9-]*--)[A-Za-z0-9](?:[A-Za-z0-9-]{0,37}[A-Za-z0-9])?$/u;
 var GITHUB_REPOSITORY_PATTERN = /^[A-Za-z0-9._-]{1,100}$/u;
@@ -623,10 +634,10 @@ function hasProjectPrimInstall(cwd) {
   const root = gitToplevel(cwd);
   if (root === null || root === homedir2()) return false;
   for (const rel of PROJECT_INSTALL_FILES) {
-    const path = join7(root, rel);
-    if (existsSync5(path)) {
+    const path = join8(root, rel);
+    if (existsSync6(path)) {
       try {
-        const content = readFileSync6(path, "utf-8");
+        const content = readFileSync7(path, "utf-8");
         if (PRIM_HOOK_BINS.some((bin) => content.includes(bin))) return true;
       } catch {
       }
@@ -18712,12 +18723,18 @@ function cachedCollectScopeAdmits(cwd, facts) {
   );
 }
 
+// src/lib/unattended.ts
+var UNATTENDED_ENV = "PRIM_UNATTENDED";
+function unattendedEnv(env = process.env) {
+  return { ...env, [UNATTENDED_ENV]: "1" };
+}
+
 // src/lib/workspace-id.ts
 import { execFileSync as execFileSync3 } from "child_process";
 import { randomUUID as randomUUID2 } from "crypto";
 import {
   constants as constants2,
-  chmodSync as chmodSync2,
+  chmodSync as chmodSync3,
   closeSync as closeSync3,
   fchmodSync as fchmodSync2,
   fsyncSync as fsyncSync2,
@@ -18725,13 +18742,13 @@ import {
   lstatSync as lstatSync2,
   mkdirSync as mkdirSync5,
   openSync as openSync3,
-  readFileSync as readFileSync7,
+  readFileSync as readFileSync8,
   statSync as statSync2,
   unlinkSync,
   writeFileSync as writeFileSync3
 } from "fs";
-import { dirname as dirname7, isAbsolute as isAbsolute3, join as join8, resolve as resolve3 } from "path";
-var WORKSPACE_ID_RELATIVE_PATH = join8("prim", "workspace-id");
+import { dirname as dirname8, isAbsolute as isAbsolute3, join as join9, resolve as resolve3 } from "path";
+var WORKSPACE_ID_RELATIVE_PATH = join9("prim", "workspace-id");
 var MAX_ANCESTORS = 64;
 var MAX_GIT_FILE_BYTES = 4096;
 var MAX_ID_FILE_BYTES = 128;
@@ -18790,19 +18807,19 @@ function resolveWorkspaceIdPath(cwd) {
 function resolveFromFilesystem(cwd) {
   let current = resolve3(cwd);
   for (let depth = 0; depth < MAX_ANCESTORS; depth += 1) {
-    const dotGit = join8(current, ".git");
+    const dotGit = join9(current, ".git");
     try {
       const stat = lstatSync2(dotGit);
       if (stat.isDirectory() && isGitDirectory(dotGit)) {
-        return join8(dotGit, WORKSPACE_ID_RELATIVE_PATH);
+        return join9(dotGit, WORKSPACE_ID_RELATIVE_PATH);
       }
       if (stat.isFile() && stat.size <= MAX_GIT_FILE_BYTES) {
-        const contents = readFileSync7(dotGit, "utf8");
+        const contents = readFileSync8(dotGit, "utf8");
         const match = /^gitdir: (.+?)(?:\r?\n)?$/.exec(contents);
         if (match?.[1]) {
           const gitDirectory = isAbsolute3(match[1]) ? resolve3(match[1]) : resolve3(current, match[1]);
           if (isGitDirectory(gitDirectory)) {
-            return join8(gitDirectory, WORKSPACE_ID_RELATIVE_PATH);
+            return join9(gitDirectory, WORKSPACE_ID_RELATIVE_PATH);
           }
         }
       }
@@ -18813,7 +18830,7 @@ function resolveFromFilesystem(cwd) {
         return null;
       }
     }
-    const parent = dirname7(current);
+    const parent = dirname8(current);
     if (parent === current) break;
     current = parent;
   }
@@ -18821,7 +18838,7 @@ function resolveFromFilesystem(cwd) {
 }
 function isGitDirectory(path) {
   try {
-    return statSync2(join8(path, "HEAD")).isFile();
+    return statSync2(join9(path, "HEAD")).isFile();
   } catch {
     return false;
   }
@@ -18840,7 +18857,7 @@ function inspectPath(path) {
     return { status: "corrupt", path, reason: "invalid_content" };
   }
   try {
-    const contents = readFileSync7(path, "utf8");
+    const contents = readFileSync8(path, "utf8");
     const workspaceId = contents.endsWith("\n") ? contents.slice(0, -1) : contents;
     if ((contents === workspaceId || contents === `${workspaceId}
 `) && isCanonicalWorkspaceId(workspaceId)) {
@@ -18857,14 +18874,14 @@ function inspectPath(path) {
   }
 }
 function createWorkspaceId(path) {
-  const parent = dirname7(path);
+  const parent = dirname8(path);
   const workspaceId = randomUUID2();
-  const temporaryPath = join8(parent, `.workspace-id-${process.pid}-${randomUUID2()}.tmp`);
+  const temporaryPath = join9(parent, `.workspace-id-${process.pid}-${randomUUID2()}.tmp`);
   let temporaryCreated = false;
   let publishing = false;
   try {
     mkdirSync5(parent, { recursive: true, mode: 448 });
-    chmodSync2(parent, 448);
+    chmodSync3(parent, 448);
     const fd = openSync3(
       temporaryPath,
       constants2.O_CREAT | constants2.O_EXCL | constants2.O_WRONLY,
@@ -18927,8 +18944,8 @@ var LEGACY_ENVELOPE_VERSION = 1;
 var ENVELOPE_VERSION = LEGACY_ENVELOPE_VERSION;
 
 // src/hooks/redact.ts
-import { existsSync as existsSync6, readFileSync as readFileSync8, statSync as statSync3 } from "fs";
-import { join as join9 } from "path";
+import { existsSync as existsSync7, readFileSync as readFileSync9, statSync as statSync3 } from "fs";
+import { join as join10 } from "path";
 import { Worker } from "worker_threads";
 var USER_HOME_RULES = [
   {
@@ -19107,7 +19124,7 @@ function toRewriteMove(rewrite, cliVersion, cwd, context) {
 }
 
 // src/hooks/post-rewrite.ts
-var here = dirname8(fileURLToPath(import.meta.url));
+var here = dirname9(fileURLToPath(import.meta.url));
 var GIT_TIMEOUT_MS3 = 1e3;
 var MAX_PAIRS_FILE_BYTES = 1048576;
 var MAX_PAIRS_FILE_AGE_MS = 10 * 60 * 1e3;
@@ -19137,7 +19154,7 @@ function privatePairsFileStat(stat, now) {
 }
 function rewritePairsFromLauncher(env = process.env, now = Date.now()) {
   const path = env.PRIM_REWRITE_PAIRS_FILE;
-  if (!path || !isAbsolute4(path) || !PAIRS_FILE_RE.test(basename2(path))) return;
+  if (!path || !isAbsolute4(path) || !PAIRS_FILE_RE.test(basename3(path))) return;
   let fd;
   try {
     const pathStat = lstatSync3(path);
@@ -19147,7 +19164,7 @@ function rewritePairsFromLauncher(env = process.env, now = Date.now()) {
     if (!privatePairsFileStat(openStat, now) || openStat.dev !== pathStat.dev || openStat.ino !== pathStat.ino) {
       return;
     }
-    const bytes = readFileSync9(fd);
+    const bytes = readFileSync10(fd);
     if (bytes.length !== openStat.size) return;
     let text;
     try {
@@ -19203,17 +19220,18 @@ function validBranch(value) {
 }
 function resolveCliVersion() {
   try {
-    const pkg = JSON.parse(readFileSync9(join10(here, "..", "..", "package.json"), "utf-8"));
+    const pkg = JSON.parse(readFileSync10(join11(here, "..", "..", "package.json"), "utf-8"));
     return pkg.version ?? "unknown";
   } catch {
     return "unknown";
   }
 }
 function spawnBackgroundFlush() {
-  const entry = join10(here, "..", "index.js");
+  const entry = join11(here, "..", "index.js");
   spawn(process.execPath, [entry, "moves", "flush"], {
     detached: true,
-    stdio: "ignore"
+    stdio: "ignore",
+    env: unattendedEnv()
   }).unref();
 }
 function runPostRewrite() {

package/dist/hook-runtime/hooks/post-tool-use.js

@@ -52,8 +52,8 @@ var require_ucs2length = __commonJS({
 });
 
 // src/hooks/post-tool-use.ts
-import { readFileSync as readFileSync14 } from "fs";
-import { dirname as dirname11, join as join16 } from "path";
+import { readFileSync as readFileSync15 } from "fs";
+import { dirname as dirname12, join as join17 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 
 // src/binding.ts
@@ -19998,6 +19998,13 @@ function shellQuote(value) {
 }
 var STABLE_HOOK_ARGUMENTS_RE = /^[-A-Za-z0-9_ ]*$/u;
 var STABLE_HOOK_BIN_RE = /^[A-Za-z0-9][A-Za-z0-9-]*$/u;
+var PRIM_CONFIG_SHELL_RESOLVER = [
+  'prim_absolute() { case "$1" in [/]* ) ;; *) return 1 ;; esac; case "$1" in [[:space:]]*|*[[:space:]]|*[/][/]*|*[/].[/]*|*[/]..[/]*|*[/].|*[/]..|?*[/]) return 1 ;; esac; }; ',
+  'prim_config=${PRIM_CONFIG_DIR:-}; if ! prim_absolute "$prim_config"; then prim_config=${XDG_CONFIG_HOME:-}; if prim_absolute "$prim_config"; then ',
+  'case "$prim_config" in /) prim_config=/prim ;; *) prim_config="$prim_config/prim" ;; esac; ',
+  'else prim_home=${HOME:-}; prim_absolute "$prim_home" || exit 78; case "$prim_home" in /) prim_config=/.config/prim ;; *) prim_config="$prim_home/.config/prim" ;; esac; ',
+  "fi; fi; "
+].join("");
 function stableHookCommand(bin, args = "") {
   if (!STABLE_HOOK_BIN_RE.test(bin) || !STABLE_HOOK_ARGUMENTS_RE.test(args)) {
     throw new Error("invalid stable hook command");
@@ -20007,11 +20014,7 @@ function stableHookCommand(bin, args = "") {
     // it as inert data during the rolling window so an older uninstall or
     // reinstall can remove the stable entry without invoking npm or PATH.
     `prim_legacy_reader='-p ${PKG_NAME}@stable prim-shim.sh ${bin} '; `,
-    'prim_absolute() { case "$1" in [/]* ) ;; *) return 1 ;; esac; case "$1" in [[:space:]]*|*[[:space:]]|*[/][/]*|*[/].[/]*|*[/]..[/]*|*[/].|*[/]..|?*[/]) return 1 ;; esac; }; ',
-    'prim_config=${PRIM_CONFIG_DIR:-}; if ! prim_absolute "$prim_config"; then prim_config=${XDG_CONFIG_HOME:-}; if prim_absolute "$prim_config"; then ',
-    'case "$prim_config" in /) prim_config=/prim ;; *) prim_config="$prim_config/prim" ;; esac; ',
-    'else prim_home=${HOME:-}; prim_absolute "$prim_home" || exit 78; case "$prim_home" in /) prim_config=/.config/prim ;; *) prim_config="$prim_home/.config/prim" ;; esac; ',
-    "fi; fi; ",
+    PRIM_CONFIG_SHELL_RESOLVER,
     `case "$prim_config" in /) prim_launcher=/${STABLE_HOOK_LAUNCHER_NAME} ;; *) prim_launcher="$prim_config/${STABLE_HOOK_LAUNCHER_NAME}" ;; esac; `,
     'exec "$prim_launcher" "$@"'
   ].join("");
@@ -20022,6 +20025,67 @@ function detachedHookShimCommand(bin, args = "") {
   return `payload=$(cat); { trap '' HUP; printf '%s' "$payload" | { ${stableHookCommand(bin, args)}; }; } </dev/null >/dev/null 2>&1 &`;
 }
 
+// src/lib/ansi.ts
+var ANSI_CODES = {
+  yellow: "\x1B[33m",
+  magenta: "\x1B[35m",
+  blue: "\x1B[34m",
+  cyan: "\x1B[36m",
+  green: "\x1B[32m",
+  red: "\x1B[31m",
+  // 256-color approximation of the orange trigger marker (xterm 208).
+  orange: "\x1B[38;5;208m",
+  gray: "\x1B[90m"
+};
+var ANSI_RESET = "\x1B[0m";
+var ANSI_BOLD = "\x1B[1m";
+function supportsColor() {
+  if (process.env.NO_COLOR !== void 0 && process.env.NO_COLOR !== "") {
+    return false;
+  }
+  return process.stderr.isTTY === true;
+}
+function color(text, c) {
+  if (!supportsColor()) {
+    return text;
+  }
+  return `${ANSI_CODES[c]}${text}${ANSI_RESET}`;
+}
+function bold(text) {
+  if (!supportsColor()) {
+    return text;
+  }
+  return `${ANSI_BOLD}${text}${ANSI_RESET}`;
+}
+var MAX_HEALTH_ERROR_LENGTH = 240;
+function boundedHealthError(value) {
+  if (!value) return void 0;
+  const clean = terminalSafeLine(value);
+  if (!clean) return void 0;
+  return clean.length <= MAX_HEALTH_ERROR_LENGTH ? clean : `${clean.slice(0, MAX_HEALTH_ERROR_LENGTH - 1)}\u2026`;
+}
+
+// src/lib/delivery-backlog.ts
+var MS_PER_SECOND = 1e3;
+var MS_PER_MINUTE = 60 * MS_PER_SECOND;
+var MS_PER_HOUR = 60 * MS_PER_MINUTE;
+var MS_PER_DAY = 24 * MS_PER_HOUR;
+function isNonNegativeInteger(value) {
+  return typeof value === "number" && Number.isInteger(value) && value >= 0;
+}
+function isPositiveInteger(value) {
+  return isNonNegativeInteger(value) && value > 0;
+}
+function deliveryBacklogState(ingestion) {
+  if (ingestion?.healthy !== false) return void 0;
+  const failures = ingestion.consecutiveFailures;
+  const failedWithoutProgress = failures !== 0 && !(isPositiveInteger(failures) && isPositiveInteger(ingestion.lastFailedDrainAcknowledgedCount));
+  if (failedWithoutProgress) return "failing";
+  const retained = ingestion.lastRetainedBucketCount;
+  if (!isNonNegativeInteger(retained)) return "failing";
+  return retained > 0 ? "retained" : "draining";
+}
+
 // src/lib/presence.ts
 var DECISION_ORIGIN = "https://app.getprimitive.ai";
 function validDecisionUrl(value) {
@@ -20096,7 +20160,8 @@ function formatStatusline(version, snapshot, resolveIngestionStatus, options = {
     if (snapshot.ingestion?.healthy === false) {
       const pending = snapshot.ingestion.pendingCount;
       const qualifier = snapshot.ingestion.pendingSampled ? "at least " : "";
-      return `primitive ${version} (daemon: degraded \xB7 delivery: stalled${typeof pending === "number" ? ` \xB7 ${qualifier}${String(pending)} pending` : ""}${repositorySuffix}${ingestionSuffix(ingestionStatus)})`;
+      const delivery = deliveryBacklogState(snapshot.ingestion) === "draining" && snapshot.heartbeat?.healthy === true ? "draining" : "stalled";
+      return `primitive ${version} (daemon: degraded \xB7 delivery: ${delivery}${typeof pending === "number" ? ` \xB7 ${qualifier}${String(pending)} pending` : ""}${repositorySuffix}${ingestionSuffix(ingestionStatus)})`;
     }
     if (snapshot.heartbeat?.healthy === false) {
       return `primitive ${version} (daemon: degraded \xB7 presence: unavailable${repositorySuffix}${ingestionSuffix(ingestionStatus)})`;
@@ -20599,6 +20664,53 @@ import {
   writeFileSync as writeFileSync5
 } from "fs";
 import { delimiter, dirname as dirname8, isAbsolute as isAbsolute5, join as join11, resolve as resolve4 } from "path";
+
+// src/lib/git-hook-contract.ts
+var GIT_HOOK_ENTRYPOINT_CONTENT = `#!/bin/sh
+# prim git hook entrypoint v1 \u2014 managed by prim; do not edit.
+# Run by the "# >>> prim <hook> hook >>>" block in a Git hook file. Acts only
+# where prim is active (git config prim.active true) and never fails the hook.
+case "$0" in */*) prim_dir=\${0%/*} ;; *) exit 0 ;; esac
+prim_launcher="$prim_dir/${STABLE_HOOK_LAUNCHER_NAME}"
+[ -x "$prim_launcher" ] || exit 0
+[ "$(git config --get prim.active 2>/dev/null)" = "true" ] || exit 0
+prim_hook=\${1-}
+if [ "$#" -gt 0 ]; then shift; fi
+case "$prim_hook" in
+pre-commit)
+  "$prim_launcher" prim-pre-commit "$@" || :
+  ;;
+post-commit)
+  prim_sha=$(git rev-parse --verify HEAD 2>/dev/null) || exit 0
+  case "$prim_sha" in *[!0-9a-f]* | "") exit 0 ;; esac
+  case "\${#prim_sha}" in 40 | 64) ;; *) exit 0 ;; esac
+  prim_branch=$(git symbolic-ref --quiet --short HEAD 2>/dev/null) || prim_branch=
+  prim_observed=$(mktemp "\${TMPDIR:-/tmp}/prim-post-commit-observed.XXXXXXXX" 2>/dev/null) || prim_observed=
+  (
+    trap '' HUP
+    trap 'if [ -n "$prim_observed" ]; then rm -f "$prim_observed"; fi' 0
+    PRIM_COMMIT_SHA=$prim_sha PRIM_COMMIT_BRANCH=$prim_branch PRIM_COMMIT_OBSERVED_FILE=$prim_observed "$prim_launcher" prim-post-commit
+  ) </dev/null >/dev/null 2>&1 &
+  ;;
+post-rewrite)
+  case "\${1-}" in amend | rebase) prim_source=$1 ;; *) exit 0 ;; esac
+  prim_pairs=$(mktemp "\${TMPDIR:-/tmp}/prim-post-rewrite-pairs.XXXXXXXX" 2>/dev/null) || exit 0
+  if ! chmod 600 "$prim_pairs" 2>/dev/null || ! cat >"$prim_pairs"; then
+    rm -f "$prim_pairs"
+    exit 0
+  fi
+  prim_branch=$(git symbolic-ref --quiet --short HEAD 2>/dev/null) || prim_branch=
+  (
+    trap '' HUP
+    trap 'rm -f "$prim_pairs"' 0
+    PRIM_REWRITE_SOURCE=$prim_source PRIM_REWRITE_BRANCH=$prim_branch PRIM_REWRITE_PAIRS_FILE=$prim_pairs "$prim_launcher" prim-post-rewrite
+  ) </dev/null >/dev/null 2>&1 &
+  ;;
+esac
+exit 0
+`;
+
+// src/lib/hook-runtime.ts
 var RELEASE_PREFIX = "release-";
 var MAX_MANIFEST_BYTES = 64 * 1024;
 var RELEASE_GRACE_MS = 10 * 60 * 1e3;
@@ -25682,17 +25794,30 @@ function requireDurableIngestAcknowledgement(value, expected, cwd = process.cwd(
 import {
   appendFileSync,
   closeSync as closeSync3,
-  existsSync as existsSync10,
+  existsSync as existsSync11,
   fstatSync,
   mkdirSync as mkdirSync7,
   openSync as openSync3,
   opendirSync,
-  readFileSync as readFileSync12,
+  readFileSync as readFileSync13,
   readSync,
-  readdirSync as readdirSync3
+  readdirSync as readdirSync4
 } from "fs";
-import { dirname as dirname10, join as join14 } from "path";
-var JOURNAL_DIR = join14(primConfigDirectory(), "moves");
+import { dirname as dirname11, join as join15 } from "path";
+
+// src/drain-progress.ts
+import {
+  chmodSync as chmodSync5,
+  existsSync as existsSync10,
+  readFileSync as readFileSync12,
+  readdirSync as readdirSync3,
+  rmSync as rmSync6,
+  rmdirSync
+} from "fs";
+import { basename as basename2, dirname as dirname10, join as join14 } from "path";
+
+// src/journal.ts
+var JOURNAL_DIR = join15(primConfigDirectory(), "moves");
 var UNBOUND_BUCKET = "_unbound";
 var JOURNAL_BASENAME = "journal.ndjson";
 var JOURNAL_STATS_SAMPLE_BYTES = 64 * 1024;
@@ -25704,15 +25829,15 @@ function envSlug(apiUrl) {
   return slug;
 }
 function currentEnvDir() {
-  return join14(JOURNAL_DIR, envSlug(getSiteUrl()));
+  return join15(JOURNAL_DIR, envSlug(getSiteUrl()));
 }
 var DIR_MODE = 448;
 var FILE_MODE2 = 384;
 var SAFE_BUCKET = /^[A-Za-z0-9_-]+$/;
 var RESERVED_BUCKETS = /* @__PURE__ */ new Set([UNBOUND_BUCKET, "_legacy"]);
 function appendMoveToPath(path, move) {
-  const dir = dirname10(path);
-  if (!existsSync10(dir)) {
+  const dir = dirname11(path);
+  if (!existsSync11(dir)) {
     mkdirSync7(dir, { recursive: true, mode: DIR_MODE });
   }
   appendFileSync(path, `${JSON.stringify(move)}
@@ -25720,10 +25845,10 @@ function appendMoveToPath(path, move) {
 }
 function bucketDir(orgId) {
   const safe = orgId !== void 0 && SAFE_BUCKET.test(orgId) && !RESERVED_BUCKETS.has(orgId);
-  return join14(currentEnvDir(), safe ? orgId : UNBOUND_BUCKET);
+  return join15(currentEnvDir(), safe ? orgId : UNBOUND_BUCKET);
 }
 function journalPath(orgId) {
-  return join14(bucketDir(orgId), JOURNAL_BASENAME);
+  return join15(bucketDir(orgId), JOURNAL_BASENAME);
 }
 function appendMove(move, orgId) {
   appendMoveToPath(journalPath(orgId), move);
@@ -25750,51 +25875,9 @@ import { platform } from "os";
 var AGENT_ENVELOPE_VERSION = 3;
 
 // src/hooks/redact.ts
-import { existsSync as existsSync11, readFileSync as readFileSync13, statSync as statSync5 } from "fs";
-import { join as join15 } from "path";
+import { existsSync as existsSync12, readFileSync as readFileSync14, statSync as statSync5 } from "fs";
+import { join as join16 } from "path";
 import { Worker } from "worker_threads";
-
-// src/lib/ansi.ts
-var ANSI_CODES = {
-  yellow: "\x1B[33m",
-  magenta: "\x1B[35m",
-  blue: "\x1B[34m",
-  cyan: "\x1B[36m",
-  green: "\x1B[32m",
-  red: "\x1B[31m",
-  // 256-color approximation of the orange trigger marker (xterm 208).
-  orange: "\x1B[38;5;208m",
-  gray: "\x1B[90m"
-};
-var ANSI_RESET = "\x1B[0m";
-var ANSI_BOLD = "\x1B[1m";
-function supportsColor() {
-  if (process.env.NO_COLOR !== void 0 && process.env.NO_COLOR !== "") {
-    return false;
-  }
-  return process.stderr.isTTY === true;
-}
-function color(text, c) {
-  if (!supportsColor()) {
-    return text;
-  }
-  return `${ANSI_CODES[c]}${text}${ANSI_RESET}`;
-}
-function bold(text) {
-  if (!supportsColor()) {
-    return text;
-  }
-  return `${ANSI_BOLD}${text}${ANSI_RESET}`;
-}
-var MAX_HEALTH_ERROR_LENGTH = 240;
-function boundedHealthError(value) {
-  if (!value) return void 0;
-  const clean = terminalSafeLine(value);
-  if (!clean) return void 0;
-  return clean.length <= MAX_HEALTH_ERROR_LENGTH ? clean : `${clean.slice(0, MAX_HEALTH_ERROR_LENGTH - 1)}\u2026`;
-}
-
-// src/hooks/redact.ts
 var USER_HOME_RULES = [
   {
     pattern: /\/Users\/[^/\\\s"'`]+/g,
@@ -25869,15 +25952,15 @@ function normalizedWorkspaceFlags(value) {
   return [...new Set(`g${requested}`)].sort().join("");
 }
 function loadWorkspaceRules(cwd) {
-  const path = join15(cwd, WORKSPACE_FILE2);
-  if (!existsSync11(path)) return [];
+  const path = join16(cwd, WORKSPACE_FILE2);
+  if (!existsSync12(path)) return [];
   let cfg;
   try {
     if (statSync5(path).size > MAX_WORKSPACE_CONFIG_BYTES) {
       debugRedaction(`ignoring oversized ${WORKSPACE_FILE2}`);
       return [];
     }
-    cfg = JSON.parse(readFileSync13(path, "utf-8"));
+    cfg = JSON.parse(readFileSync14(path, "utf-8"));
   } catch {
     debugRedaction(`ignoring unparseable ${WORKSPACE_FILE2}`);
     return [];
@@ -26182,10 +26265,10 @@ function editingToolsFor(agent) {
   }
   return EDITING_TOOLS;
 }
-var here = dirname11(fileURLToPath2(import.meta.url));
+var here = dirname12(fileURLToPath2(import.meta.url));
 function resolveCliVersion() {
   try {
-    const pkg = JSON.parse(readFileSync14(join16(here, "..", "..", "package.json"), "utf-8"));
+    const pkg = JSON.parse(readFileSync15(join17(here, "..", "..", "package.json"), "utf-8"));
     return pkg.version ?? "unknown";
   } catch {
     return "unknown";