borgmcp 1.1.15 → 2.0.1

package/dist/worktree-lifecycle.js

@@ -1,2 +1,205 @@
-import{join as c}from"node:path";function h(e,o){const t=`${o}-`;return`wt-${e.startsWith(t)?e.slice(t.length):e}`}function p(e){return c(e,".borg","worktrees")}function x(e,o,t,r){if(t.length===0)throw new Error("computeWorktreePath: suffix must be non-empty (empty leaf would collapse the path to the repo-level dir)");const n=r!==void 0&&r>=2?`${t}-${r}`:t;return c(p(e),o,n)}function d(e,o){const t=e("git",["status","--porcelain"],o);return t.status===0&&t.stdout.trim()===""}const g=/^\.claude\//;function $(e,o){const t=e("git",["status","--porcelain"],o),r={staged:[],unstaged:[],untracked:[],localConfig:[]};if(t.status!==0)return r;for(const n of t.stdout.split(`
-`)){if(!n.trim())continue;const s=n.slice(3);if(n.startsWith("??"))r.untracked.push(s);else{const a=n[0],u=n[1];a!==" "&&a!=="?"&&r.staged.push(s),u!==" "&&u!=="?"&&r.unstaged.push(s)}g.test(s)&&r.localConfig.push(s)}return r}function f(e,o,t,r){return e("git",["merge-base","--is-ancestor",t,r],o).status===0}function i(e,o,t,r){return e("git",["merge-base","--is-ancestor",t,r],o).status===0}function k(e,o,t,r){if(!d(e,o))return{action:"skipped-dirty",message:"uncommitted changes present; sync skipped (nothing discarded)"};if(!f(e,o,t,r))return{action:"skipped-diverged",message:`${t} has diverged from ${r}; resolve manually (no auto-merge/rebase)`};const n=e("git",["rev-list","--count",`${t}..${r}`],o);return n.status===0&&n.stdout.trim()==="0"?{action:"already-current"}:e("git",["merge","--ff-only",r],o).status!==0?{action:"skipped-diverged",message:"ff-only merge unexpectedly failed"}:{action:"fast-forwarded"}}function l(e,o,t){return e("git",["rev-parse","--verify","--quiet",`refs/heads/${t}`],o).status===0}function b(e,o,t,r){return d(e,o)?i(e,o,"HEAD",r)?l(e,o,t)&&!i(e,o,t,r)?{action:"blocked-target-unmerged",message:`branch ${t} exists with commits not on ${r}; resolve before adopting (a force-switch would discard them)`}:(e("git",["switch","-C",t,r],o),{action:"adopted"}):{action:"blocked-unmerged",message:`current HEAD has commits not on ${r}; commit/push or set aside before adopting`}:{action:"skipped-dirty",message:"uncommitted changes present; not switching (nothing discarded)"}}function v(e,o,t,r,n={prune:!1}){return i(e,o,t,r)?n.prune?(e("git",["branch","-d",t],o),{action:"pruned",branch:t}):{action:"announced",branch:t,message:`${t} is merged into ${r} and can be pruned: \`git branch -d ${t}\` (or re-run with --prune)`}:{action:"not-merged",branch:t}}export{b as adoptWorktree,$ as classifyDirty,v as cleanupMerged,x as computeWorktreePath,d as isCleanTree,f as isFastForward,i as isMerged,l as localBranchExists,h as perWorktreeBranchName,k as syncWorktree,p as worktreesHome};
+/**
+ * gh#33 — worktree lifecycle as product behavior.
+ *
+ * Pure git-decision helpers behind an injected `runSync` seam (matching
+ * the `AssimilateDeps.runSync` shape), so every branch is unit-testable
+ * without a live repo. This module DECIDES + emits git command sequences;
+ * it never launches agents and never touches the cube API.
+ *
+ * Design spec: docs/superpowers/specs/2026-05-29-worktree-lifecycle-design.md
+ * Q-resolutions baked in (SPEC-APPROVED 3a80412d):
+ *   Q1 branch naming  — `wt-<suffix>` prefix-stripped, full-basename fallback.
+ *   Q2 idle-sync      — ff-only, clean-gated; never merge/rebase; never over dirty.
+ *   Q3 post-merge     — auto-return to wt-<basename>; ANNOUNCE the prunable
+ *                       merged branch, prune only when explicitly requested.
+ *   Q4 uniform        — no primary-worktree carve-out; main is never a working branch.
+ */
+import { join } from 'node:path';
+/**
+ * Per-worktree branch name (Q1). Strips the repo basename prefix from the
+ * worktree dir basename for readability (`borg-mcp-codex-builder` ->
+ * `wt-codex-builder`); falls back to the full dir basename when there is
+ * no shared prefix (`myrepo-feature` under repo `otherrepo` ->
+ * `wt-myrepo-feature`).
+ */
+export function perWorktreeBranchName(worktreeBasename, repoBasename) {
+    const prefix = `${repoBasename}-`;
+    const suffix = worktreeBasename.startsWith(prefix)
+        ? worktreeBasename.slice(prefix.length)
+        : worktreeBasename;
+    return `wt-${suffix}`;
+}
+/**
+ * gh#556 Part 1 — the home for NEW drone worktrees: `<homeDir>/.borg/worktrees`.
+ * (`~/.borg` is the established borg home — it already holds the encrypted
+ * credentials file, see config.ts.)
+ */
+export function worktreesHome(homeDir) {
+    return join(homeDir, '.borg', 'worktrees');
+}
+/**
+ * gh#556 Part 1 — where a NEW drone worktree lives:
+ * `<homeDir>/.borg/worktrees/<repoBase>/<suffix>` (collision variant `<suffix>-<n>`
+ * for n>=2; the caller loops n until the path is free).
+ *
+ * Pure (homeDir injected) so the path scheme + collision dedup + containment are
+ * unit-testable without touching $HOME or spawning git.
+ *
+ * Path-safety / no-traversal: `suffix` is validated upstream BEFORE it reaches here —
+ * `--worktree` via validateName (NAME_RE excludes `.`/`/`) or the role default via
+ * roleSlug (strips everything but `[a-z0-9-]`); `repoBase` is a single `basename(...)`
+ * component. So the result is always CONTAINED under `worktreesHome(homeDir)`.
+ * As defense-in-depth this throws on an EMPTY suffix — an empty leaf would let
+ * `join` collapse the path up to the repo-level dir (the degenerate-path bug); the
+ * caller also guards empty before calling, fail-loud.
+ */
+export function computeWorktreePath(homeDir, repoBase, suffix, n) {
+    if (suffix.length === 0) {
+        throw new Error('computeWorktreePath: suffix must be non-empty (empty leaf would collapse the path to the repo-level dir)');
+    }
+    const leaf = n !== undefined && n >= 2 ? `${suffix}-${n}` : suffix;
+    return join(worktreesHome(homeDir), repoBase, leaf);
+}
+/** True iff the working tree is clean (`git status --porcelain` empty). */
+export function isCleanTree(runSync, cwd) {
+    const r = runSync('git', ['status', '--porcelain'], cwd);
+    return r.status === 0 && r.stdout.trim() === '';
+}
+const LOCAL_CONFIG_RE = /^\.claude\//;
+/**
+ * Classify a dirty tree into staged / unstaged / untracked buckets, and
+ * flag local-config files separately. The STAGED bucket is load-bearing:
+ * the live UNBLOCK case (b15894be) had a *staged* leftover diff that
+ * blocked `pull --ff-only`, which an unstaged-only check would miss.
+ */
+export function classifyDirty(runSync, cwd) {
+    const r = runSync('git', ['status', '--porcelain'], cwd);
+    const out = { staged: [], unstaged: [], untracked: [], localConfig: [] };
+    if (r.status !== 0)
+        return out;
+    for (const line of r.stdout.split('\n')) {
+        if (!line.trim())
+            continue;
+        const path = line.slice(3);
+        if (line.startsWith('??')) {
+            out.untracked.push(path);
+        }
+        else {
+            const x = line[0]; // staged (index) column
+            const y = line[1]; // unstaged (work-tree) column
+            if (x !== ' ' && x !== '?')
+                out.staged.push(path);
+            if (y !== ' ' && y !== '?')
+                out.unstaged.push(path);
+        }
+        if (LOCAL_CONFIG_RE.test(path))
+            out.localConfig.push(path);
+    }
+    return out;
+}
+/** True iff `branch` is an ancestor of `ref` — i.e. a clean fast-forward target. */
+export function isFastForward(runSync, cwd, branch, ref) {
+    return runSync('git', ['merge-base', '--is-ancestor', branch, ref], cwd).status === 0;
+}
+/** True iff `branch`'s tip is an ancestor of `ref` — i.e. fully merged into it. */
+export function isMerged(runSync, cwd, branch, ref) {
+    return runSync('git', ['merge-base', '--is-ancestor', branch, ref], cwd).status === 0;
+}
+/**
+ * Idle-sync the current per-worktree branch to `ref` (Q2). NEVER discards
+ * work: dirty -> skipped-dirty (no mutation). Only fast-forwards (no
+ * merge/rebase): diverged -> skipped-diverged. The caller fetches first.
+ *
+ * `already-current` when the branch tip already equals `ref` (the common
+ * no-op case on every launch).
+ */
+export function syncWorktree(runSync, cwd, branch, ref) {
+    if (!isCleanTree(runSync, cwd)) {
+        return {
+            action: 'skipped-dirty',
+            message: 'uncommitted changes present; sync skipped (nothing discarded)',
+        };
+    }
+    if (!isFastForward(runSync, cwd, branch, ref)) {
+        return {
+            action: 'skipped-diverged',
+            message: `${branch} has diverged from ${ref}; resolve manually (no auto-merge/rebase)`,
+        };
+    }
+    // Already at ref? merge --ff-only is a no-op but we report it distinctly
+    // so callers can stay quiet on the common case.
+    const ahead = runSync('git', ['rev-list', '--count', `${branch}..${ref}`], cwd);
+    if (ahead.status === 0 && ahead.stdout.trim() === '0') {
+        return { action: 'already-current' };
+    }
+    const ff = runSync('git', ['merge', '--ff-only', ref], cwd);
+    if (ff.status !== 0) {
+        return { action: 'skipped-diverged', message: 'ff-only merge unexpectedly failed' };
+    }
+    return { action: 'fast-forwarded' };
+}
+/** True iff a local branch named `branch` already exists. */
+export function localBranchExists(runSync, cwd, branch) {
+    return runSync('git', ['rev-parse', '--verify', '--quiet', `refs/heads/${branch}`], cwd).status === 0;
+}
+/**
+ * Migration (Q4/Q5/§4.5): bring a detached/stale worktree onto
+ * `wt-<basename>` at `ref`. Idempotent: re-running on an already-adopted
+ * clean worktree is a lossless reset to `ref`. Never discards:
+ *   - dirty work tree            -> skipped-dirty (surface)
+ *   - current HEAD unmerged      -> blocked-unmerged (surface)
+ *   - TARGET `branch` exists with commits not on `ref` -> blocked-target-
+ *     unmerged (surface). This is load-bearing: the switch uses `-C`
+ *     (force-create/reset), which would ORPHAN commits on a pre-existing
+ *     `wt-` branch. The HEAD-merged check alone misses this when the
+ *     target branch != HEAD (e.g. on `main` while a prior `wt-x` holds
+ *     committed-but-unmerged work). gh#33 CR-v2 blocker 078d1630.
+ */
+export function adoptWorktree(runSync, cwd, branch, ref) {
+    if (!isCleanTree(runSync, cwd)) {
+        return {
+            action: 'skipped-dirty',
+            message: 'uncommitted changes present; not switching (nothing discarded)',
+        };
+    }
+    if (!isMerged(runSync, cwd, 'HEAD', ref)) {
+        return {
+            action: 'blocked-unmerged',
+            message: `current HEAD has commits not on ${ref}; commit/push or set aside before adopting`,
+        };
+    }
+    // Guard the TARGET branch ref before the `switch -C` force-reset. If
+    // `branch` already exists and is NOT an ancestor of `ref`, it carries
+    // committed-unmerged work that `-C` would discard — block instead.
+    // (Absent, or an ancestor of `ref` = a clean reset target → proceed.)
+    if (localBranchExists(runSync, cwd, branch) && !isMerged(runSync, cwd, branch, ref)) {
+        return {
+            action: 'blocked-target-unmerged',
+            message: `branch ${branch} exists with commits not on ${ref}; resolve before adopting (a force-switch would discard them)`,
+        };
+    }
+    runSync('git', ['switch', '-C', branch, ref], cwd);
+    return { action: 'adopted' };
+}
+/**
+ * Post-merge cleanup (Q3): when `feature` is fully merged into `ref`,
+ * either ANNOUNCE it as prunable (default) or actually prune it with the
+ * safe `git branch -d` (which itself refuses to delete an unmerged
+ * branch — defense in depth against a stale local ref). Unmerged ->
+ * not-merged (never touched).
+ */
+export function cleanupMerged(runSync, cwd, feature, ref, opts = { prune: false }) {
+    if (!isMerged(runSync, cwd, feature, ref)) {
+        return { action: 'not-merged', branch: feature };
+    }
+    if (!opts.prune) {
+        return {
+            action: 'announced',
+            branch: feature,
+            message: `${feature} is merged into ${ref} and can be pruned: \`git branch -d ${feature}\` (or re-run with --prune)`,
+        };
+    }
+    runSync('git', ['branch', '-d', feature], cwd);
+    return { action: 'pruned', branch: feature };
+}
+//# sourceMappingURL=worktree-lifecycle.js.map

