@tokenfactory/acc-runner 0.27.0 → 0.27.1

package/dist/runtime/worktree.d.ts

@@ -0,0 +1,74 @@
+export declare function workDir(): string;
+export interface PreparedWorktree {
+    path: string;
+    /**
+     * v0.12-RESUME — true when a pre-existing registered worktree on
+     * the expected branch was reused instead of force-recreated. The
+     * caller logs this so an operator can audit how often the resume
+     * path actually fires vs. force-recreate (which is the path taken
+     * on every fresh task and on every stale/mismatched leftover).
+     * Optional so v0.11-F-era test stubs that omit the flag remain
+     * valid; absent or false both mean "fresh-recreate path".
+     */
+    resumed?: boolean;
+    cleanup(): Promise<void>;
+}
+export type GitExec = (args: string[], cwd: string) => Promise<void>;
+export type WorktreeInspector = (repoPath: string, taskId: string) => Promise<WorktreeInspection | null>;
+export interface PrepareWorktreeOptions {
+    repoPath: string;
+    /**
+     * v0.41-B: optional mirror clone path used exclusively for `git
+     * worktree` sub-commands (add/remove/prune). `git fetch` still runs
+     * against `repoPath` (which has credentials + the full ref history),
+     * so when this is set the runner reads from the operator's clone and
+     * writes worktree registrations against a separate path — sidestepping
+     * the virtiofs lock conflicts that arise when another process (e.g.
+     * Cowork) holds `repoPath` open. Undefined preserves v0.40 byte-for-
+     * byte behaviour: every git op runs against `repoPath`.
+     */
+    worktreeRepoPath?: string;
+    taskId: string;
+    branch: string;
+    baseBranch: string;
+    git?: GitExec;
+    /**
+     * v0.12-RESUME — override worktree-state inspection for tests.
+     * Defaults to the real `inspectExistingWorktree` which shells out
+     * via `execa`. Tests inject a stub so the resume-vs-fresh branch is
+     * exercisable without standing up a real git repo on disk.
+     */
+    inspect?: WorktreeInspector;
+}
+export declare function worktreePath(taskId: string): string;
+/**
+ * v0.12-RESUME — capture the state of `worktreePath(taskId)` so the
+ * caller can decide between resume (reuse the dir + branch) and
+ * force-recreate (the legacy v0.11-F behaviour). Returns null when
+ * the directory does not exist.
+ *
+ * `dirty` is set when `git status --porcelain` inside the worktree
+ * lists at least one entry — meaning the prior (crashed) runner left
+ * uncommitted edits Claude can pick up from. `branch` is the result
+ * of `git rev-parse --abbrev-ref HEAD` — when it matches the
+ * task's expected branch the worktree is a valid resume candidate.
+ *
+ * Best-effort: failures (corrupt worktree, missing .git/worktrees
+ * entry, etc.) return `registered: false, branch: null` so the
+ * caller falls back to force-recreate rather than crashing.
+ */
+export interface WorktreeInspection {
+    path: string;
+    registered: boolean;
+    branch: string | null;
+    dirty: boolean;
+}
+export declare function inspectExistingWorktree(repoPath: string, taskId: string): Promise<WorktreeInspection | null>;
+export declare function prepareTaskWorktree(opts: PrepareWorktreeOptions): Promise<PreparedWorktree>;
+export interface OrphanWorktree {
+    path: string;
+    taskId: string;
+}
+/** Doctor helper: dirs under workDir() not registered in `git worktree list`. */
+export declare function listOrphanWorktrees(repoPath: string): Promise<OrphanWorktree[]>;
+//# sourceMappingURL=worktree.d.ts.map

