@north-light/cli 0.3.561 → 0.3.563

package/dist/core/grants/watch.d.ts

@@ -1,12 +1,18 @@
-import { type GrantRecord } from './mirror.js';
-/** Resolve when grant `grantId` is notified, or after `seconds`. Register it in the
- *  same synchronous block that read the mirror, so no notify falls between the read
- *  and the registration. The timer is unref'd: a held request never keeps the
- *  process alive. */
-export declare function waitGrantChange(grantId: string, seconds: number): Promise<void>;
-/** Wake the long-polls of every grant whose `grant.get` answer this sync changed:
- *  it left (or reached) `active`, or its version differs. Never triggers a sync. */
-export declare function notifyGrantChanges(before: readonly GrantRecord[], after: readonly GrantRecord[]): void;
+/** A `grant.get` hold on one grant. It is registered before the caller reads the mirror and stays registered until `release`, so a
+ *  wake that lands at any moment of the hold (including while a mirror read is outstanding) is remembered: the next `changed()`
+ *  answers at once. */
+export interface GrantHold {
+    /** Resolve when the grant was notified since the last `changed()` returned, or after `seconds`. */
+    changed(seconds: number): Promise<void>;
+    release(): void;
+}
+/** Register a hold on grant `grantId`. The timer of a pending `changed()` is unref'd: a held request never keeps the process alive. */
+export declare function holdGrant(grantId: string): GrantHold;
+/** Wake the long-polls held on grant `grantId`: its row changed. Each woken `grant.get` re-reads the grant and waits again unless
+ *  its version moved, so a change that leaves the version alone never ends a hold early. Never triggers a sync. */
+export declare function wakeGrantWaiters(grantId: string): void;
+/** Wake every held long-poll (the listen connection restarted: changes may have gone unheard). */
+export declare function wakeAllGrantWaiters(): void;
 /** The app listener is closing: drop every held long-poll and its timer. Its
  *  socket is being destroyed, so nothing is answered. */
 export declare function releaseGrantWaiters(): void;

package/dist/core/grants/watch.js

@@ -1 +1 @@
-var u=Object.defineProperty;var s=(e,t)=>u(e,"name",{value:t,configurable:!0});import{grantVersion as c}from"./mirror.js";const o=new Map;function f(e,t){const i=o.get(e);i&&(i.delete(t),i.size||o.delete(e))}s(f,"release");function m(e,t){return new Promise(i=>{const r={wake:s(()=>{clearTimeout(n),f(e,r),i()},"wake"),cancel:s(()=>{clearTimeout(n),f(e,r)},"cancel")},n=setTimeout(r.wake,t*1e3);n.unref();let a=o.get(e);a||o.set(e,a=new Set),a.add(r)})}s(m,"waitGrantChange");function l(e,t){const i=e?.status==="active",r=t?.status==="active";return i!==r?!0:r?c(e)!==c(t):!1}s(l,"changed");function v(e,t){if(!o.size)return;const i=new Map(e.map(n=>[n.id,n])),r=new Map(t.map(n=>[n.id,n]));for(const n of[...o.keys()])if(l(i.get(n),r.get(n)))for(const a of[...o.get(n)??[]])a.wake()}s(v,"notifyGrantChanges");function d(){for(const e of[...o.values()])for(const t of[...e])t.cancel();o.clear()}s(d,"releaseGrantWaiters");function g(){let e=0;for(const t of o.values())e+=t.size;return e}s(g,"grantWaiterCount");export{g as grantWaiterCount,v as notifyGrantChanges,d as releaseGrantWaiters,m as waitGrantChange};
+var u=Object.defineProperty;var n=(e,t)=>u(e,"name",{value:t,configurable:!0});const o=new Map;function w(e,t){const r=o.get(e);r&&(r.delete(t),r.size||o.delete(e))}n(w,"release");function k(e){let t=!1,r,s;const a=n(()=>{clearTimeout(s);const f=r;r=void 0,f?.()},"settle"),c={wake:n(()=>{t=!0,a()},"wake"),cancel:n(()=>{clearTimeout(s)},"cancel")};let i=o.get(e);return i||o.set(e,i=new Set),i.add(c),{changed:n(f=>new Promise(l=>{if(t){t=!1,l();return}r=n(()=>{t=!1,l()},"resolveWait"),s=setTimeout(a,f*1e3),s.unref()}),"changed"),release:n(()=>{w(e,c),a()},"release")}}n(k,"holdGrant");function d(e){for(const t of[...o.get(e)??[]])t.wake()}n(d,"wakeGrantWaiters");function m(){for(const e of[...o.keys()])d(e)}n(m,"wakeAllGrantWaiters");function x(){for(const e of[...o.values()])for(const t of[...e])t.cancel();o.clear()}n(x,"releaseGrantWaiters");function W(){let e=0;for(const t of o.values())e+=t.size;return e}n(W,"grantWaiterCount");export{W as grantWaiterCount,k as holdGrant,x as releaseGrantWaiters,m as wakeAllGrantWaiters,d as wakeGrantWaiters};

package/dist/core/graph/custom.js