package/dist/worktree-lifecycle.js.map

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

package/docs/EXTRACTION_PROVENANCE.md

@@ -0,0 +1,40 @@
+# Extraction Provenance
+
+The initial standalone source was extracted from `Byte-Ventures/borg-mcp` commit `17ff8ce14e12122a8cc9089f6b94174c02fa2a04` on branch `main`.
+
+The extraction copied the monorepo's `client/src/` production boundary and top-level `client/__tests__/*.test.ts` unit tests. It did not import monorepo Git history, worker or website source, deployment configuration, local state, credentials files, build output, or the live integration suite.
+
+[`provenance/extraction-map.json`](../provenance/extraction-map.json) records every one of the 225 source-client files with source and destination SHA-256 hashes plus one of four dispositions: byte-identical copy, standalone transformation, shared-package replacement, or exclusion. The map is generated against the detached exact-source checkout with `scripts/generate-extraction-map.mjs`; it is repository evidence and is not included in the npm artifact.
+
+## Deliberate Transformations
+
+- Replaced the monorepo dependency on `borgmcp-shared` with the exact audited registry release `borgmcp-shared@0.4.2` and a fresh standalone lockfile.
+- Replaced local template, role-section, drone-address, and log high-water-mark implementations with `borgmcp-shared` exports.
+- Removed monorepo-only website anti-drift tests and re-anchored remaining filesystem tests to this repository.
+- Removed consumer lifecycle hooks, parent-directory deployment scripts, minification, and private integration-environment configuration.
+- Added standalone source typecheck, unit/release tests, readable build, onboarding smoke, artifact verification, and public-source sensitivity scanning.
+- Made the package root export side-effect-free while retaining `borg-mcp` executable behavior.
+- Kept self-hosted `--host --enroll` preview-only while implementing the
+  client-generated PENDING credential/retry tuple and capability-gated,
+  repository-idempotent cube creation required for local dogfood.
+- Initially set the standalone package identity to `2.0.0`. Its immutable
+  lightweight release tag failed before packaging, so the reviewed recovery
+  identity is `2.0.1`; extraction and versioning do not authorize publication.
+
+## Review Holds
+
+Google OAuth / Cloud sign-in has been fully removed from this local-only client.
+`src/auth.ts`, `src/device-auth.ts`, and all installed-application OAuth client
+material are deleted, along with the hosted API default and the Cloud
+subscription/billing/dashboard tools. `scripts/verify-public-source.mjs` now
+forbids ANY Google OAuth client ID or `GOCSPX` value anywhere in the source or
+packed artifact (zero tolerance), and a no-cloud egress guard asserts the packed
+artifact reaches no hosted authority.
+
+Local enrollment now uses the reviewed client-generated credential/retry
+contract, with a pre-request `PENDING` record in the local 0600-permission seat
+store, exact-tuple ambiguous retry, and verified activation. The contract now
+resolves to the audited registry `borgmcp-shared@0.4.2`. The matching
+`borgmcp-server@0.1.7` release is published and registry-verified; client
+publication remains gated by reviewed `v2.0.1` source, a fresh annotated tag,
+and exact registry integrity and signature verification.

