@north-light/cli 0.3.529 → 0.3.531

package/dist/core/canvas/waits.js

@@ -1,11 +1,11 @@
-var c=Object.defineProperty;var r=(t,e)=>c(t,"name",{value:e,configurable:!0});import{prepared as i}from"../sqlite-statements.js";import{randomBytes as l}from"node:crypto";import{openDb as o,withCanvasWrite as N}from"./db.js";function _(t){if(t.kind!=="controller")throw new Error(`wait ${t.wait_id} is not a controller wait`);return{waitId:t.wait_id,nodeId:t.node_id,controllerId:t.target_id,generation:t.generation,createdAt:t.created_at,satisfiedAt:t.satisfied_at}}r(_,"waitFrom");function E(){let t;do t=l(16).toString("hex");while(t==="00000000000000000000000000000000");return t}r(E,"newWaitId");function g(t,e,a=Date.now()){return N(n=>{i(n,"UPDATE waits SET satisfied_at = ? WHERE node_id = ? AND kind = 'controller' AND satisfied_at IS NULL").run(a,t);const d=Number(i(n,"SELECT COALESCE(MAX(generation), 0) AS generation FROM waits WHERE node_id = ? AND kind = 'controller'").get(t).generation)+1,s={wait_id:E(),node_id:t,kind:"controller",target_id:e,generation:d,created_at:a,satisfied_at:null};return i(n,`INSERT INTO waits (wait_id, node_id, kind, target_id, generation, created_at, satisfied_at)
-       VALUES (?, ?, 'controller', ?, ?, ?, NULL)`).run(s.wait_id,s.node_id,s.target_id,s.generation,s.created_at),_(s)})}r(g,"armControllerWait");function A(t){const e=i(o(),"SELECT * FROM waits WHERE node_id = ? AND kind = 'controller' AND satisfied_at IS NULL").get(t);return e===void 0?null:_(e)}r(A,"readControllerWait");function D(t,e,a,n=o()){if(e===null)return!1;const d=i(n,"SELECT wait_id, generation FROM waits WHERE node_id = ? AND kind = 'controller' AND target_id = ? AND satisfied_at IS NULL").get(t,e);return d===void 0?!1:Number(i(n,"UPDATE waits SET satisfied_at = ? WHERE wait_id = ? AND generation = ? AND satisfied_at IS NULL").run(a,d.wait_id,d.generation).changes)===1}r(D,"settleMatchingControllerWait");function S(t,e,a,n=o()){const d=i(n,`SELECT w.wait_id, w.generation, target.status AS controller_status
+var w=Object.defineProperty;var n=(t,e)=>w(t,"name",{value:e,configurable:!0});import{randomBytes as c}from"node:crypto";import{withCanvasWrite as E,openDb as d}from"./db.js";function s(t){if(t.kind!=="controller")throw new Error(`wait ${t.wait_id} is not a controller wait`);return{waitId:t.wait_id,nodeId:t.node_id,controllerId:t.target_id,generation:t.generation,createdAt:t.created_at,satisfiedAt:t.satisfied_at}}n(s,"waitFrom");function _(){let t;do t=c(16).toString("hex");while(t==="00000000000000000000000000000000");return t}n(_,"newWaitId");async function f(t,e,i=Date.now()){return await E(async a=>{await a.prepare("UPDATE waits SET satisfied_at = ? WHERE node_id = ? AND kind = 'controller' AND satisfied_at IS NULL").run(i,t);const r=Number((await a.prepare("SELECT COALESCE(MAX(generation), 0) AS generation FROM waits WHERE node_id = ? AND kind = 'controller'").get(t)).generation)+1,o={wait_id:_(),node_id:t,kind:"controller",target_id:e,generation:r,created_at:i,satisfied_at:null};return await a.prepare(`INSERT INTO waits (wait_id, node_id, kind, target_id, generation, created_at, satisfied_at)
+       VALUES (?, ?, 'controller', ?, ?, ?, NULL)`).run(o.wait_id,o.node_id,o.target_id,o.generation,o.created_at),s(o)})}n(f,"armControllerWait");async function p(t){const e=await(await d()).prepare("SELECT * FROM waits WHERE node_id = ? AND kind = 'controller' AND satisfied_at IS NULL").get(t);return e===void 0?null:s(e)}n(p,"readControllerWait");async function L(t,e,i,a){if(a??=await d(),e===null)return!1;const r=await a.prepare("SELECT wait_id, generation FROM waits WHERE node_id = ? AND kind = 'controller' AND target_id = ? AND satisfied_at IS NULL").get(t,e);return r===void 0?!1:Number((await a.prepare("UPDATE waits SET satisfied_at = ? WHERE wait_id = ? AND generation = ? AND satisfied_at IS NULL").run(i,r.wait_id,r.generation)).changes)===1}n(L,"settleMatchingControllerWait");async function g(t,e,i,a){a??=await d();const r=await a.prepare(`SELECT w.wait_id, w.generation, target.status AS controller_status
        FROM waits w LEFT JOIN nodes target ON target.node_id = w.target_id
-      WHERE w.node_id = ? AND w.kind = 'controller' AND w.target_id = ? AND w.satisfied_at IS NULL`).get(t,e);return d===void 0||d.controller_status==="active"||d.controller_status==="idle"?!1:Number(i(n,"UPDATE waits SET satisfied_at = ? WHERE wait_id = ? AND generation = ? AND satisfied_at IS NULL").run(a,d.wait_id,d.generation).changes)===1}r(S,"settleDeadControllerWait");function T(){return i(o(),"SELECT * FROM waits WHERE kind = 'controller' AND satisfied_at IS NULL").all().map(_)}r(T,"liveControllerWaits");function R(t,e,a,n=Date.now()){i(t,`INSERT INTO waits (wait_id, node_id, kind, target_id, generation, created_at, satisfied_at)
+      WHERE w.node_id = ? AND w.kind = 'controller' AND w.target_id = ? AND w.satisfied_at IS NULL`).get(t,e);return r===void 0||r.controller_status==="active"||r.controller_status==="idle"?!1:Number((await a.prepare("UPDATE waits SET satisfied_at = ? WHERE wait_id = ? AND generation = ? AND satisfied_at IS NULL").run(i,r.wait_id,r.generation)).changes)===1}n(g,"settleDeadControllerWait");async function A(){return(await(await d()).prepare("SELECT * FROM waits WHERE kind = 'controller' AND satisfied_at IS NULL").all()).map(s)}n(A,"liveControllerWaits");async function D(t,e,i,a=Date.now()){await t.prepare(`INSERT INTO waits (wait_id, node_id, kind, target_id, generation, created_at, satisfied_at)
      SELECT ?, ?, 'object', ?, 1, ?, NULL
-     WHERE NOT EXISTS (SELECT 1 FROM waits WHERE node_id = ? AND kind = 'object' AND target_id = ? AND satisfied_at IS NULL)`).run(E(),e,a,n,e,a)}r(R,"armObjectWait");function W(t,e,a=null,n=Date.now()){return Number(a===null?i(t,"UPDATE waits SET satisfied_at = ? WHERE kind = 'object' AND target_id = ? AND satisfied_at IS NULL").run(n,e).changes:i(t,"UPDATE waits SET satisfied_at = ? WHERE kind = 'object' AND target_id = ? AND node_id = ? AND satisfied_at IS NULL").run(n,e,a).changes)}r(W,"settleObjectWaits");function I(t,e,a=Date.now()){return Number(i(t,"UPDATE waits SET satisfied_at = ? WHERE kind = 'object' AND node_id = ? AND satisfied_at IS NULL").run(a,e).changes)}r(I,"settleNodeObjectWaits");function O(t=o()){return i(t,`SELECT w.wait_id, w.node_id, w.target_id, w.created_at, o.type AS object_type, o.name AS object_name
+     WHERE NOT EXISTS (SELECT 1 FROM waits WHERE node_id = ? AND kind = 'object' AND target_id = ? AND satisfied_at IS NULL)`).run(_(),e,i,a,e,i)}n(D,"armObjectWait");async function S(t,e,i=null,a=Date.now()){return Number(i===null?(await t.prepare("UPDATE waits SET satisfied_at = ? WHERE kind = 'object' AND target_id = ? AND satisfied_at IS NULL").run(a,e)).changes:(await t.prepare("UPDATE waits SET satisfied_at = ? WHERE kind = 'object' AND target_id = ? AND node_id = ? AND satisfied_at IS NULL").run(a,e,i)).changes)}n(S,"settleObjectWaits");async function T(t,e,i=Date.now()){return Number((await t.prepare("UPDATE waits SET satisfied_at = ? WHERE kind = 'object' AND node_id = ? AND satisfied_at IS NULL").run(i,e)).changes)}n(T,"settleNodeObjectWaits");async function R(t){return t??=await d(),(await t.prepare(`SELECT w.wait_id, w.node_id, w.target_id, w.created_at, o.type AS object_type, o.name AS object_name
        FROM waits w JOIN objects o ON o.id = w.target_id
       WHERE w.kind = 'object' AND w.satisfied_at IS NULL AND o.deleted_at IS NULL
-      ORDER BY w.node_id, w.created_at, w.rowid`).all().map(e=>({waitId:e.wait_id,nodeId:e.node_id,objectId:e.target_id,createdAt:e.created_at,objectType:e.object_type,objectName:e.object_name}))}r(O,"liveObjectWaitsNamed");function U(t){return i(o(),"SELECT 1 FROM waits WHERE node_id = ? AND kind = 'object' AND satisfied_at IS NULL LIMIT 1").get(t)!==void 0}r(U,"hasLiveObjectWait");function m(t){return i(o(),`SELECT 1 FROM waits w JOIN nodes target ON target.node_id = w.target_id
+      ORDER BY w.node_id, w.created_at, w.rowid`).all()).map(e=>({waitId:e.wait_id,nodeId:e.node_id,objectId:e.target_id,createdAt:e.created_at,objectType:e.object_type,objectName:e.object_name}))}n(R,"liveObjectWaitsNamed");async function W(t){return await(await d()).prepare("SELECT 1 FROM waits WHERE node_id = ? AND kind = 'object' AND satisfied_at IS NULL LIMIT 1").get(t)!==void 0}n(W,"hasLiveObjectWait");async function I(t){return await(await d()).prepare(`SELECT 1 FROM waits w JOIN nodes target ON target.node_id = w.target_id
       WHERE w.node_id = ? AND w.kind = 'controller' AND w.satisfied_at IS NULL
-        AND target.status IN ('active', 'idle') LIMIT 1`).get(t)!==void 0}r(m,"hasLiveControllerWait");export{g as armControllerWait,R as armObjectWait,m as hasLiveControllerWait,U as hasLiveObjectWait,T as liveControllerWaits,O as liveObjectWaitsNamed,A as readControllerWait,S as settleDeadControllerWait,D as settleMatchingControllerWait,I as settleNodeObjectWaits,W as settleObjectWaits};
+        AND target.status IN ('active', 'idle') LIMIT 1`).get(t)!==void 0}n(I,"hasLiveControllerWait");export{f as armControllerWait,D as armObjectWait,I as hasLiveControllerWait,W as hasLiveObjectWait,A as liveControllerWaits,R as liveObjectWaitsNamed,p as readControllerWait,g as settleDeadControllerWait,L as settleMatchingControllerWait,T as settleNodeObjectWaits,S as settleObjectWaits};

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