@@ -1,12 +1,12 @@
-var C=Object.defineProperty;var l=(e,t)=>C(e,"name",{value:t,configurable:!0});import{createHash as x,randomBytes as P,timingSafeEqual as $}from"node:crypto";import{CrtrError as j,usage as f}from"../errors.js";import{ExitCode as S}from"../../types.js";import{createObject as J,liveDocumentNamed as q}from"./objects.js";import{invalidateCustomKind as A}from"./kinds/registry.js";import{publish as O,HOP_LIMIT as F,HopLimitError as M}from"./events.js";import{checkoutsForCwd as N}from"./repo-sync/repos.js";import{onQueueSignal as B,signalQueue as b}from"./receivers.js";import{receiverEndpoint as K,isPublicReceiverAddress as V}from"./receiver-url.js";import{isIP as G}from"node:net";import{KIND as k,LOCAL as D,MAX_KIND_EVENTS as Q,RESERVED_KIND_ROOTS as Y,eventCatalogReasons as z}from"../plugin-objects-manifest.js";import{check as L}from"../permissions/evaluator.js";import{userOf as X}from"../permissions/evaluator.js";import{nodePlace as Z}from"../permissions/ceiling.js";import{PermissionError as ee}from"../permissions/errors.js";import{writeActsFor as te}from"../permissions/facts.js";async function ne(e,t,i){return t.class!=="person"&&t.app.id===i.id?!0:await L(e,t,"edit",i.id)}l(ne,"mayActAs");async function ie(e,t,i){return await L(e,t,"read",i.id)}l(ie,"customReachable");const se=["public","private"];function h(e,t){throw new j(e,t,S.GENERAL)}l(h,"conflict");function R(e){return x("sha256").update(e).digest("hex")}l(R,"hash");function H(){return`crtr_pub_${P(32).toString("base64url")}`}l(H,"issueToken");function ae(e){if(e==null)return null;if(e==="queue")return JSON.stringify(e);if(typeof e!="object"||Array.isArray(e))throw f("invalid custom receiver; expected queue, an https url, or argv and absolute cwd");if("url"in e&&typeof e.url=="string")try{const i=K(e.url).hostname.replace(/^\[|\]$/g,"");if(G(i)&&!V(i))throw new Error("non-public IP address");return JSON.stringify({url:e.url})}catch(t){throw f(`invalid custom receiver: ${String(t)}`)}if("argv"in e&&Array.isArray(e.argv)&&e.argv.length>0&&e.argv.every(t=>typeof t=="string")&&typeof e.cwd=="string"&&e.cwd.startsWith("/"))return JSON.stringify(e);throw f("invalid custom receiver; url must be https and argv requires a command and absolute cwd")}l(ae,"receiverJson");async function re(e,t){return t.class==="node"?(await Z(e,t.node.id))?.isolated===!0:t.class==="app"||t.class==="object"?t.place?.isolated===!0:!1}l(re,"inIsolatedRun");async function Ne(e,t,i){const{kind:n,name:a,owner:s,description:o,events:u,receiver:c,rotateToken:w,privacy:p}=i;if(p!==void 0&&!se.includes(p))throw f(`invalid privacy ${JSON.stringify(p)}`);if(await ne(e,t,s)||h("forbidden",`cannot act as ${s.id}`),await re(e,t))throw new ee(403,"isolated_run","a custom object cannot be registered from an isolated run");if(!k.test(n)||Y.includes(n.split(".")[0]))throw f(`invalid or reserved kind ${n}`);if(!a.trim()||a!==a.trim()||a.includes("\0"))throw f(`invalid object name ${JSON.stringify(a)}`);const m=ae(c);if(c!=="queue"&&c!==null&&c!==void 0&&"argv"in c&&t.class!=="person"&&t.class!=="node"&&h("argv_forbidden","argv receiver requires a person or node principal"),u===void 0){const d=await e.prepare("SELECT source FROM object_kinds WHERE name = ?").get(n);if(d?.source!=="manifest"&&d?.source!=="peer")throw f("events is required unless the kind is declared by an installed plugin")}else if(Object.keys(u).length>Q||Object.entries(u).some(([d,_])=>!D.test(d)||!Number.isInteger(_?.level)||_.level<1||_.level>10||_.supersedes!==void 0&&typeof _.supersedes!="boolean"||_.ends_wait!==void 0&&typeof _.ends_wait!="boolean"))throw f("invalid custom event catalog");const r=await q(e,s.id,a);if(r&&!await ie(e,t,r)&&h("forbidden",`cannot act as ${s.id}`),r&&t.class!=="person"&&t.class!=="node"){const d=(await e.prepare("SELECT receiver_json FROM custom_objects WHERE object = ?").get(r.id))?.receiver_json;d&&typeof JSON.parse(d)=="object"&&"argv"in JSON.parse(d)&&h("argv_forbidden","argv receiver requires a person or node principal")}r&&r.type!==n&&h("name_taken",`${s.name}/${a} is already held by ${r.id}`);const g=u===void 0?null:await oe(e,{name:n,owner:s,description:o,events:u,read:null,source:"register"});if(!r){const d=await J(e,{type:n,kind:null,owner:s.id,privacy:p??"public",name:a,preview:""});s.type==="app"&&await te(e,d.id,await X(e,t));const _=H();return await e.prepare(`INSERT INTO custom_objects (object, description, receiver_json, token_hash)
-      VALUES (?, ?, ?, ?)`).run(d.id,o,m,R(_)),t.class==="node"&&await e.prepare("UPDATE custom_objects SET registered_by = ? WHERE object = ?").run(t.node.id,d.id),m!==null&&await e.prepare("UPDATE objects SET reception = 2 WHERE id = ?").run(d.id),await O(e,{event:"created",object:d,actor:t.class==="object"?t.object:t.class==="person"?t.person:t.class==="app"?t.app:t.node,attrs:{}},async U=>await N(e,U)),{object:d,token:_,created:!0,changed:[]}}const y=await e.prepare("SELECT description, receiver_json FROM custom_objects WHERE object = ?").get(r.id);y||h("name_taken",`${s.name}/${a} is not a custom object`);const E=[];if(y.description!==o&&E.push("description"),y.receiver_json!==m&&E.push("receiver"),g?.changed.includes("events")&&E.push("events"),g?.changed.includes("description")&&!E.includes("description")&&E.push("description"),p!==void 0&&r.privacy!==p&&E.push("privacy"),w&&E.push("token"),E.length===0)return{object:r,created:!1,changed:E};const v=w?H():void 0,T=E.includes("privacy")?{...r,privacy:p}:r;if(T!==r&&await e.prepare("UPDATE objects SET privacy = ? WHERE id = ?").run(p,r.id),await e.prepare("UPDATE custom_objects SET description = ?, receiver_json = ?, token_hash = COALESCE(?, token_hash) WHERE object = ?").run(o,m,v===void 0?null:R(v),r.id),await e.prepare("UPDATE objects SET reception = ? WHERE id = ?").run(m===null?0:2,r.id),y.receiver_json!==m){const d=Date.now();if(m===null){const _=await e.prepare(`UPDATE deliveries SET canceled_at = ?, updated_at = ?
+var x=Object.defineProperty;var l=(e,t)=>x(e,"name",{value:t,configurable:!0});import{createHash as C,randomBytes as $,timingSafeEqual as P}from"node:crypto";import{CrtrError as j,usage as f}from"../errors.js";import{ExitCode as S}from"../../types.js";import{createObject as J,liveDocumentNamed as q}from"./objects.js";import{invalidateCustomKind as A}from"./kinds/registry.js";import{publish as O,HOP_LIMIT as F,HopLimitError as M}from"./events.js";import{checkoutsForCwd as N}from"./repo-sync/repos.js";import{onQueueSignal as B,signalQueue as R}from"./receivers.js";import{receiverEndpoint as K,isPublicReceiverAddress as V}from"./receiver-url.js";import{isIP as G}from"node:net";import{KIND as k,LOCAL as D,MAX_KIND_EVENTS as Q,RESERVED_KIND_ROOTS as Y,eventCatalogReasons as z}from"../plugin-objects-manifest.js";import{check as L}from"../permissions/evaluator.js";import{userOf as X}from"../permissions/evaluator.js";import{nodePlace as Z}from"../permissions/ceiling.js";import{PermissionError as ee}from"../permissions/errors.js";import{writeActsFor as te}from"../permissions/facts.js";async function ne(e,t,n){return t.class!=="person"&&t.app.id===n.id?!0:await L(e,t,"edit",n.id)}l(ne,"mayActAs");async function ie(e,t,n){return await L(e,t,"read",n.id)}l(ie,"customReachable");const se=["public","private"];function h(e,t){throw new j(e,t,S.GENERAL)}l(h,"conflict");function b(e){return C("sha256").update(e).digest("hex")}l(b,"hash");function H(){return`crtr_pub_${$(32).toString("base64url")}`}l(H,"issueToken");function ae(e){if(e==null)return null;if(e==="queue")return JSON.stringify(e);if(typeof e!="object"||Array.isArray(e))throw f("invalid custom receiver; expected queue, an https url, or argv and absolute cwd");if("url"in e&&typeof e.url=="string")try{const n=K(e.url).hostname.replace(/^\[|\]$/g,"");if(G(n)&&!V(n))throw new Error("non-public IP address");return JSON.stringify({url:e.url})}catch(t){throw f(`invalid custom receiver: ${String(t)}`)}if("argv"in e&&Array.isArray(e.argv)&&e.argv.length>0&&e.argv.every(t=>typeof t=="string")&&typeof e.cwd=="string"&&e.cwd.startsWith("/"))return JSON.stringify(e);throw f("invalid custom receiver; url must be https and argv requires a command and absolute cwd")}l(ae,"receiverJson");async function re(e,t){return t.class==="node"?(await Z(e,t.node.id))?.isolated===!0:t.class==="app"||t.class==="object"?t.place?.isolated===!0:!1}l(re,"inIsolatedRun");async function Ne(e,t,n){const{kind:i,name:a,owner:s,description:o,events:u,receiver:c,rotateToken:w,privacy:p}=n;if(p!==void 0&&!se.includes(p))throw f(`invalid privacy ${JSON.stringify(p)}`);if(await ne(e,t,s)||h("forbidden",`cannot act as ${s.id}`),await re(e,t))throw new ee(403,"isolated_run","a custom object cannot be registered from an isolated run");if(!k.test(i)||Y.includes(i.split(".")[0]))throw f(`invalid or reserved kind ${i}`);if(!a.trim()||a!==a.trim()||a.includes("\0"))throw f(`invalid object name ${JSON.stringify(a)}`);const m=ae(c);if(c!=="queue"&&c!==null&&c!==void 0&&"argv"in c&&t.class!=="person"&&t.class!=="node"&&h("argv_forbidden","argv receiver requires a person or node principal"),u===void 0){const d=await e.prepare("SELECT source FROM object_kinds WHERE name = ?").get(i);if(d?.source!=="manifest"&&d?.source!=="peer")throw f("events is required unless the kind is declared by an installed plugin")}else if(Object.keys(u).length>Q||Object.entries(u).some(([d,_])=>!D.test(d)||!Number.isInteger(_?.level)||_.level<1||_.level>10||_.supersedes!==void 0&&typeof _.supersedes!="boolean"||_.ends_wait!==void 0&&typeof _.ends_wait!="boolean"))throw f("invalid custom event catalog");const r=await q(e,s.id,a);if(r&&!await ie(e,t,r)&&h("forbidden",`cannot act as ${s.id}`),r&&t.class!=="person"&&t.class!=="node"){const d=(await e.prepare("SELECT receiver_json FROM custom_objects WHERE object = ?").get(r.id))?.receiver_json;d&&typeof JSON.parse(d)=="object"&&"argv"in JSON.parse(d)&&h("argv_forbidden","argv receiver requires a person or node principal")}r&&r.type!==i&&h("name_taken",`${s.name}/${a} is already held by ${r.id}`);const g=u===void 0?null:await oe(e,{name:i,owner:s,description:o,events:u,read:null,source:"register"});if(!r){const d=await J(e,{type:i,kind:null,owner:s.id,privacy:p??"public",name:a,preview:""});s.type==="app"&&await te(e,d.id,await X(e,t));const _=H();return await e.prepare(`INSERT INTO custom_objects (object, description, receiver_json, token_hash)
+      VALUES (?, ?, ?, ?)`).run(d.id,o,m,b(_)),t.class==="node"&&await e.prepare("UPDATE custom_objects SET registered_by = ? WHERE object = ?").run(t.node.id,d.id),m!==null&&await e.prepare("UPDATE objects SET reception = 2 WHERE id = ?").run(d.id),await O(e,{event:"created",object:d,actor:t.class==="object"?t.object:t.class==="person"?t.person:t.class==="app"?t.app:t.node,attrs:{}},async U=>await N(e,U)),{object:d,token:_,created:!0,changed:[]}}const y=await e.prepare("SELECT description, receiver_json FROM custom_objects WHERE object = ?").get(r.id);y||h("name_taken",`${s.name}/${a} is not a custom object`);const E=[];if(y.description!==o&&E.push("description"),y.receiver_json!==m&&E.push("receiver"),g?.changed.includes("events")&&E.push("events"),g?.changed.includes("description")&&!E.includes("description")&&E.push("description"),p!==void 0&&r.privacy!==p&&E.push("privacy"),w&&E.push("token"),E.length===0)return{object:r,created:!1,changed:E};const v=w?H():void 0,T=E.includes("privacy")?{...r,privacy:p}:r;if(T!==r&&await e.prepare("UPDATE objects SET privacy = ? WHERE id = ?").run(p,r.id),await e.prepare("UPDATE custom_objects SET description = ?, receiver_json = ?, token_hash = COALESCE(?, token_hash) WHERE object = ?").run(o,m,v===void 0?null:b(v),r.id),await e.prepare("UPDATE objects SET reception = ? WHERE id = ?").run(m===null?0:2,r.id),y.receiver_json!==m){const d=Date.now();if(m===null){const _=await e.prepare(`UPDATE deliveries SET canceled_at = ?, updated_at = ?
         WHERE destination_id = ? AND state = 'pending' AND canceled_at IS NULL`).run(d,d,r.id);await e.prepare("UPDATE custom_objects SET dropped = dropped + ? WHERE object = ?").run(_.changes,r.id)}else await e.prepare(`UPDATE deliveries SET next_attempt_at = ?, updated_at = ?
-        WHERE destination_id = ? AND state = 'pending' AND canceled_at IS NULL`).run(m==='"queue"'?null:d,d,r.id);b(r.id)}return w&&b(r.id),await O(e,{event:"configured",object:T,actor:t.class==="object"?t.object:t.class==="person"?t.person:t.class==="app"?t.app:t.node,attrs:{changed:E.join(",")}},async d=>await N(e,d)),{object:T,...v===void 0?{}:{token:v},created:!1,changed:E}}l(Ne,"registerCustomObject");async function oe(e,t){const{name:i,owner:n,description:a,events:s,read:o,source:u}=t;if(!k.test(i))throw f(`invalid kind ${i}`);if(z(s,i).length>0)throw f("invalid custom event catalog");const c=await e.prepare("SELECT owner, description, events_json, read_json, source, declared FROM object_kinds WHERE name = ?").get(i),w=I(s),p=u==="manifest"&&o!==null?JSON.stringify({command:o.command}):null,m=new Date().toISOString();if(!c)return await e.prepare(`INSERT INTO object_kinds (name, owner, description, events_json, created_at, updated_at, read_json, source, declared)
-      VALUES (?, ?, ?, ?, ?, ?, ?, ?, 1)`).run(i,n.id,a,w,m,m,p,u),A(e,i),{outcome:"inserted",changed:[]};const r=c.owner===n.id;if(u==="peer"){if(c.source!=="peer")return{outcome:"skipped",changed:[]}}else if(c.source!=="peer"&&(r||h("kind_owned",`${i} belongs to another owner`),u==="register"&&c.source==="manifest"))return{outcome:"skipped",changed:[]};const g=[];return I(JSON.parse(c.events_json))!==w&&g.push("events"),c.description!==a&&g.push("description"),(c.read_json??null)!==p&&g.push("read"),g.length===0&&r&&c.source===u&&c.declared===1?{outcome:"unchanged",changed:g}:(await e.prepare("UPDATE object_kinds SET owner = ?, description = ?, events_json = ?, read_json = ?, source = ?, declared = 1, updated_at = ? WHERE name = ?").run(n.id,a,w,p,u,m,i),A(e,i),{outcome:"updated",changed:g})}l(oe,"upsertKind");async function Te(e,t,i,n){const a=await e.prepare("SELECT events_json FROM object_kinds WHERE name = ?").get(t.type);if(!a||t.deleted_at!==null)throw f(`${t.id} is not a live custom object`);const s=JSON.parse(a.events_json);if(!D.test(n.event)||!Object.hasOwn(s,n.event))throw new j("unknown_event",`${t.type} declares ${Object.keys(s).join(", ")}, not ${n.event}`,S.USAGE,{declared:Object.keys(s),event:n.event});if(typeof n.summary!="string")throw f("summary must be text");const o=n.state===void 0?null:JSON.stringify(n.state);if(n.state!==void 0&&o===void 0)throw f("state must be JSON-serializable");if(Buffer.byteLength(JSON.stringify({summary:n.summary,...n.state===void 0?{}:{state:n.state}}))>64*1024)throw new j("body_too_large","custom event summary and state exceed 64 KiB",S.USAGE);if(o!==null&&Buffer.byteLength(o)>64*1024)throw f("state exceeds 64 KiB");const u=n.cause??null,c=u===null?null:await e.prepare(`SELECT depth FROM messages WHERE message_id = ?
-    UNION ALL SELECT depth FROM message_causes WHERE message_id = ? LIMIT 1`).get(u,u);if(u!==null&&c===void 0)throw new j("unknown_cause",`no message ${u}`,S.USAGE);if(c&&c.depth>=F)throw new M(c.depth+1);const w=new Date().toISOString();return await e.prepare("UPDATE custom_objects SET summary = ?, state_json = ?, published_at = ? WHERE object = ?").run(n.summary,o,w,t.id),await e.prepare("UPDATE objects SET preview = ? WHERE id = ?").run(n.summary.split(`
-`)[0],t.id),await O(e,{event:`${t.type}.${n.event}`,object:t,actor:i,attrs:{},messageBody:{summary:n.summary,...n.state===void 0?{}:{state:n.state}},...n.cause===void 0?{}:{cause:n.cause}},async p=>await N(e,p))}l(Te,"publishCustom");async function be(e,t,i){if(t.deleted_at!==null)return;await O(e,{event:"deleted",object:t,actor:i,attrs:{}},async a=>await N(e,a));const n=new Date().toISOString();await e.prepare("UPDATE objects SET deleted_at = ?, reception = 0 WHERE id = ?").run(n,t.id),await e.prepare("UPDATE deliveries SET canceled_at = ?, updated_at = ? WHERE destination_id = ? AND state = 'pending' AND canceled_at IS NULL").run(Date.now(),Date.now(),t.id),b(t.id)}l(be,"unregisterCustomObject");function I(e){return JSON.stringify(Object.fromEntries(Object.entries(e).sort(([t],[i])=>t.localeCompare(i)).map(([t,i])=>[t,{level:i.level,...i.supersedes===void 0?{}:{supersedes:i.supersedes},...i.ends_wait===void 0?{}:{ends_wait:i.ends_wait}}])))}l(I,"canonicalEvents");async function Re(e,t,i=0){return await W(e,t.id,i,"pending")}l(Re,"pendingFor");async function Ae(e,t){const i=await e.prepare("SELECT destination_id FROM deliveries WHERE delivery_id = ?").get(t);return i?(await W(e,i.destination_id,-1,"handed_off")).find(n=>n.delivery_id===t)??null:null}l(Ae,"pushLineFor");async function W(e,t,i,n){return(await e.prepare(`SELECT d.delivery_id, m.message_id, m.seq, m.event, m.level, m.object_id, m.actor_id, m.body_json, m.body_ref, m.depth, m.created_at,
+        WHERE destination_id = ? AND state = 'pending' AND canceled_at IS NULL`).run(m==='"queue"'?null:d,d,r.id);R(r.id)}return w&&R(r.id),await O(e,{event:"configured",object:T,actor:t.class==="object"?t.object:t.class==="person"?t.person:t.class==="app"?t.app:t.node,attrs:{changed:E.join(",")}},async d=>await N(e,d)),{object:T,...v===void 0?{}:{token:v},created:!1,changed:E}}l(Ne,"registerCustomObject");async function oe(e,t){const{name:n,owner:i,description:a,events:s,read:o,source:u}=t;if(!k.test(n))throw f(`invalid kind ${n}`);if(z(s,n).length>0)throw f("invalid custom event catalog");await e.prepare("SELECT pg_advisory_xact_lock(hashtext(?))").get(`kind:${n}`);const c=await e.prepare("SELECT owner, description, events_json, read_json, source, declared FROM object_kinds WHERE name = ?").get(n),w=I(s),p=u==="manifest"&&o!==null?JSON.stringify({command:o.command}):null,m=new Date().toISOString();if(!c)return await e.prepare(`INSERT INTO object_kinds (name, owner, description, events_json, created_at, updated_at, read_json, source, declared)
+      VALUES (?, ?, ?, ?, ?, ?, ?, ?, 1)`).run(n,i.id,a,w,m,m,p,u),A(e,n),{outcome:"inserted",changed:[]};const r=c.owner===i.id;if(u==="peer"){if(c.source!=="peer")return{outcome:"skipped",changed:[]}}else if(c.source!=="peer"&&(r||h("kind_owned",`${n} belongs to another owner`),u==="register"&&c.source==="manifest"))return{outcome:"skipped",changed:[]};const g=[];return I(JSON.parse(c.events_json))!==w&&g.push("events"),c.description!==a&&g.push("description"),(c.read_json??null)!==p&&g.push("read"),g.length===0&&r&&c.source===u&&c.declared===1?{outcome:"unchanged",changed:g}:(await e.prepare("UPDATE object_kinds SET owner = ?, description = ?, events_json = ?, read_json = ?, source = ?, declared = 1, updated_at = ? WHERE name = ?").run(i.id,a,w,p,u,m,n),A(e,n),{outcome:"updated",changed:g})}l(oe,"upsertKind");async function Te(e,t,n,i){const a=await e.prepare("SELECT events_json FROM object_kinds WHERE name = ?").get(t.type);if(!a||t.deleted_at!==null)throw f(`${t.id} is not a live custom object`);const s=JSON.parse(a.events_json);if(!D.test(i.event)||!Object.hasOwn(s,i.event))throw new j("unknown_event",`${t.type} declares ${Object.keys(s).join(", ")}, not ${i.event}`,S.USAGE,{declared:Object.keys(s),event:i.event});if(typeof i.summary!="string")throw f("summary must be text");const o=i.state===void 0?null:JSON.stringify(i.state);if(i.state!==void 0&&o===void 0)throw f("state must be JSON-serializable");if(Buffer.byteLength(JSON.stringify({summary:i.summary,...i.state===void 0?{}:{state:i.state}}))>64*1024)throw new j("body_too_large","custom event summary and state exceed 64 KiB",S.USAGE);if(o!==null&&Buffer.byteLength(o)>64*1024)throw f("state exceeds 64 KiB");const u=i.cause??null,c=u===null?null:await e.prepare(`SELECT depth FROM messages WHERE message_id = ?
+    UNION ALL SELECT depth FROM message_causes WHERE message_id = ? LIMIT 1`).get(u,u);if(u!==null&&c===void 0)throw new j("unknown_cause",`no message ${u}`,S.USAGE);if(c&&c.depth>=F)throw new M(c.depth+1);const w=new Date().toISOString();return await e.prepare("UPDATE custom_objects SET summary = ?, state_json = ?, published_at = ? WHERE object = ?").run(i.summary,o,w,t.id),await e.prepare("UPDATE objects SET preview = ? WHERE id = ?").run(i.summary.split(`
+`)[0],t.id),await O(e,{event:`${t.type}.${i.event}`,object:t,actor:n,attrs:{},messageBody:{summary:i.summary,...i.state===void 0?{}:{state:i.state}},...i.cause===void 0?{}:{cause:i.cause}},async p=>await N(e,p))}l(Te,"publishCustom");async function Re(e,t,n){if(t.deleted_at!==null)return;await O(e,{event:"deleted",object:t,actor:n,attrs:{}},async a=>await N(e,a));const i=new Date().toISOString();await e.prepare("UPDATE objects SET deleted_at = ?, reception = 0 WHERE id = ?").run(i,t.id),await e.prepare("UPDATE deliveries SET canceled_at = ?, updated_at = ? WHERE destination_id = ? AND state = 'pending' AND canceled_at IS NULL").run(Date.now(),Date.now(),t.id),R(t.id)}l(Re,"unregisterCustomObject");function I(e){return JSON.stringify(Object.fromEntries(Object.entries(e).sort(([t],[n])=>t.localeCompare(n)).map(([t,n])=>[t,{level:n.level,...n.supersedes===void 0?{}:{supersedes:n.supersedes},...n.ends_wait===void 0?{}:{ends_wait:n.ends_wait}}])))}l(I,"canonicalEvents");async function be(e,t,n=0){return await W(e,t.id,n,"pending")}l(be,"pendingFor");async function Ae(e,t){const n=await e.prepare("SELECT destination_id FROM deliveries WHERE delivery_id = ?").get(t);return n?(await W(e,n.destination_id,-1,"handed_off")).find(i=>i.delivery_id===t)??null:null}l(Ae,"pushLineFor");async function W(e,t,n,i){return(await e.prepare(`SELECT d.delivery_id, m.message_id, m.seq, m.event, m.level, m.object_id, m.actor_id, m.body_json, m.body_ref, m.depth, m.created_at,
     o.type, o.name, owner.id AS owner_id
     FROM deliveries d JOIN messages m ON m.message_id = d.message_id JOIN objects o ON o.id = m.object_id
     LEFT JOIN objects owner ON owner.id = o.owner
-    WHERE d.destination_id = ? AND d.state = ? AND d.canceled_at IS NULL AND m.seq > ? ORDER BY m.seq`).all(t,n,i)).map(s=>{const o=s.body_json?JSON.parse(s.body_json):{};return{delivery_id:s.delivery_id,message_id:s.message_id,seq:s.seq,event:s.event,level:s.level,object:{id:s.object_id,type:s.type,name:s.name,owner:s.owner_id},actor:s.actor_id,attrs:o.push?.attrs??{},...o.summary===void 0?{}:{summary:o.summary},...o.state===void 0?{}:{state:o.state},...o.push?.pointer===void 0?{}:{pointer:o.push.pointer},depth:s.depth,created_at:s.created_at}})}l(W,"queueLines");async function ke(e,t,i){const n=Date.now(),a=[];let s=0;for(const o of i){const u=await e.prepare(`UPDATE deliveries SET state = 'acknowledged', acknowledged_at = ?, updated_at = ?
-      WHERE delivery_id = ? AND destination_id = ? AND state = 'pending' AND canceled_at IS NULL`).run(n,n,o,t.id);Number(u.changes)?s++:a.push(o)}return{acknowledged:s,...a.length?{unknown:a}:{}}}l(ke,"acknowledge");async function De(e,t,i){const n=await e.prepare("SELECT token_hash FROM custom_objects WHERE object = ?").get(t.id),a=Buffer.from(n?.token_hash??"".padEnd(64,"0"),"hex"),s=Buffer.from(R(i),"hex");return i.startsWith("crtr_pub_")&&t.deleted_at===null&&a.length===s.length&&$(a,s)&&n?.token_hash!=null}l(De,"verifyPublishToken");export{ke as acknowledge,ie as customReachable,ne as mayActAs,B as onQueueSignal,Re as pendingFor,Te as publishCustom,Ae as pushLineFor,Ne as registerCustomObject,be as unregisterCustomObject,oe as upsertKind,De as verifyPublishToken};
+    WHERE d.destination_id = ? AND d.state = ? AND d.canceled_at IS NULL AND m.seq > ? ORDER BY m.seq`).all(t,i,n)).map(s=>{const o=s.body_json?JSON.parse(s.body_json):{};return{delivery_id:s.delivery_id,message_id:s.message_id,seq:s.seq,event:s.event,level:s.level,object:{id:s.object_id,type:s.type,name:s.name,owner:s.owner_id},actor:s.actor_id,attrs:o.push?.attrs??{},...o.summary===void 0?{}:{summary:o.summary},...o.state===void 0?{}:{state:o.state},...o.push?.pointer===void 0?{}:{pointer:o.push.pointer},depth:s.depth,created_at:s.created_at}})}l(W,"queueLines");async function ke(e,t,n){const i=Date.now(),a=[];let s=0;for(const o of n){const u=await e.prepare(`UPDATE deliveries SET state = 'acknowledged', acknowledged_at = ?, updated_at = ?
+      WHERE delivery_id = ? AND destination_id = ? AND state = 'pending' AND canceled_at IS NULL`).run(i,i,o,t.id);Number(u.changes)?s++:a.push(o)}return{acknowledged:s,...a.length?{unknown:a}:{}}}l(ke,"acknowledge");async function De(e,t,n){const i=await e.prepare("SELECT token_hash FROM custom_objects WHERE object = ?").get(t.id),a=Buffer.from(i?.token_hash??"".padEnd(64,"0"),"hex"),s=Buffer.from(b(n),"hex");return n.startsWith("crtr_pub_")&&t.deleted_at===null&&a.length===s.length&&P(a,s)&&i?.token_hash!=null}l(De,"verifyPublishToken");export{ke as acknowledge,ie as customReachable,ne as mayActAs,B as onQueueSignal,be as pendingFor,Te as publishCustom,Ae as pushLineFor,Ne as registerCustomObject,Re as unregisterCustomObject,oe as upsertKind,De as verifyPublishToken};

package/dist/core/graph/jobs.d.ts

@@ -6,8 +6,55 @@ export interface JobRow {
     command: string;
     status: JobStatus;
     exit_code: number | null;
-    job_dir: string;
-    log_path: string;
+    /** Blob key of the job's output (`jobs/<node>/<job>/output/<seq>`). */
+    output_key: string;
+    /** ISO time the node must claim the job by, or null for a job that runs to completion. */
+    deadline_at: string | null;
+    purpose: string | null;
+    quiet_ok: boolean;
+    pgid: number | null;
+    pgid_identity: string | null;
+    activity_last_ms: number | null;
+    activity_sampled_ms: number | null;
+    activity_files: string | null;
+    silence_activity_ms: number | null;
+    silence_threshold_ms: number | null;
+    exit_reported_at: string | null;
+}
+/** A live job as the node, the roster and the stop guard see it. */
+export interface RunningJob {
+    jobId: string;
+    command: string;
+    purpose: string | null;
+    startedAtMs: number;
+    outputKey: string;
+    deadlineAtMs: number | null;
+    pgid: number | null;
+    pgidIdentity: string | null;
+    quietOk: boolean;
+    activity: {
+        lastActivityMs: number;
+        sampledAtMs: number;
+        files: string[];
+    } | null;
+    silence: {
+        lastActivityMs: number;
+        thresholdMs: number;
+    } | null;
+}
+/** The blob prefix a job's output chunks are written under, one object per chunk (`<prefix>/<seq, 8 digits>`). */
+export declare function jobOutputKey(nodeId: string, jobId: string): string;
+/** What the broker's valve reports about a job it runs: any subset, applied together. */
+export interface JobReport {
+    pgid?: number;
+    pgidIdentity?: string;
+    exitCode?: number;
+    vanished?: boolean;
+    activity?: {
+        lastActivityMs: number;
+        sampledAtMs: number;
+        files: string[];
+    };
 }
 export declare function jobRow(db: CanvasDb, job: ObjectRow): Promise<JobRow | null>;
 /** Create the job object (`id` keeps the job id the runner already uses), its `running` row,
@@ -15,15 +62,46 @@ export declare function jobRow(db: CanvasDb, job: ObjectRow): Promise<JobRow | n
 export declare function startJob(db: CanvasDb, node: ObjectRow, spec: {
     id?: string;
     command: string;
-    jobDir: string;
-    logPath: string;
+    purpose?: string | null;
+    deadlineAtMs?: number | null;
 }): Promise<ObjectRow>;
 /** End a running job: `exited` with its exit code, or `killed` with the killer as actor (null
  *  when the runtime killed it, e.g. at its deadline; `reason` then names why). The event carries
- *  the exit code and log path, never output. A job already ended is left as is. */
+ *  the exit code and output key, never output. A job already ended is left as is. */
 export declare function finishJob(db: CanvasDb, job: ObjectRow, end: {
     exitCode: number;
 } | {
     killedBy: ObjectRow | null;
     reason?: string;
 }): Promise<ObjectRow>;
+/** Arm (epoch ms) or drop (null) a running job's cancel deadline. */
+export declare function setJobDeadline(db: CanvasDb, jobId: string, deadlineAtMs: number | null): Promise<void>;
+/** Declare a running job an expected wait: it gets no silence messages. */
+export declare function markJobQuietOk(db: CanvasDb, jobId: string): Promise<void>;
+/** Record the silence message last sent for a job. */
+export declare function recordJobSilence(db: CanvasDb, jobId: string, lastActivityMs: number, thresholdMs: number): Promise<void>;
+/** Apply a broker report to a running job's row: the process identity, the activity sample, and the exit
+ *  (`exit_reported_at` set; the reconciler's next pass ends the job through `finishJob`). */
+export declare function applyJobReport(db: CanvasDb, jobId: string, report: JobReport): Promise<void>;
+/** Every `running` job a node owns, oldest first. */
+export declare function runningJobs(db: CanvasDb, nodeId: string): Promise<RunningJob[]>;
+/** Every `running` job in the canvas, with its owner. */
+export declare function allRunningJobs(db: CanvasDb): Promise<Array<RunningJob & {
+    owner: string;
+}>>;
+/** Every `running` job in the canvas whose cancel deadline has passed, with its owner. */
+export declare function expiredJobs(db: CanvasDb, nowMs: number): Promise<Array<RunningJob & {
+    owner: string;
+}>>;
+/** Credit every armed deadline of a node's running jobs for an interval the node was not permitted to run. */
+export declare function shiftJobDeadlines(db: CanvasDb, nodeId: string, byMs: number): Promise<number>;
+/** End every running job whose exit the broker reported: `exited` with its code, or `killed` when the process
+ *  vanished without one. Returns how many ended. */
+export declare function endReportedJobs(db: CanvasDb): Promise<number>;
+/** True when the node's newest execution runs on a runner other than the process runner (a sandbox): its jobs run
+ *  there, so their pids, supervisor files and output are not on this host and only the broker's reports describe them. */
+export declare function ownerRunsRemotely(db: CanvasDb, nodeId: string): Promise<boolean>;
+/** End, as killed, every running job whose owner's newest execution is a sandbox execution that has exited: the
+ *  sandbox the job ran in is gone with its broker, so nothing is left to report an exit. Run after `endReportedJobs`,
+ *  so an exit the broker did report wins. Returns how many ended. */
+export declare function endJobsOfExitedSandboxes(db: CanvasDb): Promise<number>;

package/dist/core/graph/jobs.js

@@ -1,2 +1,11 @@
-var m=Object.defineProperty;var e=(t,i)=>m(t,"name",{value:i,configurable:!0});import{recordActedOn as s}from"./edges.js";import{publish as u}from"./events.js";import{createObject as f,getById as E}from"./objects.js";import{recordWatch as h}from"./watches.js";function d(t){return t.split(`
-`,1)[0].trim()}e(d,"firstLine");function p(t,i){return`${d(t)} (${i})`}e(p,"previewOf");async function b(t,i){return await t.prepare("SELECT * FROM jobs WHERE object = ?").get(i.id)??null}e(b,"jobRow");async function T(t,i,r){if(i.type!=="node")throw new Error(`startJob: ${i.id} is a ${i.type}, not a node`);const a=await f(t,{...r.id===void 0?{}:{id:r.id},type:"job",kind:"bash",owner:i.id,privacy:"public",name:d(r.command)||"bash",preview:p(r.command,"running")});return await t.prepare("INSERT INTO jobs (object, command, status, exit_code, job_dir, log_path) VALUES (?, ?, 'running', NULL, ?, ?)").run(a.id,r.command,r.jobDir,r.logPath),await s(t,i,a),await h(t,i,a,"job-start"),await u(t,{event:"created",object:a,actor:i,attrs:{}}),a}e(T,"startJob");async function v(t,i,r){const a=await b(t,i);if(a===null)throw new Error(`finishJob: ${i.id} has no jobs row`);if(a.status!=="running")return i;const o="killedBy"in r,c=o?"killed":"exited",n=o?null:r.exitCode;await t.prepare("UPDATE jobs SET status = ?, exit_code = ? WHERE object = ?").run(c,n,i.id);const w=o?"killed":`exited ${n}`;await t.prepare("UPDATE objects SET preview = ? WHERE id = ?").run(p(a.command,w),i.id);const l=await E(t,i.id);return o&&r.killedBy!==null&&await s(t,r.killedBy,l),await u(t,{event:c,object:l,actor:o?r.killedBy:null,attrs:o?{"log-path":a.log_path,...r.reason===void 0?{}:{reason:r.reason}}:{"exit-code":n,"log-path":a.log_path}}),l}e(v,"finishJob");export{v as finishJob,b as jobRow,T as startJob};
+var y=Object.defineProperty;var o=(t,e)=>y(t,"name",{value:e,configurable:!0});import{recordActedOn as d}from"./edges.js";import{publish as p}from"./events.js";import{createObject as b,getById as u}from"./objects.js";import{recordWatch as m}from"./watches.js";function w(t,e){return`jobs/${t}/${e}/output`}o(w,"jobOutputKey");function j(t){return t.split(`
+`,1)[0].trim()}o(j,"firstLine");function E(t,e){return`${j(t)} (${e})`}o(E,"previewOf");async function h(t,e){return await t.prepare("SELECT * FROM jobs WHERE object = ?").get(e.id)??null}o(h,"jobRow");async function I(t,e,n){if(e.type!=="node")throw new Error(`startJob: ${e.id} is a ${e.type}, not a node`);const i=await b(t,{...n.id===void 0?{}:{id:n.id},type:"job",kind:"bash",owner:e.id,privacy:"public",name:j(n.command)||"bash",preview:E(n.command,"running")});return await t.prepare(`INSERT INTO jobs (object, command, status, exit_code, output_key, deadline_at, purpose)
+    VALUES (?, ?, 'running', NULL, ?, ?, ?)`).run(i.id,n.command,w(e.id,i.id),n.deadlineAtMs==null?null:new Date(n.deadlineAtMs).toISOString(),n.purpose??null),await d(t,e,i),await m(t,e,i,"job-start"),await p(t,{event:"created",object:i,actor:e,attrs:{}}),i}o(I,"startJob");async function f(t,e,n){const i=await h(t,e);if(i===null)throw new Error(`finishJob: ${e.id} has no jobs row`);if(i.status!=="running")return e;const a="killedBy"in n,l=a?"killed":"exited",s=a?null:n.exitCode;await t.prepare("UPDATE jobs SET status = ?, exit_code = ? WHERE object = ?").run(l,s,e.id);const _=a?"killed":`exited ${s}`;await t.prepare("UPDATE objects SET preview = ? WHERE id = ?").run(E(i.command,_),e.id);const r=await u(t,e.id);return a&&n.killedBy!==null&&await d(t,n.killedBy,r),await p(t,{event:l,object:r,actor:a?n.killedBy:null,attrs:a?{"output-key":i.output_key,...n.reason===void 0?{}:{reason:n.reason}}:{"exit-code":s,"output-key":i.output_key}}),r}o(f,"finishJob");async function x(t,e,n){await t.prepare("UPDATE jobs SET deadline_at = ? WHERE object = ? AND status = 'running'").run(n===null?null:new Date(n).toISOString(),e)}o(x,"setJobDeadline");async function L(t,e){await t.prepare("UPDATE jobs SET quiet_ok = true WHERE object = ?").run(e)}o(L,"markJobQuietOk");async function M(t,e,n,i){await t.prepare("UPDATE jobs SET silence_activity_ms = ?, silence_threshold_ms = ? WHERE object = ?").run(Math.trunc(n),Math.trunc(i),e)}o(M,"recordJobSilence");async function v(t,e,n){const i=[],a=[];n.pgid!==void 0&&(i.push("pgid = ?"),a.push(n.pgid)),n.pgidIdentity!==void 0&&(i.push("pgid_identity = ?"),a.push(n.pgidIdentity)),n.activity!==void 0&&(i.push("activity_last_ms = ?","activity_sampled_ms = ?","activity_files = ?"),a.push(Math.trunc(n.activity.lastActivityMs),Math.trunc(n.activity.sampledAtMs),n.activity.files.join(`
+`))),n.exitCode!==void 0?(i.push("exit_code = ?","exit_reported_at = ?"),a.push(n.exitCode,new Date().toISOString())):n.vanished===!0&&(i.push("exit_reported_at = ?"),a.push(new Date().toISOString())),i.length!==0&&await t.prepare(`UPDATE jobs SET ${i.join(", ")} WHERE object = ? AND status = 'running'`).run(...a,e)}o(v,"applyJobReport");function S(t){const e=Number(t.slice(0,Math.max(0,t.indexOf("-"))));return Number.isFinite(e)&&e>0?e:0}o(S,"startedAtMs");function c(t){return{jobId:t.object,command:t.command,purpose:t.purpose,startedAtMs:S(t.object),outputKey:t.output_key,deadlineAtMs:t.deadline_at===null?null:Date.parse(t.deadline_at),pgid:t.pgid,pgidIdentity:t.pgid_identity,quietOk:t.quiet_ok,activity:t.activity_last_ms===null||t.activity_sampled_ms===null?null:{lastActivityMs:t.activity_last_ms,sampledAtMs:t.activity_sampled_ms,files:(t.activity_files??"").split(`
+`).filter(e=>e!=="")},silence:t.silence_activity_ms===null||t.silence_threshold_ms===null?null:{lastActivityMs:t.silence_activity_ms,thresholdMs:t.silence_threshold_ms}}}o(c,"toRunning");async function N(t,e){return(await t.prepare(`SELECT j.* FROM jobs j JOIN objects o ON o.id = j.object
+    WHERE o.owner = ? AND o.deleted_at IS NULL AND j.status = 'running'`).all(e)).map(c).sort((i,a)=>i.startedAtMs-a.startedAtMs)}o(N,"runningJobs");async function T(t){return(await t.prepare(`SELECT j.*, o.owner AS owner FROM jobs j JOIN objects o ON o.id = j.object
+    WHERE o.deleted_at IS NULL AND j.status = 'running'`).all()).map(n=>({...c(n),owner:n.owner}))}o(T,"allRunningJobs");async function k(t,e){return(await t.prepare(`SELECT j.*, o.owner AS owner FROM jobs j JOIN objects o ON o.id = j.object
+    WHERE o.deleted_at IS NULL AND j.status = 'running' AND j.deadline_at IS NOT NULL AND j.deadline_at <= ?`).all(new Date(e).toISOString())).map(i=>({...c(i),owner:i.owner}))}o(k,"expiredJobs");async function J(t,e,n){if(!Number.isFinite(n)||n<=0)return 0;let i=0;for(const a of await N(t,e))a.deadlineAtMs!==null&&(await x(t,a.jobId,a.deadlineAtMs+n),i+=1);return i}o(J,"shiftJobDeadlines");async function C(t){const e=await t.prepare(`SELECT j.object, j.exit_code FROM jobs j JOIN objects o ON o.id = j.object
+    WHERE o.deleted_at IS NULL AND j.status = 'running' AND j.exit_reported_at IS NOT NULL`).all();for(const{object:n,exit_code:i}of e){const a=await u(t,n);await f(t,a,i===null?{killedBy:null,reason:"process disappeared without an exit record"}:{exitCode:i})}return e.length}o(C,"endReportedJobs");async function U(t,e){const n=await t.prepare("SELECT runner FROM executions WHERE node_id = ? ORDER BY started_at DESC, attempt DESC LIMIT 1").get(e);return n!==void 0&&n.runner!=="process"}o(U,"ownerRunsRemotely");async function W(t){const e=await t.prepare(`SELECT j.object FROM jobs j JOIN objects o ON o.id = j.object
+    WHERE o.deleted_at IS NULL AND j.status = 'running'
+      AND (SELECT e.runner || ':' || e.state FROM executions e WHERE e.node_id = o.owner ORDER BY e.started_at DESC, e.attempt DESC LIMIT 1) IN ('blaxel:exited')`).all();for(const{object:n}of e)await f(t,await u(t,n),{killedBy:null,reason:"the sandbox running the job ended with its broker"});return e.length}o(W,"endJobsOfExitedSandboxes");export{T as allRunningJobs,v as applyJobReport,W as endJobsOfExitedSandboxes,C as endReportedJobs,k as expiredJobs,f as finishJob,w as jobOutputKey,h as jobRow,L as markJobQuietOk,U as ownerRunsRemotely,M as recordJobSilence,N as runningJobs,x as setJobDeadline,J as shiftJobDeadlines,I as startJob};

package/dist/core/graph/kinds/job.js

@@ -1,2 +1,2 @@
-import{jobRow as d}from"../jobs.js";import{objectDTO as c}from"./dto.js";import{withBase as l}from"./kind.js";import{recordLiveRead as p}from"./live-read.js";import{attr as r,header as w}from"./render.js";const u={name:"job",addressable:"id",events:l({exited:{level:7},killed:{level:7},silent:{level:7}}),async read(a,i,e,s){const o=await d(a,e);if(!o)throw new Error(`job object ${e.id} has no jobs row`);await p(a,i,e,s.reposFn);const n=await c(a,e),t={command:o.command,status:o.status,exit_code:o.exit_code,log_path:o.log_path},m=[w("object",n,r("status",t.status)+r("exit_code",t.exit_code)),`Command: ${t.command}`,`Log: ${t.log_path}`].join(`
-`);return{data:t,text:m}}};export{u as jobKind};
+import{jobRow as d}from"../jobs.js";import{objectDTO as c}from"./dto.js";import{withBase as u}from"./kind.js";import{recordLiveRead as p}from"./live-read.js";import{attr as r,header as l}from"./render.js";const v={name:"job",addressable:"id",events:u({exited:{level:7},killed:{level:7},silent:{level:7}}),async read(a,i,e,s){const t=await d(a,e);if(!t)throw new Error(`job object ${e.id} has no jobs row`);await p(a,i,e,s.reposFn);const n=await c(a,e),o={command:t.command,status:t.status,exit_code:t.exit_code,output_key:t.output_key},m=[l("object",n,r("status",o.status)+r("exit_code",o.exit_code)),`Command: ${o.command}`,`Output: ${o.output_key}`].join(`
+`);return{data:o,text:m}}};export{v as jobKind};

package/dist/core/graph/names.js

@@ -1,11 +1,11 @@
-var F=Object.defineProperty;var p=(t,e)=>F(t,"name",{value:e,configurable:!0});import{isSafeNodeId as H}from"../canvas/paths.js";import{OBJECT_TYPE as x}from"../permissions/builtin.js";import{ceilingFrag as W,resolveCeiling as v}from"../permissions/ceiling.js";import{compilePermission as Y}from"../permissions/compile.js";import{permits as k,resolveReader as A,userOf as q}from"../permissions/evaluator.js";import{loadDefinitions as B}from"../permissions/schemas.js";import{and as P,or as b,raw as I}from"../permissions/sql.js";import{getById as J}from"./objects.js";import{flatMapAsync as O}from"../async-array.js";async function g(t,e){const o=await t.prepare(`SELECT o.* FROM objects o JOIN identities i ON i.object = o.id AND i.scheme = 'user'
-    WHERE o.type = 'person' AND o.home_machine IS NULL AND regexp_replace(i.external_id, '^user:', '') = ?`).get(await q(t,e)),i=await t.prepare(`SELECT a.* FROM objects a WHERE a.type = 'app' AND a.deleted_at IS NULL AND EXISTS (
+var F=Object.defineProperty;var p=(t,e)=>F(t,"name",{value:e,configurable:!0});import{isSafeNodeId as H}from"../canvas/paths.js";import{OBJECT_TYPE as x}from"../permissions/builtin.js";import{ceilingFrag as W,resolveCeiling as v}from"../permissions/ceiling.js";import{compilePermission as Y}from"../permissions/compile.js";import{permits as k,readerUser as q,resolveReader as A}from"../permissions/evaluator.js";import{loadDefinitions as B}from"../permissions/schemas.js";import{and as P,or as b,raw as I}from"../permissions/sql.js";import{getById as J}from"./objects.js";import{flatMapAsync as O}from"../async-array.js";async function g(t,e){const o=await q(t,e),s=o===null?void 0:await t.prepare(`SELECT o.* FROM objects o JOIN identities i ON i.object = o.id AND i.scheme = 'user'
+    WHERE o.type = 'person' AND o.home_machine IS NULL AND regexp_replace(i.external_id, '^user:', '') = ?`).get(o),a=await t.prepare(`SELECT a.* FROM objects a WHERE a.type = 'app' AND a.deleted_at IS NULL AND EXISTS (
       SELECT 1 FROM objects o JOIN documents d ON d.object = o.id
       WHERE o.owner = a.id AND o.type = 'document' AND o.deleted_at IS NULL AND d.source_path IS NOT NULL)
-    ORDER BY a.name = 'crtr', a.name`).all(),a=e.class==="node"?[e.node,...e.repos,...e.projectRepos,e.profile,e.app]:e.class==="app"?[e.app]:e.class==="object"?[e.owner,...e.repos,e.app]:[],s=new Set;return[...a,o,...i].filter(r=>!!r&&!s.has(r.id)&&!!s.add(r.id))}p(g,"viewOf");async function V(t,e,o){const i=await k(t,e,"read",o),a=await v(t,e.reader,"read"),s=Y(await B(t),e.subjects,x,"read",I("gr.id")),r={sql:`EXISTS (WITH RECURSIVE up(id, depth) AS (
+    ORDER BY a.name = 'crtr', a.name`).all(),c=e.class==="node"?[e.node,...e.repos,...e.projectRepos,e.profile,e.app]:e.class==="app"?[e.app]:e.class==="object"?[e.owner,...e.repos,e.app]:[],r=new Set;return[...c,s,...a].filter(i=>!!i&&!r.has(i.id)&&!!r.add(i.id))}p(g,"viewOf");async function V(t,e,o){const s=await k(t,e,"read",o),a=await v(t,e.reader,"read"),c=Y(await B(t),e.subjects,x,"read",I("gr.id")),r={sql:`EXISTS (WITH RECURSIVE up(id, depth) AS (
       SELECT ${o}.id, 0
       UNION ALL SELECT p.owner, up.depth + 1 FROM up JOIN objects p ON p.id = up.id WHERE p.owner IS NOT NULL AND up.depth < 12)
-    SELECT 1 FROM up gr WHERE ${s.sql})`,params:s.params},c=P([I(`${o}.deleted_at IS NOT NULL AND ${o}.schema_type IS NULL`),...a===null?[]:[W(a,o)],r]);return b([i,c])}p(V,"readableOrDeleted");const S=new WeakMap;function D(t,e){let o=S.get(e);return o===void 0&&(o=V(t,e,"o"),o.catch(()=>S.delete(e)),S.set(e,o)),o}p(D,"readableFrag");async function X(t,e,o){const i=await D(t,e);return(await t.prepareUncached(`SELECT ${i.sql} AS ok FROM objects o WHERE o.id = ?`).get(...i.params,o))?.ok===!0}p(X,"canReadOrDeleted");async function E(t,e,o,i,a,s=!1){const r=await D(t,e);return await t.prepareUncached(`SELECT o.* FROM objects o WHERE (o.type = 'document' OR strpos(o.type, '.') > 0) AND o.owner = ? AND o.name = ? AND o.home_machine IS ${s?"NOT NULL":"NULL"}
-    AND o.deleted_at IS ${a?"NOT NULL":"NULL"} AND ${r.sql}${a?" ORDER BY o.deleted_at DESC":""}`).all(o.id,i,...r.params)}p(E,"namedObjects");const re=["person","app","repo","profile"],T=/^(person|app|repo|profile|node):([^/]+)\/(.+)$/,h=p(t=>t.trim().replace(/^\[\[(.*)\]\]$/,"$1").trim(),"unwrapRef");function j(t){const e=T.exec(t);if(e)return{type:e[1],handle:e[2],rest:e[3]};const o=t.indexOf("/");return o>0?{handle:t.slice(0,o),rest:t.slice(o+1)}:null}p(j,"splitOwnerRef");async function U(t,e,o){return o==="node"?await t.prepare("SELECT * FROM objects WHERE type = 'node' AND id = ?").all(e):o?await t.prepare("SELECT * FROM objects WHERE type = ? AND (name = ? OR id = ?) AND home_machine IS NULL").all(o,e,e):await t.prepare(`SELECT * FROM objects WHERE (type = 'node' AND id = ?)
-    OR (type IN ('person','app','repo','profile') AND (name = ? OR id = ?) AND home_machine IS NULL)`).all(e,e,e)}p(U,"ownersByHandle");const _=/^([^:/]+):reports\/(.+?)(?:\.md)?$/;async function ie(t,e,o){const i=[...new Set(o.filter(n=>h(n)===n&&!_.test(n)))],a=new Map;if(i.length===0||e.view.length===0)return a;const s=new Set((await t.prepare("SELECT id FROM objects WHERE id = ANY(?::text[])").all(i)).map(n=>n.id)),r=i.filter(n=>!s.has(n));for(const n of r)a.set(n,null);const c=await D(t,e.ev),w=await t.prepareUncached(`SELECT o.id, o.owner, o.name FROM objects o WHERE (o.type = 'document' OR strpos(o.type, '.') > 0)
-    AND o.owner = ANY(?::text[]) AND o.name = ANY(?::text[]) AND o.home_machine IS NULL AND o.deleted_at IS NULL AND ${c.sql}`).all(e.view.map(n=>n.id),r,...c.params),m=new Map(e.view.map((n,d)=>[n.id,d])),l=new Map;for(const n of w){const d=m.get(n.owner);d<(l.get(n.name)??1/0)&&(l.set(n.name,d),a.set(n.name,n.id))}return a}p(ie,"viewResolutions");async function se(t,e,o,i){let a=h(o);const s=_.exec(a);s&&!T.test(a)&&(a=`${s[1]}/reports/${s[2]}`);const r=i?.ev??await A(t,e),c=await J(t,a);if(c&&await X(t,r,c.id))return c.deleted_at?{deleted:c}:{object:c};const w=i?.view??await g(t,e);for(const l of w){const n=(await E(t,r,l,a,!1))[0];if(n)return{object:n}}const m=j(a);if(m){const{type:l,handle:n,rest:d}=m,C=l!==void 0,N=await U(t,n,l),R=p(f=>{const u=w.findIndex($=>$.id===f.id);return u<0?1/0:u},"rank"),M=N.filter(f=>R(f)<1/0).sort((f,u)=>R(f)-R(u));for(const f of M){const u=(await E(t,r,f,d,!1))[0];if(u)return{object:u}}const L=await O(N,async f=>await E(t,r,f,d,!1));if(L.length===1)return{object:L[0]};if(L.length>1)return{ambiguous:L};const y=(await O(N,async f=>await E(t,r,f,d,!0)))[0];return y?{deleted:y}:!C&&N.length===0&&H(n)?{remote:a}:{missing:!0}}for(const l of w){const n=(await E(t,r,l,a,!0))[0];if(n)return{deleted:n}}return{missing:!0}}p(se,"resolveName");async function ce(t,e,o){const i=h(o),a=await A(t,e),s=p(async(w,m)=>await O(w,async l=>await E(t,a,l,m,!1,!0)),"found"),r=await s(await g(t,e),i);if(r.length)return r;const c=j(i);return c?await s(await U(t,c.handle,c.type),c.rest):[]}p(ce,"stubsNamed");export{re as HANDLE_TYPES,X as canReadOrDeleted,U as ownersByHandle,V as readableOrDeleted,se as resolveName,ce as stubsNamed,h as unwrapRef,g as viewOf,ie as viewResolutions};
+    SELECT 1 FROM up gr WHERE ${c.sql})`,params:c.params},i=P([I(`${o}.deleted_at IS NOT NULL AND ${o}.schema_type IS NULL`),...a===null?[]:[W(a,o)],r]);return b([s,i])}p(V,"readableOrDeleted");const S=new WeakMap;function D(t,e){let o=S.get(e);return o===void 0&&(o=V(t,e,"o"),o.catch(()=>S.delete(e)),S.set(e,o)),o}p(D,"readableFrag");async function X(t,e,o){const s=await D(t,e);return(await t.prepareUncached(`SELECT ${s.sql} AS ok FROM objects o WHERE o.id = ?`).get(...s.params,o))?.ok===!0}p(X,"canReadOrDeleted");async function E(t,e,o,s,a,c=!1){const r=await D(t,e);return await t.prepareUncached(`SELECT o.* FROM objects o WHERE (o.type = 'document' OR strpos(o.type, '.') > 0) AND o.owner = ? AND o.name = ? AND o.home_machine IS ${c?"NOT NULL":"NULL"}
+    AND o.deleted_at IS ${a?"NOT NULL":"NULL"} AND ${r.sql}${a?" ORDER BY o.deleted_at DESC":""}`).all(o.id,s,...r.params)}p(E,"namedObjects");const re=["person","app","repo","profile"],T=/^(person|app|repo|profile|node):([^/]+)\/(.+)$/,h=p(t=>t.trim().replace(/^\[\[(.*)\]\]$/,"$1").trim(),"unwrapRef");function j(t){const e=T.exec(t);if(e)return{type:e[1],handle:e[2],rest:e[3]};const o=t.indexOf("/");return o>0?{handle:t.slice(0,o),rest:t.slice(o+1)}:null}p(j,"splitOwnerRef");async function U(t,e,o){return o==="node"?await t.prepare("SELECT * FROM objects WHERE type = 'node' AND id = ?").all(e):o?await t.prepare("SELECT * FROM objects WHERE type = ? AND (name = ? OR id = ?) AND home_machine IS NULL").all(o,e,e):await t.prepare(`SELECT * FROM objects WHERE (type = 'node' AND id = ?)
+    OR (type IN ('person','app','repo','profile') AND (name = ? OR id = ?) AND home_machine IS NULL)`).all(e,e,e)}p(U,"ownersByHandle");const _=/^([^:/]+):reports\/(.+?)(?:\.md)?$/;async function ie(t,e,o){const s=[...new Set(o.filter(n=>h(n)===n&&!_.test(n)))],a=new Map;if(s.length===0||e.view.length===0)return a;const c=new Set((await t.prepare("SELECT id FROM objects WHERE id = ANY(?::text[])").all(s)).map(n=>n.id)),r=s.filter(n=>!c.has(n));for(const n of r)a.set(n,null);const i=await D(t,e.ev),w=await t.prepareUncached(`SELECT o.id, o.owner, o.name FROM objects o WHERE (o.type = 'document' OR strpos(o.type, '.') > 0)
+    AND o.owner = ANY(?::text[]) AND o.name = ANY(?::text[]) AND o.home_machine IS NULL AND o.deleted_at IS NULL AND ${i.sql}`).all(e.view.map(n=>n.id),r,...i.params),m=new Map(e.view.map((n,d)=>[n.id,d])),l=new Map;for(const n of w){const d=m.get(n.owner);d<(l.get(n.name)??1/0)&&(l.set(n.name,d),a.set(n.name,n.id))}return a}p(ie,"viewResolutions");async function se(t,e,o,s){let a=h(o);const c=_.exec(a);c&&!T.test(a)&&(a=`${c[1]}/reports/${c[2]}`);const r=s?.ev??await A(t,e),i=await J(t,a);if(i&&await X(t,r,i.id))return i.deleted_at?{deleted:i}:{object:i};const w=s?.view??await g(t,e);for(const l of w){const n=(await E(t,r,l,a,!1))[0];if(n)return{object:n}}const m=j(a);if(m){const{type:l,handle:n,rest:d}=m,C=l!==void 0,N=await U(t,n,l),R=p(f=>{const u=w.findIndex($=>$.id===f.id);return u<0?1/0:u},"rank"),M=N.filter(f=>R(f)<1/0).sort((f,u)=>R(f)-R(u));for(const f of M){const u=(await E(t,r,f,d,!1))[0];if(u)return{object:u}}const L=await O(N,async f=>await E(t,r,f,d,!1));if(L.length===1)return{object:L[0]};if(L.length>1)return{ambiguous:L};const y=(await O(N,async f=>await E(t,r,f,d,!0)))[0];return y?{deleted:y}:!C&&N.length===0&&H(n)?{remote:a}:{missing:!0}}for(const l of w){const n=(await E(t,r,l,a,!0))[0];if(n)return{deleted:n}}return{missing:!0}}p(se,"resolveName");async function ce(t,e,o){const s=h(o),a=await A(t,e),c=p(async(w,m)=>await O(w,async l=>await E(t,a,l,m,!1,!0)),"found"),r=await c(await g(t,e),s);if(r.length)return r;const i=j(s);return i?await c(await U(t,i.handle,i.type),i.rest):[]}p(ce,"stubsNamed");export{re as HANDLE_TYPES,X as canReadOrDeleted,U as ownersByHandle,V as readableOrDeleted,se as resolveName,ce as stubsNamed,h as unwrapRef,g as viewOf,ie as viewResolutions};

package/dist/core/graph/objects.d.ts

@@ -15,6 +15,8 @@ export declare function createObject(db: CanvasDb, spec: {
     /** The permission schema type the object is evaluated under (`firstlight/memory`); omitted = `crtr/object`. */
     schema_type?: string;
 }): Promise<ObjectRow>;
+/** The advisory lock key `ensureOwner` takes for a first sighting of an identity. */
+export declare const ownerLockKey: (scheme: string, externalId: string) => string;
 /** The owner object for an identity, created on first sight. Idempotent on
  *  (scheme, externalId). Handles are unique per owner type: a handle already held
  *  by a different identity of the same type throws `conflict` naming both; it is
@@ -26,7 +28,9 @@ export declare function ensureOwner(db: CanvasDb, type: OwnerType, scheme: strin
  *  A profile with no object yet has nothing to rename (its object is created from the manifest name
  *  on first use). Returns whether an object was renamed. Links are edges to ids, so they keep resolving. */
 export declare function renameProfileObject(db: CanvasDb, profileId: string, handle: string): Promise<boolean>;
-/** The owner object of a principal: `app:<x>` → app `<x>`; `user:<id>` → person (handle `user` for this install's person, else the id). */
+/** The owner object of a principal: `app:<x>` → app `<x>`; `user:<id>` → person (handle `user` for this install's person, else the id).
+ *  A cloud role serves many people and `personId()` is the request's person, so every person there gets the id as its handle: the one
+ *  `user` handle would otherwise go to whichever person was created first and refuse every other person with a `conflict`. */
 export declare function ownerForGrantee(db: CanvasDb, grantee: string): Promise<ObjectRow>;
 /** The owner's live document named `name`, or null. */
 export declare function liveDocumentNamed(db: CanvasDb, owner: string, name: string): Promise<ObjectRow | null>;

package/dist/core/graph/objects.js

@@ -1,17 +1,17 @@
-var F=Object.defineProperty;var i=(e,t)=>F(e,"name",{value:t,configurable:!0});import{CrtrError as _,notFound as M}from"../errors.js";import{ExitCode as j}from"../../types.js";import{newNodeId as H}from"../runtime/nodes.js";import{kindOf as W}from"./kinds/registry.js";import{bodyOf as v}from"./bodies.js";import{personId as k,personIdAsync as J}from"../canvas/person.js";import{check as P,permits as l,resolveReader as I}from"../permissions/evaluator.js";import{userSubject as y,writeActsFor as b}from"../permissions/facts.js";const Y=new Set(["person","app","repo","profile"]);function D(e){return e||null}i(D,"rowFrom");async function K(e,t){return D(await e.prepare("SELECT * FROM objects WHERE id = ?").get(t))}i(K,"getById");async function X(e,t){return await W(e,t.type),await e.prepare(`INSERT INTO objects (id, type, kind, owner, privacy, name, preview, created_at, home_machine, schema_type)
-    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) RETURNING *`).get(t.id??await H(),t.type,t.kind,t.owner,t.privacy,t.name,t.preview,new Date().toISOString(),t.home_machine??null,t.schema_type??null)}i(X,"createObject");async function T(e,t,o,s,n,c){if(!Y.has(t))throw new Error(`ensureOwner: ${t} is not an owner type`);const p=await e.prepare(`SELECT o.* FROM identities i JOIN objects o ON o.id = i.object
-    WHERE i.scheme = ? AND i.external_id = ?`).get(o,s);if(p)return p;const d=await e.prepare(`SELECT o.id, o.type, i.scheme, i.external_id FROM objects o
+var F=Object.defineProperty;var s=(e,t)=>F(e,"name",{value:t,configurable:!0});import{CrtrError as j,notFound as M}from"../errors.js";import{ExitCode as y}from"../../types.js";import{newNodeId as H}from"../runtime/nodes.js";import{kindOf as W}from"./kinds/registry.js";import{bodyOf as v}from"./bodies.js";import{isCloudRole as k,personId as J,personIdAsync as P}from"../canvas/person.js";import{check as K,permits as L,resolveReader as I}from"../permissions/evaluator.js";import{userSubject as b,writeActsFor as D}from"../permissions/facts.js";const Y=new Set(["person","app","repo","profile"]);function T(e){return e||null}s(T,"rowFrom");async function X(e,t){return T(await e.prepare("SELECT * FROM objects WHERE id = ?").get(t))}s(X,"getById");async function z(e,t){return await W(e,t.type),await e.prepare(`INSERT INTO objects (id, type, kind, owner, privacy, name, preview, created_at, home_machine, schema_type)
+    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) RETURNING *`).get(t.id??await H(),t.type,t.kind,t.owner,t.privacy,t.name,t.preview,new Date().toISOString(),t.home_machine??null,t.schema_type??null)}s(z,"createObject");const B=s((e,t)=>`owner:${e}:${t}`,"ownerLockKey");async function x(e,t,o,i,n,c){if(!Y.has(t))throw new Error(`ensureOwner: ${t} is not an owner type`);const d=s(async()=>await e.prepare(`SELECT o.* FROM identities i JOIN objects o ON o.id = i.object
+    WHERE i.scheme = ? AND i.external_id = ?`).get(o,i),"find"),E=await d();if(E)return E;await e.prepare("SELECT pg_advisory_xact_lock(hashtext(?))").get(B(o,i));const w=await d();if(w)return w;const p=await e.prepare(`SELECT o.id, o.type, i.scheme, i.external_id FROM objects o
     LEFT JOIN identities i ON i.object = o.id
-    WHERE o.name = ? AND o.type = ? AND o.home_machine IS NULL`).get(n,t);if(d)throw new _("conflict",`handle "${n}" is held by ${d.type} ${d.id} (${d.scheme}:${d.external_id}); cannot give it to ${t} ${o}:${s}`,j.GENERAL,{handle:n,holder:d.id});const E=await X(e,{type:t,kind:null,owner:t==="profile"?c?.id??null:null,privacy:"public",name:n,preview:""});return await e.prepare("INSERT INTO identities (object, scheme, external_id) VALUES (?, ?, ?)").run(E.id,o,s),t==="person"&&o==="user"?await b(e,E.id,y(s).id):(t==="profile"||t==="repo")&&await b(e,E.id,y(await J()).id),E}i(T,"ensureOwner");async function re(e,t,o){const s=await e.prepare(`SELECT o.* FROM identities i JOIN objects o ON o.id = i.object
+    WHERE o.name = ? AND o.type = ? AND o.home_machine IS NULL`).get(n,t);if(p)throw new j("conflict",`handle "${n}" is held by ${p.type} ${p.id} (${p.scheme}:${p.external_id}); cannot give it to ${t} ${o}:${i}`,y.GENERAL,{handle:n,holder:p.id});const N=await z(e,{type:t,kind:null,owner:t==="profile"?c?.id??null:null,privacy:"public",name:n,preview:""});return await e.prepare("INSERT INTO identities (object, scheme, external_id) VALUES (?, ?, ?)").run(N.id,o,i),t==="person"&&o==="user"?await D(e,N.id,b(i).id):(t==="profile"||t==="repo")&&await D(e,N.id,b(await P()).id),N}s(x,"ensureOwner");async function se(e,t,o){const i=await e.prepare(`SELECT o.* FROM identities i JOIN objects o ON o.id = i.object
     WHERE i.scheme = 'profile' AND i.external_id = ? AND o.type = 'profile' AND o.deleted_at IS NULL`).get(t),n=await e.prepare(`SELECT o.id FROM objects o
-    WHERE o.name = ? AND o.type = 'profile' AND o.deleted_at IS NULL AND o.home_machine IS NULL AND o.id <> ?`).get(o,s?s.id:"");if(n)throw new _("conflict",`handle "${o}" is already held by profile object ${n.id}; cannot rename profile ${t} to it`,j.GENERAL,{handle:o,holder:n.id});if(!s)return!1;const c=s;return c.name===o?!1:(await z(e,c,o),!0)}i(re,"renameProfileObject");async function ie(e,t){if(/^app:[a-z0-9][a-z0-9._-]*$/.test(t))return await T(e,"app","app",t,t.slice(4));if(/^user:[a-z0-9][a-z0-9._-]*$/.test(t))return await T(e,"person","user",t,t===k()?"user":t.slice(5));throw new Error(`principal ${JSON.stringify(t)} is neither app:<name> nor user:<id>`)}i(ie,"ownerForGrantee");async function se(e,t,o){return D(await e.prepare("SELECT * FROM objects WHERE (type = 'document' OR strpos(type, '.') > 0) AND owner = ? AND name = ? AND deleted_at IS NULL AND home_machine IS NULL").get(t,o))}i(se,"liveDocumentNamed");async function ae(e,t){const o=await K(e,t);if(!o||o.type!=="node")throw M(`no node object ${t}`);return o}i(ae,"nodeObject");async function z(e,t,o){await e.prepare("UPDATE objects SET name = ? WHERE id = ?").run(o,t.id)}i(z,"setObjectName");async function ce(e,t,o){await e.prepare("UPDATE objects SET kind = ? WHERE id = ?").run(o,t.id)}i(ce,"setObjectKind");function S(e,t){const o=[];return e.type!==void 0&&(o.push("o.type = ?"),t.push(e.type)),e.kind!==void 0&&(o.push("o.kind = ?"),t.push(e.kind)),e.owner!==void 0&&(o.push("o.owner = ?"),t.push(e.owner.id)),e.namePrefix!==void 0&&(o.push("o.name LIKE ? ESCAPE '\\'"),t.push(`${e.namePrefix.replace(/[\\%_]/g,s=>`\\${s}`)}%`)),e.schemaType!==void 0&&(o.push("o.schema_type = ?"),t.push(e.schemaType)),e.extensions!==void 0&&(o.push("EXISTS (SELECT 1 FROM documents x WHERE x.object = o.id AND x.extensions_json::jsonb @> ?::jsonb)"),t.push(JSON.stringify(e.extensions))),o}i(S,"narrowing");function B(e,t){const o="WITH RECURSIVE sa(id, owner, depth) AS (SELECT o.id, o.owner, 0 UNION ALL SELECT p.id, p.owner, sa.depth + 1 FROM sa JOIN objects p ON p.id = sa.owner WHERE sa.depth < 12)";return t.push(e.subjects.userIds,e.subjects.groupIds,e.userId),["o.schema_type IS NULL",`EXISTS (${o} SELECT 1 FROM sa JOIN relations r ON r.resource_type = 'crtr/object' AND r.resource_id = sa.id
+    WHERE o.name = ? AND o.type = 'profile' AND o.deleted_at IS NULL AND o.home_machine IS NULL AND o.id <> ?`).get(o,i?i.id:"");if(n)throw new j("conflict",`handle "${o}" is already held by profile object ${n.id}; cannot rename profile ${t} to it`,y.GENERAL,{handle:o,holder:n.id});if(!i)return!1;const c=i;return c.name===o?!1:(await G(e,c,o),!0)}s(se,"renameProfileObject");async function ae(e,t){if(/^app:[a-z0-9][a-z0-9._-]*$/.test(t))return await x(e,"app","app",t,t.slice(4));if(/^user:[a-z0-9][a-z0-9._-]*$/.test(t))return await x(e,"person","user",t,!k()&&t===J()?"user":t.slice(5));throw new Error(`principal ${JSON.stringify(t)} is neither app:<name> nor user:<id>`)}s(ae,"ownerForGrantee");async function ce(e,t,o){return T(await e.prepare("SELECT * FROM objects WHERE (type = 'document' OR strpos(type, '.') > 0) AND owner = ? AND name = ? AND deleted_at IS NULL AND home_machine IS NULL").get(t,o))}s(ce,"liveDocumentNamed");async function de(e,t){const o=await X(e,t);if(!o||o.type!=="node")throw M(`no node object ${t}`);return o}s(de,"nodeObject");async function G(e,t,o){await e.prepare("UPDATE objects SET name = ? WHERE id = ?").run(o,t.id)}s(G,"setObjectName");async function pe(e,t,o){await e.prepare("UPDATE objects SET kind = ? WHERE id = ?").run(o,t.id)}s(pe,"setObjectKind");function O(e,t){const o=[];return e.type!==void 0&&(o.push("o.type = ?"),t.push(e.type)),e.kind!==void 0&&(o.push("o.kind = ?"),t.push(e.kind)),e.owner!==void 0&&(o.push("o.owner = ?"),t.push(e.owner.id)),e.namePrefix!==void 0&&(o.push("o.name LIKE ? ESCAPE '\\'"),t.push(`${e.namePrefix.replace(/[\\%_]/g,i=>`\\${i}`)}%`)),e.schemaType!==void 0&&(o.push("o.schema_type = ?"),t.push(e.schemaType)),e.extensions!==void 0&&(o.push("EXISTS (SELECT 1 FROM documents x WHERE x.object = o.id AND x.extensions_json::jsonb @> ?::jsonb)"),t.push(JSON.stringify(e.extensions))),o}s(O,"narrowing");function V(e,t){const o="WITH RECURSIVE sa(id, owner, depth) AS (SELECT o.id, o.owner, 0 UNION ALL SELECT p.id, p.owner, sa.depth + 1 FROM sa JOIN objects p ON p.id = sa.owner WHERE sa.depth < 12)";t.push(e.subjects.userIds,e.subjects.groupIds);const i=["o.schema_type IS NULL",`EXISTS (${o} SELECT 1 FROM sa JOIN relations r ON r.resource_type = 'crtr/object' AND r.resource_id = sa.id
       AND r.relation IN ('reader', 'editor', 'messenger', 'user_of') AND r.written_by <> 'package'
-      AND ((r.subject_type = 'user' AND r.subject_id = ANY(?::text[])) OR (r.subject_type = 'crtr/group' AND r.subject_relation = 'member' AND r.subject_id = ANY(?::text[]))))`,`NOT EXISTS (${o} SELECT 1 FROM sa JOIN relations r ON r.resource_type = 'crtr/object' AND r.resource_id = sa.id
-      AND r.relation = 'acts_for' AND r.subject_type = 'user' AND r.subject_id = ?)`]}i(B,"sharedOnly");async function de(e,t,o,s={}){const n=["o.seq > ?"],c=[s.after_seq??0];o.privacy!==void 0&&(n.push("o.privacy = ?"),c.push(o.privacy)),o.name!==void 0&&(n.push("o.name = ?"),c.push(o.name)),n.push("o.home_machine IS NULL"),n.push(o.deleted?"o.deleted_at IS NOT NULL":"o.deleted_at IS NULL"),n.push(...S(o,c));const p=await I(e,t);o.shared&&n.push(...B(p,c));const d=await l(e,p,"read","o"),E=Math.min(s.limit??100,100);return await e.prepareUncached(`SELECT o.* FROM objects o WHERE ${n.join(" AND ")} AND (${d.sql}) ORDER BY o.seq LIMIT ${E}`).all(...c,...d.params)}i(de,"listObjects");async function pe(e,t,o){const n=[],c=`%${o.text.replace(/[\\%_]/g,r=>`\\${r}`)}%`,p=await I(e,t);if(!o.grep){const r=[c],u=S(o,r).map(w=>` AND ${w}`).join(""),a=await l(e,p,"read","o"),m=await e.prepareUncached(`SELECT o.*, (SELECT d.summary FROM documents d WHERE d.object = o.id) AS _summary FROM objects o
+      AND ((r.subject_type = 'user' AND r.subject_id = ANY(?::text[])) OR (r.subject_type = 'crtr/group' AND r.subject_relation = 'member' AND r.subject_id = ANY(?::text[]))))`];return e.userId===null?i:(t.push(e.userId),[...i,`NOT EXISTS (${o} SELECT 1 FROM sa JOIN relations r ON r.resource_type = 'crtr/object' AND r.resource_id = sa.id
+      AND r.relation = 'acts_for' AND r.subject_type = 'user' AND r.subject_id = ?)`])}s(V,"sharedOnly");async function ue(e,t,o,i={}){const n=["o.seq > ?"],c=[i.after_seq??0];o.privacy!==void 0&&(n.push("o.privacy = ?"),c.push(o.privacy)),o.name!==void 0&&(n.push("o.name = ?"),c.push(o.name)),n.push("o.home_machine IS NULL"),n.push(o.deleted?"o.deleted_at IS NOT NULL":"o.deleted_at IS NULL"),n.push(...O(o,c));const d=await I(e,t);o.shared&&n.push(...V(d,c));const E=await L(e,d,"read","o"),w=Math.min(i.limit??100,100);return await e.prepareUncached(`SELECT o.* FROM objects o WHERE ${n.join(" AND ")} AND (${E.sql}) ORDER BY o.seq LIMIT ${w}`).all(...c,...E.params)}s(ue,"listObjects");async function Ee(e,t,o){const n=[],c=`%${o.text.replace(/[\\%_]/g,r=>`\\${r}`)}%`,d=await I(e,t);if(!o.grep){const r=[c],u=O(o,r).map(l=>` AND ${l}`).join(""),a=await L(e,d,"read","o"),m=await e.prepareUncached(`SELECT o.*, (SELECT d.summary FROM documents d WHERE d.object = o.id) AS _summary FROM objects o
       WHERE o.deleted_at IS NULL AND o.home_machine IS NULL AND (o.name ILIKE ?1 ESCAPE '\\' OR o.preview ILIKE ?1 ESCAPE '\\'
         OR EXISTS (SELECT 1 FROM documents d WHERE d.object = o.id AND d.summary ILIKE ?1 ESCAPE '\\'))${u}
-      AND (${a.sql}) ORDER BY o.seq LIMIT 100`).all(...r,...a.params),h=o.text.toLowerCase();for(const w of m){const{_summary:U,...g}=w,f=g,R=f.name.toLowerCase().includes(h)?"name":f.preview.toLowerCase().includes(h)?"preview":"summary";n.push({object:f,field:R,...R==="summary"?{text:String(U)}:{}})}if(n.length>=100)return n}if(!o.body&&!o.grep)return n;const d=new Set(n.map(r=>r.object.id)),E=o.grep?(r=>u=>r.test(u))(new RegExp(o.text)):r=>r.includes(o.text),O=[],x=S(o,O).map(r=>` AND ${r}`).join(""),$=await e.prepareUncached(`SELECT o.id, r.body_hash AS body_hash, d.source_path AS source_path FROM objects o
+      AND (${a.sql}) ORDER BY o.seq LIMIT 100`).all(...r,...a.params),f=o.text.toLowerCase();for(const l of m){const{_summary:U,...g}=l,S=g,R=S.name.toLowerCase().includes(f)?"name":S.preview.toLowerCase().includes(f)?"preview":"summary";n.push({object:S,field:R,...R==="summary"?{text:String(U)}:{}})}if(n.length>=100)return n}if(!o.body&&!o.grep)return n;const E=new Set(n.map(r=>r.object.id)),w=o.grep?(r=>u=>r.test(u))(new RegExp(o.text)):r=>r.includes(o.text),p=[],N=O(o,p).map(r=>` AND ${r}`).join(""),$=await e.prepareUncached(`SELECT o.id, r.body_hash AS body_hash, d.source_path AS source_path FROM objects o
       JOIN documents d ON d.object = o.id JOIN revisions r ON r.document = o.id
-      WHERE o.type = 'document' AND o.deleted_at IS NULL AND NOT EXISTS (SELECT 1 FROM revision_parents p WHERE p.parent = r.rev_id)${x}
-      ORDER BY o.seq, r.number`).all(...O),L=await l(e,p,"read","o"),C=200;let N=[];const A=i(async()=>{if(N.length===0)return!1;const r=await e.prepareUncached(`SELECT o.* FROM objects o WHERE o.id = ANY(?::text[]) AND (${L.sql})`).all(N.map(a=>a.id),...L.params),u=new Map(r.map(a=>[a.id,a]));for(const a of N){const m=u.get(a.id);if(m!==void 0&&(n.push({object:m,field:"body",line:a.line,text:a.text}),n.length>=100))return!0}return N=[],!1},"flush");for(const r of $){if(d.has(r.id))continue;let u;try{u=v(r.body_hash,r.source_path)}catch(h){if(await P(e,p,"read",r.id))throw h;continue}if(!o.grep&&!u.includes(o.text))continue;const a=u.split(`
-`),m=a.findIndex(E);if(!(m<0)&&(d.add(r.id),N.push({id:r.id,line:m+1,text:a[m]}),N.length>=C&&await A()))return n}return await A(),n}i(pe,"searchObjects");export{X as createObject,T as ensureOwner,K as getById,de as listObjects,se as liveDocumentNamed,ae as nodeObject,ie as ownerForGrantee,re as renameProfileObject,pe as searchObjects,ce as setObjectKind,z as setObjectName};
+      WHERE o.type = 'document' AND o.deleted_at IS NULL AND NOT EXISTS (SELECT 1 FROM revision_parents p WHERE p.parent = r.rev_id)${N}
+      ORDER BY o.seq, r.number`).all(...p),A=await L(e,d,"read","o"),C=200;let h=[];const _=s(async()=>{if(h.length===0)return!1;const r=await e.prepareUncached(`SELECT o.* FROM objects o WHERE o.id = ANY(?::text[]) AND (${A.sql})`).all(h.map(a=>a.id),...A.params),u=new Map(r.map(a=>[a.id,a]));for(const a of h){const m=u.get(a.id);if(m!==void 0&&(n.push({object:m,field:"body",line:a.line,text:a.text}),n.length>=100))return!0}return h=[],!1},"flush");for(const r of $){if(E.has(r.id))continue;let u;try{u=v(r.body_hash,r.source_path)}catch(f){if(await K(e,d,"read",r.id))throw f;continue}if(!o.grep&&!u.includes(o.text))continue;const a=u.split(`
+`),m=a.findIndex(w);if(!(m<0)&&(E.add(r.id),h.push({id:r.id,line:m+1,text:a[m]}),h.length>=C&&await _()))return n}return await _(),n}s(Ee,"searchObjects");export{z as createObject,x as ensureOwner,X as getById,ue as listObjects,ce as liveDocumentNamed,de as nodeObject,ae as ownerForGrantee,B as ownerLockKey,se as renameProfileObject,Ee as searchObjects,pe as setObjectKind,G as setObjectName};

package/dist/core/graph/reader.d.ts

@@ -10,6 +10,9 @@ export type ReposFn = (cwd: string) => Promise<Checkout[]>;
 export declare function viewRepos(cwd: string, profileId: string | null, reposFn: ReposFn, lookups: Pick<ReaderLookups, 'projectPaths'>): Promise<Pick<Extract<Reader, {
     class: 'node';
 }>, 'repos' | 'checkouts' | 'projectRepos' | 'projectCheckouts'>>;
+/** Run the git lookups a node's reader needs (its cwd and its profile's project paths) now, before a canvas write opens, so
+ *  `viewRepos` inside the write hits the identity cache instead of spawning git while the write holds a pooled connection. */
+export declare function warmNodeRepos(db: CanvasDb, nodeId: string): Promise<void>;
 export declare function readerFor(db: CanvasDb, principal: RequestPrincipal, reposFn: ReposFn): Promise<Exclude<Reader, {
     class: 'object';
 }>>;

package/dist/core/graph/reader.js

@@ -1,3 +1,3 @@
-var N=Object.defineProperty;var p=(o,e)=>N(o,"name",{value:e,configurable:!0});import{coveredByAny as f,isSandboxedNode as b}from"../../shared/env.js";import{existsSync as x}from"node:fs";import{CrtrError as L}from"../errors.js";import{getStoredProfile as $}from"../scoped-state/profiles.js";import{userScopeRoot as A}from"../scope.js";import{parseScope as S}from"@north-light/identity";import{activeGrant as R,grantFor as O}from"../grants/mirror.js";import{ApiError as C}from"../../api/errors.js";import{pluginAppToken as M}from"../secrets.js";import{loadExactProfileManifest as T}from"../profiles/manifest.js";import{ensureOwner as v,getById as H,nodeObject as W,ownerForGrantee as D}from"./objects.js";import{personId as P}from"../canvas/person.js";async function y(o,e,r,a){const t=e===null?[]:a.projectPaths(e),n=await r(o),l=new Set(n.map(s=>s.repo.id)),c=[];for(const s of t){if(!x(s))continue;let i;try{i=await r(s)}catch(u){if(u instanceof L&&u.code==="git-lookup-failed")continue;throw u}for(const u of i)l.has(u.repo.id)||(l.add(u.repo.id),c.push(u))}return{repos:n.map(s=>s.repo),checkouts:n,projectRepos:c.map(s=>s.repo),projectCheckouts:c}}p(y,"viewRepos");async function te(o,e,r){if(e.class==="anonymous")throw new Error("a publish token cannot read as a principal");if(e.class==="person")return{class:"person",person:await j(o)};if(e.class==="app")return{class:"app",app:await E(o,e.app),scopes:e.scopes,...e.sub===void 0?{}:{sub:e.sub}};if(e.class==="machine")throw new Error("a machine token cannot read as a principal");if(e.class==="forwarded"){if(e.actor.kind==="person")return{class:"person",person:await j(o)};const c=await O(e.actor.app,e.sub);if(!c)throw new C(403,"app_not_granted",`${e.actor.app} holds no active grant for ${e.sub} on this machine`);const s=e.actor.node_scopes;return{class:"app",app:await E(o,e.actor.app),place:e.actor.place,launched:s,scopes:s===null?c.resolved:s.filter(i=>f(c.resolved,i))}}if(e.class==="cron"){const c=e.grant?(await R(e.grant))?.resolved??[]:[],s=e.scopes;return{class:"app",app:await E(o,e.app),scopes:s===null?c:s.filter(i=>f(c,i)),launched:s,place:{run:e.origin_run??"",isolated:e.isolated}}}const a=d(o),t=await W(o,e.node),n=await o.prepare("SELECT cwd, profile_id, app FROM nodes WHERE node_id = ?").get(e.node),l=n.app===null?null:await a.object(n.app);if(!l)throw new Error(`node ${e.node} has no app`);return{class:"node",node:t,app:l,scopes:await F(e.app,e.sub,e.grant,e.scopes,a),launched:e.scopes,cwd:n.cwd,...await y(n.cwd,n.profile_id,r,a),profile:n.profile_id===null?null:await a.profile(n.profile_id,l)}}p(te,"readerFor");async function B(o,e,r,a=d(o),t=!1){const n=await o.prepare("SELECT o.* FROM objects o WHERE o.id = ? AND o.type = 'node'").get(e),l=await o.prepare(`SELECT (SELECT external_id FROM identities WHERE object = nodes.app) AS grantee,
-    sub, grant_id, scopes_json, cwd, profile_id, app FROM nodes WHERE node_id = ?`).get(e);if(!n||!l)throw new Error(`no node ${e}`);const{grantee:c,sub:s,grant_id:i,scopes_json:u,cwd:w,profile_id:g,app:h}=l,m=h===null?null:await a.object(h);if(!m)throw new Error(`node ${e} has no app`);const _=u===null?null:JSON.parse(u);return{class:"node",node:n,app:m,scopes:await F(c,s??"",i,_,a,t),launched:_,cwd:w,...await y(w,g,r,a),profile:g===null?null:await a.profile(g,m)}}p(B,"readerForNode");async function ne(o,e,r=async()=>[],a=d(o)){const t=await o.prepare("SELECT envelope_json FROM peer_stubs WHERE object = ?").get(e.id);if(t!==void 0)return await J(o,e,t.envelope_json===null?null:JSON.parse(t.envelope_json),a);if(e.type==="node")return await B(o,e.id,r,a,!0);const n=e.owner===null?null:await a.object(e.owner);if(!n)throw new Error(`watcher ${e.id} has no owner`);const c=(n.type==="app"?n:n.type==="profile"&&n.owner!==null?await a.object(n.owner):null)??await o.prepare("SELECT o.* FROM identities i JOIN objects o ON o.id = i.object WHERE i.external_id = 'app:terminal' AND i.scheme = 'app'").get()??await o.prepare("SELECT * FROM objects WHERE type = 'person' AND name = 'user' AND home_machine IS NULL").get();if(!c)throw new Error("no terminal app or person object");const s=(await o.prepare("SELECT external_id FROM identities WHERE object = ? AND scheme = 'app'").get(c.id))?.external_id??"app:terminal",i=await o.prepare("SELECT resolved_scopes_json FROM grants WHERE grantee = ? AND status = 'active'").all(s),u=n.type==="person"?null:i.length===0?a.pluginScopes(s):i.length===1?JSON.parse(i[0].resolved_scopes_json).filter(w=>w.mode==="always").map(w=>S(w.scope)):null;return{class:"object",object:e,node:e,owner:n,app:c,scopes:u,repos:n.type==="repo"?[n]:[]}}p(ne,"readerForObject");async function re(o,e,r){const a=(await o.prepare("SELECT external_id FROM identities WHERE object = ? AND scheme = 'app'").get(e.id))?.external_id;if(a===void 0)return null;const t=await o.prepare("SELECT resolved_scopes_json FROM grants WHERE grantee = ? AND status = 'active'").all(a);return t.length===0?r.pluginScopes(a):t.length>1?null:JSON.parse(t[0].resolved_scopes_json).filter(n=>n.mode==="always").map(n=>S(n.scope))}p(re,"appScopesNow");async function J(o,e,r,a){const t=await j(o);if(r!==null&&r.app===null)return{class:"object",object:e,node:e,owner:t,app:t,scopes:null,repos:[]};const n=r?.app==null?null:await E(o,r.app),l=r?.app==null?null:await a.grantFor(r.app,r.sub),c=r===null||l===null?null:r.node_scopes===null?l.resolved:r.node_scopes.filter(i=>f(l.resolved,i)),s=n??(e.owner===null?t:await a.object(e.owner)??t);return{class:"object",object:e,node:e,owner:s,app:s,scopes:c,launched:r?.node_scopes??null,repos:[],...r?.place==null?{}:{place:r.place}}}p(J,"readerForStub");function d(o){return{grantById:R,grantFor:O,pluginScopes:p(e=>M(e.replace(/^app:/,""))?.scopes??null,"pluginScopes"),object:p(async e=>await H(o,e),"object"),profile:p(async(e,r)=>await G(o,e,r),"profile"),projectPaths:p(e=>b()?[]:$(A(),e)?.manifest.projects.map(r=>r.path)??[],"projectPaths")}}p(d,"liveLookups");function ae(o){const e=d(o),r=new Map,a=p((t,n)=>(r.has(t)||r.set(t,n()),r.get(t)),"memo");return{grantById:p(t=>a(`g\0${t}`,()=>e.grantById(t)),"grantById"),grantFor:p((t,n)=>a(`a\0${t}\0${n}`,()=>e.grantFor(t,n)),"grantFor"),pluginScopes:p(t=>a(`t\0${t}`,()=>e.pluginScopes(t)),"pluginScopes"),object:p(async t=>await a(`o\0${t}`,async()=>await e.object(t)),"object"),profile:p(async(t,n)=>await a(`p\0${t}\0${n.id}`,async()=>await e.profile(t,n)),"profile"),projectPaths:p(t=>a(`j\0${t}`,()=>e.projectPaths(t)),"projectPaths")}}p(ae,"publishLookups");async function F(o,e,r,a,t,n=!1){const l=r?await t.grantById(r):await t.grantFor(o,e),c=l&&l.grantee===o?l.resolved:null;if(c===null){if(n)return null;throw new Error(`the grant of ${o} is not active`)}return a===null?c:a.filter(s=>f(c,s))}p(F,"nodeScopes");async function j(o){return await D(o,P())}p(j,"personObject");async function E(o,e){return await v(o,"app","app",e,e.replace(/^app:/,""))}p(E,"appObject");async function G(o,e,r){return await o.prepare(`SELECT o.* FROM identities i JOIN objects o ON o.id = i.object
-    WHERE i.scheme = 'profile' AND i.external_id = ?`).get(e)??await v(o,"profile","profile",e,T(e).manifest.name,r)}p(G,"profileObject");export{re as appScopesNow,d as liveLookups,G as profileObject,ae as publishLookups,te as readerFor,B as readerForNode,ne as readerForObject,y as viewRepos};
+var b=Object.defineProperty;var p=(o,e)=>b(o,"name",{value:e,configurable:!0});import{coveredByAny as d,isSandboxedNode as C}from"../../shared/env.js";import{existsSync as S}from"node:fs";import{CrtrError as L}from"../errors.js";import{getCachedProfile as M}from"../scoped-state/person-store.js";import{parseScope as R}from"@north-light/identity";import{activeGrant as O,grantFor as v}from"../grants/mirror.js";import{ApiError as $}from"../../api/errors.js";import{pluginAppToken as A}from"../secrets.js";import{loadExactProfileManifest as T}from"../profiles/manifest.js";import{ensureOwner as y,getById as H,nodeObject as W,ownerForGrantee as D}from"./objects.js";import{personId as P}from"../canvas/person.js";import{warmCheckoutIdentities as F}from"./repo-sync/repos.js";async function N(o,e,n,a){const t=e===null?[]:a.projectPaths(e),r=await n(o),l=new Set(r.map(s=>s.repo.id)),c=[];for(const s of t){if(!S(s))continue;let i;try{i=await n(s)}catch(u){if(u instanceof L&&u.code==="git-lookup-failed")continue;throw u}for(const u of i)l.has(u.repo.id)||(l.add(u.repo.id),c.push(u))}return{repos:r.map(s=>s.repo),checkouts:r,projectRepos:c.map(s=>s.repo),projectCheckouts:c}}p(N,"viewRepos");async function te(o,e){const n=await o.prepare("SELECT cwd, profile_id FROM nodes WHERE node_id = ?").get(e);if(n!==void 0&&(await F(n.cwd),n.profile_id))for(const a of w(o).projectPaths(n.profile_id))S(a)&&await F(a)}p(te,"warmNodeRepos");async function ne(o,e,n){if(e.class==="anonymous")throw new Error("a publish token cannot read as a principal");if(e.class==="person")return{class:"person",person:await j(o)};if(e.class==="app")return{class:"app",app:await E(o,e.app),scopes:e.scopes,...e.sub===void 0?{}:{sub:e.sub}};if(e.class==="machine")throw new Error("a machine token cannot read as a principal");if(e.class==="forwarded"){if(e.actor.kind==="person")return{class:"person",person:await j(o)};const c=await v(e.actor.app,e.sub);if(!c)throw new $(403,"app_not_granted",`${e.actor.app} holds no active grant for ${e.sub} on this machine`);const s=e.actor.node_scopes;return{class:"app",app:await E(o,e.actor.app),place:e.actor.place,launched:s,scopes:s===null?c.resolved:s.filter(i=>d(c.resolved,i))}}if(e.class==="cron"){const c=e.grant?(await O(e.grant))?.resolved??[]:[],s=e.scopes;return{class:"app",app:await E(o,e.app),scopes:s===null?c:s.filter(i=>d(c,i)),launched:s,place:{run:e.origin_run??"",isolated:e.isolated}}}const a=w(o),t=await W(o,e.node),r=await o.prepare("SELECT cwd, profile_id, app FROM nodes WHERE node_id = ?").get(e.node),l=r.app===null?null:await a.object(r.app);if(!l)throw new Error(`node ${e.node} has no app`);return{class:"node",node:t,app:l,scopes:await x(e.app,e.sub,e.grant,e.scopes,a),launched:e.scopes,cwd:r.cwd,...await N(r.cwd,r.profile_id,n,a),profile:r.profile_id===null?null:await a.profile(r.profile_id,l)}}p(ne,"readerFor");async function B(o,e,n,a=w(o),t=!1){const r=await o.prepare("SELECT o.* FROM objects o WHERE o.id = ? AND o.type = 'node'").get(e),l=await o.prepare(`SELECT (SELECT external_id FROM identities WHERE object = nodes.app) AS grantee,
+    sub, grant_id, scopes_json, cwd, profile_id, app FROM nodes WHERE node_id = ?`).get(e);if(!r||!l)throw new Error(`no node ${e}`);const{grantee:c,sub:s,grant_id:i,scopes_json:u,cwd:f,profile_id:g,app:h}=l,m=h===null?null:await a.object(h);if(!m)throw new Error(`node ${e} has no app`);const _=u===null?null:JSON.parse(u);return{class:"node",node:r,app:m,scopes:await x(c,s??"",i,_,a,t),launched:_,cwd:f,...await N(f,g,n,a),profile:g===null?null:await a.profile(g,m)}}p(B,"readerForNode");async function re(o,e,n=async()=>[],a=w(o)){const t=await o.prepare("SELECT envelope_json FROM peer_stubs WHERE object = ?").get(e.id);if(t!==void 0)return await J(o,e,t.envelope_json===null?null:JSON.parse(t.envelope_json),a);if(e.type==="node")return await B(o,e.id,n,a,!0);const r=e.owner===null?null:await a.object(e.owner);if(!r)throw new Error(`watcher ${e.id} has no owner`);const c=(r.type==="app"?r:r.type==="profile"&&r.owner!==null?await a.object(r.owner):null)??await o.prepare("SELECT o.* FROM identities i JOIN objects o ON o.id = i.object WHERE i.external_id = 'app:terminal' AND i.scheme = 'app'").get()??await o.prepare("SELECT * FROM objects WHERE type = 'person' AND name = 'user' AND home_machine IS NULL").get();if(!c)throw new Error("no terminal app or person object");const s=(await o.prepare("SELECT external_id FROM identities WHERE object = ? AND scheme = 'app'").get(c.id))?.external_id??"app:terminal",i=await o.prepare("SELECT resolved_scopes_json FROM grants WHERE grantee = ? AND status = 'active'").all(s),u=r.type==="person"?null:i.length===0?a.pluginScopes(s):i.length===1?JSON.parse(i[0].resolved_scopes_json).filter(f=>f.mode==="always").map(f=>R(f.scope)):null;return{class:"object",object:e,node:e,owner:r,app:c,scopes:u,repos:r.type==="repo"?[r]:[]}}p(re,"readerForObject");async function ae(o,e,n){const a=(await o.prepare("SELECT external_id FROM identities WHERE object = ? AND scheme = 'app'").get(e.id))?.external_id;if(a===void 0)return null;const t=await o.prepare("SELECT resolved_scopes_json FROM grants WHERE grantee = ? AND status = 'active'").all(a);return t.length===0?n.pluginScopes(a):t.length>1?null:JSON.parse(t[0].resolved_scopes_json).filter(r=>r.mode==="always").map(r=>R(r.scope))}p(ae,"appScopesNow");async function J(o,e,n,a){const t=await j(o);if(n!==null&&n.app===null)return{class:"object",object:e,node:e,owner:t,app:t,scopes:null,repos:[]};const r=n?.app==null?null:await E(o,n.app),l=n?.app==null?null:await a.grantFor(n.app,n.sub),c=n===null||l===null?null:n.node_scopes===null?l.resolved:n.node_scopes.filter(i=>d(l.resolved,i)),s=r??(e.owner===null?t:await a.object(e.owner)??t);return{class:"object",object:e,node:e,owner:s,app:s,scopes:c,launched:n?.node_scopes??null,repos:[],...n?.place==null?{}:{place:n.place}}}p(J,"readerForStub");function w(o){return{grantById:O,grantFor:v,pluginScopes:p(e=>A(e.replace(/^app:/,""))?.scopes??null,"pluginScopes"),object:p(async e=>await H(o,e),"object"),profile:p(async(e,n)=>await I(o,e,n),"profile"),projectPaths:p(e=>C()?[]:M(e)?.manifest.projects.map(n=>n.path)??[],"projectPaths")}}p(w,"liveLookups");function se(o){const e=w(o),n=new Map,a=p((t,r)=>(n.has(t)||n.set(t,r()),n.get(t)),"memo");return{grantById:p(t=>a(`g\0${t}`,()=>e.grantById(t)),"grantById"),grantFor:p((t,r)=>a(`a\0${t}\0${r}`,()=>e.grantFor(t,r)),"grantFor"),pluginScopes:p(t=>a(`t\0${t}`,()=>e.pluginScopes(t)),"pluginScopes"),object:p(async t=>await a(`o\0${t}`,async()=>await e.object(t)),"object"),profile:p(async(t,r)=>await a(`p\0${t}\0${r.id}`,async()=>await e.profile(t,r)),"profile"),projectPaths:p(t=>a(`j\0${t}`,()=>e.projectPaths(t)),"projectPaths")}}p(se,"publishLookups");async function x(o,e,n,a,t,r=!1){const l=n?await t.grantById(n):await t.grantFor(o,e),c=l&&l.grantee===o?l.resolved:null;if(c===null){if(r)return null;throw new Error(`the grant of ${o} is not active`)}return a===null?c:a.filter(s=>d(c,s))}p(x,"nodeScopes");async function j(o){return await D(o,P())}p(j,"personObject");async function E(o,e){return await y(o,"app","app",e,e.replace(/^app:/,""))}p(E,"appObject");async function I(o,e,n){return await o.prepare(`SELECT o.* FROM identities i JOIN objects o ON o.id = i.object
+    WHERE i.scheme = 'profile' AND i.external_id = ?`).get(e)??await y(o,"profile","profile",e,T(e).manifest.name,n)}p(I,"profileObject");export{ae as appScopesNow,w as liveLookups,I as profileObject,se as publishLookups,ne as readerFor,B as readerForNode,re as readerForObject,N as viewRepos,te as warmNodeRepos};

package/dist/core/graph/repo-sync/identity.d.ts

@@ -25,6 +25,8 @@ export declare function normalizeRemoteUrl(url: string, base?: string): string;
 /** Owner handle a new repo object takes: the last segment of its external id (the normalized remote path, or the folder of a local-path repo), without `.git`. */
 export declare function handleHint(externalId: string): string;
 export declare function identifyCheckout(dir: string): CheckoutIdentity;
+/** `identifyCheckout` without blocking the event loop: the same parsing and cache, git run through `gitAsync`. */
+export declare function identifyCheckoutAsync(dir: string): Promise<CheckoutIdentity>;
 /** Checkouts enclosing `dir`, innermost first; stops at the first directory
  *  that is not in a repo. A failed lookup ends the chain and is returned last. */
-export declare function checkoutChain(dir: string): CheckoutIdentity[];
+export declare function checkoutChain(dir: string): Promise<CheckoutIdentity[]>;

package/dist/core/graph/repo-sync/identity.js

@@ -1 +1 @@
-var C=Object.defineProperty;var u=(o,e)=>C(o,"name",{value:e,configurable:!0});import{existsSync as O}from"node:fs";import{basename as g,dirname as k,isAbsolute as v,resolve as $}from"node:path";import{gitSync as x}from"../../git.js";import{realpathOrSelf as f}from"../../fs-utils.js";const p=5e3,M=6e4,h=new Map;function b(o,e){const r=o.trim();let t,s;const l=/^([a-z][a-z0-9+.-]*):\/\//i.exec(r);if(l){if(l[1].toLowerCase()==="file")return`file:${w(decodeURIComponent(r.slice(7)),e)}`;const i=r.slice(l[0].length),a=i.indexOf("/"),c=a<0?i:i.slice(0,a);s=a<0?"":i.slice(a),t=c.replace(/^.*@/,"").replace(/:\d*$/,"")}else{const i=/^(?:[^@/]+@)?([^:/]+):(.*)$/.exec(r);if(!i)return`file:${w(r,e)}`;t=i[1],s=i[2]}return s=s.replace(/^\/*~?/,"").replace(/\/+$/,"").replace(/\.git$/i,"").replace(/\/+$/,""),`${t}/${s}`.toLowerCase()}u(b,"normalizeRemoteUrl");function w(o,e){const r=v(o)?o:$(e??process.cwd(),o);return f(r).replace(/\/+$/,"")||"/"}u(w,"localPath");function y(o){const e=o.startsWith("file:")?o.slice(5):o;return g(e).replace(/\.git$/i,"")||"repo"}u(y,"handleHint");function L(o){const e=f($(o)),r=h.get(e);if(r&&Date.now()-r.at<M)return r.id;if(!O(e))return{ok:!1,code:"not-a-repo",dir:e,reason:"directory does not exist"};const t=x(["rev-parse","--path-format=absolute","--show-toplevel","--git-common-dir"],e,void 0,{timeoutMs:p});if(t.timedOut)return{ok:!1,code:"git-lookup-failed",dir:e,reason:`git lookup timed out after ${p}ms`};if(t.status!==0){if(/not a git repository/i.test(t.stderr)){const n={ok:!1,code:"not-a-repo",dir:e,reason:t.stderr.trim()};return h.set(e,{at:Date.now(),id:n}),n}return{ok:!1,code:"git-lookup-failed",dir:e,reason:t.stderr.trim()||t.processError||`git rev-parse exited ${t.status}`}}const[s,l]=t.stdout.split(/\r?\n/).map(n=>n.trim());if(!s||!l)return{ok:!1,code:"git-lookup-failed",dir:e,reason:"git rev-parse returned no work tree (bare repository?)"};const i=f(s),a=f(l),c=x(["remote","get-url","origin"],i,void 0,{timeoutMs:p});if(c.timedOut)return{ok:!1,code:"git-lookup-failed",dir:e,reason:`git remote lookup timed out after ${p}ms`};let d;const m=c.stdout.trim();if(c.status===0&&m!==""){const n=b(m,i);d={ok:!0,scheme:"git",externalId:n,remoteUrl:m,root:i,commonDir:a,handleHint:y(n)}}else if(/no such remote/i.test(c.stderr)){const n=g(a)===".git"?k(a):a;d={ok:!0,scheme:"local-path",externalId:n,root:i,handleHint:y(n)}}else return{ok:!1,code:"git-lookup-failed",dir:e,reason:c.stderr.trim()||`git remote get-url exited ${c.status}`};return h.set(e,{at:Date.now(),id:d}),d}u(L,"identifyCheckout");function z(o){const e=[];let r=o;for(;;){const t=L(r);if(!t.ok)return t.code==="git-lookup-failed"&&e.push(t),e;e.push(t);const s=k(t.root);if(s===t.root)return e;r=s}}u(z,"checkoutChain");export{z as checkoutChain,y as handleHint,L as identifyCheckout,b as normalizeRemoteUrl};
+var L=Object.defineProperty;var a=(t,e)=>L(t,"name",{value:e,configurable:!0});import{existsSync as S}from"node:fs";import{basename as m,dirname as h,isAbsolute as U,resolve as d}from"node:path";import{gitAsync as g,gitSync as k}from"../../git.js";import{realpathOrSelf as u}from"../../fs-utils.js";const c=5e3,_=6e4,f=new Map;function A(t,e){const r=t.trim();let o,n;const s=/^([a-z][a-z0-9+.-]*):\/\//i.exec(r);if(s){if(s[1].toLowerCase()==="file")return`file:${y(decodeURIComponent(r.slice(7)),e)}`;const i=r.slice(s[0].length),l=i.indexOf("/"),E=l<0?i:i.slice(0,l);n=l<0?"":i.slice(l),o=E.replace(/^.*@/,"").replace(/:\d*$/,"")}else{const i=/^(?:[^@/]+@)?([^:/]+):(.*)$/.exec(r);if(!i)return`file:${y(r,e)}`;o=i[1],n=i[2]}return n=n.replace(/^\/*~?/,"").replace(/\/+$/,"").replace(/\.git$/i,"").replace(/\/+$/,""),`${o}/${n}`.toLowerCase()}a(A,"normalizeRemoteUrl");function y(t,e){const r=U(t)?t:d(e??process.cwd(),t);return u(r).replace(/\/+$/,"")||"/"}a(y,"localPath");function w(t){const e=t.startsWith("file:")?t.slice(5):t;return m(e).replace(/\.git$/i,"")||"repo"}a(w,"handleHint");const $=["rev-parse","--path-format=absolute","--show-toplevel","--git-common-dir"],x=["remote","get-url","origin"];function M(t){const e=f.get(t);return e&&Date.now()-e.at<_?e.id:void 0}a(M,"cached");function O(t){return S(t)?void 0:{ok:!1,code:"not-a-repo",dir:t,reason:"directory does not exist"}}a(O,"missingDir");function C(t,e){if(t.timedOut)return{done:{ok:!1,code:"git-lookup-failed",dir:e,reason:`git lookup timed out after ${c}ms`}};if(t.status!==0){if(/not a git repository/i.test(t.stderr)){const n={ok:!1,code:"not-a-repo",dir:e,reason:t.stderr.trim()};return f.set(e,{at:Date.now(),id:n}),{done:n}}return{done:{ok:!1,code:"git-lookup-failed",dir:e,reason:t.stderr.trim()||t.processError||`git rev-parse exited ${t.status}`}}}const[r,o]=t.stdout.split(/\r?\n/).map(n=>n.trim());return!r||!o?{done:{ok:!1,code:"git-lookup-failed",dir:e,reason:"git rev-parse returned no work tree (bare repository?)"}}:{root:u(r),commonDir:u(o)}}a(C,"parseRevParse");function R(t,e,r,o){if(t.timedOut)return{ok:!1,code:"git-lookup-failed",dir:e,reason:`git remote lookup timed out after ${c}ms`};let n;const s=t.stdout.trim();if(t.status===0&&s!==""){const i=A(s,r);n={ok:!0,scheme:"git",externalId:i,remoteUrl:s,root:r,commonDir:o,handleHint:w(i)}}else if(/no such remote/i.test(t.stderr)){const i=m(o)===".git"?h(o):o;n={ok:!0,scheme:"local-path",externalId:i,root:r,handleHint:w(i)}}else return{ok:!1,code:"git-lookup-failed",dir:e,reason:t.stderr.trim()||`git remote get-url exited ${t.status}`};return f.set(e,{at:Date.now(),id:n}),n}a(R,"parseOrigin");function v(t){const e=u(d(t)),r=M(e)??O(e);if(r)return r;const o=C(k($,e,void 0,{timeoutMs:c}),e);return"done"in o?o.done:R(k(x,o.root,void 0,{timeoutMs:c}),e,o.root,o.commonDir)}a(v,"identifyCheckout");const p=new Map;async function D(t){const e=u(d(t)),r=M(e)??O(e);if(r)return r;const o=p.get(e);if(o)return await o;const n=(async()=>{const s=C(await g($,e,void 0,{timeoutMs:c}),e);return"done"in s?s.done:R(await g(x,s.root,void 0,{timeoutMs:c}),e,s.root,s.commonDir)})().finally(()=>p.delete(e));return p.set(e,n),await n}a(D,"identifyCheckoutAsync");async function K(t){const e=[];let r=t;for(;;){const o=await D(r);if(!o.ok)return o.code==="git-lookup-failed"&&e.push(o),e;e.push(o);const n=h(o.root);if(n===o.root)return e;r=n}}a(K,"checkoutChain");export{K as checkoutChain,w as handleHint,v as identifyCheckout,D as identifyCheckoutAsync,A as normalizeRemoteUrl};

package/dist/core/graph/repo-sync/repos.d.ts

@@ -16,6 +16,6 @@ export declare function ensureRepo(db: CanvasDb, id: RepoIdentity, handle?: stri
 export declare function reposForCwd(db: CanvasDb, cwd: string): Promise<ObjectRow[]>;
 /** Run the git lookups for `cwd`'s checkouts now, so a later `checkoutsForCwd` inside a canvas write hits the identity
  *  cache instead of spawning git while every other db caller waits on the write lock. */
-export declare function warmCheckoutIdentities(cwd: string): void;
+export declare function warmCheckoutIdentities(cwd: string): Promise<void>;
 /** `reposForCwd` with the directory each repo is checked out at. */
 export declare function checkoutsForCwd(db: CanvasDb, cwd: string): Promise<Checkout[]>;

package/dist/core/graph/repo-sync/repos.js

@@ -1,3 +1,3 @@
 var l=Object.defineProperty;var a=(t,o)=>l(t,"name",{value:o,configurable:!0});import{resolve as c,sep as f}from"node:path";import{CrtrError as u}from"../../errors.js";import{realpathOrSelf as h}from"../../fs-utils.js";import{ExitCode as m}from"../../../types.js";import{ensureOwner as w}from"../objects.js";import{checkoutChain as d,handleHint as E}from"./identity.js";async function x(t,o,r){return await t.prepare(`SELECT o.* FROM identities i JOIN objects o ON o.id = i.object
-    WHERE o.type = 'repo' AND i.scheme = ? AND i.external_id = ?`).get(o,r)??null}a(x,"existingRepo");async function N(t,o,r){const n=await x(t,o.scheme,o.externalId);if(n)return n;const s=r??o.handleHint,p=t.prepare("SELECT 1 FROM objects WHERE name = ? AND type = 'repo' AND home_machine IS NULL");let e=s;for(let i=2;await p.get(e);i++)e=`${s}-${i}`;return await w(t,"repo",o.scheme,o.externalId,e)}a(N,"ensureRepo");async function I(t,o){return(await C(t,o)).map(r=>r.repo)}a(I,"reposForCwd");function L(t){d(h(c(t)))}a(L,"warmCheckoutIdentities");async function C(t,o){const r=h(c(o)),n=[];for(const e of d(r)){if(!e.ok)throw new u("git-lookup-failed",`cannot identify the repo at ${e.dir}: ${e.reason}`,m.GENERAL,{dir:e.dir});n.push({root:e.root,repo:await N(t,e)})}const s=await t.prepare(`SELECT o.*, i.external_id AS path FROM identities i JOIN objects o ON o.id = i.object
-    WHERE o.type = 'repo' AND i.scheme = 'local-path'`).all();for(const{path:e,...i}of s)(r===e||r.startsWith(e.endsWith(f)?e:e+f))&&n.push({root:e,repo:i});n.sort((e,i)=>i.root.length-e.root.length);const p=new Set;return n.filter(({repo:e})=>!p.has(e.id)&&(p.add(e.id),!0))}a(C,"checkoutsForCwd");export{C as checkoutsForCwd,N as ensureRepo,E as handleHint,I as reposForCwd,L as warmCheckoutIdentities};
+    WHERE o.type = 'repo' AND i.scheme = ? AND i.external_id = ?`).get(o,r)??null}a(x,"existingRepo");async function N(t,o,r){const n=await x(t,o.scheme,o.externalId);if(n)return n;const s=r??o.handleHint,p=t.prepare("SELECT 1 FROM objects WHERE name = ? AND type = 'repo' AND home_machine IS NULL");let e=s;for(let i=2;await p.get(e);i++)e=`${s}-${i}`;return await w(t,"repo",o.scheme,o.externalId,e)}a(N,"ensureRepo");async function I(t,o){return(await y(t,o)).map(r=>r.repo)}a(I,"reposForCwd");async function L(t){await d(h(c(t)))}a(L,"warmCheckoutIdentities");async function y(t,o){const r=h(c(o)),n=[];for(const e of await d(r)){if(!e.ok)throw new u("git-lookup-failed",`cannot identify the repo at ${e.dir}: ${e.reason}`,m.GENERAL,{dir:e.dir});n.push({root:e.root,repo:await N(t,e)})}const s=await t.prepare(`SELECT o.*, i.external_id AS path FROM identities i JOIN objects o ON o.id = i.object
+    WHERE o.type = 'repo' AND i.scheme = 'local-path'`).all();for(const{path:e,...i}of s)(r===e||r.startsWith(e.endsWith(f)?e:e+f))&&n.push({root:e,repo:i});n.sort((e,i)=>i.root.length-e.root.length);const p=new Set;return n.filter(({repo:e})=>!p.has(e.id)&&(p.add(e.id),!0))}a(y,"checkoutsForCwd");export{y as checkoutsForCwd,N as ensureRepo,E as handleHint,I as reposForCwd,L as warmCheckoutIdentities};