borgmcp 2.0.8 → 2.0.10

package/dist/sync-roles-render.js

@@ -9,11 +9,30 @@
  *
  * The shape mirrors the worker's `NonClobberSyncResult`.
  */
+const BIDI_CONTROL_RE = /\p{Bidi_Control}/u;
+/** Escape cube-controlled text before it reaches Markdown or a terminal. */
+export function escapeSyncDisplay(value) {
+    return [...value].map((char) => {
+        const code = char.codePointAt(0);
+        if (code === 0x0a)
+            return '⏎';
+        if (code < 0x20 || (code >= 0x7f && code <= 0x9f))
+            return `\\u{${code.toString(16)}}`;
+        if (BIDI_CONTROL_RE.test(char) || code === 0x2028 || code === 0x2029) {
+            return `\\u{${code.toString(16)}}`;
+        }
+        if (char === '`')
+            return '\\u{60}';
+        if ('\\*_[]()<>&#|~'.includes(char))
+            return `\\${char}`;
+        return char;
+    }).join('');
+}
 /** Truncate long fragment bodies for at-a-glance diffs. */
 function trunc(s, n = 200) {
     if (s == null)
         return '(absent)';
-    const flat = s.replace(/\n/g, '⏎');
+    const flat = escapeSyncDisplay(s);
     return flat.length > n ? flat.slice(0, n) + '…' : flat;
 }
 /**
@@ -45,7 +64,7 @@ export function renderSyncRolesResult(result, templateName) {
     const mode = result.dryRun
         ? '**DRY RUN** (review conflicts below; re-run with `apply: true` + a `decisions` map to commit)'
         : '**APPLIED**';
-    const lines = [`## borg_sync-roles — ${mode}`, `Template: ${templateName}`, ''];
+    const lines = [`## borg_sync-roles — ${mode}`, `Template: ${escapeSyncDisplay(templateName)}`, ''];
     // Gather all fragments across roles + taxonomy for tallying.
     const allFragments = [
         ...result.roles.flatMap((r) => r.fragments),
@@ -74,7 +93,7 @@ export function renderSyncRolesResult(result, templateName) {
                 : applied
                     ? '✓ accepted — template version applied'
                     : '↩ kept your version';
-            lines.push(`- **${f.label}** \`${f.key}\` ${status}`);
+            lines.push(`- **${escapeSyncDisplay(f.label)}** \`${escapeSyncDisplay(f.key)}\` ${status}`);
             lines.push(`  - cube (current): "${trunc(f.cubeValue)}"`);
             lines.push(`  - template (new): "${trunc(f.templateValue)}"`);
         }
@@ -87,7 +106,7 @@ export function renderSyncRolesResult(result, templateName) {
         lines.push('These keys in your `decisions` map did not correspond to any classified conflict this run ' +
             '(typo or stale key) — their intended accept had NO effect. Check the exact keys against the conflicts above:');
         for (const k of unmatched) {
-            lines.push(`- \`${k}\``);
+            lines.push(`- \`${escapeSyncDisplay(k)}\``);
         }
         lines.push('');
     }
@@ -96,17 +115,17 @@ export function renderSyncRolesResult(result, templateName) {
         lines.push(`### Additions (safe — auto-applied, zero clobber risk)`);
         for (const r of newRoles) {
             const note = result.dryRun ? '(new role — would be created)' : '✓ created';
-            lines.push(`- new role **${r.name}** ${note}`);
+            lines.push(`- new role **${escapeSyncDisplay(r.name)}** ${note}`);
         }
         for (const f of adds) {
             const note = result.dryRun ? '(would be added)' : '✓ added';
-            lines.push(`- **${f.label}** \`${f.key}\` ${note}`);
+            lines.push(`- **${escapeSyncDisplay(f.label)}** \`${escapeSyncDisplay(f.key)}\` ${note}`);
         }
         lines.push('');
     }
     // ── Custom roles (never touched) ──
     if (customRoles.length > 0) {
-        lines.push(`### Custom roles (untouched): ${customRoles.map((r) => r.name).join(', ')}`);
+        lines.push(`### Custom roles (untouched): ${customRoles.map((r) => escapeSyncDisplay(r.name)).join(', ')}`);
         lines.push('');
     }
     // ── Clean no-op ──

package/dist/sync-roles-render.js.map

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

package/dist/working-repo.d.ts

@@ -7,8 +7,9 @@
  */
 export interface WorkingRepo {
     name: string | null;
-    /** Canonical host/path identity, never a raw Git remote URL. */
+    /** Canonical public HTTPS identity, never a raw Git remote URL. */
     origin: string | null;
+    state?: 'known' | 'unknown' | 'unavailable' | 'rejected';
 }
 export interface WorkingRepoDeps {
     runGit?: (cwd: string, args: string[]) => {
@@ -17,13 +18,10 @@ export interface WorkingRepoDeps {
     };
 }
 /**
- * Convert a Git remote to a non-secret `host/org/repo` identity.
- *
- * URL userinfo, query strings, fragments, scheme, and SCP-style user prefixes
- * are deliberately discarded. Inputs that cannot identify a host and path are
- * treated as unreportable rather than forwarded verbatim.
+ * Convert a Git remote to the shared canonical public repository identity.
+ * Hostile or credential-bearing inputs are rejected rather than sanitized.
  */
-export declare function canonicalizeWorkingRepoIdentity(origin: string): string | null;
+export declare function canonicalizeWorkingRepoIdentity(origin: string): WorkingRepo | null;
 /**
  * Return a reportable identity for the caller's current directory.
  *

package/dist/working-repo.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"working-repo.d.ts","sourceRoot":"","sources":["../src/working-repo.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,gEAAgE;IAChE,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CACvB;AAED,MAAM,WAAW,eAAe;IAC9B,MAAM,CAAC,EAAE,CACP,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,EAAE,KACX;QAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAC;CACxD;AAkBD;;;;;;GAMG;AACH,wBAAgB,+BAA+B,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CA0B7E;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAChC,GAAG,GAAE,MAAsB,EAC3B,IAAI,GAAE,eAAoB,GACzB,WAAW,CAeb"}
+{"version":3,"file":"working-repo.d.ts","sourceRoot":"","sources":["../src/working-repo.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,mEAAmE;IACnE,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,KAAK,CAAC,EAAE,OAAO,GAAG,SAAS,GAAG,aAAa,GAAG,UAAU,CAAC;CAC1D;AAED,MAAM,WAAW,eAAe;IAC9B,MAAM,CAAC,EAAE,CACP,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,EAAE,KACX;QAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAC;CACxD;AAYD;;;GAGG;AACH,wBAAgB,+BAA+B,CAAC,MAAM,EAAE,MAAM,GAAG,WAAW,GAAG,IAAI,CAWlF;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAChC,GAAG,GAAE,MAAsB,EAC3B,IAAI,GAAE,eAAoB,GACzB,WAAW,CA0Bb"}

package/dist/working-repo.js

@@ -6,6 +6,7 @@
  * included in lifecycle metadata.
  */
 import { spawnSync } from 'node:child_process';
+import { canonicalizeRepositoryIdentity } from 'borgmcp-shared/runtime-metadata';
 function defaultRunGit(cwd, args) {
     const result = spawnSync('git', args, { cwd, encoding: 'utf-8' });
     return { status: result.status, stdout: result.stdout };
@@ -14,45 +15,20 @@ function trimmed(value) {
     const normalized = value?.trim();
     return normalized ? normalized : null;
 }
-function nameFromIdentity(identity) {
-    const lastPathSegment = identity.replace(/\/$/, '').split('/').pop();
-    const name = lastPathSegment?.replace(/\.git$/i, '').trim();
-    return name || null;
-}
 /**
- * Convert a Git remote to a non-secret `host/org/repo` identity.
- *
- * URL userinfo, query strings, fragments, scheme, and SCP-style user prefixes
- * are deliberately discarded. Inputs that cannot identify a host and path are
- * treated as unreportable rather than forwarded verbatim.
+ * Convert a Git remote to the shared canonical public repository identity.
+ * Hostile or credential-bearing inputs are rejected rather than sanitized.
  */
 export function canonicalizeWorkingRepoIdentity(origin) {
-    const raw = origin.trim();
-    if (!raw)
-        return null;
-    // Remote clients send this canonical form on subsequent lifecycle calls.
-    const canonical = raw.match(/^([A-Za-z0-9.-]+)\/([^?#\s]+)$/);
-    if (canonical) {
-        const host = canonical[1].toLowerCase();
-        const path = canonical[2].replace(/^\/+|\/+$/g, '').replace(/\.git$/i, '');
-        return host && path ? `${host}/${path}` : null;
-    }
     try {
-        const url = new URL(origin);
-        if (!['http:', 'https:', 'ssh:', 'git:'].includes(url.protocol))
-            return null;
-        const path = url.pathname.replace(/^\/+|\/+$/g, '').replace(/\.git$/i, '');
-        return url.hostname && path ? `${url.hostname.toLowerCase()}/${path}` : null;
+        const canonical = canonicalizeRepositoryIdentity(origin.trim());
+        return {
+            name: canonical.working_repo_name,
+            origin: canonical.working_repo_origin,
+            state: 'known',
+        };
     }
     catch {
-        // SCP-style SSH remote: discard its optional user prefix and URL-like
-        // query/fragment suffix before accepting only host + repository path.
-        const match = raw.match(/^(?:[^@\s/:]+@)?([A-Za-z0-9.-]+):\/?([^?#\s]+)(?:[?#].*)?$/);
-        if (match) {
-            const host = match[1].toLowerCase();
-            const path = match[2].replace(/^\/+|\/+$/g, '').replace(/\.git$/i, '');
-            return host && path ? `${host}/${path}` : null;
-        }
         return null;
     }
 }
@@ -65,17 +41,31 @@ export function canonicalizeWorkingRepoIdentity(origin) {
  */
 export function resolveWorkingRepo(cwd = process.cwd(), deps = {}) {
     const runGit = deps.runGit ?? defaultRunGit;
-    const rootResult = runGit(cwd, ['rev-parse', '--show-toplevel']);
+    let rootResult;
+    try {
+        rootResult = runGit(cwd, ['rev-parse', '--show-toplevel']);
+    }
+    catch {
+        return { name: null, origin: null, state: 'unavailable' };
+    }
     const root = rootResult.status === 0 ? trimmed(rootResult.stdout) : null;
     if (!root) {
-        return { name: null, origin: null };
+        return { name: null, origin: null, state: 'unknown' };
+    }
+    let originResult;
+    try {
+        originResult = runGit(cwd, ['config', '--get', 'remote.origin.url']);
+    }
+    catch {
+        return { name: null, origin: null, state: 'unavailable' };
     }
-    const originResult = runGit(cwd, ['config', '--get', 'remote.origin.url']);
     const originRaw = originResult.status === 0 ? trimmed(originResult.stdout) : null;
-    const origin = originRaw ? canonicalizeWorkingRepoIdentity(originRaw) : null;
-    return {
-        name: origin ? nameFromIdentity(origin) : null,
-        origin,
+    if (!originRaw)
+        return { name: null, origin: null, state: 'unknown' };
+    return canonicalizeWorkingRepoIdentity(originRaw) ?? {
+        name: null,
+        origin: null,
+        state: 'rejected',
     };
 }
 //# sourceMappingURL=working-repo.js.map

package/dist/working-repo.js.map

@@ -1 +1 @@
-{"version":3,"file":"working-repo.js","sourceRoot":"","sources":["../src/working-repo.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"working-repo.js","sourceRoot":"","sources":["../src/working-repo.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,8BAA8B,EAAE,MAAM,iCAAiC,CAAC;AAejF,SAAS,aAAa,CAAC,GAAW,EAAE,IAAc;IAChD,MAAM,MAAM,GAAG,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;IAClE,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;AAC1D,CAAC;AAED,SAAS,OAAO,CAAC,KAAgC;IAC/C,MAAM,UAAU,GAAG,KAAK,EAAE,IAAI,EAAE,CAAC;IACjC,OAAO,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC;AACxC,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,+BAA+B,CAAC,MAAc;IAC5D,IAAI,CAAC;QACH,MAAM,SAAS,GAAG,8BAA8B,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;QAChE,OAAO;YACL,IAAI,EAAE,SAAS,CAAC,iBAAiB;YACjC,MAAM,EAAE,SAAS,CAAC,mBAAmB;YACrC,KAAK,EAAE,OAAO;SACf,CAAC;IACJ,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,kBAAkB,CAChC,MAAc,OAAO,CAAC,GAAG,EAAE,EAC3B,OAAwB,EAAE;IAE1B,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,aAAa,CAAC;IAC5C,IAAI,UAAU,CAAC;IACf,IAAI,CAAC;QACH,UAAU,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC,CAAC;IAC7D,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,aAAa,EAAE,CAAC;IAC5D,CAAC;IACD,MAAM,IAAI,GAAG,UAAU,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACzE,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;IACxD,CAAC;IAED,IAAI,YAAY,CAAC;IACjB,IAAI,CAAC;QACH,YAAY,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,OAAO,EAAE,mBAAmB,CAAC,CAAC,CAAC;IACvE,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,aAAa,EAAE,CAAC;IAC5D,CAAC;IACD,MAAM,SAAS,GAAG,YAAY,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAClF,IAAI,CAAC,SAAS;QAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;IACtE,OAAO,+BAA+B,CAAC,SAAS,CAAC,IAAI;QACnD,IAAI,EAAE,IAAI;QACV,MAAM,EAAE,IAAI;QACZ,KAAK,EAAE,UAAU;KAClB,CAAC;AACJ,CAAC"}

package/docs/EXTRACTION_PROVENANCE.md

@@ -8,7 +8,7 @@ The extraction copied the monorepo's `client/src/` production boundary and top-l
 
 ## Deliberate Transformations
 
-- Replaced the monorepo dependency on `borgmcp-shared` with the exact audited registry release `borgmcp-shared@0.5.0` and a fresh standalone lockfile.
+- Replaced the monorepo dependency on `borgmcp-shared` with the exact audited registry release `borgmcp-shared@0.6.1` 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.
@@ -21,8 +21,9 @@ The extraction copied the monorepo's `client/src/` production boundary and top-l
   lightweight release tag failed before packaging. The reviewed `2.0.1`
   recovery, `2.0.2`, `2.0.3`, `2.0.4`, `2.0.5`, and `2.0.6` successors were
   published and registry-verified. The immutable `2.0.7` workflow failed before
-  package creation or npm publication, so the next candidate identity is `2.0.8`.
-  Extraction and versioning do not authorize publication.
+  package creation or npm publication. The `2.0.8` and `2.0.9` successors were
+  published and registry-verified, so the next candidate identity is `2.0.10`. Extraction and
+  versioning do not authorize publication.
 
 ## Review Holds
 
@@ -37,9 +38,9 @@ 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.5.0`. The matching
-`borgmcp-server@0.1.8` release is published and registry-verified. Client
-`borgmcp@2.0.6` is published and registry-verified. The immutable `v2.0.7`
+resolves to the audited registry `borgmcp-shared@0.6.1`. The matching
+`borgmcp-server@0.1.17` release is published and registry-verified. Client
+`borgmcp@2.0.9` is published and registry-verified. The immutable `v2.0.7`
 attempt failed before publication and remains preserved. Publication of the next
-candidate remains gated by reviewed `v2.0.8` source, a fresh annotated tag, and
+candidate remains gated by reviewed `v2.0.10` source, a fresh annotated tag, and
 exact registry integrity and signature verification.

package/docs/LOCAL_SERVER.md

@@ -139,7 +139,7 @@ The default discovery endpoint is `https://127.0.0.1:7091`. Explicit `--host` va
 
 ## Release status
 
-This self-hosted path consumes the published `borgmcp-shared@0.5.0` v3 registry
+This self-hosted path consumes the published `borgmcp-shared@0.6.1` v3 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

package/docs/RELEASING.md

@@ -76,6 +76,24 @@ rerun that tag, version, or workflow. The next candidate uses the unused
 `v2.0.8` identity from a fresh reviewed protected-main commit and requires the
 complete release gate again.
 
+The annotated `v2.0.8` tag object
+`7b5a4929534abfa97a65e278df230adfdb842d8f` peels to protected-main commit
+`8bc796d8fc4e307dca593138fb080984662c7d62`. Workflow run `30012098601`, attempt 1,
+successfully published that exact source as `borgmcp@2.0.8`; the registry records integrity
+`sha512-az1IKG4VNwAF/8PKEVK88gdRoFFBqgtl6ObXX+CcJadavNqkwJ9UFeP8LOJ2js911mIiXEm8c4xDf6MnO0GOng==`.
+Never move, replace, reuse, or rerun that tag or workflow. Its successor used
+the fresh `v2.0.9` identity from a reviewed protected-main commit and passed the
+complete release gate.
+
+The annotated `v2.0.9` tag object
+`3a88bb4f46143789803a4e57f52b94d762f1ca9b` peels to protected-main commit
+`18084fc486a041f3438f584a97d218c01a5e0399`. Workflow run `30047299013`, attempt 1,
+successfully published that exact source as `borgmcp@2.0.9`; the registry records integrity
+`sha512-lf0TZ8ZcpHv/Nt3LkY/IGxkUFkg3weavF+rLv6xLImDDhLIaZly1y8jUdo3UuheQVhrLnLcxoz37Myr4mPx9lg==`.
+Never move, replace, reuse, or rerun that tag or workflow. The next candidate
+uses the unused `v2.0.10` 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
@@ -85,7 +103,7 @@ 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.5.0` remains locked to
+- the exact audited registry dependency `borgmcp-shared@0.6.1` 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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "borgmcp",
-  "version": "2.0.8",
+  "version": "2.0.10",
   "description": "Coordinate AI coding agents in shared cubes. Works with Claude Code, Codex, and OpenCode.",
   "type": "module",
   "main": "./dist/index.js",
@@ -68,7 +68,7 @@
   },
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.0.4",
-    "borgmcp-shared": "0.5.0",
+    "borgmcp-shared": "0.6.1",
     "chalk": "^5.3.0",
     "prompts": "^2.4.2",
     "which": "^4.0.0"

package/src/agent-runtime.ts

@@ -24,10 +24,17 @@ function isAgentKind(value: string | undefined): value is AgentKind {
  * already-installed clients.
  */
 export function resolveSessionAgentKind(env: NodeJS.ProcessEnv = process.env): AgentKind {
+  return resolveReportableSessionAgentKind(env) ?? 'claude';
+}
+
+/** Resolve only positively identified CLI state for advisory server reporting. */
+export function resolveReportableSessionAgentKind(
+  env: NodeJS.ProcessEnv = process.env
+): AgentKind | null {
   if (isAgentKind(env[BORG_AGENT_KIND_ENV])) return env[BORG_AGENT_KIND_ENV];
   if (env[BORG_OPENCODE_ENV] === '1') return 'opencode';
   if (env[BORG_CODEX_REMOTE_WAKE_ENV] === '1') return 'codex';
-  return 'claude';
+  return null;
 }
 
 /**

package/src/assimilate-cmd.ts

@@ -49,6 +49,7 @@ import type { ExpectedBinding, FinalizeServerSeatOutcome, PersistedLocalSeat } f
 import type { SeatBinding, BindPendingSeatOutcome } from './seats.js';
 import { createHash } from 'node:crypto';
 import { buildOpenCodeLaunchArgs, type LaunchApprovalDecision } from './cli-tool-approval.js';
+import { resolveWorkingRepo, type WorkingRepo } from './working-repo.js';
 
 const PRIVATE_STATE_UNAVAILABLE_COPY = [
   'Borg could not safely prepare its private local state.',
@@ -259,7 +260,7 @@ export interface AssimilateDeps {
   assimilate: (
     apiUrl: string,
     token: string,
-    params: { cube_id: string; role_id: string; hostname?: string | null; prior_drone_id?: string; remint_invalid_prior?: boolean; model?: string | null; agent_kind?: 'claude' | 'codex' | 'opencode' | null; session_operation?: ServerSessionOperation; session_expected?: ExpectedBinding; revalidate_at_prepare?: boolean },
+    params: { cube_id: string; role_id: string; hostname?: string | null; prior_drone_id?: string; remint_invalid_prior?: boolean; model?: string | null; agent_kind?: 'claude' | 'codex' | 'opencode' | null; working_repo?: WorkingRepo; session_operation?: ServerSessionOperation; session_expected?: ExpectedBinding; revalidate_at_prepare?: boolean },
     serverTrustIdentity?: string,
   ) => Promise<AssimilateResult>;
 
@@ -1183,6 +1184,7 @@ export async function runAssimilate(
       hostname: deps.getHostname(),
       agent_kind: cli,
       model: effectiveModel,
+      working_repo: resolveWorkingRepo(projectRoot),
       ...(reattachPriorId ? { prior_drone_id: reattachPriorId } : {}),
       ...(remintInvalidPrior ? { remint_invalid_prior: true } : {}),
       session_operation: sessionOperation,

package/src/assimilate-deps.ts

@@ -16,6 +16,7 @@ import { createInterface } from 'node:readline/promises';
 import prompts from 'prompts';
 import { readinessProbeEnv } from './readiness-probe.js';
 import { resolveMcpBinaryPath } from './self-path.js';
+import { buildRuntimeMetadataReport } from './runtime-metadata.js';
 
 import type { AssimilateDeps } from './assimilate-cmd.js';
 import {
@@ -322,10 +323,15 @@ export function buildDefaultAssimilateDeps(): AssimilateDeps {
             cubeId: params.cube_id,
             roleId: params.role_id,
             operation,
-            ...(params.prior_drone_id === undefined
-              ? {}
-              : { priorDroneId: params.prior_drone_id }),
-          },
+             ...(params.prior_drone_id === undefined
+               ? {}
+               : { priorDroneId: params.prior_drone_id }),
+            runtimeMetadata: buildRuntimeMetadataReport({
+              agentKind: params.agent_kind,
+              reportedModel: params.model,
+              workingRepo: params.working_repo,
+            }),
+           },
           pending.credential,
           { fetchImpl: trust.fetchImpl },
         );

package/src/index.ts

@@ -43,11 +43,14 @@ import {
   patchTaxonomyClass,
   deleteRole,
   getCube,
+  getCubeForManagement,
+  resolveLocalManageAuthority,
   listRoles,
   syncRoles,
   applyTemplate,
   whoami,
   roleRationale,
+  type LocalManageAuthority,
 } from './remote-client.js';
 import {
   getTemplate,
@@ -90,7 +93,11 @@ import {
   formatWakePathPrefix,
   shouldShowWakePathWarning,
 } from './stream-status.js';
-import { formatRoleAgentLabel, formatWorkingRepoLabel, renderRoster } from './roster-render.js';
+import {
+  RUNTIME_METADATA_ADVISORY,
+  renderRoster,
+  renderRuntimeMetadataLines,
+} from './roster-render.js';
 import { resolveWorkingRepo } from './working-repo.js';
 import {
   DroneEvictedError,
@@ -107,6 +114,7 @@ import { initConsolePrefix, consolePrefix } from './console-prefix.js';
 import {
   resolveSessionAgentKind,
 } from './codex-app-wake.js';
+import { resolveReportableSessionAgentKind } from './agent-runtime.js';
 import {
   connectOpenCodeDrone,
   injectOpenCodeEntry,
@@ -142,9 +150,38 @@ import {
  */
 async function applyTemplateToCube(
   cubeId: string,
-  template: Template
+  template: Template,
+  authority?: LocalManageAuthority,
 ): Promise<{ created: number; updated: number }> {
-  return await applyTemplate(cubeId, template.name);
+  return await applyTemplate(cubeId, template.name, authority);
+}
+
+export async function runApplyTemplateTool(
+  cubeId: string,
+  template: Template,
+  authority: LocalManageAuthority,
+  deps: {
+    applyTemplate?: typeof applyTemplate;
+    getCubeForManagement?: typeof getCubeForManagement;
+    updateCube?: typeof updateCube;
+  } = {},
+): Promise<{ summary: { created: number; updated: number }; cubeDirectiveNote: string }> {
+  const apply = deps.applyTemplate ?? applyTemplate;
+  const read = deps.getCubeForManagement ?? getCubeForManagement;
+  const update = deps.updateCube ?? updateCube;
+  const summary = await apply(cubeId, template.name, authority);
+  const cubeForRules = await read(cubeId, {
+    operation: `read template target ${JSON.stringify(template.name)}`,
+    cubeName: cubeId === authority.active.cubeId ? authority.active.name : cubeId,
+    noMutation: 'No template fragments were changed.',
+  }, authority.active, authority.connection);
+  const newCubeDirective = resolveCubeDirectiveForApply(cubeForRules.cube_directive, template);
+  if (newCubeDirective === null) return { summary, cubeDirectiveNote: '' };
+  await update(cubeId, { cube_directive: newCubeDirective }, authority.active, authority.connection);
+  return {
+    summary,
+    cubeDirectiveNote: ' Template cube directive applied (cube directive was empty).',
+  };
 }
 
 /**
@@ -336,6 +373,7 @@ export async function main() {
           const result = await regen(active.sessionToken, active.apiUrl, {
             since,
             reportedModel,
+            agentKind: resolveReportableSessionAgentKind(),
             workingRepo: resolveWorkingRepo(),
             serverTrustIdentity: active.serverTrustIdentity,
           });
@@ -412,6 +450,7 @@ export async function main() {
           // — an evicted/revoked seat FAILS server-side and is surfaced).
           try {
             const result = await regen(active!.sessionToken, active!.apiUrl, {
+              agentKind: resolveReportableSessionAgentKind(),
               workingRepo: resolveWorkingRepo(),
               serverTrustIdentity: active!.serverTrustIdentity,
             });
@@ -1052,21 +1091,18 @@ export async function main() {
             return { content: [{ type: 'text', text: 'No drones in this cube yet.' }] };
           }
           const rolesById = new Map(roles.map((r: any) => [r.id, r]));
-          const lines = drones.map((d: any) => {
-            const r = rolesById.get(d.role_id) as any;
-            const roleLabel = formatRoleAgentLabel(r?.name ?? '?', d.agent_kind);
-            const wakeClass =
+           const lines = drones.map((d: any) => {
+             const r = rolesById.get(d.role_id) as any;
+             const wakeClass =
               d.wake_path_alert_class && d.wake_path_alert_class !== 'independent'
                 ? ` — wake-path-class: ${d.wake_path_alert_class}`
                 : '';
-            const reportedModel = d.reported_model
-              ? ` — Reported model: ${d.reported_model}`
-              : ' — Reported model: not reported';
-            const workingRepo = formatWorkingRepoLabel(d);
-            const workingRepoText = workingRepo ? ` — ${workingRepo}` : '';
-            return `- **${d.label}** (id: ${d.id}) — role: ${roleLabel} (${d.role_id}) — last seen ${d.last_seen}${wakeClass}${reportedModel}${workingRepoText}`;
-          });
-          return { content: [{ type: 'text', text: `Drones in cube ${cubeId} (${drones.length}):\n\n${lines.join('\n')}` }] };
+            return [
+              `- **${d.label}** (id: ${d.id}) — Role: ${r?.name ?? '?'} (${d.role_id}) — last seen ${d.last_seen}${wakeClass}`,
+              ...renderRuntimeMetadataLines(d),
+            ].join('\n');
+           });
+          return { content: [{ type: 'text', text: `Drones in cube ${cubeId} (${drones.length}):\n\n_${RUNTIME_METADATA_ADVISORY}_\n\n${lines.join('\n')}` }] };
         }
 
         case 'borg_list-roles': {
@@ -1119,18 +1155,13 @@ export async function main() {
           if (!template) {
             throw new Error(`Unknown template "${templateName}". Available: ${listTemplateNames().join(', ')}`);
           }
-          const summary = await applyTemplateToCube(cubeId, template);
-
-          // Sprint 14: optionally write template's cube_directive to the
-          // cube. No-clobber discipline — only fills empty directives,
-          // never overwrites operator-customized text.
-          let cubeDirectiveNote = '';
-          const cubeForRules = await getCube(cubeId);
-          const newCubeDirective = resolveCubeDirectiveForApply(cubeForRules.cube_directive, template);
-          if (newCubeDirective !== null) {
-            await updateCube(cubeId, { cube_directive: newCubeDirective });
-            cubeDirectiveNote = ' Template cube directive applied (cube directive was empty).';
-          }
+           const active = await requireActiveCube();
+           const authority = await resolveLocalManageAuthority(active, {
+             operation: `apply template ${JSON.stringify(templateName)}`,
+             cubeName: cubeId === active.cubeId ? active.name : cubeId,
+             noMutation: 'No template fragments were changed.',
+           });
+           const { summary, cubeDirectiveNote } = await runApplyTemplateTool(cubeId, template, authority);
 
           return { content: [{ type: 'text', text: `Applied template **${templateName}** to cube ${cubeId} — ${summary.created} role(s) created, ${summary.updated} updated.${cubeDirectiveNote}` }] };
         }

package/src/regen-format.ts

@@ -12,7 +12,10 @@ import {
 } from 'borgmcp-shared/templates';
 import { parseRoleSections } from 'borgmcp-shared/role-section';
 import { formatDroneAddressToken } from 'borgmcp-shared/drone-address';
-import { formatRoleAgentLabel } from './roster-render.js';
+import {
+  RUNTIME_METADATA_ADVISORY,
+  renderRuntimeMetadataLines,
+} from './roster-render.js';
 import { shellEscape } from './shell-escape.js';
 import { resolveInboxMonitorPath } from './self-path.js';
 
@@ -488,10 +491,12 @@ export function formatRegenMarkdown(
 
   const droneOverview =
     result.drones
-      .map((d: any) => {
-        const role = result.roles.find((r: any) => r.id === d.role_id);
-        const roleLabel = formatRoleAgentLabel(role?.name ?? '?', d.agent_kind);
-        return `- **${d.label}** (${roleLabel}) — last seen ${humanAgo(new Date(d.last_seen))}`;
+       .map((d: any) => {
+         const role = result.roles.find((r: any) => r.id === d.role_id);
+        return [
+          `- **${d.label}** (Role: ${role?.name ?? '?'}) — last seen ${humanAgo(new Date(d.last_seen))}`,
+          ...renderRuntimeMetadataLines(d),
+        ].join('\n');
       })
       .join('\n') || '_(no drones connected)_';
 
@@ -611,6 +616,8 @@ export function formatRegenMarkdown(
     roleOverview,
     '',
     `## Connected drones`,
+    `_${RUNTIME_METADATA_ADVISORY}_`,
+    '',
     droneOverview,
     '',
     `## Cube log`,

package/src/regen.ts

@@ -26,6 +26,7 @@ import {
   type AgentKind,
 } from './regen-format.js';
 import { resolveSessionAgentKind } from './codex-app-wake.js';
+import { resolveReportableSessionAgentKind } from './agent-runtime.js';
 import { handleVersionFlag } from './version.js';
 import { gateAllowsActivation } from './launch-gate.js';
 import { resolveWorkingRepo } from './working-repo.js';
@@ -85,6 +86,7 @@ async function main(): Promise<void> {
   let result: Awaited<ReturnType<typeof regen>> | null = null;
   try {
     result = await regen(active.sessionToken, active.apiUrl, {
+      agentKind: resolveReportableSessionAgentKind(),
       workingRepo: resolveWorkingRepo(),
       serverTrustIdentity: active.serverTrustIdentity,
     });