@@ -1,12 +1,12 @@
-import { DatabaseSync } from 'node:sqlite';
+import { type CanvasDb } from './db.js';
 import type { ManagedWorktree, ManagedWorktreeObservation } from './types.js';
 export declare function worktreeFromRow(row: Record<string, unknown> | undefined): ManagedWorktree | null;
-export declare function readWorktree(nodeId: string): ManagedWorktree | null;
-export declare function openWorktree(nodeId: string, worktree: ManagedWorktree, db?: DatabaseSync): void;
+export declare function readWorktree(nodeId: string): Promise<ManagedWorktree | null>;
+export declare function openWorktree(nodeId: string, worktree: ManagedWorktree, db?: CanvasDb): Promise<void>;
 export declare function closeWorktree(nodeId: string, input: {
     cleanup: 'pending' | 'complete';
     closedAt: string;
-}): void;
+}): Promise<void>;
 /** Complete a worktree close and repoint the node in the same SQL transaction.
  * A close invalidates the active transcript because Pi remains in the old
  * checkout; the next launch starts from the durable base checkout. */
@@ -15,14 +15,14 @@ export declare function closeWorktreeAndRepoint(nodeId: string, input: {
     cleanup: 'pending' | 'complete';
     closedAt: string;
     unbindSession: boolean;
-}): void;
-export declare function abandonWorktree(nodeId: string, abandoned: NonNullable<ManagedWorktree['abandoned']>): void;
+}): Promise<void>;
+export declare function abandonWorktree(nodeId: string, abandoned: NonNullable<ManagedWorktree['abandoned']>): Promise<void>;
 export declare function abandonWorktreeAndRepoint(nodeId: string, input: {
     cwd: string;
     abandoned: NonNullable<ManagedWorktree['abandoned']>;
-}): void;
-export declare function recordLandIntent(nodeId: string, intent: NonNullable<ManagedWorktree['land_intent']>): void;
-export declare function recordDisposalGrant(nodeId: string, disposal: NonNullable<ManagedWorktree['disposal']>): void;
+}): Promise<void>;
+export declare function recordLandIntent(nodeId: string, intent: NonNullable<ManagedWorktree['land_intent']>): Promise<void>;
+export declare function recordDisposalGrant(nodeId: string, disposal: NonNullable<ManagedWorktree['disposal']>): Promise<void>;
 export declare function recordSweepAttempt(nodeId: string, input: {
     reason: string;
     detail?: string;
@@ -31,11 +31,11 @@ export declare function recordSweepAttempt(nodeId: string, input: {
     lastAttemptAt: string;
     nextAttemptAt: string;
     quarantined: boolean;
-}): void;
-export declare function completeCleanup(nodeId: string): void;
-export declare function hasUnreconciledWorktree(nodeId: string): boolean;
-export declare function sweepCandidates(now: string): string[];
-export declare function quarantinedWorktrees(): Array<{
+}): Promise<void>;
+export declare function completeCleanup(nodeId: string): Promise<void>;
+export declare function hasUnreconciledWorktree(nodeId: string): Promise<boolean>;
+export declare function sweepCandidates(now: string): Promise<string[]>;
+export declare function quarantinedWorktrees(): Promise<Array<{
     nodeId: string;
     worktree: ManagedWorktree;
-}>;
+}>>;

package/dist/core/canvas/worktrees.js