package/dist/runtime/worktree.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"worktree.d.ts","sourceRoot":"","sources":["../../src/runtime/worktree.ts"],"names":[],"mappings":"AAwCA,wBAAgB,OAAO,IAAI,MAAM,CAEhC;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb;;;;;;;;OAQG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1B;AAED,MAAM,MAAM,OAAO,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AACrE,MAAM,MAAM,iBAAiB,GAAG,CAC9B,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,KACX,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC,CAAC;AAExC,MAAM,WAAW,sBAAsB;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB;;;;;;;;;OASG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd;;;;;OAKG;IACH,OAAO,CAAC,EAAE,iBAAiB,CAAC;CAC7B;AAMD,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAEnD;AAyBD;;;;;;;;;;;;;;;GAeG;AACH,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,OAAO,CAAC;IACpB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,KAAK,EAAE,OAAO,CAAC;CAChB;AAED,wBAAsB,uBAAuB,CAC3C,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC,CAgDpC;AAED,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,sBAAsB,GAC3B,OAAO,CAAC,gBAAgB,CAAC,CA8D3B;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,iFAAiF;AACjF,wBAAsB,mBAAmB,CACvC,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,cAAc,EAAE,CAAC,CA+B3B"}

package/dist/runtime/worktree.js

@@ -0,0 +1,211 @@
+/**
+ * Per-task isolated `git worktree` at `~/.cache/acc-runner/work/<task_id>/`
+ * so parallel runners on the same machine don't race on the shared
+ * clone's branch checkout. Cleaned up on every task completion path.
+ *
+ * v0.19-T64 — start-point contract. A FRESH task branch MUST be cut from
+ * the LATEST integration tip, not a stale local ref. `git fetch` is driven
+ * by the caller (task-runner.ts), which fetches origin and passes the
+ * freshly-fetched remote-tracking ref (`origin/<integration>`) as
+ * `baseBranch`. T-63-1 shipped a PR that conflicted against the real
+ * integration because a 13-commit-stale LOCAL ref was used as the base;
+ * forking from `origin/<integration>` is the fix. On a caller-side fetch
+ * failure the caller falls back to the local ref and emits
+ * `runner.stale_base_fallback` — the worktree still starts from whatever
+ * `baseBranch` it is handed, so this module never aborts for staleness.
+ *
+ * v0.12-RESUME — when a prior runner crashed mid-task and the
+ * v0.12 stale-running sweep returned the task to queued, a fresh
+ * runner that picks the same task back up will find a leftover
+ * worktree directory + git registration. The pre-v0.12 behaviour
+ * was to force-remove and recreate, throwing away the dead
+ * runner's in-progress edits. We now detect this case
+ * (`inspectExistingWorktree`), preserve the directory when it is
+ * still a valid registration on the expected task branch, and
+ * mark the returned `PreparedWorktree` as `resumed: true` so the
+ * task-runner can log the resume and Claude picks up from the
+ * partially-committed state instead of restarting from baseBranch.
+ */
+import fs from "node:fs/promises";
+import path from "node:path";
+import { execa } from "execa";
+import { buildEnv } from "../bin-resolve.js";
+import { cacheDir } from "./cache-dir.js";
+// Lazy so tests can override ACC_RUNNER_CACHE_DIR / HOME between cases.
+//
+// v1.00-B: resolves through `cacheDir()` (honours ACC_RUNNER_CACHE_DIR)
+// rather than a hardcoded ~/.cache path, so two ephemeral runners with
+// distinct cache dirs get isolated `work/` trees and never race on each
+// other's per-task worktrees.
+export function workDir() {
+    return path.join(cacheDir(), "work");
+}
+function defaultGitExec(args, cwd) {
+    return execa("git", args, { cwd, env: buildEnv() }).then(() => undefined);
+}
+export function worktreePath(taskId) {
+    return path.join(workDir(), taskId);
+}
+async function pathExists(p) {
+    try {
+        await fs.access(p);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+async function removeWorktree(repoPath, target, git) {
+    if (await pathExists(target)) {
+        // Best-effort: deregister, then nuke residue. Partial cleanup
+        // shouldn't fail the surrounding task lifecycle.
+        try {
+            await git(["worktree", "remove", "--force", target], repoPath);
+        }
+        catch { /* noop */ }
+        await fs.rm(target, { recursive: true, force: true });
+    }
+    try {
+        await git(["worktree", "prune"], repoPath);
+    }
+    catch { /* noop */ }
+}
+export async function inspectExistingWorktree(repoPath, taskId) {
+    const target = worktreePath(taskId);
+    if (!(await pathExists(target)))
+        return null;
+    // `git worktree list --porcelain` runs from the *parent* clone so
+    // the registration check sees the canonical list. A target dir
+    // that exists on disk but is absent here is an orphan — the
+    // caller will treat it as not-registered and force-recreate.
+    let registered = false;
+    try {
+        const { stdout } = await execa("git", ["worktree", "list", "--porcelain"], { cwd: repoPath, env: buildEnv() });
+        for (const line of stdout.split(/\r?\n/)) {
+            const m = /^worktree (.+)$/.exec(line);
+            if (m && path.resolve(m[1]) === path.resolve(target)) {
+                registered = true;
+                break;
+            }
+        }
+    }
+    catch {
+        registered = false;
+    }
+    let branch = null;
+    try {
+        const { stdout } = await execa("git", ["rev-parse", "--abbrev-ref", "HEAD"], { cwd: target, env: buildEnv() });
+        branch = stdout.trim() || null;
+    }
+    catch {
+        branch = null;
+    }
+    let dirty = false;
+    try {
+        const { stdout } = await execa("git", ["status", "--porcelain"], { cwd: target, env: buildEnv() });
+        dirty = stdout.trim().length > 0;
+    }
+    catch {
+        dirty = false;
+    }
+    return { path: target, registered, branch, dirty };
+}
+export async function prepareTaskWorktree(opts) {
+    const git = opts.git ?? defaultGitExec;
+    await fs.mkdir(workDir(), { recursive: true });
+    const target = worktreePath(opts.taskId);
+    // v0.41-B: every `git worktree` sub-command runs against this base,
+    // which is the mirror clone when configured and the operator's
+    // working clone otherwise. `git fetch` (driven by the caller) stays
+    // on opts.repoPath so credentials and ref history come from the
+    // working clone; only worktree registration/removal/prune relocate.
+    const worktreeBase = opts.worktreeRepoPath ?? opts.repoPath;
+    // v0.12-RESUME — if a leftover worktree is registered on the
+    // expected branch, preserve it so Claude can pick up where the
+    // dead runner left off. Otherwise (orphan dir, wrong branch,
+    // corrupt state) fall through to the v0.11-F force-recreate
+    // path so the new task starts from a known baseBranch tip.
+    //
+    // We only enter the resume path when the inspector reports
+    // registered=true on the expected branch. The real inspector
+    // shells to `git worktree list --porcelain`; tests inject a stub.
+    // When `opts.repoPath` is not a real git checkout (test fixtures
+    // like "/repo"), the default inspector swallows the `git` error
+    // and returns registered=false, preserving v0.11-F's force-
+    // recreate semantics for the existing test suite.
+    const inspect = opts.inspect ?? inspectExistingWorktree;
+    const existing = await inspect(worktreeBase, opts.taskId);
+    if (existing && existing.registered && existing.branch === opts.branch) {
+        let cleaned = false;
+        return {
+            path: target,
+            resumed: true,
+            async cleanup() {
+                if (cleaned)
+                    return;
+                cleaned = true;
+                await removeWorktree(worktreeBase, target, git);
+            },
+        };
+    }
+    await removeWorktree(worktreeBase, target, git);
+    // `-B <branch> <path> <baseBranch>` force-creates the task branch at
+    // baseBranch's tip, overwriting a stale ref from a prior crashed run.
+    // v0.19 T-64-1: for a FRESH task the caller passes the freshly-fetched
+    // origin tip (`origin/<integration>`) as baseBranch — NOT a stale local
+    // ref — so the branch starts at the latest integration HEAD. The resume
+    // path above returns before reaching here, so a resumed partial branch
+    // is never reset to this base.
+    await git(["worktree", "add", "-B", opts.branch, target, opts.baseBranch], worktreeBase);
+    let cleaned = false;
+    return {
+        path: target,
+        resumed: false,
+        async cleanup() {
+            if (cleaned)
+                return;
+            cleaned = true;
+            await removeWorktree(worktreeBase, target, git);
+        },
+    };
+}
+/** Doctor helper: dirs under workDir() not registered in `git worktree list`. */
+export async function listOrphanWorktrees(repoPath) {
+    let entries;
+    try {
+        entries = await fs.readdir(workDir());
+    }
+    catch (err) {
+        if (err.code === "ENOENT")
+            return [];
+        throw err;
+    }
+    const registered = new Set();
+    try {
+        const { stdout } = await execa("git", ["worktree", "list", "--porcelain"], { cwd: repoPath, env: buildEnv() });
+        for (const line of stdout.split(/\r?\n/)) {
+            const m = /^worktree (.+)$/.exec(line);
+            if (m)
+                registered.add(path.resolve(m[1]));
+        }
+    }
+    catch {
+        // Without a usable repo we can't distinguish; surface everything.
+    }
+    const orphans = [];
+    for (const name of entries) {
+        const p = path.join(workDir(), name);
+        try {
+            const stat = await fs.stat(p);
+            if (!stat.isDirectory())
+                continue;
+        }
+        catch {
+            continue;
+        }
+        if (!registered.has(p))
+            orphans.push({ path: p, taskId: name });
+    }
+    return orphans;
+}
+//# sourceMappingURL=worktree.js.map

package/dist/runtime/worktree.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"worktree.js","sourceRoot":"","sources":["../../src/runtime/worktree.ts"],"names":[],"mappings":"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"}

package/dist/secrets/inject.d.ts

@@ -0,0 +1,70 @@
+/**
+ * Runner-side `{{secret:NAME}}` placeholder expander.
+ *
+ * The runner never holds the service-role key (which would let it pull
+ * arbitrary plaintext from the vault). Instead, name→id resolution and
+ * decryption run server-side behind the user's JWT, and the runner POSTs
+ * to /api/runner/expand-secret for each unique name encountered in a
+ * tool-call argument tree.
+ *
+ * The plaintext flow is:
+ *
+ *   1. Runner extracts `{{secret:NAME}}` placeholders from the args.
+ *   2. For each unique NAME, runner POSTs `/api/runner/expand-secret`
+ *      with `{ name, agent_id, tool_name }`. The endpoint uses
+ *      `getAdminClient()` to call acc.resolve_secret_id_by_name (v0.7-D)
+ *      then acc.fetch_secret_for_runtime (v0.7-B, frozen).
+ *   3. Plaintext is held in memory ONLY for the duration of the tool
+ *      call. We never log it, never serialize it, never copy it to the
+ *      DB. The pre-expansion args (still containing the literal
+ *      `{{secret:…}}`) are what gets logged to telemetry.
+ *   4. Caller hands the expanded result to MCP stdio.
+ *
+ * Telemetry tripwire test: a fake secret named `TRIPWIRE_VALUE` with
+ * plaintext `tripwire-do-not-log-me` must NOT appear in any captured
+ * telemetry row. See packages/acc-runner/tests/expand-args.test.ts.
+ *
+ * Deviations from planning/v0.7-D-chat-encryption-and-visibility.md:
+ *   - The planning doc imagined `import { supabaseAdmin } from '../db'`
+ *     — a service-role client at the runner. That doesn't exist (and
+ *     shouldn't; the runner is end-user-deployed). The /api/runner/
+ *     expand-secret endpoint is the actual seam.
+ *   - The planning doc's single fetch_secret_for_runtime call is split
+ *     into resolve_secret_id_by_name → fetch_secret_for_runtime because
+ *     v0.7-B's frozen contract takes a uuid, not a name.
+ */
+export declare const SECRET_PATTERN: RegExp;
+/**
+ * Fetcher signature. Production wires this to an HTTP call against
+ * /api/runner/expand-secret; tests pass a stub.
+ *
+ * MUST throw on any failure (missing secret, locked vault, denied
+ * grant, rate-limit). MUST NOT include any secret-derived data in the
+ * error message.
+ */
+export type SecretFetcher = (name: string, agentId: string, toolName?: string) => Promise<string>;
+export interface ExpandResult {
+    expanded: string;
+    consumedSecrets: string[];
+}
+/**
+ * Expand `{{secret:NAME}}` placeholders in a single string. Returns the
+ * expanded string plus the list of secret names consumed (for telemetry
+ * of NAMES, never plaintexts). Throws if any required secret is
+ * unavailable — partial expansion is never returned (atomic).
+ */
+export declare function expandSecretsInString(raw: string, agentId: string, fetcher: SecretFetcher, toolName?: string): Promise<ExpandResult>;
+/**
+ * Build an HTTP-backed SecretFetcher pointing at the deployed
+ * /api/runner/expand-secret endpoint. The runner wires this at startup
+ * once it has its user JWT and config.
+ *
+ * The endpoint MUST NOT echo the plaintext into any error path; this
+ * helper trusts that contract.
+ */
+export declare function makeHttpSecretFetcher(opts: {
+    publicUrl: string;
+    jwt: string;
+    fetchImpl?: typeof fetch;
+}): SecretFetcher;
+//# sourceMappingURL=inject.d.ts.map

package/dist/secrets/inject.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"inject.d.ts","sourceRoot":"","sources":["../../src/secrets/inject.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AAEH,eAAO,MAAM,cAAc,QAAsC,CAAC;AAElE;;;;;;;GAOG;AACH,MAAM,MAAM,aAAa,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;AAElG,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,MAAM,EAAE,CAAC;CAC3B;AAED;;;;;GAKG;AACH,wBAAsB,qBAAqB,CACzC,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,aAAa,EACtB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,YAAY,CAAC,CA4BvB;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE;IAC1C,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,CAAC,EAAE,OAAO,KAAK,CAAC;CAC1B,GAAG,aAAa,CAwBhB"}

package/dist/secrets/inject.js

@@ -0,0 +1,102 @@
+/**
+ * Runner-side `{{secret:NAME}}` placeholder expander.
+ *
+ * The runner never holds the service-role key (which would let it pull
+ * arbitrary plaintext from the vault). Instead, name→id resolution and
+ * decryption run server-side behind the user's JWT, and the runner POSTs
+ * to /api/runner/expand-secret for each unique name encountered in a
+ * tool-call argument tree.
+ *
+ * The plaintext flow is:
+ *
+ *   1. Runner extracts `{{secret:NAME}}` placeholders from the args.
+ *   2. For each unique NAME, runner POSTs `/api/runner/expand-secret`
+ *      with `{ name, agent_id, tool_name }`. The endpoint uses
+ *      `getAdminClient()` to call acc.resolve_secret_id_by_name (v0.7-D)
+ *      then acc.fetch_secret_for_runtime (v0.7-B, frozen).
+ *   3. Plaintext is held in memory ONLY for the duration of the tool
+ *      call. We never log it, never serialize it, never copy it to the
+ *      DB. The pre-expansion args (still containing the literal
+ *      `{{secret:…}}`) are what gets logged to telemetry.
+ *   4. Caller hands the expanded result to MCP stdio.
+ *
+ * Telemetry tripwire test: a fake secret named `TRIPWIRE_VALUE` with
+ * plaintext `tripwire-do-not-log-me` must NOT appear in any captured
+ * telemetry row. See packages/acc-runner/tests/expand-args.test.ts.
+ *
+ * Deviations from planning/v0.7-D-chat-encryption-and-visibility.md:
+ *   - The planning doc imagined `import { supabaseAdmin } from '../db'`
+ *     — a service-role client at the runner. That doesn't exist (and
+ *     shouldn't; the runner is end-user-deployed). The /api/runner/
+ *     expand-secret endpoint is the actual seam.
+ *   - The planning doc's single fetch_secret_for_runtime call is split
+ *     into resolve_secret_id_by_name → fetch_secret_for_runtime because
+ *     v0.7-B's frozen contract takes a uuid, not a name.
+ */
+export const SECRET_PATTERN = /\{\{secret:([A-Z][A-Z0-9_]*)\}\}/g;
+/**
+ * Expand `{{secret:NAME}}` placeholders in a single string. Returns the
+ * expanded string plus the list of secret names consumed (for telemetry
+ * of NAMES, never plaintexts). Throws if any required secret is
+ * unavailable — partial expansion is never returned (atomic).
+ */
+export async function expandSecretsInString(raw, agentId, fetcher, toolName) {
+    const matches = [...raw.matchAll(SECRET_PATTERN)];
+    if (matches.length === 0) {
+        return { expanded: raw, consumedSecrets: [] };
+    }
+    const names = [...new Set(matches.map((m) => m[1]))];
+    const plaintexts = new Map();
+    for (const name of names) {
+        try {
+            const plaintext = await fetcher(name, agentId, toolName);
+            plaintexts.set(name, plaintext);
+        }
+        catch (err) {
+            const message = err instanceof Error ? err.message : String(err);
+            throw new Error(`secret_unavailable: ${name}: ${message}`);
+        }
+    }
+    const expanded = raw.replace(SECRET_PATTERN, (_match, name) => {
+        const value = plaintexts.get(name);
+        if (value === undefined) {
+            throw new Error(`secret_unavailable: ${name}: missing after fetch`);
+        }
+        return value;
+    });
+    return { expanded, consumedSecrets: names };
+}
+/**
+ * Build an HTTP-backed SecretFetcher pointing at the deployed
+ * /api/runner/expand-secret endpoint. The runner wires this at startup
+ * once it has its user JWT and config.
+ *
+ * The endpoint MUST NOT echo the plaintext into any error path; this
+ * helper trusts that contract.
+ */
+export function makeHttpSecretFetcher(opts) {
+    const f = opts.fetchImpl ?? fetch;
+    const endpoint = `${opts.publicUrl.replace(/\/$/, "")}/api/runner/expand-secret`;
+    return async (name, agentId, toolName) => {
+        const res = await f(endpoint, {
+            method: "POST",
+            headers: {
+                Authorization: `Bearer ${opts.jwt}`,
+                "Content-Type": "application/json",
+            },
+            body: JSON.stringify({ name, agent_id: agentId, tool_name: toolName ?? null }),
+        });
+        if (!res.ok) {
+            // Read body for the error reason, but the endpoint contract is
+            // that the body NEVER contains plaintext.
+            const text = await res.text().catch(() => "");
+            throw new Error(`expand-secret HTTP ${res.status}: ${text || res.statusText}`);
+        }
+        const data = (await res.json());
+        if (typeof data.plaintext !== "string") {
+            throw new Error("expand-secret response missing plaintext");
+        }
+        return data.plaintext;
+    };
+}
+//# sourceMappingURL=inject.js.map

package/dist/secrets/inject.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"inject.js","sourceRoot":"","sources":["../../src/secrets/inject.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AAEH,MAAM,CAAC,MAAM,cAAc,GAAG,mCAAmC,CAAC;AAiBlE;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,GAAW,EACX,OAAe,EACf,OAAsB,EACtB,QAAiB;IAEjB,MAAM,OAAO,GAAG,CAAC,GAAG,GAAG,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC;IAClD,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,eAAe,EAAE,EAAE,EAAE,CAAC;IAChD,CAAC;IAED,MAAM,KAAK,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACrD,MAAM,UAAU,GAAG,IAAI,GAAG,EAAkB,CAAC;IAE7C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,CAAC;YACH,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;YACzD,UAAU,CAAC,GAAG,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QAClC,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,OAAO,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACjE,MAAM,IAAI,KAAK,CAAC,uBAAuB,IAAI,KAAK,OAAO,EAAE,CAAC,CAAC;QAC7D,CAAC;IACH,CAAC;IAED,MAAM,QAAQ,GAAG,GAAG,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC,MAAM,EAAE,IAAY,EAAE,EAAE;QACpE,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACnC,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,MAAM,IAAI,KAAK,CAAC,uBAAuB,IAAI,uBAAuB,CAAC,CAAC;QACtE,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC,CAAC;IAEH,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,KAAK,EAAE,CAAC;AAC9C,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,qBAAqB,CAAC,IAIrC;IACC,MAAM,CAAC,GAAG,IAAI,CAAC,SAAS,IAAI,KAAK,CAAC;IAClC,MAAM,QAAQ,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,2BAA2B,CAAC;IACjF,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE;QACvC,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC,QAAQ,EAAE;YAC5B,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,aAAa,EAAE,UAAU,IAAI,CAAC,GAAG,EAAE;gBACnC,cAAc,EAAE,kBAAkB;aACnC;YACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,IAAI,IAAI,EAAE,CAAC;SAC/E,CAAC,CAAC;QACH,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;YACZ,+DAA+D;YAC/D,0CAA0C;YAC1C,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;YAC9C,MAAM,IAAI,KAAK,CAAC,sBAAsB,GAAG,CAAC,MAAM,KAAK,IAAI,IAAI,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC;QACjF,CAAC;QACD,MAAM,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAA4B,CAAC;QAC3D,IAAI,OAAO,IAAI,CAAC,SAAS,KAAK,QAAQ,EAAE,CAAC;YACvC,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;QAC9D,CAAC;QACD,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC,CAAC;AACJ,CAAC"}

package/dist/supabase.d.ts

@@ -0,0 +1,4 @@
+import type { RunnerConfig } from "./config.js";
+export declare function createRunnerClient(cfg: RunnerConfig, jwt: string): import("@supabase/supabase-js").SupabaseClient<any, "public", "acc", any, any>;
+export type RunnerSupabaseClient = ReturnType<typeof createRunnerClient>;
+//# sourceMappingURL=supabase.d.ts.map

package/dist/supabase.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"supabase.d.ts","sourceRoot":"","sources":["../src/supabase.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,kFAoBhE;AAED,MAAM,MAAM,oBAAoB,GAAG,UAAU,CAAC,OAAO,kBAAkB,CAAC,CAAC"}

package/dist/supabase.js

@@ -0,0 +1,36 @@
+/**
+ * Supabase client factory for the CLI. Authenticates with the user's
+ * stored JWT (loaded from keychain) so RLS / acc.is_member() resolve
+ * correctly on every RPC.
+ *
+ * Realtime transport is pinned to the `ws` package. Node 20+ has a
+ * native WebSocket global, but Supabase's runtime detector still warns
+ * "Node.js 20 detected without native WebSocket support" because it
+ * looks for a Node-API-shaped constructor, not the WHATWG one. Passing
+ * `ws` explicitly silences the warning and is the same transport every
+ * server-side Supabase consumer uses.
+ */
+import { createClient } from "@supabase/supabase-js";
+import WebSocket from "ws";
+export function createRunnerClient(cfg, jwt) {
+    return createClient(cfg.supabaseUrl, cfg.supabaseAnonKey, {
+        db: { schema: "acc" },
+        auth: {
+            persistSession: false,
+            autoRefreshToken: false,
+            detectSessionInUrl: false,
+        },
+        global: {
+            headers: {
+                Authorization: `Bearer ${jwt}`,
+            },
+        },
+        realtime: {
+            // any-allowed: ws's type matches Node, not the browser WebSocket
+            // interface Supabase's option signature is declared against.
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            transport: WebSocket,
+        },
+    });
+}
+//# sourceMappingURL=supabase.js.map

package/dist/supabase.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"supabase.js","sourceRoot":"","sources":["../src/supabase.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,SAAS,MAAM,IAAI,CAAC;AAG3B,MAAM,UAAU,kBAAkB,CAAC,GAAiB,EAAE,GAAW;IAC/D,OAAO,YAAY,CAAC,GAAG,CAAC,WAAW,EAAE,GAAG,CAAC,eAAe,EAAE;QACxD,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE;QACrB,IAAI,EAAE;YACJ,cAAc,EAAE,KAAK;YACrB,gBAAgB,EAAE,KAAK;YACvB,kBAAkB,EAAE,KAAK;SAC1B;QACD,MAAM,EAAE;YACN,OAAO,EAAE;gBACP,aAAa,EAAE,UAAU,GAAG,EAAE;aAC/B;SACF;QACD,QAAQ,EAAE;YACR,iEAAiE;YACjE,6DAA6D;YAC7D,8DAA8D;YAC9D,SAAS,EAAE,SAAgB;SAC5B;KACF,CAAC,CAAC;AACL,CAAC"}