package/docs/LOCAL_SERVER.md

@@ -0,0 +1,103 @@
+# Self-Hosted Server
+
+Install and initialize the server in the human operator's terminal:
+
+```bash
+npm install -g borgmcp-server
+borg-mcp-server setup
+borg-mcp-server start
+```
+
+Keep the server running. Open a second operator terminal in the project checkout
+and run:
+
+```bash
+borg assimilate --host 127.0.0.1:7091 --enroll
+```
+
+The labeled hidden prompt awaits the owner enrollment invitation (single-use,
+shown once). An owner enrollment invitation comes from setup or the offline
+`borg-mcp-server owner-invite` recovery command. A later ordinary client uses a
+client enrollment invitation from `borg-mcp-server client-invite`. Never put an
+enrollment invitation in argv, environment variables, logs, or diagnostics.
+The offline replacement commands visibly prompt for the recovery credential;
+never put that credential in argv or environment variables either.
+
+Before sending the invitation,
+the client generates a 256-bit credential and UUID retry key and persists the
+exact tuple as `PENDING` in the local seat store on this machine — a
+0600-permission file store, parity with the server's TLS keys. An ambiguous
+exchange retries that tuple exactly; the credential becomes active only after the
+versioned response is decoded and the authenticated protocol handshake succeeds.
+A new process resumes that pending enrollment before displaying another
+invitation prompt.
+
+`--cube-name <name>` explicitly selects the repository cube name. Without an
+explicit name, Borg uses the `origin` repository name or, when `origin` is
+absent, proposes the sanitized repository-directory basename before consuming
+an enrollment invitation. Confirm interactively or pass `--yes`; bare
+repositories fail closed.
+
+The connection is HTTPS-only. Borg validates the server trust material, stores
+enrollment and session credentials in the local seat store on this machine (a
+0600-permission file store), and persists only an opaque credential reference
+with the active cube. Local requests
+use the server's `/api/cubes/*` coordination routes. They cannot use hosted OAuth
+credentials or change authority implicitly.
+
+The current client does not install or start `borgmcp-server`. The server must
+already be running and trusted. An owner enrollment carrying the persisted
+`create_cube` capability creates one idempotent cube per repository during
+normal assimilation, using the server-owned `default` role template; repeating
+an ambiguous request does not duplicate the cube, and distinct repositories can
+create distinct bounded cubes. An ordinary enrolled client is denied before a
+create request is sent. Cloud-only capabilities fail explicitly rather than
+being redirected.
+
+After the first attach, the launched agent should run `borg_whoami` and
+`borg_roster` to verify its seat and begin coordinating. To create a second seat,
+the operator runs the explicit local assimilation command from the intended
+worktree. A fresh worktree operation creates a distinct drone; an ambiguous
+retry of that same operation resumes the same drone.
+
+An identical `--here` rerun validates the saved local seat and reattaches by
+re-sending the same client-generated session bearer — the sole server correlator —
+instead of choosing another role or minting a new drone. The bearer is REUSED, not
+rotated: the server binds only its digest, so a re-sent identical bearer resolves to
+the existing seat. Ambiguous liveness or transport results never authorize a
+replacement; only an authoritative eviction mints a fresh bearer and permits a
+remint. (The `retry_key` idempotency key applies to enrollment and cube-creation
+only — never to seat re-attach, which is idempotent through the bearer itself.)
+
+The default discovery endpoint is `https://127.0.0.1:7091`. Explicit `--host` values may include another port but must pass the same trust and endpoint policy.
+
+## Recovery commands
+
+- No saved or rejected enrollment: rerun `borg assimilate --host <server> --enroll`
+  from the operator's interactive terminal.
+- Rejected or expired invitation: keep the server running and mint a replacement
+  scoped invitation with `borg-mcp-server owner-invite` for an unclaimed owner
+  client or `borg-mcp-server client-invite` for an ordinary client, then rerun
+  `borg assimilate --host <server> --enroll` with the replacement invitation.
+- Rejected or unloadable local seat: run `borg reset-local-seat --host <server>`
+  to clear ONLY this worktree's saved local seat, then — with the server still
+  running — ask the operator for a fresh scoped invitation and rerun
+  `borg assimilate --host <server> --enroll`.
+- Unreachable server: start or restart it with `borg-mcp-server start`, then
+  rerun `borg assimilate --host <server>`.
+- Trust mismatch after an intentional server re-initialization: verify the
+  expected server identity, stop and restart `borg-mcp-server start`, then retry.
+- Busy local seat store: wait for the other Borg process to finish, then rerun
+  the same command. If the local seat store cannot be read or written, ensure its
+  directory on this machine is readable and writable, then rerun.
+- Unusable project name: rerun with `--cube-name <name>`.
+- Incompatible response: verify compatible client and server versions, then
+  retry the same endpoint.
+
+## Release status
+
+This self-hosted path consumes the published `borgmcp-shared@0.4.2` v2 registry
+release. The matching server owner-enrollment, cube-create, attach, restart, log,
+and SSE implementation must also pass the full process-level local dogfood gate.
+Until that gate opens the self-hosted path remains preview-only, and the client
+publish is deferred accordingly.

