@north-light/cli 0.3.561 → 0.3.562

package/dist/core/canvas/schema-pg/003-fleet-removals.sql

@@ -6,7 +6,7 @@
 -- database that still holds un-migrated rows in `usage`, `grantee_usage` or `provider_receipts` would strand them. Refuse until a
 -- cycle 4 build has run against it. A fresh database, or one that never had cycle-3 rows, has all three empty, so the chain from the
 -- baseline to here still applies (D71). The three tables stay: the version-2 build still lists them in its SQLite import and export,
--- and a later delta (004, with the `jobs` columns, once the reader floor reaches 3) drops them.
+-- and a later delta (007, with the `jobs` columns, once the reader floor reaches 3) drops them.
 DO $$
 BEGIN
   IF NOT EXISTS (SELECT 1 FROM canvas_meta WHERE key = 'ledger_migrated')

package/dist/core/canvas/schema-pg/005-fleet-blobs.sql

@@ -0,0 +1,13 @@
+-- 005-fleet-blobs.sql — cycle 5 additions for the blob store (design-fleet "Data model", D98, D100). One transaction, additions only:
+-- `schema_min_reader` is not touched and stays 2.
+-- The previous release (version 3, the build that shipped 003) opens the result: it never names `blob_key`, and the index changes no
+-- row it reads or writes.
+
+-- D98: the control plane puts each fetched upload in the blob store at `attachments/<run root node>/<sha256>` and records that key here.
+-- Null for a use recorded before this release, and for any use whose bytes the storage service still holds.
+ALTER TABLE upload_uses ADD COLUMN IF NOT EXISTS blob_key text;
+
+-- D100: the node blob-deletion pass in `storage-due-work` claims node rows whose `deleted_at` is more than 90 days old. Partial, so it
+-- holds only the soft-deleted node rows, not every object. A plain CREATE INDEX (the chain runs each step in a transaction, so not
+-- CONCURRENTLY): it blocks writes to `objects` for the time it takes to scan the table.
+CREATE INDEX IF NOT EXISTS objects_node_deleted ON objects(deleted_at) WHERE type = 'node';

package/dist/core/canvas/schema-pg/006-job-rows.sql

@@ -0,0 +1,20 @@
+-- 006-job-rows.sql — cycle 5 additions for bash jobs as rows (design-fleet "A bash job outlives the turn", D7). One transaction, additions only:
+-- `schema_min_reader` is not touched and stays 2. The previous release never names these columns.
+-- Each column holds a fact another process reads that the bash valve used to leave in a file under `context/jobs/<id>/`.
+-- The broker's valve is the only writer (POST /v1/nodes/:id/jobs/:jobId/report); `job_dir` and `log_path` stay nullable and unused until the removals delta.
+ALTER TABLE jobs
+  ADD COLUMN IF NOT EXISTS purpose text,
+  ADD COLUMN IF NOT EXISTS quiet_ok boolean NOT NULL DEFAULT false,
+  ADD COLUMN IF NOT EXISTS pgid bigint,
+  ADD COLUMN IF NOT EXISTS pgid_identity text,
+  ADD COLUMN IF NOT EXISTS activity_last_ms bigint,
+  ADD COLUMN IF NOT EXISTS activity_sampled_ms bigint,
+  ADD COLUMN IF NOT EXISTS activity_files text,
+  ADD COLUMN IF NOT EXISTS silence_activity_ms bigint,
+  ADD COLUMN IF NOT EXISTS silence_threshold_ms bigint,
+  ADD COLUMN IF NOT EXISTS exit_reported_at text;
+
+-- A job recorded before this delta has no output key: give it the key the new rows get. Its deadline and process identity
+-- are still in its supervisor files, which the daemon's reconciler moves onto the row.
+UPDATE jobs SET output_key = 'jobs/' || o.owner || '/' || jobs.object || '/output'
+  FROM objects o WHERE o.id = jobs.object AND jobs.output_key IS NULL;

package/dist/core/canvas/schema-pg/007-ledger-check.sql

@@ -0,0 +1,117 @@
+-- 007-ledger-check.sql — cycle 5 L7 (design-fleet "Money", D58, D59, D89): the one limit rule as a SQL function, and the
+-- `charges` rollup trigger that now adds `usd` on INSERT. One transaction, additions only: `schema_min_reader` is not touched
+-- and stays 2. The previous build never names `ledger_check`, `ledger_holder` or the new column.
+
+-- A writer at version 7 or above sets this on every row it inserts. The previous build leaves it false and keeps calling
+-- `addToTotals` for `usd`, so the trigger must not add that row's `usd` a second time.
+ALTER TABLE charges ADD COLUMN IF NOT EXISTS usd_rolled_by_trigger boolean NOT NULL DEFAULT false;
+
+-- D-3's `$0` card-stop bill limit (D68) has `source card`.
+ALTER TABLE limits DROP CONSTRAINT IF EXISTS limits_source_check;
+ALTER TABLE limits ADD CONSTRAINT limits_source_check CHECK (source IN ('grant_sync', 'person', 'operator', 'billing', 'card'));
+
+-- Replaces 002's function. INSERT adds `billed_usd` for every row (as 002 did) and adds `usd` only for a marked row. UPDATE is
+-- as in 002: it moves both amounts, the old negative and the new positive; the old `usd` is in the rollup whichever way it got
+-- there. Refused rows and `take` rows are never rolled up, as in `rebuildTotals`.
+CREATE OR REPLACE FUNCTION charge_totals_rollup() RETURNS trigger LANGUAGE plpgsql AS $$
+BEGIN
+  IF TG_OP = 'UPDATE' AND OLD.refused IS NULL AND OLD.kind <> 'take' THEN
+    INSERT INTO charge_totals (month, payer, funding, sub, grantee, provider, usd, billed_usd)
+      VALUES (OLD.month, OLD.payer, OLD.funding, COALESCE(OLD.sub, ''), OLD.grantee, COALESCE(OLD.provider, ''),
+              -COALESCE(OLD.usd, 0), -COALESCE(OLD.billed_usd, 0))
+      ON CONFLICT (month, payer, funding, sub, grantee, provider) DO UPDATE
+        SET usd = charge_totals.usd + EXCLUDED.usd, billed_usd = charge_totals.billed_usd + EXCLUDED.billed_usd;
+  END IF;
+  IF NEW.refused IS NULL AND NEW.kind <> 'take'
+     AND (TG_OP = 'UPDATE' OR COALESCE(NEW.billed_usd, 0) <> 0 OR (NEW.usd_rolled_by_trigger AND COALESCE(NEW.usd, 0) <> 0)) THEN
+    INSERT INTO charge_totals (month, payer, funding, sub, grantee, provider, usd, billed_usd)
+      VALUES (NEW.month, NEW.payer, NEW.funding, COALESCE(NEW.sub, ''), NEW.grantee, COALESCE(NEW.provider, ''),
+              CASE WHEN TG_OP = 'UPDATE' OR NEW.usd_rolled_by_trigger THEN COALESCE(NEW.usd, 0) ELSE 0 END, COALESCE(NEW.billed_usd, 0))
+      ON CONFLICT (month, payer, funding, sub, grantee, provider) DO UPDATE
+        SET usd = charge_totals.usd + EXCLUDED.usd, billed_usd = charge_totals.billed_usd + EXCLUDED.billed_usd;
+  END IF;
+  RETURN NULL;
+END $$;
+
+-- Who Northlight invoices for a payer (`billingAccountOf`, directory `billing/payer.ts`): a user payer is its own account; an
+-- app payer's account is the team with an `admin` tuple on the app, else the user with one; null when it has neither. A
+-- directory tuple's team subject is type `crtr/group` with the id `team:<id>`; a person is type `user` with the bare id.
+CREATE FUNCTION ledger_holder(payer text) RETURNS text LANGUAGE sql STABLE AS $$
+  SELECT CASE
+    WHEN payer LIKE 'user:%' THEN payer
+    WHEN payer LIKE 'app:%' THEN COALESCE(
+      (SELECT r.subject_id FROM relations r
+        WHERE r.resource_type = 'app' AND r.resource_id = substr(payer, 5) AND r.relation = 'admin'
+          AND r.subject_type = 'crtr/group' AND r.subject_id LIKE 'team:%' ORDER BY r.subject_id LIMIT 1),
+      (SELECT 'user:' || r.subject_id FROM relations r
+        WHERE r.resource_type = 'app' AND r.resource_id = substr(payer, 5) AND r.relation = 'admin'
+          AND r.subject_type = 'user' ORDER BY r.subject_id LIMIT 1))
+  END
+$$;
+
+-- The one limit rule (design-ledger "The check", cycle 4's `findRefusal`, now in SQL). Input `{payer, account, funding, sub,
+-- grantee, provider, scope: 'call' | 'start', month?}`; `month` defaults to the current UTC month. Result: null, or the first
+-- refusing limit (by id) as `{limit, usd, month, reset_at}`. No reservation: a limit refuses when the month's rollup
+-- is already at or over it.
+--  * A limit matches when its `payer`, `account`, `funding`, `grantee`, `provider` and `sub` filters (null = any) equal the
+--    candidate's. A `call` is checked against every such limit; a `start` only against limits with null `funding` and
+--    `provider`. A limit's `account` matches the candidate's `account`, or the holder `ledger_holder(payer)` finds when the candidate gives none (a house-paid payer's candidate carries none, and the house limit is on the team's account).
+--  * Spent = this month's `charge_totals` rows matching the limit's non-null filters. A limit with an `account` filter counts
+--    the rows whose payer is that account or an app it holds now (D89). A limit with `funding bill` sums `billed_usd`; any
+--    other limit sums `usd` (so the house limit counts full price).
+CREATE FUNCTION ledger_check(candidate jsonb) RETURNS jsonb LANGUAGE plpgsql STABLE AS $$
+DECLARE
+  m      text := COALESCE(candidate->>'month', to_char(now() AT TIME ZONE 'UTC', 'YYYY-MM'));
+  scope  text := candidate->>'scope';
+  pay    text := candidate->>'payer';
+  acct   text := COALESCE(candidate->>'account', ledger_holder(candidate->>'payer'));
+  result jsonb;
+BEGIN
+  IF scope IS NULL OR scope NOT IN ('call', 'start') THEN RAISE EXCEPTION 'ledger_check: scope must be call or start'; END IF;
+  IF pay IS NULL THEN RAISE EXCEPTION 'ledger_check: payer is required'; END IF;
+  SELECT jsonb_build_object(
+           'limit', jsonb_build_object('id', q.id, 'payer', q.payer, 'account', q.account, 'funding', q.funding, 'grantee', q.grantee,
+                                       'provider', q.provider, 'sub', q.sub, 'usd_per_month', q.usd_per_month, 'source', q.source,
+                                       'updated_at', q.updated_at),
+           'usd', q.spent, 'month', m,
+           'reset_at', to_char((m || '-01')::date + interval '1 month', 'YYYY-MM-DD"T"00:00:00.000"Z"'))
+    INTO result
+    FROM (SELECT l.*, s.spent
+            FROM limits l
+            -- The payers an `account` limit counts: the account itself and the apps it holds now. Built once per limit from the
+            -- apps with an `admin` tuple for the account (one `relations_subject` lookup), each kept only when `ledger_holder`
+            -- agrees (a team admin wins over a user admin), so the answer equals `ledger_holder`'s and the sum below can use the
+            -- (month, payer, ...) key. A limit with no `account` has the one payer; every limit has a payer or an account.
+            CROSS JOIN LATERAL (
+              SELECT CASE WHEN l.account IS NULL THEN ARRAY[l.payer] ELSE
+                       ARRAY[l.account] || COALESCE((SELECT array_agg(a.app)
+                         FROM (SELECT DISTINCT 'app:' || r.resource_id AS app FROM relations r
+                                WHERE r.subject_type = CASE WHEN l.account LIKE 'team:%' THEN 'crtr/group' ELSE 'user' END
+                                  AND r.subject_id = CASE WHEN l.account LIKE 'user:%' THEN substr(l.account, 6) ELSE l.account END
+                                  AND r.relation = 'admin' AND r.resource_type = 'app') a
+                        WHERE ledger_holder(a.app) = l.account), ARRAY[]::text[]) END AS payers) h
+            CROSS JOIN LATERAL (
+              SELECT COALESCE(SUM(CASE WHEN l.funding = 'bill' THEN t.billed_usd ELSE t.usd END), 0) AS spent
+                FROM charge_totals t
+               WHERE t.month = m
+                 AND (l.payer IS NULL OR t.payer = l.payer)
+                 AND t.payer = ANY(h.payers)
+                 AND (l.funding IS NULL OR t.funding = l.funding)
+                 AND (l.grantee IS NULL OR t.grantee = l.grantee)
+                 AND (l.provider IS NULL OR t.provider = l.provider)
+                 AND (l.sub IS NULL OR t.sub = l.sub)) s
+           WHERE (l.payer IS NOT NULL OR l.account IS NOT NULL)
+             AND (l.payer IS NULL OR l.payer = pay)
+             AND (l.account IS NULL OR l.account = acct)
+             AND (l.grantee IS NULL OR l.grantee = candidate->>'grantee')
+             AND (l.sub IS NULL OR l.sub = COALESCE(candidate->>'sub', ''))
+             AND (CASE WHEN scope = 'call'
+                       THEN (l.funding IS NULL OR l.funding = candidate->>'funding')
+                            AND (l.provider IS NULL OR l.provider = COALESCE(candidate->>'provider', ''))
+                       ELSE l.funding IS NULL AND l.provider IS NULL END)
+             AND s.spent >= l.usd_per_month
+           ORDER BY l.id LIMIT 1) q;
+  RETURN result;
+END $$;
+
+INSERT INTO canvas_meta (key, value) VALUES ('schema_min_reader', '2') ON CONFLICT (key) DO NOTHING;

package/dist/core/canvas/schema-version.d.ts

@@ -1,7 +1,7 @@
 /** The canvas schema version this build supports: the number of the highest delta in `schema-pg/` (the baseline
  *  `schema-pg.sql` is version 1). `scripts/install-runtime.mjs` reads this module from a candidate generation to refuse
  *  one below the live database's `schema_min_reader`. */
-export declare const CANVAS_SCHEMA_VERSION = 4;
+export declare const CANVAS_SCHEMA_VERSION = 7;
 /** The Postgres schema holding the canvas tables: `CRTR_DATABASE_SCHEMA` (`crtr` in the cloud deploy). Unset or empty
  *  means the role's own search_path (`public` on a Mac and on a VM). A name that is not a plain identifier is an error:
  *  it is put in a `search_path` connection option. */

package/dist/core/canvas/schema-version.js

@@ -1 +1 @@
-var m=Object.defineProperty;var r=(n,e)=>m(n,"name",{value:e,configurable:!0});const A=4;function _(n=process.env){const e=n.CRTR_DATABASE_SCHEMA?.trim();if(e){if(!/^[A-Za-z_][A-Za-z0-9_]*$/.test(e))throw new Error(`CRTR_DATABASE_SCHEMA must be a plain identifier (letters, digits, underscore); got ${JSON.stringify(e)}`);return e}}r(_,"canvasDatabaseSchema");function h(n=process.env){return n.CRTR_SCHEMA_DATABASE_URL?.trim()||void 0}r(h,"canvasSchemaDatabaseUrl");function E(n=process.env){const e=_(n);return e===void 0?void 0:`-c search_path=${e}`}r(E,"canvasSearchPathOptions");async function v(n,e){const t=e===void 0?"canvas_meta":`"${e.replace(/"/g,'""')}".canvas_meta`;if((await n.query(`SELECT to_regclass('${t.replace(/'/g,"''")}') IS NOT NULL AS found`)).rows[0].found!==!0)return;const u=(await n.query(`SELECT key, value FROM ${t} WHERE key IN ('schema_version', 'schema_min_reader')`)).rows,o=r(c=>{const i=u.find(f=>f.key===c);if(i===void 0)return;const d=Number(i.value);if(!Number.isSafeInteger(d))throw new Error(`canvas_meta.${c} is not an integer: ${String(i.value)}`);return d},"value"),s=o("schema_version");return s===void 0?void 0:{version:s,minReader:o("schema_min_reader")??s}}r(v,"readStoredVersions");async function l(n,e,t){const a=await v(n,t);if(a!==void 0&&a.minReader>e)throw new Error(`refusing to select runtime with canvas schema ${e}: the live database requires readers at version ${a.minReader} or above (it is at ${a.version}); install a descendant build instead`)}r(l,"assertCandidateMayOpen");export{A as CANVAS_SCHEMA_VERSION,l as assertCandidateMayOpen,_ as canvasDatabaseSchema,h as canvasSchemaDatabaseUrl,E as canvasSearchPathOptions,v as readStoredVersions};
+var m=Object.defineProperty;var r=(n,e)=>m(n,"name",{value:e,configurable:!0});const A=7;function _(n=process.env){const e=n.CRTR_DATABASE_SCHEMA?.trim();if(e){if(!/^[A-Za-z_][A-Za-z0-9_]*$/.test(e))throw new Error(`CRTR_DATABASE_SCHEMA must be a plain identifier (letters, digits, underscore); got ${JSON.stringify(e)}`);return e}}r(_,"canvasDatabaseSchema");function h(n=process.env){return n.CRTR_SCHEMA_DATABASE_URL?.trim()||void 0}r(h,"canvasSchemaDatabaseUrl");function E(n=process.env){const e=_(n);return e===void 0?void 0:`-c search_path=${e}`}r(E,"canvasSearchPathOptions");async function v(n,e){const t=e===void 0?"canvas_meta":`"${e.replace(/"/g,'""')}".canvas_meta`;if((await n.query(`SELECT to_regclass('${t.replace(/'/g,"''")}') IS NOT NULL AS found`)).rows[0].found!==!0)return;const u=(await n.query(`SELECT key, value FROM ${t} WHERE key IN ('schema_version', 'schema_min_reader')`)).rows,o=r(c=>{const i=u.find(f=>f.key===c);if(i===void 0)return;const d=Number(i.value);if(!Number.isSafeInteger(d))throw new Error(`canvas_meta.${c} is not an integer: ${String(i.value)}`);return d},"value"),s=o("schema_version");return s===void 0?void 0:{version:s,minReader:o("schema_min_reader")??s}}r(v,"readStoredVersions");async function l(n,e,t){const a=await v(n,t);if(a!==void 0&&a.minReader>e)throw new Error(`refusing to select runtime with canvas schema ${e}: the live database requires readers at version ${a.minReader} or above (it is at ${a.version}); install a descendant build instead`)}r(l,"assertCandidateMayOpen");export{A as CANVAS_SCHEMA_VERSION,l as assertCandidateMayOpen,_ as canvasDatabaseSchema,h as canvasSchemaDatabaseUrl,E as canvasSearchPathOptions,v as readStoredVersions};