@@ -1 +1 @@
-var l=Object.defineProperty;var n=(e,t)=>l(e,"name",{value:t,configurable:!0});import{prepared as a}from"../sqlite-statements.js";import{openDb as s,withCanvasWrite as p}from"./db.js";function _(e){const t=JSON.stringify(e);if(t===void 0)throw new TypeError("worktree value must be JSON-serializable");return t}n(_,"json");function d(e){if(typeof e=="string")return JSON.parse(e)}n(d,"parse");function i(e){if(e===void 0)return null;const t=d(e.sweep_observed_json),o=e.attempts,r=t===void 0?void 0:{reason:e.sweep_reason,...e.sweep_detail===null?{}:{detail:e.sweep_detail},observed:t,attempts:o,last_attempt:e.sweep_last_at,next_attempt:e.next_attempt_at,...e.quarantined===1?{quarantined:!0}:{}};return{state:e.state,...e.cleanup_state===null?{}:{cleanup:e.cleanup_state},path:e.path,branch:e.branch,repo_root:e.repo_root,base_ref:e.base_ref,base_sha:e.base_sha,created:e.created_at,...e.closed_at===null?{}:{closed:e.closed_at},...d(e.abandoned_json)===void 0?{}:{abandoned:d(e.abandoned_json)},...d(e.land_intent_json)===void 0?{}:{land_intent:d(e.land_intent_json)},...r===void 0?{}:{sweep:r},...d(e.disposal_json)===void 0?{}:{disposal:d(e.disposal_json)}}}n(i,"worktreeFromRow");function c(e){return i(a(s(),"SELECT * FROM worktrees WHERE node_id = ?").get(e))}n(c,"readWorktree");function N(e,t,o=s()){a(o,"INSERT INTO worktrees (node_id, state, cleanup_state, path, branch, repo_root, base_ref, base_sha, created_at, closed_at, next_attempt_at, attempts, quarantined, sweep_reason, sweep_detail, sweep_last_at, sweep_observed_json, abandoned_json, land_intent_json, disposal_json) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL)").run(e,t.state,t.cleanup??null,t.path,t.branch,t.repo_root,t.base_ref,t.base_sha,t.created,t.closed??null)}n(N,"openWorktree");function U(e,t){a(s(),"UPDATE worktrees SET state = 'closed', cleanup_state = ?, closed_at = ?, land_intent_json = NULL, sweep_reason = NULL, sweep_detail = NULL, sweep_last_at = NULL, sweep_observed_json = NULL, next_attempt_at = NULL, attempts = 0, quarantined = 0 WHERE node_id = ?").run(t.cleanup,t.closedAt,e)}n(U,"closeWorktree");function f(e,t){p(o=>{a(o,"UPDATE nodes SET cwd = ? WHERE node_id = ?").run(t.cwd,e),t.unbindSession&&a(o,"UPDATE sessions SET unbound_at = ? WHERE node_id = ? AND unbound_at IS NULL").run(t.closedAt,e),a(o,"UPDATE worktrees SET state = 'closed', cleanup_state = ?, closed_at = ?, land_intent_json = NULL, sweep_reason = NULL, sweep_detail = NULL, sweep_last_at = NULL, sweep_observed_json = NULL, next_attempt_at = NULL, attempts = 0, quarantined = 0 WHERE node_id = ?").run(t.cleanup,t.closedAt,e)})}n(f,"closeWorktreeAndRepoint");function b(e,t){a(s(),"UPDATE worktrees SET state = 'abandoned', abandoned_json = ? WHERE node_id = ? AND abandoned_json IS NULL").run(_(t),e)}n(b,"abandonWorktree");function A(e,t){p(o=>{a(o,"UPDATE nodes SET cwd = ? WHERE node_id = ?").run(t.cwd,e),a(o,"UPDATE worktrees SET state = 'abandoned', abandoned_json = ? WHERE node_id = ? AND abandoned_json IS NULL").run(_(t.abandoned),e)})}n(A,"abandonWorktreeAndRepoint");function m(e,t){a(s(),"UPDATE worktrees SET land_intent_json = ? WHERE node_id = ? AND land_intent_json IS NULL").run(_(t),e)}n(m,"recordLandIntent");function w(e,t){a(s(),"UPDATE worktrees SET disposal_json = ? WHERE node_id = ? AND disposal_json IS NULL").run(_(t),e)}n(w,"recordDisposalGrant");function R(e,t){a(s(),"UPDATE worktrees SET sweep_reason = ?, sweep_detail = ?, sweep_observed_json = ?, attempts = ?, sweep_last_at = ?, next_attempt_at = ?, quarantined = ? WHERE node_id = ?").run(t.reason,t.detail??null,_(t.observed),t.attempts,t.lastAttemptAt,t.nextAttemptAt,t.quarantined?1:0,e)}n(R,"recordSweepAttempt");function S(e){a(s(),"UPDATE worktrees SET state = 'closed', cleanup_state = 'complete', sweep_reason = NULL, sweep_detail = NULL, sweep_last_at = NULL, sweep_observed_json = NULL, next_attempt_at = NULL, attempts = 0, quarantined = 0 WHERE node_id = ?").run(e)}n(S,"completeCleanup");function T(e){return a(s(),"SELECT 1 FROM worktrees WHERE node_id = ? AND state != 'abandoned' AND (state = 'open' OR cleanup_state IS NULL OR cleanup_state != 'complete')").get(e)!==void 0}n(T,"hasUnreconciledWorktree");function D(e){return a(s(),"SELECT w.node_id FROM worktrees w JOIN nodes n ON n.node_id = w.node_id WHERE n.status IN ('done', 'dead', 'canceled') AND n.frozen_at IS NULL AND w.state IN ('open', 'closed') AND (w.state = 'open' OR w.cleanup_state IS NULL OR w.cleanup_state != 'complete') AND (w.state = 'closed' OR (n.status = 'done' AND n.final_report IS NOT NULL)) AND (w.next_attempt_at IS NULL OR w.next_attempt_at <= ?) ORDER BY w.next_attempt_at, w.node_id").all(e).map(({node_id:t})=>t)}n(D,"sweepCandidates");function j(){return a(s(),"SELECT node_id FROM worktrees WHERE quarantined = 1 ORDER BY sweep_last_at").all().flatMap(({node_id:e})=>{const t=c(e);return t===null?[]:[{nodeId:e,worktree:t}]})}n(j,"quarantinedWorktrees");export{b as abandonWorktree,A as abandonWorktreeAndRepoint,U as closeWorktree,f as closeWorktreeAndRepoint,S as completeCleanup,T as hasUnreconciledWorktree,N as openWorktree,j as quarantinedWorktrees,c as readWorktree,w as recordDisposalGrant,m as recordLandIntent,R as recordSweepAttempt,D as sweepCandidates,i as worktreeFromRow};
+var p=Object.defineProperty;var a=(e,t)=>p(e,"name",{value:t,configurable:!0});import{openDb as s,withCanvasWrite as _}from"./db.js";import{flatMapAsync as i}from"../async-array.js";function d(e){const t=JSON.stringify(e);if(t===void 0)throw new TypeError("worktree value must be JSON-serializable");return t}a(d,"json");function o(e){if(typeof e=="string")return JSON.parse(e)}a(o,"parse");function l(e){if(e===void 0)return null;const t=o(e.sweep_observed_json),n=e.attempts,r=t===void 0?void 0:{reason:e.sweep_reason,...e.sweep_detail===null?{}:{detail:e.sweep_detail},observed:t,attempts:n,last_attempt:e.sweep_last_at,next_attempt:e.next_attempt_at,...e.quarantined===1?{quarantined:!0}:{}};return{state:e.state,...e.cleanup_state===null?{}:{cleanup:e.cleanup_state},path:e.path,branch:e.branch,repo_root:e.repo_root,base_ref:e.base_ref,base_sha:e.base_sha,created:e.created_at,...e.closed_at===null?{}:{closed:e.closed_at},...o(e.abandoned_json)===void 0?{}:{abandoned:o(e.abandoned_json)},...o(e.land_intent_json)===void 0?{}:{land_intent:o(e.land_intent_json)},...r===void 0?{}:{sweep:r},...o(e.disposal_json)===void 0?{}:{disposal:o(e.disposal_json)}}}a(l,"worktreeFromRow");async function c(e){return l(await(await s()).prepare("SELECT * FROM worktrees WHERE node_id = ?").get(e))}a(c,"readWorktree");async function w(e,t,n){n??=await s(),await n.prepare("INSERT INTO worktrees (node_id, state, cleanup_state, path, branch, repo_root, base_ref, base_sha, created_at, closed_at, next_attempt_at, attempts, quarantined, sweep_reason, sweep_detail, sweep_last_at, sweep_observed_json, abandoned_json, land_intent_json, disposal_json) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL)").run(e,t.state,t.cleanup??null,t.path,t.branch,t.repo_root,t.base_ref,t.base_sha,t.created,t.closed??null)}a(w,"openWorktree");async function N(e,t){await(await s()).prepare("UPDATE worktrees SET state = 'closed', cleanup_state = ?, closed_at = ?, land_intent_json = NULL, sweep_reason = NULL, sweep_detail = NULL, sweep_last_at = NULL, sweep_observed_json = NULL, next_attempt_at = NULL, attempts = 0, quarantined = 0 WHERE node_id = ?").run(t.cleanup,t.closedAt,e)}a(N,"closeWorktree");async function U(e,t){await _(async n=>{await n.prepare("UPDATE nodes SET cwd = ? WHERE node_id = ?").run(t.cwd,e),t.unbindSession&&await n.prepare("UPDATE sessions SET unbound_at = ? WHERE node_id = ? AND unbound_at IS NULL").run(t.closedAt,e),await n.prepare("UPDATE worktrees SET state = 'closed', cleanup_state = ?, closed_at = ?, land_intent_json = NULL, sweep_reason = NULL, sweep_detail = NULL, sweep_last_at = NULL, sweep_observed_json = NULL, next_attempt_at = NULL, attempts = 0, quarantined = 0 WHERE node_id = ?").run(t.cleanup,t.closedAt,e)})}a(U,"closeWorktreeAndRepoint");async function f(e,t){await(await s()).prepare("UPDATE worktrees SET state = 'abandoned', abandoned_json = ? WHERE node_id = ? AND abandoned_json IS NULL").run(d(t),e)}a(f,"abandonWorktree");async function b(e,t){await _(async n=>{await n.prepare("UPDATE nodes SET cwd = ? WHERE node_id = ?").run(t.cwd,e),await n.prepare("UPDATE worktrees SET state = 'abandoned', abandoned_json = ? WHERE node_id = ? AND abandoned_json IS NULL").run(d(t.abandoned),e)})}a(b,"abandonWorktreeAndRepoint");async function A(e,t){await(await s()).prepare("UPDATE worktrees SET land_intent_json = ? WHERE node_id = ? AND land_intent_json IS NULL").run(d(t),e)}a(A,"recordLandIntent");async function m(e,t){await(await s()).prepare("UPDATE worktrees SET disposal_json = ? WHERE node_id = ? AND disposal_json IS NULL").run(d(t),e)}a(m,"recordDisposalGrant");async function R(e,t){await(await s()).prepare("UPDATE worktrees SET sweep_reason = ?, sweep_detail = ?, sweep_observed_json = ?, attempts = ?, sweep_last_at = ?, next_attempt_at = ?, quarantined = ? WHERE node_id = ?").run(t.reason,t.detail??null,d(t.observed),t.attempts,t.lastAttemptAt,t.nextAttemptAt,t.quarantined?1:0,e)}a(R,"recordSweepAttempt");async function S(e){await(await s()).prepare("UPDATE worktrees SET state = 'closed', cleanup_state = 'complete', sweep_reason = NULL, sweep_detail = NULL, sweep_last_at = NULL, sweep_observed_json = NULL, next_attempt_at = NULL, attempts = 0, quarantined = 0 WHERE node_id = ?").run(e)}a(S,"completeCleanup");async function T(e){return await(await s()).prepare("SELECT 1 FROM worktrees WHERE node_id = ? AND state != 'abandoned' AND (state = 'open' OR cleanup_state IS NULL OR cleanup_state != 'complete')").get(e)!==void 0}a(T,"hasUnreconciledWorktree");async function D(e){return(await(await s()).prepare("SELECT w.node_id FROM worktrees w JOIN nodes n ON n.node_id = w.node_id WHERE n.status IN ('done', 'dead', 'canceled') AND n.frozen_at IS NULL AND w.state IN ('open', 'closed') AND (w.state = 'open' OR w.cleanup_state IS NULL OR w.cleanup_state != 'complete') AND (w.state = 'closed' OR (n.status = 'done' AND n.final_report IS NOT NULL)) AND (w.next_attempt_at IS NULL OR w.next_attempt_at <= ?) ORDER BY w.next_attempt_at, w.node_id").all(e)).map(({node_id:t})=>t)}a(D,"sweepCandidates");async function j(){return await i(await(await s()).prepare("SELECT node_id FROM worktrees WHERE quarantined = 1 ORDER BY sweep_last_at").all(),async({node_id:e})=>{const t=await c(e);return t===null?[]:[{nodeId:e,worktree:t}]})}a(j,"quarantinedWorktrees");export{f as abandonWorktree,b as abandonWorktreeAndRepoint,N as closeWorktree,U as closeWorktreeAndRepoint,S as completeCleanup,T as hasUnreconciledWorktree,w as openWorktree,j as quarantinedWorktrees,c as readWorktree,m as recordDisposalGrant,A as recordLandIntent,R as recordSweepAttempt,D as sweepCandidates,l as worktreeFromRow};

package/dist/core/command-hooks/lifecycle-catalog.d.ts