package/docs/RELEASING.md

@@ -0,0 +1,120 @@
+# Publishing `borgmcp`
+
+The GitHub Actions workflow publishes one immutable, reviewed `borgmcp` version
+from a protected annotated tag. The protected publish job uses npm Trusted
+Publishing; no long-lived npm token is stored or exposed.
+
+## Immutable Failed Release Evidence
+
+The existing lightweight `v2.0.0` tag points to
+`90a078264f4d61c0140ad0a30357a4df42c34ab0`. Immutable workflow run
+`29693915689` rejected it at annotated-tag verification and failed before package
+creation or npm publication; the publish job was skipped and
+`borgmcp@2.0.0` remains absent from npm. Never delete, move, replace, reuse, or
+rerun that tag or run. Recovery uses the unused `v2.0.1` identity from a fresh
+reviewed protected-main commit and requires the complete release gate again.
+
+## Release Prerequisites
+
+The standalone client was extracted from private-monorepo commit
+`17ff8ce14e12122a8cc9089f6b94174c02fa2a04` without importing its Git history.
+Before creating the release tag, independently verify all of these conditions:
+
+- the extraction review confirms no private backend secrets, deployment
+  configuration, customer data, local state, or duplicated shared contracts
+  entered the public package;
+- the exact audited registry dependency `borgmcp-shared@0.4.2` remains locked to
+  its canonical tarball and integrity;
+- the client and matching server pass the complete local dogfood gate;
+- the selected stable client version is unused and the exact release commit is
+  on protected `main`;
+- the repository and protected npm environment settings pass an operator audit;
+- the exact release source passes Code Review, Security Review, Release Quality,
+  extraction, and package gates; and
+- the immutable annotated tag and publication receive explicit release
+  authorization.
+
+`scripts/verify-release-readiness.mjs` makes the source-side blockers
+machine-checkable. A release tag created before they are resolved fails before
+dependency installation or publication.
+
+## Repository Controls
+
+Repository settings are operator-owned and are not changed by this workflow.
+Before preparing a candidate, independently verify:
+
+1. The `npm-publish` environment disables administrator bypass, requires the
+   reviewed human approver, and allows only the protected release refs. Its
+   `NPM_EXPECTED_OWNER` variable must match the sole reviewed maintainer of the
+   existing `borgmcp` package. It must contain no npm token.
+2. npm Trusted Publishing is configured for organization `Byte-Ventures`,
+   repository `borg-mcp-client`, workflow `publish.yml`, and environment
+   `npm-publish`.
+3. `refs/tags/v*.*.*` cannot be updated, deleted, or force-moved. Release tags
+   are annotated, match the package version, and point to a commit on protected
+   `main`.
+4. `main` requires reviewed pull requests, resolved threads, and current CI.
+5. GitHub Actions permits only the full-SHA-pinned GitHub-owned actions present
+   in this repository. The default workflow token remains read-only.
+6. Private vulnerability reporting, secret scanning, push protection, CodeQL,
+   and Dependabot security updates remain enabled.
+
+## Release Workflow
+
+The only trigger is a protected annotated `v<package version>` tag. Manual
+dispatch is intentionally absent so a second run cannot rebuild or publish an
+existing tag. The workflow rejects reruns, root `.npmrc`
+configuration, non-tag events, lightweight or malformed tags, version mismatch,
+source/tag mismatch, and tags whose commits are not on protected `main`.
+
+The unprivileged `verify` job performs one sequence:
+
+1. Verify the public-source boundary, extraction readiness, exact shared-package
+   pin, and canonical registry lock metadata.
+2. Install the lockfile once with lifecycle scripts disabled and audit it.
+3. Run type checks, tests, and one readable build; reject generated `dist` drift.
+4. Produce one npm tarball.
+5. Verify that tarball once for package identity, license/notice, source and map
+   completeness, executable bins, archive safety, dependency integrity, and
+   absence of credentials, private endpoints, local paths, links, or lifecycle
+   hooks.
+6. Install the exact local tarball once with scripts disabled and require package
+   import plus MCP initialize/tool discovery through npm's generated bin shim.
+7. Upload only the tarball and its verifier-generated report as the same-run
+   release artifact.
+
+The protected `publish` job alone receives `id-token: write`. It downloads the
+same-run artifact and rejects a report whose package name or version differs
+from the release, a version that already exists, an unclaimed package, or an
+owner set that differs from `NPM_EXPECTED_OWNER`. It requires the GitHub OIDC
+request context, rejects a legacy `NODE_AUTH_TOKEN`, and publishes the exact
+tarball path once with lifecycle scripts disabled and provenance enabled. It
+does not install project dependencies, rebuild, retest, repack, or reverify the
+package.
+
+The dependent, unprivileged `registry-verification` job has no environment or
+OIDC permission. It polls registry visibility with fixed attempt and delay
+bounds, compares `dist.integrity` exactly with the same-run report, installs the
+exact published version with lifecycle scripts disabled, and runs
+`npm audit signatures` to verify registry signatures and the Trusted Publishing
+attestation.
+
+No separate checksum file is needed: the tarball verifier records canonical
+SHA-512 SRI in the artifact report. GitHub's same-run artifact transport and the
+report bind the reviewed candidate without repeated SHA512 choreography.
+
+Rely on npm's signature and Trusted Publishing attestation validation. Do not
+reconstruct DSSE, in-toto, SLSA, workflow-ref, or builder statements locally.
+Do not add cross-run tuple variables, cross-run artifact selection, duplicate
+builds, duplicate package verification, checksum bundles, or SBOM ceremony.
+
+A post-publication verification failure is a release incident; it never means
+the immutable npm publication did not happen and never authorizes a rerun.
+
+## Stop And Recovery Conditions
+
+Stop when source, settings, ownership, tag, artifact, test, audit, review, or
+authorization evidence is missing or inconsistent. Never move or reuse a failed
+tag, rerun a failed release workflow, overwrite an npm version, unpublish to hide
+a failure, or substitute a local rebuild. Recovery starts from a fresh reviewed
+source change and, after any registry mutation, a separately authorized version.