package/dist/core/canvas/sessions.d.ts

@@ -31,27 +31,24 @@ export declare function transferSession(input: {
     transcriptPath: string | null;
 }): Promise<'transferred' | 'shutdown' | 'changed'>;
 export declare function unbindSession(nodeId: string): Promise<void>;
-/** Rewrite the header `cwd` of every transcript this node owns from `oldCwd` to `newCwd`, keeping
- *  the sessions bound. Pi opens a transcript with its header cwd and a resume is vetoed once that
- *  directory is gone, so a same-directory relocation must move the header too. Each file is replaced
- *  atomically (temp + fsync + rename) and a run node's indexed `event_offset` shifts by the byte
- *  delta, in one canvas write that also serializes against `appendSection`. Returns files rewritten. */
+/** Rewrite the header `cwd` of every conversation this node owns from `oldCwd` to `newCwd`, keeping the sessions bound. Returns conversations rewritten. */
 export declare function relocateSessionCwd(nodeId: string, oldCwd: string, newCwd: string): Promise<number>;
 export declare function setCyclePending(nodeId: string, pending: boolean): Promise<void>;
 export declare function conversationOwner(conversationId: string): Promise<string | null>;
-/** Map only the indexed conversation paths; repair each file on first use. */
-export declare function openCanvasConversationStore(root: string): ConversationStore & {
+/** Open the row store: durable tail rows plus immutable blob parts. `root` is unused; it stays so test callers keep one signature. */
+export declare function openCanvasConversationStore(_root?: string): ConversationStore & {
+    commit(id: string): Promise<number>;
+    importLegacy(runId?: string): Promise<void>;
     recover(rows: Array<{
         session_id: string;
         node_id: string;
         transcript_path: string | null;
     }>): void;
-    repair(id: string): void;
 };
+/** Record each run conversation's existing transcript file as part 0 (first boot after the file store). */
 export declare function repairRunConversations(runId: string): Promise<void>;
-/** Open the canvas conversation store from the user `store` settings, install it in this
- *  process, and serve it for brokers. Unset settings use pi's sessions dir and
- *  `<CRTR_HOME>/store.sock`. */
+/** Install the row store in this process and import any transcript files not yet recorded as part 0.
+ *  Brokers reach it over the /v1 API; no socket is bound here. */
 export declare function serveCanvasConversationStore(): Promise<{
     close(): Promise<void>;
 }>;

package/dist/core/canvas/sessions.js

@@ -1,4 +1 @@
-var v=Object.defineProperty;var a=(n,e)=>v(n,"name",{value:e,configurable:!0});import{randomUUID as w}from"node:crypto";import{closeSync as y,existsSync as N,fsyncSync as C,openSync as T,readFileSync as U,readSync as A,renameSync as W,statSync as H,truncateSync as I,unlinkSync as D,writeFileSync as M}from"node:fs";import{openDb as c,withCanvasWrite as l}from"./db.js";import{canonicalSessionFile as R}from"./canvas.js";import{join as O}from"node:path";import{readConfig as x}from"../config.js";import{appSpace as F,socketDir as P}from"../layout.js";import{createFileStore as B,conversationStore as $,defaultConversationRoot as k,installConversationStore as b}from"../conversation-store/index.js";import{listenConversationStore as J}from"../conversation-store/listener.js";import{appendConversationEvents as h}from"../../daemon/runs/append-section.js";function S(){return new Date().toISOString()}a(S,"now");async function m(n,e,s){return await n.prepare("SELECT 1 FROM executions WHERE execution_id = ? AND node_id = ? AND state != 'exited'").get(s,e)!==void 0}a(m,"liveExecution");function j(n){return{bindingId:n.binding_id,sessionId:n.session_id??null,nodeId:n.node_id,transcriptPath:n.transcript_path??null,sourceSessionId:n.source_session_id??null,forkEntryId:n.fork_entry_id??null,createdAt:n.created_at,boundAt:n.bound_at,unboundAt:n.unbound_at??null}}a(j,"hydrate");async function rn(n){const e=await(await c()).prepare("SELECT * FROM sessions WHERE node_id = ? AND unbound_at IS NULL").get(n);return e===void 0?null:j(e)}a(rn,"readLiveSession");async function an(n){return(await(await c()).prepare("SELECT node_id FROM sessions WHERE transcript_path = ? AND unbound_at IS NULL").get(R(n)))?.node_id??null}a(an,"findNodeBySessionFileSql");async function dn(n,e){return await l(async s=>{if(!await m(s,n,e.executionId))return"shutdown";const i=S(),o=e.transcriptPath===null?null:R(e.transcriptPath),r=await s.prepare("SELECT binding_id, session_id FROM sessions WHERE node_id = ? AND unbound_at IS NULL").get(n);if(r!==void 0&&r.session_id===e.sessionId)await s.prepare("UPDATE sessions SET transcript_path = ?, source_session_id = ?, bound_at = ? WHERE binding_id = ?").run(o,e.sourceSessionId??null,i,r.binding_id);else{r!==void 0&&await s.prepare("UPDATE sessions SET unbound_at = ? WHERE binding_id = ?").run(i,r.binding_id);const t=e.sessionId===null?void 0:await s.prepare("SELECT binding_id FROM sessions WHERE node_id = ? AND session_id = ? ORDER BY created_at DESC LIMIT 1").get(n,e.sessionId);t?await s.prepare("UPDATE sessions SET transcript_path = ?, source_session_id = ?, bound_at = ?, unbound_at = NULL WHERE binding_id = ?").run(o,e.sourceSessionId??null,i,t.binding_id):await s.prepare("INSERT INTO sessions (binding_id, session_id, node_id, transcript_path, source_session_id, fork_entry_id, created_at, bound_at) VALUES (?, ?, ?, ?, ?, NULL, ?, ?)").run(w(),e.sessionId,n,o,e.sourceSessionId??null,i,i)}return await s.prepare("UPDATE nodes SET cycle_pending = 0 WHERE node_id = ?").run(n),"bound"})}a(dn,"bindSession");async function cn(n,e){await l(async s=>{const i=S();await s.prepare("UPDATE sessions SET unbound_at = ? WHERE node_id = ? AND unbound_at IS NULL").run(i,n),await s.prepare("INSERT INTO sessions (binding_id, session_id, node_id, transcript_path, source_session_id, fork_entry_id, created_at, bound_at) VALUES (?, ?, ?, ?, NULL, NULL, ?, ?)").run(w(),e.sessionId,n,e.transcriptPath===null?null:R(e.transcriptPath),i,i),await s.prepare("UPDATE nodes SET cycle_pending = 0 WHERE node_id = ?").run(n)})}a(cn,"resetSession");async function _n(n){return await l(async e=>{if(!await m(e,n.toNodeId,n.executionId))return"shutdown";if(await e.prepare("SELECT binding_id FROM sessions WHERE node_id = ? AND binding_id = ? AND unbound_at IS NULL").get(n.fromNodeId,n.fromBindingId)===void 0)return"changed";if(await e.prepare("SELECT run_id FROM nodes WHERE node_id IN (?, ?) AND run_id IS NOT NULL LIMIT 1").get(n.fromNodeId,n.toNodeId))throw new Error("run conversation transfer is not supported");const o=S();return await e.prepare("UPDATE sessions SET unbound_at = ? WHERE binding_id = ?").run(o,n.fromBindingId),await e.prepare("UPDATE sessions SET unbound_at = ? WHERE node_id = ? AND unbound_at IS NULL").run(o,n.toNodeId),await e.prepare("INSERT INTO sessions (binding_id, session_id, node_id, transcript_path, source_session_id, fork_entry_id, created_at, bound_at) VALUES (?, ?, ?, ?, NULL, NULL, ?, ?)").run(w(),n.sessionId,n.toNodeId,n.transcriptPath===null?null:R(n.transcriptPath),o,o),await e.prepare("UPDATE nodes SET cycle_pending = 0 WHERE node_id = ?").run(n.toNodeId),"transferred"})}a(_n,"transferSession");async function un(n){await(await c()).prepare("UPDATE sessions SET unbound_at = ? WHERE node_id = ? AND unbound_at IS NULL").run(S(),n)}a(un,"unbindSession");async function En(n,e,s){return await l(async i=>{const o=await i.prepare("SELECT binding_id, transcript_path FROM sessions WHERE node_id = ? AND transcript_path IS NOT NULL").all(n),r=[];try{for(const t of o){if(!N(t.transcript_path))continue;const _=U(t.transcript_path),f=_.indexOf(10);if(f<0)continue;let u;try{u=JSON.parse(_.subarray(0,f).toString("utf8"))}catch{continue}if(u.type!=="session"||u.cwd!==e)continue;const E=Buffer.concat([Buffer.from(JSON.stringify({...u,cwd:s}),"utf8"),_.subarray(f)]),d=`${t.transcript_path}.${w()}.tmp`;r.push({binding_id:t.binding_id,path:t.transcript_path,temp:d,delta:E.length-_.length}),M(d,E,{flag:"wx",mode:384});const p=T(d,"r");try{C(p)}finally{y(p)}}for(const t of r)t.delta!==0&&await i.prepare("UPDATE sessions SET event_offset = event_offset + ? WHERE binding_id = ? AND event_offset IS NOT NULL AND event_offset > 0").run(t.delta,t.binding_id);for(const t of r)W(t.temp,t.path)}finally{for(const t of r)N(t.temp)&&D(t.temp)}return r.length})}a(En,"relocateSessionCwd");async function pn(n,e){await(await c()).prepare("UPDATE nodes SET cycle_pending = ? WHERE node_id = ?").run(e?1:0,n)}a(pn,"setCyclePending");const L="unbound_at IS NULL DESC, created_at DESC, seq DESC";async function fn(n){return(await(await c()).prepare(`SELECT node_id FROM sessions WHERE session_id = ? ORDER BY ${L} LIMIT 1`).get(n))?.node_id??null}a(fn,"conversationOwner");const Y={appendSection:a(async(n,e,s)=>{const i=e.kind==="create"?e:void 0;i&&await l(async o=>{if(!await o.prepare("SELECT node_id FROM nodes WHERE node_id = ?").get(i.nodeId))throw new Error(`missing conversation owner ${i.nodeId}`);const t=S();await o.prepare("INSERT INTO sessions (binding_id, session_id, node_id, transcript_path, source_session_id, fork_entry_id, created_at, bound_at, unbound_at, event_offset) VALUES (?, ?, ?, ?, ?, NULL, ?, ?, ?, 0)").run(w(),n,i.nodeId,i.path,i.sourceId??null,t,t,t)}),await l(async o=>{const r=await o.prepare(`SELECT node_id, binding_id, input_ids_json FROM sessions WHERE session_id = ? ORDER BY ${L} LIMIT 1`).get(n),t=i?i.nodeId:r?.node_id;if(!t)throw new Error(`conversation ${n} has no active owner`);const _=await o.prepare("SELECT run_id FROM nodes WHERE node_id = ?").get(t);if(!_)throw new Error(`cannot write conversation ${n}: missing node ${t}`);if(e.kind==="replace"&&_.run_id!==null)throw new Error(`run conversation ${n} is append-only; replace refused`);const f=r.binding_id,u=s();if(_.run_id!==null&&e.kind!=="replace"){const E=i?.sourceId?[]:e.entries,d=await h(o,_.run_id,t,E,JSON.parse(r?.input_ids_json??"[]"));await o.prepare("UPDATE sessions SET event_offset = ?, indexed_entry_id = ?, input_ids_json = ? WHERE binding_id = ?").run(u,E.at(-1)?.id??null,JSON.stringify(d),f)}})},"appendSection"),async abortCreate(n){await(await c()).prepare("DELETE FROM sessions WHERE session_id = ? AND event_offset = 0").run(n)},async delete(n){await(await c()).prepare("DELETE FROM sessions WHERE session_id = ?").run(n)},async pathFor(n){return(await(await c()).prepare(`SELECT transcript_path FROM sessions WHERE session_id = ? ORDER BY ${L} LIMIT 1`).get(n))?.transcript_path??void 0},async createPath(n,e){const s=await(await c()).prepare("SELECT grantee FROM node_rows WHERE node_id = ?").get(n);if(!s)throw new Error(`missing conversation owner ${n}`);return O(F(s.grantee).conversations,n,`${e.timestamp.replace(/[:.]/g,"-")}_${e.id}.jsonl`)},async repair(n,e){await V(n,e)},async owners(){const n=new Map,e=await(await c()).prepare(`SELECT session_id, node_id FROM sessions WHERE session_id IS NOT NULL ORDER BY session_id, ${L}`).all();for(const s of e)n.has(s.session_id)||n.set(s.session_id,s.node_id);return n}};async function V(n,e){const s=await(await c()).prepare(`SELECT s.binding_id, s.node_id, s.event_offset, s.input_ids_json, s.source_session_id, n.run_id
-    FROM sessions s JOIN nodes n ON n.node_id = s.node_id WHERE s.session_id = ? ORDER BY s.unbound_at IS NULL DESC, s.created_at DESC, s.seq DESC LIMIT 1`).get(n);if(!s?.run_id||s.event_offset===null)return;if(s.event_offset===0&&!N(e)){await(await c()).prepare("DELETE FROM sessions WHERE binding_id = ?").run(s.binding_id);return}const i=H(e).size;if(i<s.event_offset)throw new Error(`conversation shorter than indexed offset: ${n}`);if(i===s.event_offset)return;const o=T(e,"r"),r=[];try{const d=Buffer.allocUnsafe(65536);for(let p=s.event_offset;p<i;){const g=A(o,d,0,Math.min(d.length,i-p),p);if(!g)throw new Error(`conversation read ended early: ${n}`);r.push(Buffer.from(d.subarray(0,g))),p+=g}}finally{y(o)}const t=Buffer.concat(r).toString("utf8"),_=t.lastIndexOf(`
-`);if(_<0){s.event_offset===0?(D(e),await(await c()).prepare("DELETE FROM sessions WHERE binding_id = ?").run(s.binding_id)):I(e,s.event_offset);return}const f=t.slice(0,_+1),u=f.split(`
-`).filter(Boolean).map(d=>JSON.parse(d)).filter(d=>d.type!=="session"),E=s.event_offset+Buffer.byteLength(f);E<i&&I(e,E),await l(async d=>{const p=s.source_session_id?[]:await h(d,s.run_id,s.node_id,u,JSON.parse(s.input_ids_json));await d.prepare("UPDATE sessions SET event_offset = ?, indexed_entry_id = ?, input_ids_json = ? WHERE binding_id = ?").run(E,u.at(-1)?.id??null,JSON.stringify(p),s.binding_id)})}a(V,"repairConversationTail");function q(n){return B(n,Y)}a(q,"openCanvasConversationStore");async function ln(n){const e=await(await c()).prepare("SELECT DISTINCT s.session_id FROM sessions s JOIN nodes n ON n.node_id = s.node_id WHERE n.run_id = ? AND s.session_id IS NOT NULL").all(n),s=$();for(const i of e)s.repair?.(i.session_id)}a(ln,"repairRunConversations");async function wn(){const n=x("user").store,e=n?.address??O(P(),"store.sock"),s=q(n?.root??k());b(s),process.env.CRTR_STORE_ADDRESS=e;const i=await J(e,s);return{async close(){await i.close(),b(void 0)}}}a(wn,"serveCanvasConversationStore");export{dn as bindSession,fn as conversationOwner,an as findNodeBySessionFileSql,q as openCanvasConversationStore,rn as readLiveSession,En as relocateSessionCwd,ln as repairRunConversations,cn as resetSession,wn as serveCanvasConversationStore,pn as setCyclePending,_n as transferSession,un as unbindSession};
+var l=Object.defineProperty;var i=(n,e)=>l(n,"name",{value:e,configurable:!0});import{randomUUID as _}from"node:crypto";import{openDb as a,withCanvasWrite as c}from"./db.js";import{canonicalSessionFile as d}from"./canvas.js";import{conversationStore as f,installConversationStore as p}from"../conversation-store/index.js";import{createRowStore as L,relocateConversationHeader as I}from"../conversation-store/row-store.js";function u(){return new Date().toISOString()}i(u,"now");async function S(n,e,s){return await n.prepare("SELECT 1 FROM executions WHERE execution_id = ? AND node_id = ? AND state != 'exited'").get(s,e)!==void 0}i(S,"liveExecution");function w(n){return{bindingId:n.binding_id,sessionId:n.session_id??null,nodeId:n.node_id,transcriptPath:n.transcript_path??null,sourceSessionId:n.source_session_id??null,forkEntryId:n.fork_entry_id??null,createdAt:n.created_at,boundAt:n.bound_at,unboundAt:n.unbound_at??null}}i(w,"hydrate");async function b(n){const e=await(await a()).prepare("SELECT * FROM sessions WHERE node_id = ? AND unbound_at IS NULL").get(n);return e===void 0?null:w(e)}i(b,"readLiveSession");async function C(n){return(await(await a()).prepare("SELECT node_id FROM sessions WHERE transcript_path = ? AND unbound_at IS NULL").get(d(n)))?.node_id??null}i(C,"findNodeBySessionFileSql");async function h(n,e){return await c(async s=>{if(!await S(s,n,e.executionId))return"shutdown";if(e.sessionId!==null&&await s.prepare("SELECT 1 FROM sessions WHERE session_id = ? AND node_id <> ? LIMIT 1").get(e.sessionId,n)!==void 0)throw new Error(`session ${e.sessionId} is bound to another node`);const o=u(),r=e.transcriptPath===null?null:d(e.transcriptPath),t=await s.prepare("SELECT binding_id, session_id FROM sessions WHERE node_id = ? AND unbound_at IS NULL").get(n);if(t!==void 0&&t.session_id===e.sessionId)await s.prepare("UPDATE sessions SET transcript_path = ?, source_session_id = ?, bound_at = ? WHERE binding_id = ?").run(r,e.sourceSessionId??null,o,t.binding_id);else{t!==void 0&&await s.prepare("UPDATE sessions SET unbound_at = ? WHERE binding_id = ?").run(o,t.binding_id);const E=e.sessionId===null?void 0:await s.prepare("SELECT binding_id FROM sessions WHERE node_id = ? AND session_id = ? ORDER BY created_at DESC LIMIT 1").get(n,e.sessionId);E?await s.prepare("UPDATE sessions SET transcript_path = ?, source_session_id = ?, bound_at = ?, unbound_at = NULL WHERE binding_id = ?").run(r,e.sourceSessionId??null,o,E.binding_id):await s.prepare("INSERT INTO sessions (binding_id, session_id, node_id, transcript_path, source_session_id, fork_entry_id, created_at, bound_at) VALUES (?, ?, ?, ?, ?, NULL, ?, ?)").run(_(),e.sessionId,n,r,e.sourceSessionId??null,o,o)}return await s.prepare("UPDATE nodes SET cycle_pending = 0 WHERE node_id = ?").run(n),"bound"})}i(h,"bindSession");async function W(n,e){await c(async s=>{const o=u();await s.prepare("UPDATE sessions SET unbound_at = ? WHERE node_id = ? AND unbound_at IS NULL").run(o,n),await s.prepare("INSERT INTO sessions (binding_id, session_id, node_id, transcript_path, source_session_id, fork_entry_id, created_at, bound_at) VALUES (?, ?, ?, ?, NULL, NULL, ?, ?)").run(_(),e.sessionId,n,e.transcriptPath===null?null:d(e.transcriptPath),o,o),await s.prepare("UPDATE nodes SET cycle_pending = 0 WHERE node_id = ?").run(n)})}i(W,"resetSession");async function H(n){return await c(async e=>{if(!await S(e,n.toNodeId,n.executionId))return"shutdown";if(await e.prepare("SELECT binding_id FROM sessions WHERE node_id = ? AND binding_id = ? AND unbound_at IS NULL").get(n.fromNodeId,n.fromBindingId)===void 0)return"changed";if(await e.prepare("SELECT run_id FROM nodes WHERE node_id IN (?, ?) AND run_id IS NOT NULL LIMIT 1").get(n.fromNodeId,n.toNodeId))throw new Error("run conversation transfer is not supported");const r=u();return await e.prepare("UPDATE sessions SET unbound_at = ? WHERE binding_id = ?").run(r,n.fromBindingId),await e.prepare("UPDATE sessions SET unbound_at = ? WHERE node_id = ? AND unbound_at IS NULL").run(r,n.toNodeId),await e.prepare("INSERT INTO sessions (binding_id, session_id, node_id, transcript_path, source_session_id, fork_entry_id, created_at, bound_at) VALUES (?, ?, ?, ?, NULL, NULL, ?, ?)").run(_(),n.sessionId,n.toNodeId,n.transcriptPath===null?null:d(n.transcriptPath),r,r),await e.prepare("UPDATE nodes SET cycle_pending = 0 WHERE node_id = ?").run(n.toNodeId),"transferred"})}i(H,"transferSession");async function O(n){await(await a()).prepare("UPDATE sessions SET unbound_at = ? WHERE node_id = ? AND unbound_at IS NULL").run(u(),n)}i(O,"unbindSession");async function P(n,e,s){const o=await(await a()).prepare("SELECT DISTINCT session_id FROM sessions WHERE node_id = ? AND session_id IS NOT NULL").all(n);let r=0;for(const t of o)await I(t.session_id,e,s)&&r++;return r}i(P,"relocateSessionCwd");async function x(n,e){await(await a()).prepare("UPDATE nodes SET cycle_pending = ? WHERE node_id = ?").run(e?1:0,n)}i(x,"setCyclePending");const N="unbound_at IS NULL DESC, created_at DESC, seq DESC";async function m(n){return(await(await a()).prepare(`SELECT node_id FROM sessions WHERE session_id = ? ORDER BY ${N} LIMIT 1`).get(n))?.node_id??null}i(m,"conversationOwner");function T(n){return L()}i(T,"openCanvasConversationStore");async function v(n){await f().importLegacy?.(n)}i(v,"repairRunConversations");async function M(){const n=T();return p(n),await n.importLegacy(),{async close(){p(void 0)}}}i(M,"serveCanvasConversationStore");export{h as bindSession,m as conversationOwner,C as findNodeBySessionFileSql,T as openCanvasConversationStore,b as readLiveSession,P as relocateSessionCwd,v as repairRunConversations,W as resetSession,M as serveCanvasConversationStore,x as setCyclePending,H as transferSession,O as unbindSession};

package/dist/core/canvas/tree.d.ts

@@ -6,8 +6,10 @@ export interface RosterEdge {
     active: boolean;
     created: string;
 }
-/** Every in-tree node→node watch, oldest first — the roster's topology half. */
-export declare function rosterEdges(): Promise<RosterEdge[]>;
+/** Every in-tree node→node watch, oldest first — the roster's topology half. `visible` is the node ids the requester may
+ *  see: only edges between two of them are read, so each person on a shared database gets their own edges; `null` reads
+ *  every edge. */
+export declare function rosterEdges(visible?: ReadonlySet<string> | null): Promise<RosterEdge[]>;
 /** `subscriber` asks to watch `publisher` (an `ask` watch, in the tree). Re-running sets the
  *  pair's tree subscriptions active or passive (`{"3":"next-turn"}`). */
 export declare function subscribe(subscriber: string, publisher: string, active?: boolean): Promise<void>;

package/dist/core/canvas/tree.js

@@ -1,19 +1,19 @@
-var O=Object.defineProperty;var i=(o,t)=>O(o,"name",{value:t,configurable:!0});import{openDb as c,withCanvasWrite as d}from"./db.js";import{getById as m,nodeObject as r}from"../graph/objects.js";import{recordWatch as y,unwatch as I,configFromJson as N,configToJson as b}from"../graph/watches.js";import{publish as T}from"../graph/events.js";import{DEFAULT_LISTEN as v}from"../graph/types.js";const D=["spawn","job-start","ask"],S="('spawn','job-start','ask')",R=[{threshold:3,delivery:"next-turn"}];function l(o){const t=o.find(a=>a.threshold<=7);return t!==void 0&&t.delivery!=="next-turn"}i(l,"wakesAtSeven");async function w(o,t,...a){const e=await o.prepareUncached(`SELECT wo.id AS from_id, oo.id AS to_id, ws.config_json, ws.created_at,
+var O=Object.defineProperty;var i=(o,t)=>O(o,"name",{value:t,configurable:!0});import{openDb as c,withCanvasWrite as u}from"./db.js";import{getById as m,nodeObject as r}from"../graph/objects.js";import{recordWatch as y,unwatch as I,configFromJson as l,configToJson as b}from"../graph/watches.js";import{publish as T}from"../graph/events.js";import{DEFAULT_LISTEN as D}from"../graph/types.js";const v=["spawn","job-start","ask"],E="('spawn','job-start','ask')",R=[{threshold:3,delivery:"next-turn"}];function S(o){const t=o.find(a=>a.threshold<=7);return t!==void 0&&t.delivery!=="next-turn"}i(S,"wakesAtSeven");async function w(o,t,...a){const e=await o.prepareUncached(`SELECT wo.id AS from_id, oo.id AS to_id, ws.config_json, ws.created_at,
             wo.listen_json, wn.status AS from_status, onode.status AS to_status
        FROM watches w
        JOIN objects wo ON wo.id = w.watcher AND wo.type = 'node'
        JOIN objects oo ON oo.id = w.object AND oo.type = 'node'
-       JOIN watch_subscriptions ws ON ws.watch = w.watch_id AND ws.started_by IN ${S}
+       JOIN watch_subscriptions ws ON ws.watch = w.watch_id AND ws.started_by IN ${E}
        JOIN nodes wn ON wn.node_id = wo.id
        JOIN nodes onode ON onode.node_id = oo.id
       WHERE w.in_tree = 1 ${t}
-      ORDER BY ws.created_at, ws.seq`).all(...a),s=new Map;for(const n of e){const u=n.config_json,_=n.listen_json,f=u!=null?N(u):_!=null?N(_):v,p=`${n.from_id}\0${n.to_id}`,E=s.get(p);if(E){E.active||=l(f);continue}s.set(p,{from_id:n.from_id,to_id:n.to_id,active:l(f),created:n.created_at,from_status:n.from_status??null,to_status:n.to_status??null})}return[...s.values()]}i(w,"treeEdges");async function F(){return(await w(await c(),"")).map(({from_id:o,to_id:t,active:a,created:e})=>({from_id:o,to_id:t,active:a,created:e}))}i(F,"rosterEdges");async function W(o,t,a=!0){await d(async e=>{const s=await r(e,o),n=await r(e,t);await y(e,s,n,"ask"),await j(o,t,a),await T(e,{event:"watched",object:n,actor:s,attrs:{}})})}i(W,"subscribe");async function M(o,t){await d(async a=>{const e=await r(a,o),s=await r(a,t);for(const n of D)await I(a,e,s,{startedBy:n})})}i(M,"unsubscribe");async function j(o,t,a){await d(async e=>{await e.prepareUncached(`UPDATE watch_subscriptions SET config_json = ?
-        WHERE started_by IN ${S}
-          AND watch IN (SELECT watch_id FROM watches WHERE watcher = ? AND object = ?)`).run(a?null:b(R),(await r(e,o)).id,(await r(e,t)).id)})}i(j,"setSubscriptionActive");async function $(o){return(await w(await c(),"AND oo.id = ?",o)).map(t=>({node_id:t.from_id,active:t.active,created:t.created}))}i($,"subscribersOf");async function B(o){return(await w(await c(),"AND wo.id = ?",o)).map(t=>({node_id:t.to_id,active:t.active,created:t.created}))}i(B,"subscriptionsOf");function h(o){return`WITH RECURSIVE walk(id) AS (
+      ORDER BY ws.created_at, ws.seq`).all(...a),s=new Map;for(const n of e){const d=n.config_json,_=n.listen_json,f=d!=null?l(d):_!=null?l(_):D,N=`${n.from_id}\0${n.to_id}`,p=s.get(N);if(p){p.active||=S(f);continue}s.set(N,{from_id:n.from_id,to_id:n.to_id,active:S(f),created:n.created_at,from_status:n.from_status??null,to_status:n.to_status??null})}return[...s.values()]}i(w,"treeEdges");async function F(o=null){const t=o===null?null:[...o];return(t===null?await w(await c(),""):await w(await c(),"AND wo.id = ANY(?::text[]) AND oo.id = ANY(?::text[])",t,t)).map(({from_id:e,to_id:s,active:n,created:d})=>({from_id:e,to_id:s,active:n,created:d}))}i(F,"rosterEdges");async function W(o,t,a=!0){await u(async e=>{const s=await r(e,o),n=await r(e,t);await y(e,s,n,"ask"),await j(o,t,a),await T(e,{event:"watched",object:n,actor:s,attrs:{}})})}i(W,"subscribe");async function M(o,t){await u(async a=>{const e=await r(a,o),s=await r(a,t);for(const n of v)await I(a,e,s,{startedBy:n})})}i(M,"unsubscribe");async function j(o,t,a){await u(async e=>{await e.prepareUncached(`UPDATE watch_subscriptions SET config_json = ?
+        WHERE started_by IN ${E}
+          AND watch IN (SELECT watch_id FROM watches WHERE watcher = ? AND object = ?)`).run(a?null:b(R),(await r(e,o)).id,(await r(e,t)).id)})}i(j,"setSubscriptionActive");async function $(o){return(await w(await c(),"AND oo.id = ?",o)).map(t=>({node_id:t.from_id,active:t.active,created:t.created}))}i($,"subscribersOf");async function B(o){return(await w(await c(),"AND wo.id = ?",o)).map(t=>({node_id:t.to_id,active:t.active,created:t.created}))}i(B,"subscriptionsOf");function A(o){return`WITH RECURSIVE walk(id) AS (
     SELECT CAST(? AS text)
     UNION
     SELECT w.object FROM walk
       JOIN watches w ON w.watcher = walk.id AND w.in_tree = 1
       ${o?`JOIN objects oo ON oo.id = w.object AND oo.type = 'node' AND oo.kind IS DISTINCT FROM 'human'
       JOIN nodes onode ON onode.node_id = oo.id`:"JOIN nodes onode ON onode.node_id = w.object"}
-  ) SELECT id FROM walk WHERE id != ?`}i(h,"subtreeSql");const H=h(!0),L=h(!1);async function P(o){const t=await c(),a=await m(t,o);return a?.type!=="node"?[]:(await t.prepareUncached(L).all(a.id,a.id)).map(e=>e.id)}i(P,"view");const A=new Set(["active","idle"]);async function Q(o){return(await w(await c(),"AND wo.id = ?",o)).some(t=>t.active&&A.has(t.to_status??""))}i(Q,"hasActiveLiveSubscription");async function V(o){return(await w(await c(),"AND oo.id = ?",o)).some(t=>t.active&&A.has(t.from_status??""))}i(V,"hasLiveSubscriber");export{L as SUBTREE_ALL_IDS_SQL,H as SUBTREE_IDS_SQL,Q as hasActiveLiveSubscription,V as hasLiveSubscriber,F as rosterEdges,j as setSubscriptionActive,W as subscribe,$ as subscribersOf,B as subscriptionsOf,M as unsubscribe,P as view};
+  ) SELECT id FROM walk WHERE id != ?`}i(A,"subtreeSql");const H=A(!0),x=A(!1);async function P(o){const t=await c(),a=await m(t,o);return a?.type!=="node"?[]:(await t.prepareUncached(x).all(a.id,a.id)).map(e=>e.id)}i(P,"view");const h=new Set(["active","idle"]);async function Q(o){return(await w(await c(),"AND wo.id = ?",o)).some(t=>t.active&&h.has(t.to_status??""))}i(Q,"hasActiveLiveSubscription");async function V(o){return(await w(await c(),"AND oo.id = ?",o)).some(t=>t.active&&h.has(t.from_status??""))}i(V,"hasLiveSubscriber");export{x as SUBTREE_ALL_IDS_SQL,H as SUBTREE_IDS_SQL,Q as hasActiveLiveSubscription,V as hasLiveSubscriber,F as rosterEdges,j as setSubscriptionActive,W as subscribe,$ as subscribersOf,B as subscriptionsOf,M as unsubscribe,P as view};

package/dist/core/canvas/types.d.ts

@@ -68,6 +68,13 @@ export interface LaunchSpec {
     systemPrompt?: string;
     /** Extra env injected into the pi process. */
     env: Record<string, string>;
+    /** A managed-worktree request for a node in a Blaxel sandbox (D102): the start script switches the image's clone of
+     *  `repository` to a new `branch` cut from `base`. Absent on a Mac, where crtrd makes the worktree. */
+    worktree?: {
+        repository: string;
+        branch: string;
+        base: string;
+    };
 }
 /** The repository fingerprint a refusal was decided against. An examination
  *  that reads the same values can skip the whole proof cascade: nothing about

package/dist/core/command-hooks/transport/exec-lifecycle.js

@@ -1 +1 @@
-var M=Object.defineProperty;var c=(e,t)=>M(e,"name",{value:t,configurable:!0});import{randomBytes as k}from"node:crypto";import{spawn as _}from"node:child_process";import{PROCESS_GROUP_KILL_GRACE_MS as S,posixProcessGroupSpawnOptions as R,terminateProcessGroup as V}from"../../../hook-process.js";import{isRecord as L}from"../../../shared/predicates.js";import{diag as x}from"../../io.js";import{LIFECYCLE_CATALOG as O}from"../lifecycle-catalog.js";import{getNode as A}from"../../canvas/canvas.js";import{buildAppProcessEnv as C}from"../../runtime/spawn-env.js";import{appProcessSandboxed as D,launchAppProcess as G}from"../../spaces/process.js";const P=10*1024*1024;async function H(e,t,n){try{const r=await B(e,t,n);r.ok||x(`crtr: ${g(e)} failed: ${r.error.code}: ${r.error.message}`)}catch(r){x(`crtr: ${g(e)} failed: ${w(r)}`)}}c(H,"invokeLifecycleHook");async function te(e,t){if(e.length===0)return;const{hookTimeoutMs:n,eventBudgetMs:r}=O[e[0].event],s=Date.now()+r;for(const o of e){const a=s-Date.now(),u=Math.min(n,a-S);if(u<=0){x(`crtr: lifecycle hook event ${o.event} exceeded its ${r}ms aggregate budget; skipped ${g(o)}`);return}await H(o,t,u)}}c(te,"invokeLifecycleHooks");async function re(e,t){if(e.length===0)return null;const{hookTimeoutMs:n,eventBudgetMs:r}=O["node:create"],s=Date.now()+r;for(const o of e){const a=s-Date.now(),u=Math.min(n,a-S);if(u<=0)return T(o,`lifecycle hook event node:create exceeded its ${r}ms aggregate budget`);try{const i=await B(o,t,u);if(!i.ok)return{hook:o,message:i.error.message,next:i.error.next??E(o)}}catch(i){return T(o,w(i))}}return null}c(re,"invokeBlockingLifecycleHooks");function T(e,t){return{hook:e,message:`${g(e)} failed: ${t}`,next:E(e)}}c(T,"refusal");function ne(e){return E(e)}c(ne,"lifecycleHookAttribution");async function B(e,t,n){const r=e.event==="node:create"?N(e,t):I(e,t),s=D()?await J(e,t,JSON.stringify(r),n):await q(e,JSON.stringify(r),n);if(s.signal!==null)throw new Error(`executable was killed by signal ${s.signal}`);const o=K(s.stdout);return o.ok&&s.status!==0&&x(`crtr: ${g(e)} returned ok:true but exited ${s.status} (honoring the envelope)`),o}c(B,"executeLifecycleHook");function I(e,t){return{protocolVersion:1,op:e.op,event:e.event,phase:e.phase,operationId:k(16).toString("hex"),node:t.node,runtime:t.runtime,context:{cwd:t.node.cwd}}}c(I,"nodeRequest");function N(e,t){return{protocolVersion:1,op:e.op,event:"node:create",phase:"before",operationId:k(16).toString("hex"),create:t.create,runtime:t.runtime,context:{cwd:t.create.cwd}}}c(N,"createRequest");async function J(e,t,n,r){const s=e.event==="node:create",o=s?t.create.cwd:t.node.cwd,a=s?void 0:t.node.id,u=s?t.app:(await A(a))?.grantee;if(!u)throw new Error(`missing app for lifecycle hook ${e.event}`);const i=C(o,t.runtime.profile,u),m=await G({...s?{app:u}:{nodeId:a},command:[e.executable,"--crtr-hook-protocol","1"],cwd:e.plugin.root,pluginRoot:e.plugin.root,env:i,stdin:n,stdoutBytes:P,stderrBytes:64*1024});let l;try{const p=await Promise.race([m.completion,new Promise((b,f)=>{l=setTimeout(()=>{m.stop().then(()=>f(new Error(`executable timed out after ${r}ms`)),f)},r)})]);if(p.stdoutTruncated)throw new Error("stdout exceeded the 10 MiB cap");return{stdout:p.stdout,status:p.exitCode,signal:p.signal}}finally{l&&clearTimeout(l)}}c(J,"runSandboxedLifecycleProcess");async function q(e,t,n){let r;try{r=_(e.executable,["--crtr-hook-protocol","1"],{cwd:e.plugin.root,env:process.env,stdio:["pipe","pipe","inherit"],...R()})}catch(s){throw new Error(`executable could not be run (${w(s)})`)}return new Promise((s,o)=>{let a=0;const u=[];let i,m=!1,l=!1,p=null,b=null,f;const y=c(()=>{if(!(!m||i!==void 0&&!l)){if(f!==void 0&&clearTimeout(f),i?.kind==="timeout")return o(new Error(`executable timed out after ${n}ms`));if(i?.kind==="output_limit")return o(new Error("stdout exceeded the 10 MiB cap"));if(i?.kind==="spawn")return o(new Error(`executable could not be run (${w(i.error)})`));if(i?.kind==="cleanup")return o(new Error(`executable cleanup failed (${w(i.error)})`));s({stdout:Buffer.concat(u).toString("utf8"),status:p,signal:b})}},"finish"),$=c(d=>{i===void 0&&(i=d,f!==void 0&&clearTimeout(f),V(r).then(()=>{l=!0,y()},h=>{i={kind:"cleanup",error:h},l=!0,y()}))},"terminate");r.stdout.on("data",d=>{if(a+=d.byteLength,a>P)return $({kind:"output_limit"});u.push(d)}),r.once("error",d=>{if(r.pid===void 0){i={kind:"spawn",error:d},m=!0,l=!0,y();return}$({kind:"spawn",error:d})}),r.once("close",(d,h)=>{p=d,b=h,m=!0,y()}),f=setTimeout(()=>$({kind:"timeout"}),n),r.stdin.end(t)})}c(q,"runLifecycleProcess");function K(e){let t;try{t=JSON.parse(e.trim())}catch{throw new Error("stdout was not a single JSON envelope")}if(!L(t)||t.protocolVersion!==1)throw new Error("stdout was not a protocolVersion: 1 envelope");if(t.ok===!0&&v(t,["protocolVersion","ok"]))return{protocolVersion:1,ok:!0};if(t.ok!==!1||!v(t,["protocolVersion","ok","error"]))throw new Error("response envelope had missing or extra fields");const n=t.error;if(!L(n)||!v(n,["code","message"],["next"])||typeof n.code!="string"||n.code===""||typeof n.message!="string"||n.message===""||n.next!==void 0&&typeof n.next!="string")throw new Error("failure envelope had invalid error fields");return{protocolVersion:1,ok:!1,error:{code:n.code,message:n.message,...n.next===void 0?{}:{next:n.next}}}}c(K,"parseEnvelope");function v(e,t,n=[]){return t.every(r=>Object.hasOwn(e,r))&&Object.keys(e).every(r=>t.includes(r)||n.includes(r))}c(v,"exactKeys");function g(e){return`plugin "${e.plugin.name}" lifecycle hook "${e.op}" for ${e.event}`}c(g,"label");function E(e){return`Refused by plugin ${e.plugin.name}, op ${e.op}.`}c(E,"attribution");function w(e){return e instanceof Error?e.message:String(e)}c(w,"describeError");export{re as invokeBlockingLifecycleHooks,H as invokeLifecycleHook,te as invokeLifecycleHooks,ne as lifecycleHookAttribution};
+var M=Object.defineProperty;var c=(e,t)=>M(e,"name",{value:t,configurable:!0});import{randomBytes as k}from"node:crypto";import{spawn as _}from"node:child_process";import{PROCESS_GROUP_KILL_GRACE_MS as S,posixProcessGroupSpawnOptions as R,terminateProcessGroup as V}from"../../../hook-process.js";import{isRecord as L}from"../../../shared/predicates.js";import{diag as x}from"../../io.js";import{LIFECYCLE_CATALOG as O}from"../lifecycle-catalog.js";import{getNode as A}from"../../canvas/canvas.js";import{buildAppProcessEnv as C}from"../../runtime/spawn-env-rows.js";import{appProcessSandboxed as D,launchAppProcess as G}from"../../spaces/process.js";const P=10*1024*1024;async function H(e,t,n){try{const r=await B(e,t,n);r.ok||x(`crtr: ${g(e)} failed: ${r.error.code}: ${r.error.message}`)}catch(r){x(`crtr: ${g(e)} failed: ${w(r)}`)}}c(H,"invokeLifecycleHook");async function te(e,t){if(e.length===0)return;const{hookTimeoutMs:n,eventBudgetMs:r}=O[e[0].event],s=Date.now()+r;for(const o of e){const a=s-Date.now(),u=Math.min(n,a-S);if(u<=0){x(`crtr: lifecycle hook event ${o.event} exceeded its ${r}ms aggregate budget; skipped ${g(o)}`);return}await H(o,t,u)}}c(te,"invokeLifecycleHooks");async function re(e,t){if(e.length===0)return null;const{hookTimeoutMs:n,eventBudgetMs:r}=O["node:create"],s=Date.now()+r;for(const o of e){const a=s-Date.now(),u=Math.min(n,a-S);if(u<=0)return T(o,`lifecycle hook event node:create exceeded its ${r}ms aggregate budget`);try{const i=await B(o,t,u);if(!i.ok)return{hook:o,message:i.error.message,next:i.error.next??E(o)}}catch(i){return T(o,w(i))}}return null}c(re,"invokeBlockingLifecycleHooks");function T(e,t){return{hook:e,message:`${g(e)} failed: ${t}`,next:E(e)}}c(T,"refusal");function ne(e){return E(e)}c(ne,"lifecycleHookAttribution");async function B(e,t,n){const r=e.event==="node:create"?N(e,t):I(e,t),s=D()?await J(e,t,JSON.stringify(r),n):await q(e,JSON.stringify(r),n);if(s.signal!==null)throw new Error(`executable was killed by signal ${s.signal}`);const o=K(s.stdout);return o.ok&&s.status!==0&&x(`crtr: ${g(e)} returned ok:true but exited ${s.status} (honoring the envelope)`),o}c(B,"executeLifecycleHook");function I(e,t){return{protocolVersion:1,op:e.op,event:e.event,phase:e.phase,operationId:k(16).toString("hex"),node:t.node,runtime:t.runtime,context:{cwd:t.node.cwd}}}c(I,"nodeRequest");function N(e,t){return{protocolVersion:1,op:e.op,event:"node:create",phase:"before",operationId:k(16).toString("hex"),create:t.create,runtime:t.runtime,context:{cwd:t.create.cwd}}}c(N,"createRequest");async function J(e,t,n,r){const s=e.event==="node:create",o=s?t.create.cwd:t.node.cwd,a=s?void 0:t.node.id,u=s?t.app:(await A(a))?.grantee;if(!u)throw new Error(`missing app for lifecycle hook ${e.event}`);const i=await C(o,t.runtime.profile,u),m=await G({...s?{app:u}:{nodeId:a},command:[e.executable,"--crtr-hook-protocol","1"],cwd:e.plugin.root,pluginRoot:e.plugin.root,env:i,stdin:n,stdoutBytes:P,stderrBytes:64*1024});let l;try{const p=await Promise.race([m.completion,new Promise((b,f)=>{l=setTimeout(()=>{m.stop().then(()=>f(new Error(`executable timed out after ${r}ms`)),f)},r)})]);if(p.stdoutTruncated)throw new Error("stdout exceeded the 10 MiB cap");return{stdout:p.stdout,status:p.exitCode,signal:p.signal}}finally{l&&clearTimeout(l)}}c(J,"runSandboxedLifecycleProcess");async function q(e,t,n){let r;try{r=_(e.executable,["--crtr-hook-protocol","1"],{cwd:e.plugin.root,env:process.env,stdio:["pipe","pipe","inherit"],...R()})}catch(s){throw new Error(`executable could not be run (${w(s)})`)}return new Promise((s,o)=>{let a=0;const u=[];let i,m=!1,l=!1,p=null,b=null,f;const y=c(()=>{if(!(!m||i!==void 0&&!l)){if(f!==void 0&&clearTimeout(f),i?.kind==="timeout")return o(new Error(`executable timed out after ${n}ms`));if(i?.kind==="output_limit")return o(new Error("stdout exceeded the 10 MiB cap"));if(i?.kind==="spawn")return o(new Error(`executable could not be run (${w(i.error)})`));if(i?.kind==="cleanup")return o(new Error(`executable cleanup failed (${w(i.error)})`));s({stdout:Buffer.concat(u).toString("utf8"),status:p,signal:b})}},"finish"),$=c(d=>{i===void 0&&(i=d,f!==void 0&&clearTimeout(f),V(r).then(()=>{l=!0,y()},h=>{i={kind:"cleanup",error:h},l=!0,y()}))},"terminate");r.stdout.on("data",d=>{if(a+=d.byteLength,a>P)return $({kind:"output_limit"});u.push(d)}),r.once("error",d=>{if(r.pid===void 0){i={kind:"spawn",error:d},m=!0,l=!0,y();return}$({kind:"spawn",error:d})}),r.once("close",(d,h)=>{p=d,b=h,m=!0,y()}),f=setTimeout(()=>$({kind:"timeout"}),n),r.stdin.end(t)})}c(q,"runLifecycleProcess");function K(e){let t;try{t=JSON.parse(e.trim())}catch{throw new Error("stdout was not a single JSON envelope")}if(!L(t)||t.protocolVersion!==1)throw new Error("stdout was not a protocolVersion: 1 envelope");if(t.ok===!0&&v(t,["protocolVersion","ok"]))return{protocolVersion:1,ok:!0};if(t.ok!==!1||!v(t,["protocolVersion","ok","error"]))throw new Error("response envelope had missing or extra fields");const n=t.error;if(!L(n)||!v(n,["code","message"],["next"])||typeof n.code!="string"||n.code===""||typeof n.message!="string"||n.message===""||n.next!==void 0&&typeof n.next!="string")throw new Error("failure envelope had invalid error fields");return{protocolVersion:1,ok:!1,error:{code:n.code,message:n.message,...n.next===void 0?{}:{next:n.next}}}}c(K,"parseEnvelope");function v(e,t,n=[]){return t.every(r=>Object.hasOwn(e,r))&&Object.keys(e).every(r=>t.includes(r)||n.includes(r))}c(v,"exactKeys");function g(e){return`plugin "${e.plugin.name}" lifecycle hook "${e.op}" for ${e.event}`}c(g,"label");function E(e){return`Refused by plugin ${e.plugin.name}, op ${e.op}.`}c(E,"attribution");function w(e){return e instanceof Error?e.message:String(e)}c(w,"describeError");export{re as invokeBlockingLifecycleHooks,H as invokeLifecycleHook,te as invokeLifecycleHooks,ne as lifecycleHookAttribution};

package/dist/core/command-plugins/bundle.d.ts

@@ -98,7 +98,7 @@ export declare function isInstalledGeneration(name: string, scope: Scope, root:
  *  are recorded either way, because both describe the bytes now at the root. */
 export declare function recordCheckedGeneration(scope: Scope, name: string, etag: string | undefined, options: {
     swapped: boolean;
-}): void;
+}): Promise<void>;
 /** Every file lands by temp file plus rename, fsynced, so a crash mid-write leaves the previous bytes or
  *  the whole new ones — never a 0-byte `plugin.json` or `commands.json` that crashes the next boot. */
 export declare function writeStagedBundle(stagingRoot: string, manifest: PluginManifest, bundle: ValidatedBundle): void;

package/dist/core/command-plugins/bundle.js

@@ -1 +1 @@
-var P=Object.defineProperty;var c=(e,o)=>P(e,"name",{value:o,configurable:!0});import{Parser as J}from"tar";import{createHash as I}from"node:crypto";import{chmodSync as W,renameSync as k}from"node:fs";import{dirname as $,join as w,resolve as V,sep as z}from"node:path";import{validateCommandManifest as B}from"../../api/command-manifest/manifest.js";import{ensureScopeInitialized as R,invalidPluginKindsReasons as F,readConfig as M,updateConfig as D,updateState as T}from"../config.js";import{general as x}from"../errors.js";import{atomicWriteJson as C,atomicWriteText as q,ensureDir as j,nowIso as E,pathExists as _,removePath as S,syncDirectory as H,syncTree as U}from"../fs-utils.js";import{invalidPageComponentsReasons as K,normalizePageComponents as G}from"../human/page-catalog.js";import{validateMemoryExtensionDeclarations as X}from"../plugin-extensions.js";import{objectBlocksShapeReasons as Z}from"../plugin-objects-manifest.js";import{validateBundleTransport as L}from"./endpoint.js";const O=/^[A-Za-z0-9_-]{1,64}$/,Y=new Set(["id","major","groups"]),Q=new Set(["group","consent_line","rate","who","allowlist"]),ee=new Set(["own","user","allowlist","any"]),ne=/^team:[a-z0-9]+$/,oe=new Set(["bundleVersion","kinds","page_components","memory_extensions","version","transport","provider","object_kinds","scopes","groups"]);function re(e,o,n,r,s,a){return{code:e,message:o,received:n,expected:r,next:s,...a!==void 0?{path:a}:{}}}c(re,"issue");function u(e,o,n,r,s){return re("plugin_bundle_invalid",e,o,n,r,s)}c(u,"bundleInvalid");function se(e){if(e[0]===31&&e[1]===139)return u("bundle archive must be uncompressed tar data","gzip-compressed archive","an uncompressed tar archive","Serve the archive without compression.");if(e.length===0||e.length%512!==0)return u("bundle archive must be a non-empty whole number of 512-byte tar blocks",`${e.length} bytes`,"a non-empty tar stream with a 512-byte block length","Serve one complete uncompressed tar archive.");if(e.length<1024||!e.subarray(-1024).every(o=>o===0))return u("bundle archive is missing the required two zero-block terminator","archive tail is not 1024 zero bytes","a complete tar stream ending in two 512-byte zero blocks","Serve the complete uncompressed tar archive.")}c(se,"archiveEnvelopeIssue");function te(e,o){if(e.length===0||e.includes("\0")||e.includes("\\")||e.startsWith("/")||/^[A-Za-z]:($|\/)/.test(e))return u("bundle member path must be a safe relative POSIX path",e,"a relative path without absolute, drive-letter, backslash, or NUL forms","Use a safe relative POSIX member path.",e);if(o==="file"&&e.endsWith("/"))return u("only directory members may have a trailing slash",e,"a regular-file path without a trailing slash","Emit this member as a regular file path.",e);if((o==="directory"&&e.endsWith("/")?e.slice(0,-1):e).split("/").some(r=>r===""||r==="."||r===".."))return u("bundle member path contains an unsafe segment",e,"non-empty segments other than . or ..","Use a safe relative POSIX member path.",e)}c(te,"validateMemberName");function ie(e,o){if(o==="file")return e==="bundle.json"||e==="commands.json"||e==="hooks.json"||e.startsWith("memory/")&&e.endsWith(".md")||e.startsWith("hooks/")?void 0:u("bundle contains an unsupported file member",e,"bundle.json, commands.json, hooks.json, memory/**/*.md, or hooks/**","Remove unsupported members from the archive.",e);if(!(e==="memory"||e.startsWith("memory/")||e==="hooks"||e.startsWith("hooks/")))return u("bundle contains an unsupported directory member",e,"memory or hooks, or a directory below either subtree","Remove unsupported directory members from the archive.",e)}c(ie,"validateMemberShape");function de(e){return e.type==="directory"&&e.path.endsWith("/")?e.path.slice(0,-1):e.path}c(de,"materializedPath");function ae(e){const o=new Map;for(const n of e){const r=de(n),s=o.get(r);if(s!==void 0)return u(s===n.type?"bundle contains a duplicate member":"bundle claims one path as both a file and a directory",`${r} (${s} and ${n.type})`,"each materialized path exactly once, with one type","Emit each archive path once, as a single member type.",r);o.set(r,n.type)}for(const[n,r]of o)if(r==="file"){for(const s of o.keys())if(s.startsWith(`${n}/`))return u("bundle nests a member beneath a regular-file path",`${s} beneath file ${n}`,"members nested only beneath directory paths","Emit the parent path as a directory or remove the nested member.",s)}}c(ae,"validateMemberTree");async function ue(e){const o=[],n=new Set;let r;return await new Promise((s,a)=>{const p=new J({strict:!0,maxMetaEntrySize:Number.MAX_SAFE_INTEGER,gzip:!1,brotli:!1,zstd:!1,onReadEntry:c(t=>{const d=t.path,f=t.type==="File"||t.type==="OldFile"?"file":t.type==="Directory"?"directory":void 0;if(f===void 0||t.unsupported||t.ignore||t.linkpath!==void 0){r??=u("bundle member must be a regular file or directory without a link target",`${d} (${t.type})`,"a regular file or directory member without link metadata","Remove links and unsupported member types from the archive.",d),t.resume();return}r??=te(d,f),r??=ie(d,f),n.has(d)&&(r??=u("bundle contains a duplicate member",d,"each member path exactly once","Emit each archive member only once.",d)),n.add(d);const i=[];t.on("data",b=>i.push(b)),t.on("end",()=>{r===void 0&&o.push({path:d,type:f,bytes:new Uint8Array(Buffer.concat(i))})})},"onReadEntry")});p.on("ignoredEntry",t=>{const d=t.path;r??=u("bundle contains an ignored or unsupported archive member",`${d} (${t.type})`,"only supported regular file or directory members","Remove ignored or unsupported members from the archive.",d),t.resume()}),p.once("error",a),p.once("end",s);try{p.end(Buffer.from(e))}catch(t){a(t)}}).catch(s=>{r??=u("bundle archive could not be parsed",s instanceof Error?s.message:String(s),"a valid complete uncompressed tar archive","Fix the archive format and serve it again.")}),r===void 0?{members:o}:{issue:r}}c(ue,"parseArchive");function N(e){return typeof e=="number"&&Number.isInteger(e)&&e>=1}c(N,"isPositiveInt");function le(e){const o=c((t,d,f,i)=>({issue:u(t,d,f,"Fix the provider block in bundle.json.",`bundle.json.${i}`)}),"bad");if(typeof e!="object"||e===null||Array.isArray(e))return o("bundle.json provider must be an object",JSON.stringify(e),"{ id, major, groups }","provider");const n=e,r=Object.keys(n).filter(t=>!Y.has(t));if(r.length>0)return o("bundle.json provider has unknown keys",r.join(", "),"only: id, major, groups","provider");if(typeof n.id!="string"||!O.test(n.id))return o("provider id must match [A-Za-z0-9_-]{1,64}",JSON.stringify(n.id),'a provider id of 1-64 letters, digits, "_" or "-"',"provider.id");if(!N(n.major))return o("provider major must be an integer of at least 1",JSON.stringify(n.major),"the served major as an integer >= 1","provider.major");const s=n.groups;if(!Array.isArray(s)||s.length===0)return o("provider groups must be a non-empty array",JSON.stringify(s),"at least one { group, consent_line, rate?, who, allowlist }","provider.groups");const a=[],p=new Set;for(let t=0;t<s.length;t++){const d=`provider.groups[${t}]`,f=s[t];if(typeof f!="object"||f===null||Array.isArray(f))return o("provider group must be an object",JSON.stringify(f),"{ group, consent_line, rate?, who, allowlist }",d);const i=f,b=Object.keys(i).filter(v=>!Q.has(v));if(b.length>0)return o("provider group has unknown keys",b.join(", "),"only: group, consent_line, rate, who, allowlist",d);if(typeof i.group!="string"||!O.test(i.group))return o("provider group id must match [A-Za-z0-9_-]{1,64}",JSON.stringify(i.group),'a group id of 1-64 letters, digits, "_" or "-"',`${d}.group`);if(p.has(i.group))return o("provider group ids must be unique",i.group,"each group declared once",`${d}.group`);if(p.add(i.group),typeof i.consent_line!="string"||i.consent_line.trim().length===0)return o("provider group consent_line must be a non-empty string",JSON.stringify(i.consent_line),"the consent line shown for this group",`${d}.consent_line`);const h=i.rate;if(h!=null&&(typeof h!="number"||!Number.isFinite(h)||h<0))return o("provider group rate must be a non-negative number or null",JSON.stringify(h),"a finite number >= 0, null, or omitted",`${d}.rate`);if(typeof i.who!="string"||!(ee.has(i.who)||ne.test(i.who)))return o("provider group who must be own|user|allowlist|any|team:<id>",JSON.stringify(i.who),"own | user | allowlist | any | team:<id> (id of lowercase letters and digits)",`${d}.who`);const m=i.allowlist;if(!Array.isArray(m)||!m.every(v=>typeof v=="string"&&v.length>0))return o("provider group allowlist must be an array of non-empty strings",JSON.stringify(m),"an array of app principals ([] unless who is allowlist)",`${d}.allowlist`);if(m.length>0&&i.who!=="allowlist")return o("provider group allowlist must be empty unless who is allowlist",`who ${i.who}`,'who: "allowlist", or allowlist: []',`${d}.allowlist`);a.push({group:i.group,consent_line:i.consent_line,...h!==void 0?{rate:h}:{},who:i.who,allowlist:m})}return{provider:{id:n.id,major:n.major,groups:a}}}c(le,"parseProviderBlock");function pe(e){const o=[],n=c((r,s)=>{const a=[...s,r.name];if(r.kind==="leaf")o.push({path:a.join(" "),leaf:r});else for(const p of r.children)n(p,a)},"walk");for(const r of e.roots)n(r,[]);for(const r of e.coreMounts)n(r.node,r.parent);return o}c(pe,"collectLeaves");function ce(e,o){const n=e.provider;if(n===void 0)return;if(e.transport===void 0)return u("a provider bundle must declare its transport","(missing)",'transport { kind: "http", endpoint } in bundle.json',"Add the provider endpoint as bundle.json transport.","bundle.json.transport");if(e.transport.kind==="http"&&e.transport.authEnv!==void 0)return u("a provider bundle must not declare authEnv",e.transport.authEnv,"no authEnv: the runtime presents its own outbound token","Remove transport.authEnv from bundle.json.","bundle.json.transport.authEnv");const r=new Set(n.groups.map(s=>s.group));for(const{path:s,leaf:a}of pe(o)){const p="group"in a?a.group:void 0;if(p===void 0)return u(`provider leaf "${s}" has no group`,s,"a group on every leaf of a provider bundle",`Add a group to leaf "${s}".`,`commands.json:${s}.group`);if(!r.has(p))return u(`provider leaf "${s}" names undeclared group "${p}"`,p,`one of: ${[...r].join(", ")}`,`Declare group "${p}" in the provider block, or move leaf "${s}" to a declared group.`,`commands.json:${s}.group`);if("rest"in a&&a.rest.streaming===!0)return u(`provider leaf "${s}" streams`,"rest.streaming: true","no streaming leaves in a provider bundle",`Make leaf "${s}" return one response.`,`commands.json:${s}.rest.streaming`)}}c(ce,"providerBundleIssue");function me(e){let o;try{o=JSON.parse(Buffer.from(e).toString("utf8"))}catch{return{issue:u("bundle.json is not valid JSON","invalid JSON",'{"bundleVersion":1}',"Write valid bundle metadata.","bundle.json")}}if(typeof o!="object"||o===null||Array.isArray(o))return{issue:u("bundle.json must be a JSON object",JSON.stringify(o),"an object with bundleVersion set to 1 and optionally kinds",'Set bundle.json to {"bundleVersion":1}.',"bundle.json")};const n=o,r=Object.keys(n).filter(d=>!oe.has(d));if(n.bundleVersion!==1||r.length>0)return{issue:u("bundle.json must contain bundleVersion 1 and at most version, transport, provider, kinds, page_components, memory_extensions, object_kinds, scopes, and groups",JSON.stringify(o),"an object with bundleVersion set to 1 and optional version, transport, provider, kinds, page_components, memory_extensions, object_kinds, scopes, and groups",'Set bundle.json to {"bundleVersion":1} plus optional contribution blocks.',"bundle.json")};if(n.kinds!==void 0){const d=F(n.kinds);if(d.length>0)return{issue:u("bundle.json kinds block is invalid",d.join("; "),"each entry a full KindConfig (whenToUse required) or a sparse patch of launch fields","Fix the kinds entries in bundle.json.","bundle.json")}}if(n.page_components!==void 0){const d=K(n.page_components);if(d.length>0)return{issue:u("bundle.json page_components block is invalid",d.join("; "),"an array of page component registrations, each a kind string or {kind, description?, useWhen?, doc?, display?}","Fix the page_components entries in bundle.json.","bundle.json")}}const s=Z(n);if(n.provider!==void 0&&n.scopes!==void 0&&s.push("scopes is for local plugins; a provider gets its scopes from directory consent"),s.length>0)return{issue:u("bundle.json object_kinds or scopes block is invalid",s.join("; "),"object_kinds keyed by kind name with description, events and optional read.command; scopes an array of crtr:objects:<verb>:<target> strings (local plugins only)","Fix the object_kinds and scopes blocks in bundle.json.","bundle.json")};let a;if(n.memory_extensions!==void 0)try{a=X(n.memory_extensions)}catch(d){return{issue:u("bundle.json memory_extensions block is invalid",d instanceof Error?d.message:String(d),"a valid memory_extensions declaration object","Fix the memory_extensions declarations in bundle.json.","bundle.json")}}if(n.version!==void 0&&!N(n.version))return{issue:u("bundle.json version must be an integer of at least 1",JSON.stringify(n.version),"the plugin major as an integer >= 1, or omitted","Fix version in bundle.json.","bundle.json.version")};let p;if(n.transport!==void 0){const d=L(n.transport);if(d.transport===void 0)return{issue:u("bundle.json transport is invalid",d.errors.join("; "),'{ kind: "http", endpoint, authEnv? } or { kind: "machine" }',"Fix transport in bundle.json.","bundle.json.transport")};p=d.transport}let t;if(n.provider!==void 0){const d=le(n.provider);if(d.issue!==void 0)return{issue:d.issue};if(t=d.provider,n.version!==void 0&&n.version!==t.major)return{issue:u("bundle.json provider major must equal version",`version ${String(n.version)}, major ${t.major}`,"one major","Set provider.major and version to the same integer.","bundle.json.provider.major")}}return{...n.version!==void 0?{version:n.version}:{},...p!==void 0?{transport:p}:{},...t!==void 0?{provider:t}:{},...n.kinds!==void 0?{kinds:n.kinds}:{},...n.page_components!==void 0?{page_components:G(n.page_components)}:{},...a!==void 0?{memory_extensions:a}:{},...n.object_kinds!==void 0?{object_kinds:n.object_kinds}:{},...n.scopes!==void 0?{scopes:n.scopes}:{}}}c(me,"parseBundleMetadata");function fe(e,o,n,r=new Set){let s;try{s=JSON.parse(Buffer.from(e).toString("utf8"))}catch{return{issues:[u("commands.json is not valid JSON","invalid JSON","a valid command-manifest JSON object","Regenerate commands.json.","commands.json")]}}const a=B(s,{transport:"http",reservedCoreNames:o,extensibleCoreBranches:r,...n!==void 0?{coreCommandPaths:n}:{}});return{...a.manifest!==void 0?{commands:a.manifest}:{},issues:a.issues}}c(fe,"parseCommands");async function he(e,o){const n=se(e);if(n!==void 0)return{issues:[n]};const r=await ue(e);if(r.issue!==void 0||r.members===void 0)return{issues:[r.issue]};const s=ae(r.members);if(s!==void 0)return{issues:[s]};const a=r.members.find(l=>l.path==="bundle.json"&&l.type==="file"),p=r.members.find(l=>l.path==="commands.json"&&l.type==="file");if(a===void 0||p===void 0)return{issues:[u("bundle must contain exactly one bundle.json and one commands.json regular file",`bundle.json=${a!==void 0}, commands.json=${p!==void 0}`,"one regular bundle.json and one regular commands.json member","Add the required metadata members to the archive.")]};const t=r.members.find(l=>l.path==="hooks.json"&&l.type==="file"),d=r.members.filter(l=>l.type==="file"&&l.path.startsWith("hooks/"));if((t!==void 0||r.members.some(l=>l.path==="hooks"||l.path.startsWith("hooks/")))&&(t===void 0||!d.some(l=>l.path==="hooks/dispatch")))return{issues:[u("bundle hook payload must contain both hooks.json and hooks/dispatch regular files",`hooks.json=${t!==void 0}, hooks/dispatch=${d.some(l=>l.path==="hooks/dispatch")}`,"both hooks.json and hooks/dispatch regular files","Add both required hook members or remove the hook payload.")]};const i=me(a.bytes);if(i.issue!==void 0)return{issues:[i.issue]};const b=fe(p.bytes,o.reservedCoreNames,o.coreCommandPaths,o.extensibleCoreBranches);if(b.commands===void 0)return{issues:b.issues};const h=b.commands.version;if(i.version!==void 0&&h!==void 0&&i.version!==h)return{issues:[u("bundle.json version and commands.json version differ",`bundle.json ${i.version}, commands.json ${h}`,"one plugin major","Emit the same version in bundle.json and commands.json.","bundle.json.version")]};const m=i.version??h;if(i.provider!==void 0&&m===void 0)return{issues:[u("a provider bundle requires a plugin version","no version in bundle.json or commands.json",`version ${i.provider.major}, the provider major`,"Emit the provider major as the plugin version.","bundle.json.version")]};if(i.provider!==void 0&&m!==i.provider.major)return{issues:[u("bundle provider major must equal the plugin version",`version ${m}, major ${i.provider.major}`,"one major","Emit the provider major as the plugin version.","bundle.json.provider.major")]};const v=ce(i,b.commands);return v!==void 0?{issues:[v]}:{bundle:{bundleVersion:1,...m!==void 0?{version:m}:{},...i.transport!==void 0?{transport:i.transport}:{},...i.provider!==void 0?{provider:i.provider}:{},...i.kinds!==void 0?{kinds:i.kinds}:{},...i.page_components!==void 0?{page_components:i.page_components}:{},...i.memory_extensions!==void 0?{memory_extensions:i.memory_extensions}:{},...i.object_kinds!==void 0?{object_kinds:i.object_kinds}:{},...i.scopes!==void 0?{scopes:i.scopes}:{},commands:b.commands,commandsBytes:p.bytes,directories:r.members.filter(l=>l.type==="directory").map(l=>({path:l.path})),memory:r.members.filter(l=>l.type==="file"&&l.path.startsWith("memory/")).map(l=>({path:l.path,bytes:l.bytes})),...t!==void 0?{hooks:{manifest:t.bytes,files:d.map(l=>({path:l.path,bytes:l.bytes}))}}:{}},issues:[]}}c(he,"validatePluginBundle");function be(e){return I("sha256").update(e).digest("hex").slice(0,12)}c(be,"bundleVersion");function Je(e,o,n,r){return M(o).plugins[e]?.version!==r?!1:_(w(n,"commands.json"))}c(Je,"isInstalledGeneration");function ve(e,o,n,r){T(e,s=>{s.plugins[o]===void 0&&(s.plugins[o]={}),r.swapped&&(s.plugins[o].last_updated=E()),s.plugins[o].checked_at=E(),n===void 0?delete s.plugins[o].etag:s.plugins[o].etag=n})}c(ve,"recordCheckedGeneration");function g(e,o){const n=V(e,o);if(n===e||!n.startsWith(e+z))throw x(`bundle member path escapes the staging directory: ${o}`);return n}c(g,"stagedPath");function ge(e,o,n){const r=c((s,a,p=420)=>q(s,a,{mode:p,durable:!0}),"write");C(g(e,".crouter-plugin/plugin.json"),o,{durable:!0});for(const s of n.directories)j(g(e,s.path));r(g(e,"commands.json"),n.commandsBytes);for(const s of n.memory)r(g(e,s.path),s.bytes);if(n.hooks!==void 0){r(g(e,"hooks.json"),n.hooks.manifest);for(const s of n.hooks.files)r(g(e,s.path),s.bytes);W(g(e,"hooks/dispatch"),493)}U(e)}c(ge,"writeStagedBundle");async function Ie(e,o,n){const{scope:r,scopeRootPath:s,root:a}=n,p=await he(o,n.validation);if(p.bundle===void 0)throw n.invalid(`HTTP plugin bundle for "${e}" is invalid`,p.issues);const t=p.bundle,d=n.accept?.(t);if(d!==void 0)throw n.invalid(`HTTP plugin bundle for "${e}" is invalid`,[u(d,e,"the bundle this install asked for","Serve the requested bundle.")]);const f=n.version??be(o),i=t.provider!==void 0&&t.transport!==void 0?t.transport:n.transport,b={name:e,version:f,commands:"commands.json",transport:i,bundle:n.bundle,...t.kinds!==void 0?{kinds:t.kinds}:{},...t.page_components!==void 0?{page_components:t.page_components}:{},...t.memory_extensions!==void 0?{memory_extensions:t.memory_extensions}:{},...t.object_kinds!==void 0?{object_kinds:t.object_kinds}:{},...t.scopes!==void 0?{scopes:t.scopes}:{},...t.hooks!==void 0?{hooks:"hooks.json",hookExecutable:"hooks/dispatch"}:{},...t.provider!==void 0?{provider:t.provider}:{}},h=w(s,"tmp"),m=w(h,`${e}.${process.pid}`),v=`${m}.prev`;if(_(v))throw x(`cannot replace plugin "${e}": prior interrupted replacement remains at ${v}`);j(h),j($(a)),S(m);let l;try{j(m),ge(m,b,t),l=await n.validateStaged(m,b);let y=!1;_(a)&&(k(a,v),y=!0);try{k(m,a)}catch(A){throw y&&k(v,a),A}H($(a)),y&&S(v)}finally{S(m)}return R(r,s),D(r,y=>{y.plugins[e]={enabled:n.enable?!0:y.plugins[e]?.enabled??!0,version:f}}),ve(r,e,n.etag,{swapped:!0}),{manifest:b,validated:t,version:f,root:a,staged:l}}c(Ie,"installBundleArchive");export{be as bundleVersion,Ie as installBundleArchive,Je as isInstalledGeneration,ve as recordCheckedGeneration,he as validatePluginBundle,ge as writeStagedBundle};
+var P=Object.defineProperty;var c=(e,o)=>P(e,"name",{value:o,configurable:!0});import{Parser as J}from"tar";import{createHash as I}from"node:crypto";import{chmodSync as W,renameSync as k}from"node:fs";import{dirname as $,join as w,resolve as V,sep as z}from"node:path";import{validateCommandManifest as B}from"../../api/command-manifest/manifest.js";import{ensureScopeInitialized as R,invalidPluginKindsReasons as F,readConfig as M,updateConfig as D,updateState as T}from"../config.js";import{general as x}from"../errors.js";import{atomicWriteJson as C,atomicWriteText as q,ensureDir as j,nowIso as E,pathExists as _,removePath as S,syncDirectory as H,syncTree as U}from"../fs-utils.js";import{invalidPageComponentsReasons as K,normalizePageComponents as G}from"../human/page-catalog.js";import{validateMemoryExtensionDeclarations as X}from"../plugin-extensions.js";import{objectBlocksShapeReasons as Z}from"../plugin-objects-manifest.js";import{validateBundleTransport as L}from"./endpoint.js";const O=/^[A-Za-z0-9_-]{1,64}$/,Y=new Set(["id","major","groups"]),Q=new Set(["group","consent_line","rate","who","allowlist"]),ee=new Set(["own","user","allowlist","any"]),ne=/^team:[a-z0-9]+$/,oe=new Set(["bundleVersion","kinds","page_components","memory_extensions","version","transport","provider","object_kinds","scopes","groups"]);function re(e,o,n,r,s,d){return{code:e,message:o,received:n,expected:r,next:s,...d!==void 0?{path:d}:{}}}c(re,"issue");function u(e,o,n,r,s){return re("plugin_bundle_invalid",e,o,n,r,s)}c(u,"bundleInvalid");function se(e){if(e[0]===31&&e[1]===139)return u("bundle archive must be uncompressed tar data","gzip-compressed archive","an uncompressed tar archive","Serve the archive without compression.");if(e.length===0||e.length%512!==0)return u("bundle archive must be a non-empty whole number of 512-byte tar blocks",`${e.length} bytes`,"a non-empty tar stream with a 512-byte block length","Serve one complete uncompressed tar archive.");if(e.length<1024||!e.subarray(-1024).every(o=>o===0))return u("bundle archive is missing the required two zero-block terminator","archive tail is not 1024 zero bytes","a complete tar stream ending in two 512-byte zero blocks","Serve the complete uncompressed tar archive.")}c(se,"archiveEnvelopeIssue");function te(e,o){if(e.length===0||e.includes("\0")||e.includes("\\")||e.startsWith("/")||/^[A-Za-z]:($|\/)/.test(e))return u("bundle member path must be a safe relative POSIX path",e,"a relative path without absolute, drive-letter, backslash, or NUL forms","Use a safe relative POSIX member path.",e);if(o==="file"&&e.endsWith("/"))return u("only directory members may have a trailing slash",e,"a regular-file path without a trailing slash","Emit this member as a regular file path.",e);if((o==="directory"&&e.endsWith("/")?e.slice(0,-1):e).split("/").some(r=>r===""||r==="."||r===".."))return u("bundle member path contains an unsafe segment",e,"non-empty segments other than . or ..","Use a safe relative POSIX member path.",e)}c(te,"validateMemberName");function ie(e,o){if(o==="file")return e==="bundle.json"||e==="commands.json"||e==="hooks.json"||e.startsWith("memory/")&&e.endsWith(".md")||e.startsWith("hooks/")?void 0:u("bundle contains an unsupported file member",e,"bundle.json, commands.json, hooks.json, memory/**/*.md, or hooks/**","Remove unsupported members from the archive.",e);if(!(e==="memory"||e.startsWith("memory/")||e==="hooks"||e.startsWith("hooks/")))return u("bundle contains an unsupported directory member",e,"memory or hooks, or a directory below either subtree","Remove unsupported directory members from the archive.",e)}c(ie,"validateMemberShape");function ae(e){return e.type==="directory"&&e.path.endsWith("/")?e.path.slice(0,-1):e.path}c(ae,"materializedPath");function de(e){const o=new Map;for(const n of e){const r=ae(n),s=o.get(r);if(s!==void 0)return u(s===n.type?"bundle contains a duplicate member":"bundle claims one path as both a file and a directory",`${r} (${s} and ${n.type})`,"each materialized path exactly once, with one type","Emit each archive path once, as a single member type.",r);o.set(r,n.type)}for(const[n,r]of o)if(r==="file"){for(const s of o.keys())if(s.startsWith(`${n}/`))return u("bundle nests a member beneath a regular-file path",`${s} beneath file ${n}`,"members nested only beneath directory paths","Emit the parent path as a directory or remove the nested member.",s)}}c(de,"validateMemberTree");async function ue(e){const o=[],n=new Set;let r;return await new Promise((s,d)=>{const p=new J({strict:!0,maxMetaEntrySize:Number.MAX_SAFE_INTEGER,gzip:!1,brotli:!1,zstd:!1,onReadEntry:c(t=>{const a=t.path,f=t.type==="File"||t.type==="OldFile"?"file":t.type==="Directory"?"directory":void 0;if(f===void 0||t.unsupported||t.ignore||t.linkpath!==void 0){r??=u("bundle member must be a regular file or directory without a link target",`${a} (${t.type})`,"a regular file or directory member without link metadata","Remove links and unsupported member types from the archive.",a),t.resume();return}r??=te(a,f),r??=ie(a,f),n.has(a)&&(r??=u("bundle contains a duplicate member",a,"each member path exactly once","Emit each archive member only once.",a)),n.add(a);const i=[];t.on("data",b=>i.push(b)),t.on("end",()=>{r===void 0&&o.push({path:a,type:f,bytes:new Uint8Array(Buffer.concat(i))})})},"onReadEntry")});p.on("ignoredEntry",t=>{const a=t.path;r??=u("bundle contains an ignored or unsupported archive member",`${a} (${t.type})`,"only supported regular file or directory members","Remove ignored or unsupported members from the archive.",a),t.resume()}),p.once("error",d),p.once("end",s);try{p.end(Buffer.from(e))}catch(t){d(t)}}).catch(s=>{r??=u("bundle archive could not be parsed",s instanceof Error?s.message:String(s),"a valid complete uncompressed tar archive","Fix the archive format and serve it again.")}),r===void 0?{members:o}:{issue:r}}c(ue,"parseArchive");function N(e){return typeof e=="number"&&Number.isInteger(e)&&e>=1}c(N,"isPositiveInt");function le(e){const o=c((t,a,f,i)=>({issue:u(t,a,f,"Fix the provider block in bundle.json.",`bundle.json.${i}`)}),"bad");if(typeof e!="object"||e===null||Array.isArray(e))return o("bundle.json provider must be an object",JSON.stringify(e),"{ id, major, groups }","provider");const n=e,r=Object.keys(n).filter(t=>!Y.has(t));if(r.length>0)return o("bundle.json provider has unknown keys",r.join(", "),"only: id, major, groups","provider");if(typeof n.id!="string"||!O.test(n.id))return o("provider id must match [A-Za-z0-9_-]{1,64}",JSON.stringify(n.id),'a provider id of 1-64 letters, digits, "_" or "-"',"provider.id");if(!N(n.major))return o("provider major must be an integer of at least 1",JSON.stringify(n.major),"the served major as an integer >= 1","provider.major");const s=n.groups;if(!Array.isArray(s)||s.length===0)return o("provider groups must be a non-empty array",JSON.stringify(s),"at least one { group, consent_line, rate?, who, allowlist }","provider.groups");const d=[],p=new Set;for(let t=0;t<s.length;t++){const a=`provider.groups[${t}]`,f=s[t];if(typeof f!="object"||f===null||Array.isArray(f))return o("provider group must be an object",JSON.stringify(f),"{ group, consent_line, rate?, who, allowlist }",a);const i=f,b=Object.keys(i).filter(v=>!Q.has(v));if(b.length>0)return o("provider group has unknown keys",b.join(", "),"only: group, consent_line, rate, who, allowlist",a);if(typeof i.group!="string"||!O.test(i.group))return o("provider group id must match [A-Za-z0-9_-]{1,64}",JSON.stringify(i.group),'a group id of 1-64 letters, digits, "_" or "-"',`${a}.group`);if(p.has(i.group))return o("provider group ids must be unique",i.group,"each group declared once",`${a}.group`);if(p.add(i.group),typeof i.consent_line!="string"||i.consent_line.trim().length===0)return o("provider group consent_line must be a non-empty string",JSON.stringify(i.consent_line),"the consent line shown for this group",`${a}.consent_line`);const h=i.rate;if(h!=null&&(typeof h!="number"||!Number.isFinite(h)||h<0))return o("provider group rate must be a non-negative number or null",JSON.stringify(h),"a finite number >= 0, null, or omitted",`${a}.rate`);if(typeof i.who!="string"||!(ee.has(i.who)||ne.test(i.who)))return o("provider group who must be own|user|allowlist|any|team:<id>",JSON.stringify(i.who),"own | user | allowlist | any | team:<id> (id of lowercase letters and digits)",`${a}.who`);const m=i.allowlist;if(!Array.isArray(m)||!m.every(v=>typeof v=="string"&&v.length>0))return o("provider group allowlist must be an array of non-empty strings",JSON.stringify(m),"an array of app principals ([] unless who is allowlist)",`${a}.allowlist`);if(m.length>0&&i.who!=="allowlist")return o("provider group allowlist must be empty unless who is allowlist",`who ${i.who}`,'who: "allowlist", or allowlist: []',`${a}.allowlist`);d.push({group:i.group,consent_line:i.consent_line,...h!==void 0?{rate:h}:{},who:i.who,allowlist:m})}return{provider:{id:n.id,major:n.major,groups:d}}}c(le,"parseProviderBlock");function pe(e){const o=[],n=c((r,s)=>{const d=[...s,r.name];if(r.kind==="leaf")o.push({path:d.join(" "),leaf:r});else for(const p of r.children)n(p,d)},"walk");for(const r of e.roots)n(r,[]);for(const r of e.coreMounts)n(r.node,r.parent);return o}c(pe,"collectLeaves");function ce(e,o){const n=e.provider;if(n===void 0)return;if(e.transport===void 0)return u("a provider bundle must declare its transport","(missing)",'transport { kind: "http", endpoint } in bundle.json',"Add the provider endpoint as bundle.json transport.","bundle.json.transport");if(e.transport.kind==="http"&&e.transport.authEnv!==void 0)return u("a provider bundle must not declare authEnv",e.transport.authEnv,"no authEnv: the runtime presents its own outbound token","Remove transport.authEnv from bundle.json.","bundle.json.transport.authEnv");const r=new Set(n.groups.map(s=>s.group));for(const{path:s,leaf:d}of pe(o)){const p="group"in d?d.group:void 0;if(p===void 0)return u(`provider leaf "${s}" has no group`,s,"a group on every leaf of a provider bundle",`Add a group to leaf "${s}".`,`commands.json:${s}.group`);if(!r.has(p))return u(`provider leaf "${s}" names undeclared group "${p}"`,p,`one of: ${[...r].join(", ")}`,`Declare group "${p}" in the provider block, or move leaf "${s}" to a declared group.`,`commands.json:${s}.group`);if("rest"in d&&d.rest.streaming===!0)return u(`provider leaf "${s}" streams`,"rest.streaming: true","no streaming leaves in a provider bundle",`Make leaf "${s}" return one response.`,`commands.json:${s}.rest.streaming`)}}c(ce,"providerBundleIssue");function me(e){let o;try{o=JSON.parse(Buffer.from(e).toString("utf8"))}catch{return{issue:u("bundle.json is not valid JSON","invalid JSON",'{"bundleVersion":1}',"Write valid bundle metadata.","bundle.json")}}if(typeof o!="object"||o===null||Array.isArray(o))return{issue:u("bundle.json must be a JSON object",JSON.stringify(o),"an object with bundleVersion set to 1 and optionally kinds",'Set bundle.json to {"bundleVersion":1}.',"bundle.json")};const n=o,r=Object.keys(n).filter(a=>!oe.has(a));if(n.bundleVersion!==1||r.length>0)return{issue:u("bundle.json must contain bundleVersion 1 and at most version, transport, provider, kinds, page_components, memory_extensions, object_kinds, scopes, and groups",JSON.stringify(o),"an object with bundleVersion set to 1 and optional version, transport, provider, kinds, page_components, memory_extensions, object_kinds, scopes, and groups",'Set bundle.json to {"bundleVersion":1} plus optional contribution blocks.',"bundle.json")};if(n.kinds!==void 0){const a=F(n.kinds);if(a.length>0)return{issue:u("bundle.json kinds block is invalid",a.join("; "),"each entry a full KindConfig (whenToUse required) or a sparse patch of launch fields","Fix the kinds entries in bundle.json.","bundle.json")}}if(n.page_components!==void 0){const a=K(n.page_components);if(a.length>0)return{issue:u("bundle.json page_components block is invalid",a.join("; "),"an array of page component registrations, each a kind string or {kind, description?, useWhen?, doc?, display?}","Fix the page_components entries in bundle.json.","bundle.json")}}const s=Z(n);if(n.provider!==void 0&&n.scopes!==void 0&&s.push("scopes is for local plugins; a provider gets its scopes from directory consent"),s.length>0)return{issue:u("bundle.json object_kinds or scopes block is invalid",s.join("; "),"object_kinds keyed by kind name with description, events and optional read.command; scopes an array of crtr:objects:<verb>:<target> strings (local plugins only)","Fix the object_kinds and scopes blocks in bundle.json.","bundle.json")};let d;if(n.memory_extensions!==void 0)try{d=X(n.memory_extensions)}catch(a){return{issue:u("bundle.json memory_extensions block is invalid",a instanceof Error?a.message:String(a),"a valid memory_extensions declaration object","Fix the memory_extensions declarations in bundle.json.","bundle.json")}}if(n.version!==void 0&&!N(n.version))return{issue:u("bundle.json version must be an integer of at least 1",JSON.stringify(n.version),"the plugin major as an integer >= 1, or omitted","Fix version in bundle.json.","bundle.json.version")};let p;if(n.transport!==void 0){const a=L(n.transport);if(a.transport===void 0)return{issue:u("bundle.json transport is invalid",a.errors.join("; "),'{ kind: "http", endpoint, authEnv? } or { kind: "machine" }',"Fix transport in bundle.json.","bundle.json.transport")};p=a.transport}let t;if(n.provider!==void 0){const a=le(n.provider);if(a.issue!==void 0)return{issue:a.issue};if(t=a.provider,n.version!==void 0&&n.version!==t.major)return{issue:u("bundle.json provider major must equal version",`version ${String(n.version)}, major ${t.major}`,"one major","Set provider.major and version to the same integer.","bundle.json.provider.major")}}return{...n.version!==void 0?{version:n.version}:{},...p!==void 0?{transport:p}:{},...t!==void 0?{provider:t}:{},...n.kinds!==void 0?{kinds:n.kinds}:{},...n.page_components!==void 0?{page_components:G(n.page_components)}:{},...d!==void 0?{memory_extensions:d}:{},...n.object_kinds!==void 0?{object_kinds:n.object_kinds}:{},...n.scopes!==void 0?{scopes:n.scopes}:{}}}c(me,"parseBundleMetadata");function fe(e,o,n,r=new Set){let s;try{s=JSON.parse(Buffer.from(e).toString("utf8"))}catch{return{issues:[u("commands.json is not valid JSON","invalid JSON","a valid command-manifest JSON object","Regenerate commands.json.","commands.json")]}}const d=B(s,{transport:"http",reservedCoreNames:o,extensibleCoreBranches:r,...n!==void 0?{coreCommandPaths:n}:{}});return{...d.manifest!==void 0?{commands:d.manifest}:{},issues:d.issues}}c(fe,"parseCommands");async function he(e,o){const n=se(e);if(n!==void 0)return{issues:[n]};const r=await ue(e);if(r.issue!==void 0||r.members===void 0)return{issues:[r.issue]};const s=de(r.members);if(s!==void 0)return{issues:[s]};const d=r.members.find(l=>l.path==="bundle.json"&&l.type==="file"),p=r.members.find(l=>l.path==="commands.json"&&l.type==="file");if(d===void 0||p===void 0)return{issues:[u("bundle must contain exactly one bundle.json and one commands.json regular file",`bundle.json=${d!==void 0}, commands.json=${p!==void 0}`,"one regular bundle.json and one regular commands.json member","Add the required metadata members to the archive.")]};const t=r.members.find(l=>l.path==="hooks.json"&&l.type==="file"),a=r.members.filter(l=>l.type==="file"&&l.path.startsWith("hooks/"));if((t!==void 0||r.members.some(l=>l.path==="hooks"||l.path.startsWith("hooks/")))&&(t===void 0||!a.some(l=>l.path==="hooks/dispatch")))return{issues:[u("bundle hook payload must contain both hooks.json and hooks/dispatch regular files",`hooks.json=${t!==void 0}, hooks/dispatch=${a.some(l=>l.path==="hooks/dispatch")}`,"both hooks.json and hooks/dispatch regular files","Add both required hook members or remove the hook payload.")]};const i=me(d.bytes);if(i.issue!==void 0)return{issues:[i.issue]};const b=fe(p.bytes,o.reservedCoreNames,o.coreCommandPaths,o.extensibleCoreBranches);if(b.commands===void 0)return{issues:b.issues};const h=b.commands.version;if(i.version!==void 0&&h!==void 0&&i.version!==h)return{issues:[u("bundle.json version and commands.json version differ",`bundle.json ${i.version}, commands.json ${h}`,"one plugin major","Emit the same version in bundle.json and commands.json.","bundle.json.version")]};const m=i.version??h;if(i.provider!==void 0&&m===void 0)return{issues:[u("a provider bundle requires a plugin version","no version in bundle.json or commands.json",`version ${i.provider.major}, the provider major`,"Emit the provider major as the plugin version.","bundle.json.version")]};if(i.provider!==void 0&&m!==i.provider.major)return{issues:[u("bundle provider major must equal the plugin version",`version ${m}, major ${i.provider.major}`,"one major","Emit the provider major as the plugin version.","bundle.json.provider.major")]};const v=ce(i,b.commands);return v!==void 0?{issues:[v]}:{bundle:{bundleVersion:1,...m!==void 0?{version:m}:{},...i.transport!==void 0?{transport:i.transport}:{},...i.provider!==void 0?{provider:i.provider}:{},...i.kinds!==void 0?{kinds:i.kinds}:{},...i.page_components!==void 0?{page_components:i.page_components}:{},...i.memory_extensions!==void 0?{memory_extensions:i.memory_extensions}:{},...i.object_kinds!==void 0?{object_kinds:i.object_kinds}:{},...i.scopes!==void 0?{scopes:i.scopes}:{},commands:b.commands,commandsBytes:p.bytes,directories:r.members.filter(l=>l.type==="directory").map(l=>({path:l.path})),memory:r.members.filter(l=>l.type==="file"&&l.path.startsWith("memory/")).map(l=>({path:l.path,bytes:l.bytes})),...t!==void 0?{hooks:{manifest:t.bytes,files:a.map(l=>({path:l.path,bytes:l.bytes}))}}:{}},issues:[]}}c(he,"validatePluginBundle");function be(e){return I("sha256").update(e).digest("hex").slice(0,12)}c(be,"bundleVersion");function Je(e,o,n,r){return M(o).plugins[e]?.version!==r?!1:_(w(n,"commands.json"))}c(Je,"isInstalledGeneration");async function ve(e,o,n,r){await T(e,s=>{s.plugins[o]===void 0&&(s.plugins[o]={}),r.swapped&&(s.plugins[o].last_updated=E()),s.plugins[o].checked_at=E(),n===void 0?delete s.plugins[o].etag:s.plugins[o].etag=n})}c(ve,"recordCheckedGeneration");function g(e,o){const n=V(e,o);if(n===e||!n.startsWith(e+z))throw x(`bundle member path escapes the staging directory: ${o}`);return n}c(g,"stagedPath");function ge(e,o,n){const r=c((s,d,p=420)=>q(s,d,{mode:p,durable:!0}),"write");C(g(e,".crouter-plugin/plugin.json"),o,{durable:!0});for(const s of n.directories)j(g(e,s.path));r(g(e,"commands.json"),n.commandsBytes);for(const s of n.memory)r(g(e,s.path),s.bytes);if(n.hooks!==void 0){r(g(e,"hooks.json"),n.hooks.manifest);for(const s of n.hooks.files)r(g(e,s.path),s.bytes);W(g(e,"hooks/dispatch"),493)}U(e)}c(ge,"writeStagedBundle");async function Ie(e,o,n){const{scope:r,scopeRootPath:s,root:d}=n,p=await he(o,n.validation);if(p.bundle===void 0)throw n.invalid(`HTTP plugin bundle for "${e}" is invalid`,p.issues);const t=p.bundle,a=n.accept?.(t);if(a!==void 0)throw n.invalid(`HTTP plugin bundle for "${e}" is invalid`,[u(a,e,"the bundle this install asked for","Serve the requested bundle.")]);const f=n.version??be(o),i=t.provider!==void 0&&t.transport!==void 0?t.transport:n.transport,b={name:e,version:f,commands:"commands.json",transport:i,bundle:n.bundle,...t.kinds!==void 0?{kinds:t.kinds}:{},...t.page_components!==void 0?{page_components:t.page_components}:{},...t.memory_extensions!==void 0?{memory_extensions:t.memory_extensions}:{},...t.object_kinds!==void 0?{object_kinds:t.object_kinds}:{},...t.scopes!==void 0?{scopes:t.scopes}:{},...t.hooks!==void 0?{hooks:"hooks.json",hookExecutable:"hooks/dispatch"}:{},...t.provider!==void 0?{provider:t.provider}:{}},h=w(s,"tmp"),m=w(h,`${e}.${process.pid}`),v=`${m}.prev`;if(_(v))throw x(`cannot replace plugin "${e}": prior interrupted replacement remains at ${v}`);j(h),j($(d)),S(m);let l;try{j(m),ge(m,b,t),l=await n.validateStaged(m,b);let y=!1;_(d)&&(k(d,v),y=!0);try{k(m,d)}catch(A){throw y&&k(v,d),A}H($(d)),y&&S(v)}finally{S(m)}return await R(r,s),await D(r,y=>{y.plugins[e]={enabled:n.enable?!0:y.plugins[e]?.enabled??!0,version:f}}),await ve(r,e,n.etag,{swapped:!0}),{manifest:b,validated:t,version:f,root:d,staged:l}}c(Ie,"installBundleArchive");export{be as bundleVersion,Ie as installBundleArchive,Je as isInstalledGeneration,ve as recordCheckedGeneration,he as validatePluginBundle,ge as writeStagedBundle};

package/dist/core/command-plugins/compose.d.ts

@@ -1,6 +1,6 @@
 import type { BranchDef, LeafDef } from '../command.js';
 import type { CommandRegistrySnapshot, CoreBranchMount } from '../command-manifests/registry.js';
-import type { ProviderToolDescription, UnavailableProviderToolDescription } from '../providers/call.js';
+import type { ProviderToolDescription, UnavailableProviderToolDescription } from '../providers/description.js';
 import type { ValidatedContribution, ValidatedCoreMount } from './discovery.js';
 /** A sandbox sees no user plugin files. Compose only daemon-projected help data,
  *  with an adapter that cannot execute plugin code or send provider HTTP. */

package/dist/core/command-plugins/discovery.d.ts

@@ -38,7 +38,6 @@ export interface PluginCommandValidation {
     coreMounts: ValidatedCoreMount[];
     issues: CommandDiscoveryIssue[];
 }
-export declare function effectiveCommandPlugins(startDir?: string, profileId?: string | null): InstalledPlugin[];
 export declare function validatePluginCommands(plugin: InstalledPlugin, reservedNames?: ReadonlySet<string>, coreCommandPaths?: ReadonlySet<string>, extensibleCoreBranches?: ReadonlySet<string>): PluginCommandValidation;
 export declare function discoverPluginCommandCandidates(startDir?: string, profileId?: string | null): PluginCommandValidation[];
 export declare function validateEffectiveCommandPlugins(reservedNames: ReadonlySet<string>, startDir?: string, profileId?: string | null, coreCommandPaths?: ReadonlySet<string>, extensibleCoreBranches?: ReadonlySet<string>): PluginCommandValidation[];

package/dist/core/command-plugins/discovery.js

@@ -1 +1 @@
-var P=Object.defineProperty;var u=(e,n)=>P(e,"name",{value:n,configurable:!0});import{realpathSync as k,readFileSync as N,statSync as g}from"node:fs";import{isSandboxedNode as F}from"../../shared/env.js";import{isAbsolute as O,resolve as _,sep as R}from"node:path";import{listInstalledPlugins as q,listInstalledPluginsInRoot as A}from"../resolver.js";import{projectScopeRoots as E}from"../scope.js";import{validateCommandManifest as I}from"../../api/command-manifest/manifest.js";import{qualifiedTopLevelCommandName as J,resolveCommandRegistry as $}from"../command-manifests/registry.js";import{adaptPluginContributions as T,adaptPluginCoreMounts as B}from"./compose.js";import{validateHttpPluginTransport as H}from"./endpoint.js";import{providerRootClaims as L}from"../providers/roots.js";import{applyCommandExtensions as W}from"./extensions.js";function w(e=process.cwd(),n){const i=new Set,o=[],r=u(s=>{i.has(s.name)||(i.add(s.name),o.push(s))},"consider");for(const s of E(e,n))for(const m of A("project",s))r(m);if(!F())for(const s of q("user"))r(s);const{skipped:a}=L(o);return o.filter(s=>!a.has(s.name)).filter(s=>s.enabled&&(s.manifest.commands!==void 0||s.manifest.transport!==void 0))}u(w,"effectiveCommandPlugins");function X(e,n){return i=>n.push({...i,plugin:e.name})}u(X,"issueFor");function v(e,n){if(typeof n!="string"||n.length===0)return null;try{const i=k(e),o=k(_(e,n));return(o===i||o.startsWith(i+R))&&g(o).isFile()?o:null}catch{return null}}u(v,"safePath");function z(e,n){const i=e.manifest.transport;if(i===void 0){n.push({code:"command_manifest_invalid",plugin:e.name,message:"commands requires transport in plugin.json",received:"(missing)",expected:"a transport object",next:"Add plugin.json.transport.",path:"transport"});return}if(typeof i!="object"||i===null||Array.isArray(i)){n.push({code:"command_manifest_invalid",plugin:e.name,message:"transport must be an object",received:Array.isArray(i)?"array":typeof i,expected:"an exec or http transport object",next:"Fix plugin.json.transport.",path:"transport"});return}const o=i;if(o.kind==="http"){const a=H(o);if(a.transport!==void 0)return a.transport;n.push({code:"command_manifest_invalid",plugin:e.name,message:a.errors.join("; "),received:JSON.stringify(i),expected:"a valid HTTP transport",next:"Fix plugin.json.transport.",path:"transport"});return}if(o.kind==="machine"){if(e.manifest.provider===void 0||Object.keys(o).length!==1){n.push({code:"command_manifest_invalid",plugin:e.name,message:e.manifest.provider===void 0?"a machine transport belongs to a capability provider bundle":"transport has unknown keys",received:JSON.stringify(i),expected:'{ kind: "machine" } on a provider bundle',next:"Fix plugin.json.transport.",path:"transport"});return}return{kind:"machine"}}const r=Object.keys(o).filter(a=>!["kind","executable"].includes(a));if(o.kind!=="exec"||r.length||o.executable!==void 0&&(typeof o.executable!="string"||o.executable.length===0)){n.push({code:"command_manifest_invalid",plugin:e.name,message:r.length?`transport has unknown keys: ${r.join(", ")}`:"exec transport requires a non-empty executable when declared",received:JSON.stringify(i),expected:'{ kind: "exec", executable?: "plugin-relative path" }',next:"Fix plugin.json.transport.",path:"transport"});return}return{kind:"exec",...o.executable!==void 0?{executable:o.executable}:{}}}u(z,"transportFor");function y(e){return e.kind==="leaf"||e.children.some(y)}u(y,"hasExecutableLeaf");function M(e){return[...e.roots,...e.coreMounts.map(n=>n.node)]}u(M,"manifestNodes");function G(e,n,i,o){if(n.executable===void 0){if(!M(i).some(y))return n;o.push({code:"command_manifest_invalid",plugin:e.name,message:"exec transport requires executable when commands.json declares executable leaves",received:"(missing)",expected:'{ kind: "exec", executable: "plugin-relative path" }',next:"Add plugin.json.transport.executable.",path:"transport.executable"});return}const r=v(e.root,n.executable);if(r===null){o.push({code:"command_path_unsafe",plugin:e.name,message:"executable escapes the plugin root or is not a regular file",received:n.executable,expected:"a relative path to a regular file inside the plugin root",next:"Fix plugin.json.transport.executable.",path:"transport.executable"});return}if((g(r).mode&73)===0){o.push({code:"command_not_executable",plugin:e.name,message:"executable lacks the POSIX exec bit",received:n.executable,expected:"a file with an executable permission bit",next:"chmod +x the plugin executable, then update the plugin.",path:"transport.executable"});return}return{kind:"exec",executable:r}}u(G,"validateExecExecutable");function K(e){return O(e)||e.startsWith(".")||e.includes("/")||e.includes("\\")}u(K,"namesPath");function Q(e,n,i){let o=!0;const r=u(a=>{if(a.kind!=="branch")return;const s=a.passthrough;if(s!==void 0&&K(s.bin)){const m=v(e.root,s.bin);m===null?(i.push({code:"command_path_unsafe",plugin:e.name,message:"passthrough binary escapes the plugin root or is not a regular file",received:s.bin,expected:"a relative path to a regular file inside the plugin root",next:"Fix passthrough.bin in commands.json.",path:"passthrough.bin"}),o=!1):(g(m).mode&73)===0?(i.push({code:"command_not_executable",plugin:e.name,message:"passthrough binary lacks the POSIX exec bit",received:s.bin,expected:"a file with an executable permission bit",next:"chmod +x the plugin executable, then update commands.json.",path:"passthrough.bin"}),o=!1):a.passthrough={...s,bin:m}}for(const m of a.children)r(m)},"visit");for(const a of M(n))r(a);return o}u(Q,"resolvePassthroughBinaries");function S(e,n=new Set,i,o=new Set){const r=[],a=e.manifest.commands,s=e.manifest.transport;let m=_(e.root,typeof a=="string"?a:"commands.json");const c=u(x=>({plugin:e,manifestPath:m,...x===void 0?{}:{transport:x},contributions:[],coreMounts:[],issues:r}),"empty");if(a===void 0&&s===void 0)return c();if(typeof a!="string"||a.length===0)return r.push({code:"command_manifest_invalid",plugin:e.name,message:"transport requires commands in plugin.json",received:"(missing)",expected:"a plugin-root-relative commands path",next:"Add plugin.json.commands or remove transport.",path:"commands"}),c();const t=z(e,r);if(t===void 0)return c();const d=v(e.root,a);if(d===null)return r.push({code:"command_path_unsafe",plugin:e.name,message:"commands pointer escapes the plugin root or is not a regular file",received:a,expected:"a relative path to a regular file inside the plugin root",next:"Fix plugin.json.commands.",path:"commands"}),c(t);m=d;let p;try{p=N(d)}catch{p=null}if(p===null)return r.push({code:"command_manifest_unreadable",plugin:e.name,message:"commands.json is missing or unreadable",received:d,expected:"a readable JSON file",next:"Reinstall or update the plugin."}),c(t);let h;try{h=JSON.parse(Buffer.from(p).toString("utf8"))}catch{return r.push({code:"command_manifest_invalid",plugin:e.name,message:"commands.json is not valid JSON",received:d,expected:"a JSON object",next:"Regenerate commands.json."}),c(t)}const f=I(h,{transport:t.kind==="machine"?"http":t.kind,reservedCoreNames:n,extensibleCoreBranches:o,...i!==void 0?{coreCommandPaths:i}:{}});if(f.manifest===void 0)return f.issues.forEach(X(e,r)),c(t);const l=t.kind==="exec"?G(e,t,f.manifest,r):t;if(l===void 0)return c(t);if(l.kind==="exec"&&!Q(e,f.manifest,r))return c(l);const b=e.manifest.provider,j=f.manifest.roots;if(!j.every(x=>x.kind==="branch"))throw new Error("plugin manifest validation returned a top-level leaf");return{plugin:e,manifestPath:m,transport:l,manifest:f.manifest,contributions:j.filter(x=>b===void 0||y(x)).map(x=>({plugin:e,transport:l,node:x,manifest:f.manifest,manifestName:x.name,...b!==void 0?{provider:b}:{}})),coreMounts:f.manifest.coreMounts.map(x=>({plugin:e,transport:l,parent:x.parent,node:x.node,manifest:f.manifest,...b!==void 0?{provider:b}:{}})),issues:r}}u(S,"validatePluginCommands");function ce(e=process.cwd(),n){return w(e,n).map(i=>S(i))}u(ce,"discoverPluginCommandCandidates");function C(e,n=process.cwd(),i,o,r=new Set){const a=w(n,i).map(c=>S(c,e,o,r)),s=new Map;for(const c of a)for(const t of c.contributions){const d=s.get(t.node.name);d===void 0?s.set(t.node.name,[t]):d.push(t)}for(const[c,t]of s)if(t.length>1)for(const d of t){const{plugin:p}=d,h=J({name:p.name,sourceMarketplace:p.sourceMarketplace},c),f=a.find(l=>l.plugin.root===p.root);f.contributions=f.contributions.map(l=>l===d?{...l,node:{...l.node,name:h}}:l),f.issues.push({code:"command_collision",plugin:p.name,path:c,message:`top-level command "${c}" is claimed by ${t.map(l=>l.plugin.name).join(", ")} \u2014 mounted as "${h}"`,received:t.map(l=>l.plugin.name).join(", "),expected:"an origin-qualified top-level command for each claimant",next:`Invoke "${h}" to use this plugin command.`})}const m=new Map;for(const c of a)for(const t of c.coreMounts){const d=[...t.parent,t.node.name].join("/"),p=m.get(d);p===void 0?m.set(d,[t]):p.push(t)}for(const[c,t]of m)if(t.length>1)for(const d of t){const p=a.find(h=>h.plugin.root===d.plugin.root);p.coreMounts=p.coreMounts.filter(h=>h!==d),p.issues.push({code:"command_collision",plugin:d.plugin.name,path:c.replace("/","."),message:`contributed command "${d.node.name}" conflicts with another plugin child below the extensible core branch`,received:t.map(h=>h.plugin.name).join(", "),expected:`a unique child name below ${d.parent.join(".")}`,next:"Rename the contributed command or remove this mount."})}return a}u(C,"validateEffectiveCommandPlugins");function U(e,n){return{...n,contributor:{name:e.name,scope:e.scope,sourceMarketplace:e.sourceMarketplace}}}u(U,"contributorIssue");function de(e,n=process.cwd(),i,o,r=new Set){const a=C(e,n,i,o,r);return{contributions:a.flatMap(s=>s.contributions),coreMounts:a.flatMap(s=>s.coreMounts),issues:a.flatMap(s=>s.issues)}}u(de,"discoverCommandContributions");function ue(e,n=process.cwd(),i,o,r=new Set){const a=C(e,n,i,o,r),s=T(a.flatMap(t=>t.contributions)).contributions,m=$(s,e);return{contributions:W(m.contributions,n).contributions,coreMounts:B(a.flatMap(t=>t.coreMounts)),issues:[...a.flatMap(t=>t.issues.map(d=>U(t.plugin,d))),...m.issues]}}u(ue,"buildExternalCommandSnapshot");export{ue as buildExternalCommandSnapshot,de as discoverCommandContributions,ce as discoverPluginCommandCandidates,w as effectiveCommandPlugins,C as validateEffectiveCommandPlugins,S as validatePluginCommands};
+var P=Object.defineProperty;var m=(e,t)=>P(e,"name",{value:t,configurable:!0});import{realpathSync as k,readFileSync as F,statSync as b}from"node:fs";import{isAbsolute as N,resolve as _,sep as O}from"node:path";import{validateCommandManifest as q}from"../../api/command-manifest/manifest.js";import{qualifiedTopLevelCommandName as A,resolveCommandRegistry as E}from"../command-manifests/registry.js";import{adaptPluginContributions as J,adaptPluginCoreMounts as $}from"./compose.js";import{validateHttpPluginTransport as R}from"./endpoint.js";import{effectiveCommandPlugins as w}from"./presence.js";import{applyCommandExtensions as T}from"./extensions.js";function I(e,t){return i=>t.push({...i,plugin:e.name})}m(I,"issueFor");function v(e,t){if(typeof t!="string"||t.length===0)return null;try{const i=k(e),o=k(_(e,t));return(o===i||o.startsWith(i+O))&&b(o).isFile()?o:null}catch{return null}}m(v,"safePath");function B(e,t){const i=e.manifest.transport;if(i===void 0){t.push({code:"command_manifest_invalid",plugin:e.name,message:"commands requires transport in plugin.json",received:"(missing)",expected:"a transport object",next:"Add plugin.json.transport.",path:"transport"});return}if(typeof i!="object"||i===null||Array.isArray(i)){t.push({code:"command_manifest_invalid",plugin:e.name,message:"transport must be an object",received:Array.isArray(i)?"array":typeof i,expected:"an exec or http transport object",next:"Fix plugin.json.transport.",path:"transport"});return}const o=i;if(o.kind==="http"){const a=R(o);if(a.transport!==void 0)return a.transport;t.push({code:"command_manifest_invalid",plugin:e.name,message:a.errors.join("; "),received:JSON.stringify(i),expected:"a valid HTTP transport",next:"Fix plugin.json.transport.",path:"transport"});return}if(o.kind==="machine"){if(e.manifest.provider===void 0||Object.keys(o).length!==1){t.push({code:"command_manifest_invalid",plugin:e.name,message:e.manifest.provider===void 0?"a machine transport belongs to a capability provider bundle":"transport has unknown keys",received:JSON.stringify(i),expected:'{ kind: "machine" } on a provider bundle',next:"Fix plugin.json.transport.",path:"transport"});return}return{kind:"machine"}}const s=Object.keys(o).filter(a=>!["kind","executable"].includes(a));if(o.kind!=="exec"||s.length||o.executable!==void 0&&(typeof o.executable!="string"||o.executable.length===0)){t.push({code:"command_manifest_invalid",plugin:e.name,message:s.length?`transport has unknown keys: ${s.join(", ")}`:"exec transport requires a non-empty executable when declared",received:JSON.stringify(i),expected:'{ kind: "exec", executable?: "plugin-relative path" }',next:"Fix plugin.json.transport.",path:"transport"});return}return{kind:"exec",...o.executable!==void 0?{executable:o.executable}:{}}}m(B,"transportFor");function y(e){return e.kind==="leaf"||e.children.some(y)}m(y,"hasExecutableLeaf");function M(e){return[...e.roots,...e.coreMounts.map(t=>t.node)]}m(M,"manifestNodes");function H(e,t,i,o){if(t.executable===void 0){if(!M(i).some(y))return t;o.push({code:"command_manifest_invalid",plugin:e.name,message:"exec transport requires executable when commands.json declares executable leaves",received:"(missing)",expected:'{ kind: "exec", executable: "plugin-relative path" }',next:"Add plugin.json.transport.executable.",path:"transport.executable"});return}const s=v(e.root,t.executable);if(s===null){o.push({code:"command_path_unsafe",plugin:e.name,message:"executable escapes the plugin root or is not a regular file",received:t.executable,expected:"a relative path to a regular file inside the plugin root",next:"Fix plugin.json.transport.executable.",path:"transport.executable"});return}if((b(s).mode&73)===0){o.push({code:"command_not_executable",plugin:e.name,message:"executable lacks the POSIX exec bit",received:t.executable,expected:"a file with an executable permission bit",next:"chmod +x the plugin executable, then update the plugin.",path:"transport.executable"});return}return{kind:"exec",executable:s}}m(H,"validateExecExecutable");function L(e){return N(e)||e.startsWith(".")||e.includes("/")||e.includes("\\")}m(L,"namesPath");function W(e,t,i){let o=!0;const s=m(a=>{if(a.kind!=="branch")return;const d=a.passthrough;if(d!==void 0&&L(d.bin)){const l=v(e.root,d.bin);l===null?(i.push({code:"command_path_unsafe",plugin:e.name,message:"passthrough binary escapes the plugin root or is not a regular file",received:d.bin,expected:"a relative path to a regular file inside the plugin root",next:"Fix passthrough.bin in commands.json.",path:"passthrough.bin"}),o=!1):(b(l).mode&73)===0?(i.push({code:"command_not_executable",plugin:e.name,message:"passthrough binary lacks the POSIX exec bit",received:d.bin,expected:"a file with an executable permission bit",next:"chmod +x the plugin executable, then update commands.json.",path:"passthrough.bin"}),o=!1):a.passthrough={...d,bin:l}}for(const l of a.children)s(l)},"visit");for(const a of M(t))s(a);return o}m(W,"resolvePassthroughBinaries");function S(e,t=new Set,i,o=new Set){const s=[],a=e.manifest.commands,d=e.manifest.transport;let l=_(e.root,typeof a=="string"?a:"commands.json");const r=m(x=>({plugin:e,manifestPath:l,...x===void 0?{}:{transport:x},contributions:[],coreMounts:[],issues:s}),"empty");if(a===void 0&&d===void 0)return r();if(typeof a!="string"||a.length===0)return s.push({code:"command_manifest_invalid",plugin:e.name,message:"transport requires commands in plugin.json",received:"(missing)",expected:"a plugin-root-relative commands path",next:"Add plugin.json.commands or remove transport.",path:"commands"}),r();const n=B(e,s);if(n===void 0)return r();const c=v(e.root,a);if(c===null)return s.push({code:"command_path_unsafe",plugin:e.name,message:"commands pointer escapes the plugin root or is not a regular file",received:a,expected:"a relative path to a regular file inside the plugin root",next:"Fix plugin.json.commands.",path:"commands"}),r(n);l=c;let p;try{p=F(c)}catch{p=null}if(p===null)return s.push({code:"command_manifest_unreadable",plugin:e.name,message:"commands.json is missing or unreadable",received:c,expected:"a readable JSON file",next:"Reinstall or update the plugin."}),r(n);let h;try{h=JSON.parse(Buffer.from(p).toString("utf8"))}catch{return s.push({code:"command_manifest_invalid",plugin:e.name,message:"commands.json is not valid JSON",received:c,expected:"a JSON object",next:"Regenerate commands.json."}),r(n)}const f=q(h,{transport:n.kind==="machine"?"http":n.kind,reservedCoreNames:t,extensibleCoreBranches:o,...i!==void 0?{coreCommandPaths:i}:{}});if(f.manifest===void 0)return f.issues.forEach(I(e,s)),r(n);const u=n.kind==="exec"?H(e,n,f.manifest,s):n;if(u===void 0)return r(n);if(u.kind==="exec"&&!W(e,f.manifest,s))return r(u);const g=e.manifest.provider,j=f.manifest.roots;if(!j.every(x=>x.kind==="branch"))throw new Error("plugin manifest validation returned a top-level leaf");return{plugin:e,manifestPath:l,transport:u,manifest:f.manifest,contributions:j.filter(x=>g===void 0||y(x)).map(x=>({plugin:e,transport:u,node:x,manifest:f.manifest,manifestName:x.name,...g!==void 0?{provider:g}:{}})),coreMounts:f.manifest.coreMounts.map(x=>({plugin:e,transport:u,parent:x.parent,node:x.node,manifest:f.manifest,...g!==void 0?{provider:g}:{}})),issues:s}}m(S,"validatePluginCommands");function ee(e=process.cwd(),t){return w(e,t).map(i=>S(i))}m(ee,"discoverPluginCommandCandidates");function C(e,t=process.cwd(),i,o,s=new Set){const a=w(t,i).map(r=>S(r,e,o,s)),d=new Map;for(const r of a)for(const n of r.contributions){const c=d.get(n.node.name);c===void 0?d.set(n.node.name,[n]):c.push(n)}for(const[r,n]of d)if(n.length>1)for(const c of n){const{plugin:p}=c,h=A({name:p.name,sourceMarketplace:p.sourceMarketplace},r),f=a.find(u=>u.plugin.root===p.root);f.contributions=f.contributions.map(u=>u===c?{...u,node:{...u.node,name:h}}:u),f.issues.push({code:"command_collision",plugin:p.name,path:r,message:`top-level command "${r}" is claimed by ${n.map(u=>u.plugin.name).join(", ")} \u2014 mounted as "${h}"`,received:n.map(u=>u.plugin.name).join(", "),expected:"an origin-qualified top-level command for each claimant",next:`Invoke "${h}" to use this plugin command.`})}const l=new Map;for(const r of a)for(const n of r.coreMounts){const c=[...n.parent,n.node.name].join("/"),p=l.get(c);p===void 0?l.set(c,[n]):p.push(n)}for(const[r,n]of l)if(n.length>1)for(const c of n){const p=a.find(h=>h.plugin.root===c.plugin.root);p.coreMounts=p.coreMounts.filter(h=>h!==c),p.issues.push({code:"command_collision",plugin:c.plugin.name,path:r.replace("/","."),message:`contributed command "${c.node.name}" conflicts with another plugin child below the extensible core branch`,received:n.map(h=>h.plugin.name).join(", "),expected:`a unique child name below ${c.parent.join(".")}`,next:"Rename the contributed command or remove this mount."})}return a}m(C,"validateEffectiveCommandPlugins");function X(e,t){return{...t,contributor:{name:e.name,scope:e.scope,sourceMarketplace:e.sourceMarketplace}}}m(X,"contributorIssue");function ne(e,t=process.cwd(),i,o,s=new Set){const a=C(e,t,i,o,s);return{contributions:a.flatMap(d=>d.contributions),coreMounts:a.flatMap(d=>d.coreMounts),issues:a.flatMap(d=>d.issues)}}m(ne,"discoverCommandContributions");function te(e,t=process.cwd(),i,o,s=new Set){const a=C(e,t,i,o,s),d=J(a.flatMap(n=>n.contributions)).contributions,l=E(d,e);return{contributions:T(l.contributions,t).contributions,coreMounts:$(a.flatMap(n=>n.coreMounts)),issues:[...a.flatMap(n=>n.issues.map(c=>X(n.plugin,c))),...l.issues]}}m(te,"buildExternalCommandSnapshot");export{te as buildExternalCommandSnapshot,ne as discoverCommandContributions,ee as discoverPluginCommandCandidates,C as validateEffectiveCommandPlugins,S as validatePluginCommands};

package/dist/core/command-plugins/help-addenda.js

@@ -1 +1 @@
-var p=Object.defineProperty;var l=(r,n)=>p(r,"name",{value:n,configurable:!0});import{effectiveCommandPlugins as h,validatePluginCommands as c}from"./discovery.js";async function v(r,n,u,f){if(r.length===0)return[];const o=await n.extensibleCoreBranches(),a=[],i=h(u,f).filter(t=>{const e=c(t,n.reservedCoreNames,void 0,o).manifest;return e?.helpAddenda?.[r]===void 0?!1:(a.push(...Object.keys(e.helpAddenda),...e.coreMounts.map(d=>[...d.parent,d.node.name].join(" "))),!0)});if(i.length===0)return[];const m=await n.coreCommandPaths(a),s=[];for(const t of i){const e=c(t,n.reservedCoreNames,m,o).manifest?.helpAddenda?.[r];e!==void 0&&s.push({plugin:t.name,text:e})}return s.sort((t,e)=>t.plugin.localeCompare(e.plugin)),s}l(v,"collectHelpAddenda");export{v as collectHelpAddenda};
+var p=Object.defineProperty;var l=(r,n)=>p(r,"name",{value:n,configurable:!0});import{validatePluginCommands as c}from"./discovery.js";import{effectiveCommandPlugins as h}from"./presence.js";async function x(r,n,f,u){if(r.length===0)return[];const s=await n.extensibleCoreBranches(),i=[],a=h(f,u).filter(t=>{const e=c(t,n.reservedCoreNames,void 0,s).manifest;return e?.helpAddenda?.[r]===void 0?!1:(i.push(...Object.keys(e.helpAddenda),...e.coreMounts.map(d=>[...d.parent,d.node.name].join(" "))),!0)});if(a.length===0)return[];const m=await n.coreCommandPaths(i),o=[];for(const t of a){const e=c(t,n.reservedCoreNames,m,s).manifest?.helpAddenda?.[r];e!==void 0&&o.push({plugin:t.name,text:e})}return o.sort((t,e)=>t.plugin.localeCompare(e.plugin)),o}l(x,"collectHelpAddenda");export{x as collectHelpAddenda};