@@ -1,13 +1,13 @@
 export declare const LIFECYCLE_CATALOG: {
     readonly 'node:create': {
         readonly phase: "before";
-        readonly hookTimeoutMs: 5000;
-        readonly eventBudgetMs: 10000;
+        readonly hookTimeoutMs: 15000;
+        readonly eventBudgetMs: 30000;
     };
     readonly 'node:start': {
         readonly phase: "on";
-        readonly hookTimeoutMs: 5000;
-        readonly eventBudgetMs: 10000;
+        readonly hookTimeoutMs: 15000;
+        readonly eventBudgetMs: 30000;
     };
     readonly 'node:close': {
         readonly phase: "on";

package/dist/core/command-hooks/lifecycle-catalog.js

@@ -1 +1 @@
-var n=Object.defineProperty;var t=(e,s)=>n(e,"name",{value:s,configurable:!0});const o={"node:create":{phase:"before",hookTimeoutMs:5e3,eventBudgetMs:1e4},"node:start":{phase:"on",hookTimeoutMs:5e3,eventBudgetMs:1e4},"node:close":{phase:"on",hookTimeoutMs:12e4,eventBudgetMs:18e4}},r=Object.freeze(Object.keys(o));function u(e){return Object.hasOwn(o,e)}t(u,"isLifecycleEvent");export{o as LIFECYCLE_CATALOG,r as LIFECYCLE_EVENTS,u as isLifecycleEvent};
+var n=Object.defineProperty;var t=(e,s)=>n(e,"name",{value:s,configurable:!0});const o={"node:create":{phase:"before",hookTimeoutMs:15e3,eventBudgetMs:3e4},"node:start":{phase:"on",hookTimeoutMs:15e3,eventBudgetMs:3e4},"node:close":{phase:"on",hookTimeoutMs:12e4,eventBudgetMs:18e4}},r=Object.freeze(Object.keys(o));function u(e){return Object.hasOwn(o,e)}t(u,"isLifecycleEvent");export{o as LIFECYCLE_CATALOG,r as LIFECYCLE_EVENTS,u as isLifecycleEvent};

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: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.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};

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

@@ -2,7 +2,7 @@ import { type ValidatedCommandManifest } from '../../api/command-manifest/manife
 import type { KindConfig, MemoryExtensionDeclarations, ObjectKindDeclaration, PageComponentRegistration, PluginBundle, PluginManifest, Scope } from '../../types.js';
 import { type BundleTransport } from './endpoint.js';
 /** Who may call a capability provider's tool group (contract 3). */
-export type ProviderGroupWho = 'own' | 'user' | 'allowlist' | 'any';
+export type ProviderGroupWho = 'own' | 'user' | 'allowlist' | 'any' | `team:${string}`;
 /** One tool group a capability provider declares in `bundle.json`. */
 export interface ProviderGroupDeclaration {
     group: string;

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 B,sep as V}from"node:path";import{validateCommandManifest as z}from"../../api/command-manifest/manifest.js";import{ensureScopeInitialized as R,invalidPluginKindsReasons as F,readConfig as M,updateConfig as D,updateState as C}from"../config.js";import{general as x}from"../errors.js";import{atomicWriteJson as T,atomicWriteText as q,ensureDir as j,nowIso as E,pathExists as _,removePath as S,syncDirectory as U,syncTree as H}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=new Set(["bundleVersion","kinds","page_components","memory_extensions","version","transport","provider","object_kinds","scopes","groups"]);function oe(e,o,n,r,s,a){return{code:e,message:o,received:n,expected:r,next:s,...a!==void 0?{path:a}:{}}}c(oe,"issue");function u(e,o,n,r,s){return oe("plugin_bundle_invalid",e,o,n,r,s)}c(u,"bundleInvalid");function re(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(re,"archiveEnvelopeIssue");function se(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(se,"validateMemberName");function te(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(te,"validateMemberShape");function ie(e){return e.type==="directory"&&e.path.endsWith("/")?e.path.slice(0,-1):e.path}c(ie,"materializedPath");function de(e){const o=new Map;for(const n of e){const r=ie(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 ae(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??=se(d,f),r??=te(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(ae,"parseArchive");function N(e){return typeof e=="number"&&Number.isInteger(e)&&e>=1}c(N,"isPositiveInt");function ue(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))return o("provider group who must be own|user|allowlist|any",JSON.stringify(i.who),"own | user | allowlist | any",`${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(ue,"parseProviderBlock");function le(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(le,"collectLeaves");function pe(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 le(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(pe,"providerBundleIssue");function ce(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=>!ne.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=ue(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(ce,"parseBundleMetadata");function me(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=z(s,{transport:"http",reservedCoreNames:o,extensibleCoreBranches:r,...n!==void 0?{coreCommandPaths:n}:{}});return{...a.manifest!==void 0?{commands:a.manifest}:{},issues:a.issues}}c(me,"parseCommands");async function fe(e,o){const n=re(e);if(n!==void 0)return{issues:[n]};const r=await ae(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 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=ce(a.bytes);if(i.issue!==void 0)return{issues:[i.issue]};const b=me(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=pe(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(fe,"validatePluginBundle");function he(e){return I("sha256").update(e).digest("hex").slice(0,12)}c(he,"bundleVersion");function Pe(e,o,n,r){return M(o).plugins[e]?.version!==r?!1:_(w(n,"commands.json"))}c(Pe,"isInstalledGeneration");function be(e,o,n,r){C(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(be,"recordCheckedGeneration");function g(e,o){const n=B(e,o);if(n===e||!n.startsWith(e+V))throw x(`bundle member path escapes the staging directory: ${o}`);return n}c(g,"stagedPath");function ve(e,o,n){const r=c((s,a,p=420)=>q(s,a,{mode:p,durable:!0}),"write");T(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)}H(e)}c(ve,"writeStagedBundle");async function Je(e,o,n){const{scope:r,scopeRootPath:s,root:a}=n,p=await fe(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??he(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),ve(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}U($(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}}),be(r,e,n.etag,{swapped:!0}),{manifest:b,validated:t,version:f,root:a,staged:l}}c(Je,"installBundleArchive");export{he as bundleVersion,Je as installBundleArchive,Pe as isInstalledGeneration,be as recordCheckedGeneration,fe as validatePluginBundle,ve 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,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};

package/dist/core/conversation-store/file-store.d.ts

@@ -15,16 +15,16 @@ export type ConversationWrite = {
     kind: 'replace';
 };
 /** One coherent write: the canvas step, `write()` (returns the new file size), then commit. */
-export type AppendSection = (conversationId: string, change: ConversationWrite, write: () => number) => void;
+export type AppendSection = (conversationId: string, change: ConversationWrite, write: () => number) => Promise<void>;
 /** The canvas side of the store: the write section, and each conversation's current owner. */
 export interface ConversationCanvas {
     appendSection: AppendSection;
-    owners(): Map<string, string>;
-    createPath?(nodeId: string, header: SessionHeader): string;
-    pathFor?(id: string): string | undefined;
-    repair?(id: string, path: string): void;
-    abortCreate?(id: string): void;
-    delete?(id: string): void;
+    owners(): Promise<Map<string, string>>;
+    createPath?(nodeId: string, header: SessionHeader): Promise<string>;
+    pathFor?(id: string): Promise<string | undefined>;
+    repair?(id: string, path: string): Promise<void>;
+    abortCreate?(id: string): Promise<void>;
+    delete?(id: string): Promise<void>;
 }
 export declare function sessionDirectory(root: string, cwd: string): string;
 export declare function createFileStore(root: string, canvas: ConversationCanvas): ConversationStore & {

package/dist/core/conversation-store/file-store.js

@@ -1,9 +1,9 @@
-var G=Object.defineProperty;var u=(l,c)=>G(l,"name",{value:c,configurable:!0});import{randomUUID as J}from"node:crypto";import{closeSync as v,createReadStream as K,existsSync as $,fsyncSync as k,mkdirSync as L,openSync as z,readFileSync as P,readSync as M,renameSync as Q,statSync as S,unlinkSync as O,writeFileSync as j}from"node:fs";import{createInterface as T}from"node:readline";import{dirname as V,join as F,relative as X,resolve as b}from"node:path";import{SessionManager as Y}from"@earendil-works/pi-coding-agent";import{ConversationNotFoundError as Z}from"./index.js";function E(l){const c=[];for(const p of l.split(`
-`))if(p.trim())try{c.push(JSON.parse(p))}catch{}return c}u(E,"parseLines");function I(l){const c=z(l,"r");try{const p=Buffer.allocUnsafe(4096);let f="";for(;;){const w=M(c,p,0,p.length,null);f+=p.toString("utf8",0,w);let m=f.indexOf(`
-`);for(;m!==-1||w===0;){const y=m===-1?f:f.slice(0,m),[h]=E(y);if(h!==void 0)return h;if(m===-1)return;f=f.slice(m+1),m=f.indexOf(`
-`)}}}finally{v(c)}}u(I,"firstLine");function ee(l,c){const p=z(l,"r");try{const f=Buffer.alloc(1);return M(p,f,0,1,c-1),f[0]}finally{v(p)}}u(ee,"lastByte");function C(l,c){return[l,...c].map(p=>`${JSON.stringify(p)}
-`).join("")}u(C,"lines");function W(l,c){const p=`--${b(c).replace(/^[/\\]/,"").replace(/[/\\:]/g,"-")}--`;return F(l,p)}u(W,"sessionDirectory");function A(l){return`${l.timestamp.replace(/[:.]/g,"-")}_${l.id}.jsonl`}u(A,"fileName");function ae(l,c){const{appendSection:p}=c,f=new Map,w=new Map;L(l,{recursive:!0,mode:448});const m=new Set;function y(e){if(m.has(e))return;const t=h(e);if(c.repair?.(e,t),!$(t)){f.delete(e),w.delete(e);return}m.add(e)}u(y,"repair");function h(e){const t=f.get(e)??c.pathFor?.(e);if(!t)throw new Z(e);return f.set(e,t),t}u(h,"pathFor");function x(e){y(e);const t=h(e),r=E(P(t,"utf8")),n=r.shift();if(n?.type!=="session"||n.id!==e)throw new Error(`invalid conversation: ${e}`);return{header:n,entries:r,path:t}}u(x,"read");function B(e,t){const r=I(t);return r?.type==="session"&&r.id===e?r:void 0}u(B,"validHeader");function N(e){const t=h(e),r=B(e,t);if(!r)throw new Error(`invalid conversation: ${e}`);return{header:r,path:t}}u(N,"headerOf");function H(e,t){y(e);const{header:r,path:n}=N(e),a=S(n).size;if(a<=t.head+t.tail)return x(e);const i=z(n,"r");try{const o=u((R,_)=>{if(_<=0)return[];const U=Buffer.allocUnsafe(_),q=M(i,U,0,_,R);return U.subarray(0,q).toString("utf8").split(`
-`)},"slice"),s=o(0,t.head),d=o(a-t.tail,t.tail);s.pop(),d.shift();const g=E(s.join(`
-`));return g[0]?.type==="session"&&g.shift(),{header:r,entries:g,tail:E(d.join(`
-`)),path:n}}finally{v(i)}}u(H,"readWindow");function D(e,t,r,n,a){if(f.has(t.id))throw new Error(`conversation already exists: ${t.id}`);const i=X(l,n);if(i.startsWith("..")||i===""||b(n)===b(l))throw new Error("conversation path outside store root");if(L(V(n),{recursive:!0,mode:448}),$(n))throw new Error(`conversation file already exists: ${n}`);let o=!1;try{const s=u(()=>{const d=z(n,"wx",384);o=!0;try{return j(d,C(t,r)),k(d),o=!1,S(n).size}finally{v(d)}},"write");return e===void 0?s():p(t.id,{kind:"create",nodeId:e,path:n,entries:r,...a?{sourceId:a}:{}},s),f.set(t.id,n),t.id}catch(s){throw o||!$(n)?($(n)&&O(n),c.abortCreate?.(t.id)):f.set(t.id,n),s}}return u(D,"createAt"),{recover(e){for(const t of e){if(!t.transcript_path)continue;const r=f.get(t.session_id);if(r&&r!==t.transcript_path)throw new Error(`conflicting conversation paths: ${t.session_id}`);f.set(t.session_id,t.transcript_path)}},repair:y,readLines(e){y(e);const t=h(e),r=T({input:K(t),crlfDelay:1/0});return{path:t,lines:r}},create(e,t,r,n){return D(e,t,r,c.createPath?.(e,t)??n??F(W(l,t.cwd),A(t)))},append(e,t,r){if(t.length===0)return;y(e);const n=h(e);if(r?.dedupe){const i=new Set(x(e).entries.map(o=>o.id));if(t=t.filter(o=>!i.has(o.id)),t.length===0)return}const a=S(n).size;if(a>0&&ee(n,a)!==10)throw new Error(`incomplete conversation tail: ${e}`);try{p(e,{kind:"append",entries:t},()=>{const i=z(n,"a");try{return j(i,t.map(o=>`${JSON.stringify(o)}
-`).join("")),k(i),S(n).size}finally{v(i)}})}catch(i){throw m.delete(e),i}},replace(e,t,r){y(e);const n=h(e);if(t.id!==e)throw new Error("replacement header id differs from conversation id");const a=P(n),i=u(s=>{const d=`${n}.${J()}.tmp`;try{j(d,s,{flag:"wx",mode:384});const g=z(d,"r");try{k(g)}finally{v(g)}Q(d,n)}finally{$(d)&&O(d)}},"swap");let o=!1;try{p(e,{kind:"replace"},()=>(i(C(t,r)),o=!0,S(n).size))}catch(s){throw o&&i(a),s}finally{w.delete(e)}},read(e,t){return t?H(e,t):x(e)},header(e){y(e);const{header:t,path:r}=N(e),n=S(r);return{header:t,path:r,mtime:n.mtimeMs,size:n.size}},fork(e,t,r,n){const a=x(e);let i=a.entries;if(r!==void 0){const d=Y.inMemory(a.header.cwd,void 0,[a.header,...i]);d.createBranchedSession(r),i=d.getEntries()}const o=new Date().toISOString(),s={...a.header,id:J(),timestamp:o,cwd:n??a.header.cwd,parentSession:a.path};return D(t,s,i,t&&c.createPath?c.createPath(t,s):F(W(l,s.cwd),A(s)),e)},list(e){const t=[],r=c.owners();for(const n of new Set([...f.keys(),...r.keys()])){const a=r.get(n);if(e!==void 0&&a!==e||(y(n),!f.has(n)))continue;const i=h(n),o=S(i);let s=w.get(n);(!s||s.mtime!==o.mtimeMs||s.size!==o.size)&&(s={mtime:o.mtimeMs,size:o.size,header:B(n,i)},w.set(n,s)),s.header&&t.push({conversation_id:n,...a?{node_id:a}:{},header:s.header,mtime:o.mtimeMs,size:o.size,path:i})}return t.sort((n,a)=>a.mtime-n.mtime)},delete(e){O(h(e)),c.delete?.(e),f.delete(e),m.delete(e),w.delete(e)}}}u(ae,"createFileStore");export{ae as createFileStore,W as sessionDirectory};
+var G=Object.defineProperty;var u=(l,o)=>G(l,"name",{value:o,configurable:!0});import{randomUUID as J}from"node:crypto";import{closeSync as v,createReadStream as K,existsSync as $,fsyncSync as k,mkdirSync as L,openSync as z,readFileSync as P,readSync as M,renameSync as Q,statSync as S,unlinkSync as O,writeFileSync as j}from"node:fs";import{createInterface as T}from"node:readline";import{dirname as V,join as F,relative as X,resolve as b}from"node:path";import{SessionManager as Y}from"@earendil-works/pi-coding-agent";import{ConversationNotFoundError as Z}from"./index.js";function E(l){const o=[];for(const w of l.split(`
+`))if(w.trim())try{o.push(JSON.parse(w))}catch{}return o}u(E,"parseLines");function I(l){const o=z(l,"r");try{const w=Buffer.allocUnsafe(4096);let f="";for(;;){const h=M(o,w,0,w.length,null);f+=w.toString("utf8",0,h);let y=f.indexOf(`
+`);for(;y!==-1||h===0;){const m=y===-1?f:f.slice(0,y),[d]=E(m);if(d!==void 0)return d;if(y===-1)return;f=f.slice(y+1),y=f.indexOf(`
+`)}}}finally{v(o)}}u(I,"firstLine");function ee(l,o){const w=z(l,"r");try{const f=Buffer.alloc(1);return M(w,f,0,1,o-1),f[0]}finally{v(w)}}u(ee,"lastByte");function C(l,o){return[l,...o].map(w=>`${JSON.stringify(w)}
+`).join("")}u(C,"lines");function W(l,o){const w=`--${b(o).replace(/^[/\\]/,"").replace(/[/\\:]/g,"-")}--`;return F(l,w)}u(W,"sessionDirectory");function A(l){return`${l.timestamp.replace(/[:.]/g,"-")}_${l.id}.jsonl`}u(A,"fileName");function ce(l,o){const{appendSection:w}=o,f=new Map,h=new Map;L(l,{recursive:!0,mode:448});const y=new Set;async function m(e){if(y.has(e))return;const t=await d(e);if(await o.repair?.(e,t),!$(t)){f.delete(e),h.delete(e);return}y.add(e)}u(m,"repair");async function d(e){const t=f.get(e)??await o.pathFor?.(e);if(!t)throw new Z(e);return f.set(e,t),t}u(d,"pathFor");async function x(e){await m(e);const t=await d(e),r=E(P(t,"utf8")),n=r.shift();if(n?.type!=="session"||n.id!==e)throw new Error(`invalid conversation: ${e}`);return{header:n,entries:r,path:t}}u(x,"read");function B(e,t){const r=I(t);return r?.type==="session"&&r.id===e?r:void 0}u(B,"validHeader");async function N(e){const t=await d(e),r=B(e,t);if(!r)throw new Error(`invalid conversation: ${e}`);return{header:r,path:t}}u(N,"headerOf");async function H(e,t){await m(e);const{header:r,path:n}=await N(e),c=S(n).size;if(c<=t.head+t.tail)return await x(e);const i=z(n,"r");try{const a=u((R,_)=>{if(_<=0)return[];const U=Buffer.allocUnsafe(_),q=M(i,U,0,_,R);return U.subarray(0,q).toString("utf8").split(`
+`)},"slice"),s=a(0,t.head),p=a(c-t.tail,t.tail);s.pop(),p.shift();const g=E(s.join(`
+`));return g[0]?.type==="session"&&g.shift(),{header:r,entries:g,tail:E(p.join(`
+`)),path:n}}finally{v(i)}}u(H,"readWindow");async function D(e,t,r,n,c){if(f.has(t.id))throw new Error(`conversation already exists: ${t.id}`);const i=X(l,n);if(i.startsWith("..")||i===""||b(n)===b(l))throw new Error("conversation path outside store root");if(L(V(n),{recursive:!0,mode:448}),$(n))throw new Error(`conversation file already exists: ${n}`);let a=!1;try{const s=u(()=>{const p=z(n,"wx",384);a=!0;try{return j(p,C(t,r)),k(p),a=!1,S(n).size}finally{v(p)}},"write");return e===void 0?s():await w(t.id,{kind:"create",nodeId:e,path:n,entries:r,...c?{sourceId:c}:{}},s),f.set(t.id,n),t.id}catch(s){throw a||!$(n)?($(n)&&O(n),await o.abortCreate?.(t.id)):f.set(t.id,n),s}}return u(D,"createAt"),{recover(e){for(const t of e){if(!t.transcript_path)continue;const r=f.get(t.session_id);if(r&&r!==t.transcript_path)throw new Error(`conflicting conversation paths: ${t.session_id}`);f.set(t.session_id,t.transcript_path)}},repair:m,async readLines(e){await m(e);const t=await d(e),r=T({input:K(t),crlfDelay:1/0});return{path:t,lines:r}},async create(e,t,r,n){return await D(e,t,r,await o.createPath?.(e,t)??n??F(W(l,t.cwd),A(t)))},async append(e,t,r){if(t.length===0)return;await m(e);const n=await d(e);if(r?.dedupe){const i=new Set((await x(e)).entries.map(a=>a.id));if(t=t.filter(a=>!i.has(a.id)),t.length===0)return}const c=S(n).size;if(c>0&&ee(n,c)!==10)throw new Error(`incomplete conversation tail: ${e}`);try{await w(e,{kind:"append",entries:t},()=>{const i=z(n,"a");try{return j(i,t.map(a=>`${JSON.stringify(a)}
+`).join("")),k(i),S(n).size}finally{v(i)}})}catch(i){throw y.delete(e),i}},async replace(e,t,r){await m(e);const n=await d(e);if(t.id!==e)throw new Error("replacement header id differs from conversation id");const c=P(n),i=u(s=>{const p=`${n}.${J()}.tmp`;try{j(p,s,{flag:"wx",mode:384});const g=z(p,"r");try{k(g)}finally{v(g)}Q(p,n)}finally{$(p)&&O(p)}},"swap");let a=!1;try{await w(e,{kind:"replace"},()=>(i(C(t,r)),a=!0,S(n).size))}catch(s){throw a&&i(c),s}finally{h.delete(e)}},async read(e,t){return t?await H(e,t):await x(e)},async header(e){await m(e);const{header:t,path:r}=await N(e),n=S(r);return{header:t,path:r,mtime:n.mtimeMs,size:n.size}},async fork(e,t,r,n){const c=await x(e);let i=c.entries;if(r!==void 0){const p=Y.inMemory(c.header.cwd,void 0,[c.header,...i]);p.createBranchedSession(r),i=p.getEntries()}const a=new Date().toISOString(),s={...c.header,id:J(),timestamp:a,cwd:n??c.header.cwd,parentSession:c.path};return await D(t,s,i,t&&o.createPath?await o.createPath(t,s):F(W(l,s.cwd),A(s)),e)},async list(e){const t=[],r=await o.owners();for(const n of new Set([...f.keys(),...r.keys()])){const c=r.get(n);if(e!==void 0&&c!==e||(await m(n),!f.has(n)))continue;const i=await d(n),a=S(i);let s=h.get(n);(!s||s.mtime!==a.mtimeMs||s.size!==a.size)&&(s={mtime:a.mtimeMs,size:a.size,header:B(n,i)},h.set(n,s)),s.header&&t.push({conversation_id:n,...c?{node_id:c}:{},header:s.header,mtime:a.mtimeMs,size:a.size,path:i})}return t.sort((n,c)=>c.mtime-n.mtime)},async delete(e){O(await d(e)),await o.delete?.(e),f.delete(e),y.delete(e),h.delete(e)}}}u(ce,"createFileStore");export{ce as createFileStore,W as sessionDirectory};

package/dist/core/conversation-store/index.d.ts

@@ -54,41 +54,43 @@ export interface ConversationStoreClient {
 }
 /** The daemon's file store (`createFileStore`, installed by `sessions.ts`). */
 export interface ConversationStore {
-    create(nodeId: string, header: SessionHeader, entries: SessionEntry[], path?: string): string;
+    create(nodeId: string, header: SessionHeader, entries: SessionEntry[], path?: string): Promise<string>;
     append(id: string, entries: SessionEntry[], options?: {
         dedupe?: boolean;
-    }): void;
-    replace(id: string, header: SessionHeader, entries: SessionEntry[]): void;
-    read(id: string, window?: ConversationWindow): {
+    }): Promise<void>;
+    replace(id: string, header: SessionHeader, entries: SessionEntry[]): Promise<void>;
+    read(id: string, window?: ConversationWindow): Promise<{
         header: SessionHeader;
         entries: SessionEntry[];
         tail?: SessionEntry[];
         path: string;
-    };
+    }>;
     /** Stream a complete conversation without blocking the daemon on a full-file read. */
-    readLines?(id: string): {
+    readLines?(id: string): Promise<{
         path: string;
         lines: AsyncIterable<string>;
-    };
-    header(id: string): {
+    }>;
+    header(id: string): Promise<{
         header: SessionHeader;
         mtime: number;
         size: number;
         path: string;
-    };
-    fork(id: string, nodeId?: string, leafId?: string, cwd?: string): string;
-    list(nodeId?: string): ConversationInfo[];
-    delete(id: string): void;
+    }>;
+    fork(id: string, nodeId?: string, leafId?: string, cwd?: string): Promise<string>;
+    list(nodeId?: string): Promise<ConversationInfo[]>;
+    delete(id: string): Promise<void>;
 }
 export declare function conversationIdFromPath(path: string): string | null;
 export declare function defaultConversationRoot(): string;
 export declare function storeAddress(): string;
 export declare function installConversationStore(store: ConversationStore | undefined): void;
+/** The installed store, else the client over the store socket with each call awaited. */
 export declare function conversationStore(): ConversationStore;
-/** The synchronous store pi's `SessionManager` statics call: the installed store, else the client over the store socket. */
+/** The synchronous store pi's `SessionManager` statics call: always the client over the store socket (the installed
+ *  store is async, so it cannot serve a synchronous caller). */
 export declare function conversationClient(): ConversationStoreClient;
 /** Read a conversation without parking the event loop on the store worker. */
-export declare function readConversationAsync(id: string, window?: ConversationWindow): Promise<ReturnType<ConversationStore['read']>>;
+export declare function readConversationAsync(id: string, window?: ConversationWindow): Promise<Awaited<ReturnType<ConversationStore['read']>>>;
 export { createFileStore, sessionDirectory, type AppendSection, type ConversationCanvas, type ConversationWrite } from './file-store.js';
 export { installSessionManagerStorePatch } from './patch.js';
 export { findOrphanedParents, relinkOrphanedParents, repairConversationFile, type FileRepair, type OrphanRelink } from './repair.js';

package/dist/core/conversation-store/index.js

@@ -1 +1 @@
-var a=Object.defineProperty;var r=(o,t)=>a(o,"name",{value:t,configurable:!0});import{appsRoot as c,socketDir as u}from"../layout.js";import{join as f}from"node:path";import{createStoreClient as p}from"./client.js";import{currentNodeToken as d}from"../runtime/broker/node-token.js";class l extends Error{static{r(this,"ConversationNotFoundError")}code="not_found";constructor(t){super(`conversation not found: ${t}`)}}function R(o){return o instanceof l}r(R,"isConversationNotFound");function y(o){return/(?:^|\/)[^/]+_([0-9a-f-]{36})\.jsonl$/i.exec(o)?.[1]??null}r(y,"conversationIdFromPath");function A(){return c()}r(A,"defaultConversationRoot");function m(){return process.env.CRTR_STORE_ADDRESS||f(u(),"store.sock")}r(m,"storeAddress");let n,s;function F(o){n=o}r(F,"installConversationStore");function k(){return i()}r(k,"conversationStore");function i(){if(n)return n;const o=m();return s?.address!==o&&(s={address:o,store:p(o,d())}),s.store}r(i,"conversationClient");async function D(o,t){const e=i();return e.readAsync?e.readAsync(o,t):e.read(o,t)}r(D,"readConversationAsync");import{createFileStore as _,sessionDirectory as N}from"./file-store.js";import{installSessionManagerStorePatch as T}from"./patch.js";import{findOrphanedParents as $,relinkOrphanedParents as g,repairConversationFile as I}from"./repair.js";export{l as ConversationNotFoundError,i as conversationClient,y as conversationIdFromPath,k as conversationStore,_ as createFileStore,A as defaultConversationRoot,$ as findOrphanedParents,F as installConversationStore,T as installSessionManagerStorePatch,R as isConversationNotFound,D as readConversationAsync,g as relinkOrphanedParents,I as repairConversationFile,N as sessionDirectory,m as storeAddress};
+var c=Object.defineProperty;var o=(e,r)=>c(e,"name",{value:r,configurable:!0});import{appsRoot as i,socketDir as p}from"../layout.js";import{join as d}from"node:path";import{createStoreClient as f}from"./client.js";import{currentNodeToken as u}from"../runtime/broker/node-token.js";class l extends Error{static{o(this,"ConversationNotFoundError")}code="not_found";constructor(r){super(`conversation not found: ${r}`)}}function h(e){return e instanceof l}o(h,"isConversationNotFound");function k(e){return/(?:^|\/)[^/]+_([0-9a-f-]{36})\.jsonl$/i.exec(e)?.[1]??null}o(k,"conversationIdFromPath");function R(){return i()}o(R,"defaultConversationRoot");function m(){return process.env.CRTR_STORE_ADDRESS||d(p(),"store.sock")}o(m,"storeAddress");let t,s;function A(e){t=e}o(A,"installConversationStore");function F(){if(t)return t;const e=a();return{create:o(async(...r)=>e.create(...r),"create"),append:o(async(...r)=>e.append(...r),"append"),replace:o(async(...r)=>e.replace(...r),"replace"),read:o(async(...r)=>e.read(...r),"read"),header:o(async(...r)=>e.header(...r),"header"),fork:o(async(...r)=>e.fork(...r),"fork"),list:o(async(...r)=>e.list(...r),"list"),delete:o(async(...r)=>e.delete(...r),"delete")}}o(F,"conversationStore");function a(){const e=m();return s?.address!==e&&(s={address:e,store:f(e,u())}),s.store}o(a,"conversationClient");async function D(e,r){if(t)return t.read(e,r);const n=a();return n.readAsync?n.readAsync(e,r):n.read(e,r)}o(D,"readConversationAsync");import{createFileStore as _,sessionDirectory as N}from"./file-store.js";import{installSessionManagerStorePatch as T}from"./patch.js";import{findOrphanedParents as $,relinkOrphanedParents as g,repairConversationFile as I}from"./repair.js";export{l as ConversationNotFoundError,a as conversationClient,k as conversationIdFromPath,F as conversationStore,_ as createFileStore,R as defaultConversationRoot,$ as findOrphanedParents,A as installConversationStore,T as installSessionManagerStorePatch,h as isConversationNotFound,D as readConversationAsync,g as relinkOrphanedParents,I as repairConversationFile,N as sessionDirectory,m as storeAddress};

package/dist/core/conversation-store/listener.js

@@ -1,8 +1,8 @@
-var O=Object.defineProperty;var v=(r,t)=>O(r,"name",{value:t,configurable:!0});import{createServer as _}from"node:http";import{chmodSync as k,existsSync as N,unlinkSync as T}from"node:fs";import{isConversationNotFound as b}from"./index.js";import{resolveNodeToken as j}from"../canvas/node-tokens.js";import{conversationOwner as H}from"../canvas/sessions.js";import{peerUid as J}from"../../native/linux.js";async function x(r){const t=[];for await(const s of r)t.push(Buffer.from(s));return JSON.parse(Buffer.concat(t).toString("utf8"))}v(x,"body");function l(r,t,s){r.writeHead(t,{"content-type":"application/json"}),r.end(JSON.stringify(s))}v(l,"json");async function P(r,t,s){if(!t.readLines){const f=t.read(s);r.writeHead(200,{"content-type":"application/x-ndjson","x-conversation-path":f.path}),r.end([f.header,...f.entries].map(d=>JSON.stringify(d)).join(`
+var O=Object.defineProperty;var v=(o,n)=>O(o,"name",{value:n,configurable:!0});import{createServer as _}from"node:http";import{chmodSync as k,existsSync as N,unlinkSync as T}from"node:fs";import{isConversationNotFound as b}from"./index.js";import{resolveNodeToken as j}from"../canvas/node-tokens.js";import{conversationOwner as H}from"../canvas/sessions.js";import{peerUid as J}from"../../native/linux.js";async function x(o){const n=[];for await(const s of o)n.push(Buffer.from(s));return JSON.parse(Buffer.concat(n).toString("utf8"))}v(x,"body");function l(o,n,s){o.writeHead(n,{"content-type":"application/json"}),o.end(JSON.stringify(s))}v(l,"json");async function P(o,n,s){if(!n.readLines){const f=await n.read(s);o.writeHead(200,{"content-type":"application/x-ndjson","x-conversation-path":f.path}),o.end([f.header,...f.entries].map(d=>JSON.stringify(d)).join(`
 `)+`
-`);return}const{path:i,lines:e}=t.readLines(s);let a=!1,c=0;for await(const f of e){if(!f.trim())continue;let d;try{d=JSON.parse(f)}catch{continue}if(!a){if(d.type!=="session"||d.id!==s)throw new Error(`invalid conversation: ${s}`);r.writeHead(200,{"content-type":"application/x-ndjson","x-conversation-path":i}),a=!0}const S=JSON.stringify(d)+`
-`;c+=Buffer.byteLength(S),c>=256*1024?(c=0,await new Promise((p,u)=>r.write(S,m=>m?u(m):p()))):r.write(S)}if(!a)throw new Error(`invalid conversation: ${s}`);r.end()}v(P,"fullRead");async function C(r,t){const s=_(async(i,e)=>{try{const a=i.headers.authorization,c=typeof a=="string"&&a.startsWith("Bearer ")?j(a.slice(7)):null,f=new URL(i.url??"/","http://store"),d=f.pathname.split("/").filter(Boolean);if(a===void 0&&process.platform!=="linux"&&i.method==="GET"&&d[0]==="conversations"&&(d.length===1||d.length===2||d.length===3&&d[2]==="header")){const n=d[1];if(!n)l(e,200,{conversations:t.list(f.searchParams.get("node_id")??void 0)});else if(d[2]==="header")l(e,200,t.header(n));else{const y=f.searchParams.get("head"),h=f.searchParams.get("tail");if(y===null||h===null)await P(e,t,n);else{const g=t.read(n,{head:Number(y),tail:Number(h)});e.writeHead(200,{"content-type":"application/x-ndjson","x-conversation-path":g.path,...g.tail?{"x-conversation-tail":String(1+g.entries.length)}:{}}),e.end([g.header,...g.entries,...g.tail??[]].map(E=>JSON.stringify(E)).join(`
+`);return}const{path:a,lines:e}=await n.readLines(s);let r=!1,c=0;for await(const f of e){if(!f.trim())continue;let d;try{d=JSON.parse(f)}catch{continue}if(!r){if(d.type!=="session"||d.id!==s)throw new Error(`invalid conversation: ${s}`);o.writeHead(200,{"content-type":"application/x-ndjson","x-conversation-path":a}),r=!0}const S=JSON.stringify(d)+`
+`;c+=Buffer.byteLength(S),c>=256*1024?(c=0,await new Promise((p,u)=>o.write(S,w=>w?u(w):p()))):o.write(S)}if(!r)throw new Error(`invalid conversation: ${s}`);o.end()}v(P,"fullRead");async function C(o,n){const s=_(async(a,e)=>{try{const r=a.headers.authorization,c=typeof r=="string"&&r.startsWith("Bearer ")?await j(r.slice(7)):null,f=new URL(a.url??"/","http://store"),d=f.pathname.split("/").filter(Boolean);if(r===void 0&&process.platform!=="linux"&&a.method==="GET"&&d[0]==="conversations"&&(d.length===1||d.length===2||d.length===3&&d[2]==="header")){const t=d[1];if(!t)l(e,200,{conversations:await n.list(f.searchParams.get("node_id")??void 0)});else if(d[2]==="header")l(e,200,await n.header(t));else{const y=f.searchParams.get("head"),h=f.searchParams.get("tail");if(y===null||h===null)await P(e,n,t);else{const g=await n.read(t,{head:Number(y),tail:Number(h)});e.writeHead(200,{"content-type":"application/x-ndjson","x-conversation-path":g.path,...g.tail?{"x-conversation-tail":String(1+g.entries.length)}:{}}),e.end([g.header,...g.entries,...g.tail??[]].map(E=>JSON.stringify(E)).join(`
 `)+`
-`)}}return}if(!c){l(e,401,{error:"unauthorized"});return}if(process.platform==="linux"){let n;try{n=J(i.socket)}catch{l(e,401,{error:"unauthorized"});return}if(n!==c.uid){l(e,401,{error:"unauthorized"});return}}const p=v(n=>H(n)===c.node,"owns"),u=v(()=>l(e,404,{error:"not_found"}),"notFound"),m=new URL(i.url??"/","http://store"),w=m.pathname.split("/").filter(Boolean);if(w[0]!=="conversations"){l(e,404,{error:"not_found"});return}const o=w[1];if(!o&&i.method==="POST"){const n=await x(i);if(n.node_id!==c.node){u();return}l(e,201,{conversation_id:t.create(n.node_id,n.header,n.entries,n.path)})}else if(!o&&i.method==="GET"){if(m.searchParams.has("node_id")&&m.searchParams.get("node_id")!==c.node){u();return}l(e,200,{conversations:t.list(c.node)})}else if(o&&w[2]==="entries"&&i.method==="POST"){if(!p(o)){u();return}const n=await x(i);t.append(o,n.entries,n.dedupe===!0?{dedupe:!0}:void 0),e.writeHead(204).end()}else if(o&&w[2]==="header"&&i.method==="GET"){if(!p(o)){u();return}l(e,200,t.header(o))}else if(o&&w[2]==="fork"&&i.method==="POST"){if(!p(o)){u();return}const n=await x(i);if(n.node_id!==c.node){u();return}l(e,201,{conversation_id:t.fork(o,c.node,n.leaf_id,n.cwd)})}else if(o&&w.length===2&&i.method==="GET"){if(!p(o)){u();return}const n=m.searchParams.get("head"),y=m.searchParams.get("tail");if(n===null||y===null)await P(e,t,o);else{const h=t.read(o,{head:Number(n),tail:Number(y)});e.writeHead(200,{"content-type":"application/x-ndjson","x-conversation-path":h.path,...h.tail?{"x-conversation-tail":String(1+h.entries.length)}:{}}),e.end([h.header,...h.entries,...h.tail??[]].map(g=>JSON.stringify(g)).join(`
+`)}}return}if(!c){l(e,401,{error:"unauthorized"});return}if(process.platform==="linux"){let t;try{t=J(a.socket)}catch{l(e,401,{error:"unauthorized"});return}if(t!==c.uid){l(e,401,{error:"unauthorized"});return}}const p=v(async t=>await H(t)===c.node,"owns"),u=v(()=>l(e,404,{error:"not_found"}),"notFound"),w=new URL(a.url??"/","http://store"),m=w.pathname.split("/").filter(Boolean);if(m[0]!=="conversations"){l(e,404,{error:"not_found"});return}const i=m[1];if(!i&&a.method==="POST"){const t=await x(a);if(t.node_id!==c.node){u();return}l(e,201,{conversation_id:await n.create(t.node_id,t.header,t.entries,t.path)})}else if(!i&&a.method==="GET"){if(w.searchParams.has("node_id")&&w.searchParams.get("node_id")!==c.node){u();return}l(e,200,{conversations:await n.list(c.node)})}else if(i&&m[2]==="entries"&&a.method==="POST"){if(!await p(i)){u();return}const t=await x(a);await n.append(i,t.entries,t.dedupe===!0?{dedupe:!0}:void 0),e.writeHead(204).end()}else if(i&&m[2]==="header"&&a.method==="GET"){if(!await p(i)){u();return}l(e,200,await n.header(i))}else if(i&&m[2]==="fork"&&a.method==="POST"){if(!await p(i)){u();return}const t=await x(a);if(t.node_id!==c.node){u();return}l(e,201,{conversation_id:await n.fork(i,c.node,t.leaf_id,t.cwd)})}else if(i&&m.length===2&&a.method==="GET"){if(!await p(i)){u();return}const t=w.searchParams.get("head"),y=w.searchParams.get("tail");if(t===null||y===null)await P(e,n,i);else{const h=await n.read(i,{head:Number(t),tail:Number(y)});e.writeHead(200,{"content-type":"application/x-ndjson","x-conversation-path":h.path,...h.tail?{"x-conversation-tail":String(1+h.entries.length)}:{}}),e.end([h.header,...h.entries,...h.tail??[]].map(g=>JSON.stringify(g)).join(`
 `)+`
-`)}}else if(o&&w.length===2&&i.method==="PUT"){if(!p(o)){u();return}const n=await x(i);t.replace(o,n.header,n.entries),e.writeHead(204).end()}else if(o&&w.length===2&&i.method==="DELETE"){if(!p(o)){u();return}t.delete(o),e.writeHead(204).end()}else l(e,404,{error:"not_found"})}catch(a){const c=a instanceof Error?a.message:String(a);e.headersSent?e.destroy(a instanceof Error?a:new Error(c)):l(e,b(a)?404:500,{error:c})}});if(N(r)&&T(r),await new Promise((i,e)=>{s.once("error",e),s.listen(r,()=>{s.off("error",e),i()})}),typeof s.address()!="string")throw s.close(),new Error(`store listener must bind a unix socket: ${JSON.stringify(s.address())}`);return k(r,process.platform==="linux"&&N("/run/crtr/launcher.sock")?438:384),{close:v(()=>new Promise((i,e)=>s.close(a=>a?e(a):i())),"close")}}v(C,"listenConversationStore");export{C as listenConversationStore};
+`)}}else if(i&&m.length===2&&a.method==="PUT"){if(!await p(i)){u();return}const t=await x(a);await n.replace(i,t.header,t.entries),e.writeHead(204).end()}else if(i&&m.length===2&&a.method==="DELETE"){if(!await p(i)){u();return}await n.delete(i),e.writeHead(204).end()}else l(e,404,{error:"not_found"})}catch(r){const c=r instanceof Error?r.message:String(r);e.headersSent?e.destroy(r instanceof Error?r:new Error(c)):l(e,b(r)?404:500,{error:c})}});if(N(o)&&T(o),await new Promise((a,e)=>{s.once("error",e),s.listen(o,()=>{s.off("error",e),a()})}),typeof s.address()!="string")throw s.close(),new Error(`store listener must bind a unix socket: ${JSON.stringify(s.address())}`);return k(o,process.platform==="linux"&&N("/run/crtr/launcher.sock")?438:384),{close:v(()=>new Promise((a,e)=>s.close(r=>r?e(r):a())),"close")}}v(C,"listenConversationStore");export{C as listenConversationStore};

package/dist/core/conversation-store/patch.d.ts

@@ -1 +1,3 @@
-export declare function installSessionManagerStorePatch(nodeId: string): void;
+import { type ConversationStoreClient } from './index.js';
+/** `store` is the synchronous client pi's `SessionManager` needs: the broker's client over the store socket unless a caller supplies one. */
+export declare function installSessionManagerStorePatch(nodeId: string, store?: ConversationStoreClient): void;

package/dist/core/conversation-store/patch.js

@@ -1 +1 @@
-var P=Object.defineProperty;var h=(a,c)=>P(a,"name",{value:c,configurable:!0});import{dirname as E,resolve as A}from"node:path";import{SessionManager as w}from"@earendil-works/pi-coding-agent";import{conversationClient as R,conversationIdFromPath as O}from"./index.js";import{findOrphanedParents as T}from"./repair.js";import{emitEvent as I}from"../events/emit.js";const f=new WeakMap;function k(a){a>0&&Atomics.wait(new Int32Array(new SharedArrayBuffer(4)),0,0,a)}h(k,"sleep");function C(){const a=Number(process.env.CRTR_CONVERSATION_APPEND_RETRY_MS);return Number.isFinite(a)&&a>=0?a:500}h(C,"retryDelayMs");let x=!1;function z(a){if(x)return;const c=w.prototype,d=w;for(const e of["_setSessionFile","_rewriteFile","_persist","createBranchedSession","newSession"])if(typeof c[e]!="function")throw new Error(`pi SessionManager.${e} changed; store patch cannot start`);for(const e of["create","open","continueRecent","forkFrom","findById","list","listAll"])if(typeof d[e]!="function")throw new Error(`pi SessionManager.${e} changed; store patch cannot start`);const M=c.createBranchedSession,y=c.newSession,o=R();function N(e,s){const t=T(s);t.length!==0&&I({level:"error",event:"conversation.orphaned_parent",fields:{conversation_id:e,orphan_count:t.length,orphans:t.slice(0,20).map(i=>({entry_id:i.entryId,missing_parent_id:i.missingParentId}))}})}h(N,"reportOrphans");function _(e,s){const{header:t,entries:i,path:r}=o.read(e);N(t.id,i);const n=w.inMemory(s??t.cwd);n.sessionFile=r,n.sessionDir=E(r),n._loadEntries([t,...i]),n.persist=!0,n.flushed=!0;const u=n.fileEntries[0];return u?.type==="session"&&u.version!==t.version&&n._rewriteFile(),n}h(_,"fromStore");function m(e){const[s,...t]=e.fileEntries;if(!s||s.type!=="session")throw new Error("conversation has no session header");o.create(a,s,t),e.sessionFile=o.header(s.id).path,e.sessionDir=E(e.sessionFile),e.flushed=!0,f.delete(e)}h(m,"persistNew");function B(e,s){const t=f.get(e)??{entries:[],ambiguous:!1};t.entries.push(s),f.set(e,t);let i;for(let r=0;r<2;r++){r>0&&k(C());try{o.append(e.sessionId,t.entries,t.ambiguous?{dedupe:!0}:void 0),f.delete(e);return}catch(n){i=n,t.ambiguous=!0}}throw I({level:"error",event:"conversation.append_failed",error:i,fields:{conversation_id:e.sessionId,pending_entries:t.entries.length}}),i}h(B,"appendInOrder");function g(e){const s=O(e);if(!s)throw new Error(`invalid conversation path: ${e}`);return s}h(g,"idOf"),c._setSessionFile=function(e){const{header:s,entries:t}=o.read(g(e));this.sessionFile=o.header(s.id).path,this.sessionDir=E(this.sessionFile),N(s.id,t),this._loadEntries([s,...t]),this.flushed=!0,f.delete(this)},c._rewriteFile=function(){if(!this.persist||!this.sessionFile)return;const[e,...s]=this.fileEntries;if(!e||e.type!=="session")throw new Error("conversation has no session header");o.replace(e.id,e,s),f.delete(this)},c._persist=function(e){!this.persist||!this.sessionFile||(this.flushed?B(this,e):m(this))},c.newSession=function(e){if(!this.persist)return y.call(this,e);const s=this.flushed&&this.fileEntries.length===1&&this.sessionFile!==void 0?this.sessionId:void 0;if(s!==void 0&&(e?.id===void 0||e.id===s)){const t=this.sessionFile;y.call(this,{...e,id:s});const i=this.fileEntries[0];if(!i||i.type!=="session")throw new Error("conversation has no session header");return o.replace(s,i,[]),this.sessionFile=t,this.flushed=!0,t}return y.call(this,e),m(this),this.sessionFile},c.createBranchedSession=function(e){if(!this.persist)return M.call(this,e);const s=this.sessionFile;this.persist=!1;try{M.call(this,e)}finally{this.persist=!0}const t=this.fileEntries[0];if(!t||t.type!=="session")throw new Error("branch has no header");return this.fileEntries[0]={...t,parentSession:s},m(this),this.sessionFile},d.create=(e,s,t)=>{const i=w.inMemory(e,t);return i.persist=!0,m(i),i},d.open=(e,s,t)=>_(g(e),t),d.continueRecent=e=>{const s=o.list().find(t=>t.header.cwd===A(e));return s?_(s.conversation_id,e):d.create(e)},d.forkFrom=(e,s)=>_(o.fork(g(e),a,void 0,s)),d.findById=(e,s)=>o.list().find(t=>t.conversation_id===s&&t.header.cwd===A(e))?.path;function b(e){return o.list().filter(s=>e===void 0||s.header.cwd===A(e)).map(s=>{let t,i=0,r="",n;const u=[];for(const p of o.read(s.conversation_id).entries){if(p.type==="session_info"&&(t=p.name?.trim()||void 0),p.type!=="message")continue;i++;const l=p.message;if(l.role!=="user"&&l.role!=="assistant")continue;const D=typeof l.timestamp=="number"?l.timestamp:Date.parse(p.timestamp);Number.isNaN(D)||(n=Math.max(n??0,D));const F=typeof l.content=="string"?l.content:Array.isArray(l.content)?l.content.filter(S=>S.type==="text").map(S=>S.text??"").join(" "):"";F&&(u.push(F),!r&&l.role==="user"&&(r=F))}const v=new Date(s.header.timestamp);return{path:s.path,id:s.conversation_id,cwd:s.header.cwd,...t?{name:t}:{},...s.header.parentSession?{parentSessionPath:s.header.parentSession}:{},created:v,modified:n&&n>0?new Date(n):Number.isNaN(v.getTime())?new Date(s.mtime):v,messageCount:i,firstMessage:r||"(no messages)",allMessagesText:u.join(" ")}})}h(b,"sessionInfos"),d.list=async(e,s,t,i)=>{i?.throwIfAborted();const r=b(e);return t?.(r.length,r.length,r),r},d.listAll=async(...e)=>(e.find(t=>t instanceof AbortSignal)?.throwIfAborted(),b()),x=!0}h(z,"installSessionManagerStorePatch");export{z as installSessionManagerStorePatch};
+var P=Object.defineProperty;var c=(a,r)=>P(a,"name",{value:r,configurable:!0});import{dirname as E,resolve as A}from"node:path";import{SessionManager as w}from"@earendil-works/pi-coding-agent";import{conversationClient as R,conversationIdFromPath as O}from"./index.js";import{findOrphanedParents as T}from"./repair.js";import{emitEvent as I}from"../events/emit.js";const f=new WeakMap;function k(a){a>0&&Atomics.wait(new Int32Array(new SharedArrayBuffer(4)),0,0,a)}c(k,"sleep");function C(){const a=Number(process.env.CRTR_CONVERSATION_APPEND_RETRY_MS);return Number.isFinite(a)&&a>=0?a:500}c(C,"retryDelayMs");let x=!1;function z(a,r=R()){if(x)return;const l=w.prototype,h=w;for(const e of["_setSessionFile","_rewriteFile","_persist","createBranchedSession","newSession"])if(typeof l[e]!="function")throw new Error(`pi SessionManager.${e} changed; store patch cannot start`);for(const e of["create","open","continueRecent","forkFrom","findById","list","listAll"])if(typeof h[e]!="function")throw new Error(`pi SessionManager.${e} changed; store patch cannot start`);const M=l.createBranchedSession,y=l.newSession;function N(e,s){const t=T(s);t.length!==0&&I({level:"error",event:"conversation.orphaned_parent",fields:{conversation_id:e,orphan_count:t.length,orphans:t.slice(0,20).map(i=>({entry_id:i.entryId,missing_parent_id:i.missingParentId}))}})}c(N,"reportOrphans");function _(e,s){const{header:t,entries:i,path:o}=r.read(e);N(t.id,i);const n=w.inMemory(s??t.cwd);n.sessionFile=o,n.sessionDir=E(o),n._loadEntries([t,...i]),n.persist=!0,n.flushed=!0;const u=n.fileEntries[0];return u?.type==="session"&&u.version!==t.version&&n._rewriteFile(),n}c(_,"fromStore");function m(e){const[s,...t]=e.fileEntries;if(!s||s.type!=="session")throw new Error("conversation has no session header");r.create(a,s,t),e.sessionFile=r.header(s.id).path,e.sessionDir=E(e.sessionFile),e.flushed=!0,f.delete(e)}c(m,"persistNew");function B(e,s){const t=f.get(e)??{entries:[],ambiguous:!1};t.entries.push(s),f.set(e,t);let i;for(let o=0;o<2;o++){o>0&&k(C());try{r.append(e.sessionId,t.entries,t.ambiguous?{dedupe:!0}:void 0),f.delete(e);return}catch(n){i=n,t.ambiguous=!0}}throw I({level:"error",event:"conversation.append_failed",error:i,fields:{conversation_id:e.sessionId,pending_entries:t.entries.length}}),i}c(B,"appendInOrder");function g(e){const s=O(e);if(!s)throw new Error(`invalid conversation path: ${e}`);return s}c(g,"idOf"),l._setSessionFile=function(e){const{header:s,entries:t}=r.read(g(e));this.sessionFile=r.header(s.id).path,this.sessionDir=E(this.sessionFile),N(s.id,t),this._loadEntries([s,...t]),this.flushed=!0,f.delete(this)},l._rewriteFile=function(){if(!this.persist||!this.sessionFile)return;const[e,...s]=this.fileEntries;if(!e||e.type!=="session")throw new Error("conversation has no session header");r.replace(e.id,e,s),f.delete(this)},l._persist=function(e){!this.persist||!this.sessionFile||(this.flushed?B(this,e):m(this))},l.newSession=function(e){if(!this.persist)return y.call(this,e);const s=this.flushed&&this.fileEntries.length===1&&this.sessionFile!==void 0?this.sessionId:void 0;if(s!==void 0&&(e?.id===void 0||e.id===s)){const t=this.sessionFile;y.call(this,{...e,id:s});const i=this.fileEntries[0];if(!i||i.type!=="session")throw new Error("conversation has no session header");return r.replace(s,i,[]),this.sessionFile=t,this.flushed=!0,t}return y.call(this,e),m(this),this.sessionFile},l.createBranchedSession=function(e){if(!this.persist)return M.call(this,e);const s=this.sessionFile;this.persist=!1;try{M.call(this,e)}finally{this.persist=!0}const t=this.fileEntries[0];if(!t||t.type!=="session")throw new Error("branch has no header");return this.fileEntries[0]={...t,parentSession:s},m(this),this.sessionFile},h.create=(e,s,t)=>{const i=w.inMemory(e,t);return i.persist=!0,m(i),i},h.open=(e,s,t)=>_(g(e),t),h.continueRecent=e=>{const s=r.list().find(t=>t.header.cwd===A(e));return s?_(s.conversation_id,e):h.create(e)},h.forkFrom=(e,s)=>_(r.fork(g(e),a,void 0,s)),h.findById=(e,s)=>r.list().find(t=>t.conversation_id===s&&t.header.cwd===A(e))?.path;function b(e){return r.list().filter(s=>e===void 0||s.header.cwd===A(e)).map(s=>{let t,i=0,o="",n;const u=[];for(const p of r.read(s.conversation_id).entries){if(p.type==="session_info"&&(t=p.name?.trim()||void 0),p.type!=="message")continue;i++;const d=p.message;if(d.role!=="user"&&d.role!=="assistant")continue;const D=typeof d.timestamp=="number"?d.timestamp:Date.parse(p.timestamp);Number.isNaN(D)||(n=Math.max(n??0,D));const F=typeof d.content=="string"?d.content:Array.isArray(d.content)?d.content.filter(S=>S.type==="text").map(S=>S.text??"").join(" "):"";F&&(u.push(F),!o&&d.role==="user"&&(o=F))}const v=new Date(s.header.timestamp);return{path:s.path,id:s.conversation_id,cwd:s.header.cwd,...t?{name:t}:{},...s.header.parentSession?{parentSessionPath:s.header.parentSession}:{},created:v,modified:n&&n>0?new Date(n):Number.isNaN(v.getTime())?new Date(s.mtime):v,messageCount:i,firstMessage:o||"(no messages)",allMessagesText:u.join(" ")}})}c(b,"sessionInfos"),h.list=async(e,s,t,i)=>{i?.throwIfAborted();const o=b(e);return t?.(o.length,o.length,o),o},h.listAll=async(...e)=>(e.find(t=>t instanceof AbortSignal)?.throwIfAborted(),b()),x=!0}c(z,"installSessionManagerStorePatch");export{z as installSessionManagerStorePatch};

package/dist/core/directory/join.d.ts

@@ -42,7 +42,7 @@ export interface JoinDaemonControl {
 export declare function installedPluginIds(): string[];
 /** The owner a successful join recorded, or null when `crtr sys join` never
  *  wrote the client file (no file, or one provisioned without join, which has
- *  no `token_sha256`). The daemon applies OWN-11 to canvas.db from it at every start. */
+ *  no `token_sha256`). The daemon applies OWN-11 to canvas.db from it at the first start under each owner. */
 export declare function joinedOwner(): string | null;
 /** Join this runtime to a directory.
  *