package/package.json

@@ -1,61 +1,75 @@
 {
   "name": "borgmcp",
-  "version": "1.1.15",
-  "description": "Coordinate AI coding agents in shared cubes. Works with Claude Code and Codex. Create projects, assign roles, and share a live activity log.",
+  "version": "2.0.1",
+  "description": "Coordinate AI coding agents in shared cubes. Works with Claude Code, Codex, and OpenCode.",
   "type": "module",
-  "main": "dist/index.js",
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js"
+    },
+    "./package.json": "./package.json"
+  },
   "bin": {
-    "borg": "dist/claude.js",
-    "borg-setup": "dist/setup.js",
-    "borg-mcp": "dist/index.js",
-    "borg-regen": "dist/regen.js",
-    "borg-clear-rewake": "dist/clear-rewake.js",
-    "borg-log-audit": "dist/log-audit.js",
-    "borg-inbox-monitor": "dist/inbox-monitor.js"
+    "borg": "./dist/claude.js",
+    "borg-setup": "./dist/setup.js",
+    "borg-mcp": "./dist/index.js",
+    "borg-regen": "./dist/regen.js",
+    "borg-clear-rewake": "./dist/clear-rewake.js",
+    "borg-log-audit": "./dist/log-audit.js",
+    "borg-inbox-monitor": "./dist/inbox-monitor.js"
   },
   "scripts": {
-    "prebuild": "rm -rf dist",
-    "build": "tsc",
-    "postbuild": "chmod +x dist/claude.js dist/setup.js dist/index.js dist/regen.js dist/clear-rewake.js dist/log-audit.js dist/inbox-monitor.js",
-    "minify": "node scripts/minify-dist.js",
-    "dev": "tsc --watch",
+    "clean": "node scripts/clean.mjs",
+    "build": "npm run clean && tsc -p tsconfig.json && node scripts/set-bin-mode.mjs",
+    "check": "tsc -p tsconfig.json --noEmit",
+    "dev": "tsc -p tsconfig.json --watch",
     "start": "node dist/index.js",
-    "postinstall": "node dist/postinstall.js || true",
-    "test:integration": "vitest run --config ./vitest.integration.config.ts",
-    "safe-deploy": "bash ../scripts/safe-deploy.sh",
-    "onboarding-smoke": "bash ../scripts/onboarding-smoke.sh",
-    "prepublishOnly": "npm run safe-deploy && npm run build && npm run test:integration && npm run minify && npm run onboarding-smoke"
+    "test": "npm run test:unit && npm run test:release",
+    "test:unit": "vitest run --config vitest.config.ts",
+    "test:release": "node --test test/release-lane.test.mjs",
+    "onboarding:smoke": "node scripts/onboarding-smoke.mjs",
+    "release:check": "npm run verify:public-source && npm run verify:release && npm run verify:lock && npm run check && npm test && npm run build && npm run onboarding:smoke && npm run verify:package",
+    "verify:artifact": "node scripts/verify-packed-artifact.mjs",
+    "verify:public-source": "node scripts/verify-public-source.mjs",
+    "verify:package": "node scripts/verify-local-package.mjs",
+    "verify:release": "node scripts/verify-release-readiness.mjs",
+    "verify:lock": "node scripts/verify-lock-registry.mjs"
   },
   "files": [
     "dist",
+    "src",
+    "docs/*.md",
     "README.md",
-    "LICENSE"
+    "LICENSE",
+    "NOTICE",
+    "SECURITY.md",
+    "CONTRIBUTING.md"
   ],
   "keywords": [
     "mcp",
-    "claude",
     "claude-code",
-    "anthropic",
+    "codex",
+    "opencode",
     "multi-agent",
-    "coordination",
-    "agent",
-    "borg"
+    "coordination"
   ],
-  "author": "Theodor Storm <theodor@byteventures.se>",
-  "license": "SEE LICENSE IN LICENSE",
-  "homepage": "https://borgmcp.ai",
+  "author": "Byte Ventures IO AB",
+  "license": "Apache-2.0",
+  "homepage": "https://github.com/Byte-Ventures/borg-mcp-client",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/Byte-Ventures/borg-mcp.git"
+    "url": "git+https://github.com/Byte-Ventures/borg-mcp-client.git"
   },
   "bugs": {
-    "url": "https://github.com/Byte-Ventures/borg-mcp/issues"
+    "url": "https://github.com/Byte-Ventures/borg-mcp-client/issues"
   },
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.0.4",
-    "@napi-rs/keyring": "^1.3.0",
+    "borgmcp-shared": "0.4.2",
     "chalk": "^5.3.0",
-    "open": "^10.0.0",
     "prompts": "^2.4.2",
     "which": "^4.0.0"
   },
@@ -63,10 +77,14 @@
     "@types/node": "^22.10.2",
     "@types/prompts": "^2.4.9",
     "@types/which": "^3.0.4",
-    "esbuild": "^0.28.1",
+    "tsx": "^4.20.5",
     "typescript": "^6.0.3",
     "vitest": "^3.2.6"
   },
+  "engines": {
+    "node": ">=20"
+  },
+  "packageManager": "npm@11.18.0",
   "publishConfig": {
     "access": "public"
   }