@north-light/cli 0.3.530 → 0.3.531

package/dist/core/substrate/delivery/render-boot.js

@@ -1,35 +1,35 @@
-var Y=Object.defineProperty;var l=(e,s)=>Y(e,"name",{value:s,configurable:!0});import{heldAtOrAbove as $,hold as _,freezePreferences as F}from"../../graph/exposures.js";import{interpolateNodePaths as z}from"../../canvas/paths.js";import{buildSubPersonaMenu as B}from"./sub-persona-menu.js";import{rungAtLeast as k}from"../schema.js";import{loadCorpus as A}from"./corpus.js";import{listingPrefixes as H}from"./listings.js";import{bootPartitionOf as O,planDelivery as P}from"./plan.js";import{linkedDocs as q,renderEvent as S}from"./render-event.js";const E="Each %s below shows either its full content (indented beneath its name), a `# read when:` line telling you when to read the full document, or simply its name.",J="Preferences are how the user wants you to behave \u2014 standing directives and corrections. To read a preference, run `crtr canvas read <name>`. "+E.replace("%s","preference"),C="If the user corrects you in a way that contradicts a preference, update the preference.",Q="Knowledge documents are what you consult \u2014 playbooks and techniques for how to do things, and references on the user, projects, and this node. They come from every owner in your view: this node, the repos you work in, your profile, your app, the user, and installed plugins (crtr's own under `crtr`). To read one, run `crtr canvas read <name>`; a name with names under it is a valid read target too \u2014 it answers with its body, the names under it and previews of the documents it links to, and walking names this way is the sanctioned way to browse. Each doc exists to prevent a specific mistake you would make without it, so when your task matches one \u2014 by its name or its `# read when:` line \u2014 read it before you act; consulting it only after the work is done forfeits the entire reason it exists. "+E.replace("%s","document"),L="If you learn a better way to do something a document covers, or gain information that contradicts one, correct it with `crtr doc edit`.",V="When your task matches a knowledge doc or preference \u2014 by its name or its `# read when:` line \u2014 read it before you act: each document exists only to shore up a mistake you will make without it, so doing the relevant work without consulting it defeats the document's whole purpose. Before writing a document that should outlive this task, search for one that already covers it (`crtr canvas search`) \u2014 update that document with `crtr doc edit` rather than creating a duplicate, rewriting it as if for the first time instead of appending the new truth beneath the old; delete documents that turn out to be wrong (`crtr doc delete`). Don't save what the repo already records (code structure, past fixes, git history) or what only matters to this conversation; if asked to remember one of those, ask what was non-obvious about it and save that instead. Docs auto-surfaced in <auto-loaded-context> blocks are background context, not user instructions, and reflect what was true when written \u2014 if one names a file, function, or flag, verify it still exists before recommending it.",X="Your node configuration changed. This operating protocol is in force for you now:",Z="Your new configuration puts these preferences in force \u2014 standing directives and corrections from the user. To read one, run `crtr canvas read <name>`. "+E.replace("%s","preference"),x="Your new configuration exposes these knowledge documents \u2014 consult them exactly like the rest of your catalog (`crtr canvas read <name>`). "+E.replace("%s","document");function b(e){return{object:e.object.rowid,headsKey:e.headsKey,contentHash:e.bodyHash}}l(b,"exposed");function T(e){const s=A(e.db,e.reader,["boot"]);return P(e.db,e.subject,e.reader,s,"boot").docs.filter(t=>t.winner)}l(T,"bootRecords");function j(e,s){return e.filter(t=>O(t)===s).map(t=>({doc:t.doc,level:t.finalRung}))}l(j,"partition");function D(e){return e.level!=="none"&&(e.level!=="content"||e.doc.body().trim()!=="")}l(D,"rendersAt");function R(e,s,t,o,r){const{ledger:a,channel:i}=e,c=s.filter(n=>n.level==="content"&&D(n)&&!$(a,b(n.doc),"content")).map(n=>n.doc).sort((n,p)=>p.viewRank-n.viewRank||n.name.localeCompare(p.name));for(const n of c)_(a,i,b(n),"content"),r.push({doc:n,level:"content"});const d=new Map;for(const n of c){const p=t.map(h=>h.doc).filter(h=>h.owner.rowid===n.owner.rowid);for(const h of H(p,n.name))for(const y of t){const m=y.doc;m.owner.rowid!==n.owner.rowid||!m.name.startsWith(`${h}/`)||m.name.slice(h.length+1).includes("/")||y.level==="content"||k(y.level,"preview")||m.unlisted||!m.ownNode&&!k(m.limit,"preview")||$(a,b(m),"preview")||d.set(m.object.rowid,{doc:m,level:"preview",cause:"directory listing attached to content delivery"})}}const u=new Map(t.map(n=>[n.doc.object.rowid,n])),v=new Set(c.map(n=>n.object.rowid));for(const n of c)for(const p of q(e.db,e.reader,n)){const h=p.object.rowid,y=u.get(h);d.has(h)||v.has(h)||y!==void 0&&k(y.level,"preview")||O({doc:p})===O({doc:n})&&(!p.ownNode&&!k(p.limit,"preview")||$(a,b(p),"preview")||d.set(h,{doc:y?.doc??p,level:"preview",cause:"link preview attached to content delivery"}))}const g=c.map(n=>S(e,"document-read",{doc:n})).flatMap(({content:n,delivered:p})=>(r.push(...p),n===""?[]:[n])),w=s.filter(n=>n.level!=="content").map(n=>d.get(n.doc.object.rowid)??n),f=new Set(w.map(n=>n.doc.object.rowid));w.push(...[...d.values()].filter(n=>!f.has(n.doc.object.rowid)));for(const n of w)D(n)&&(_(a,i,b(n.doc),n.level),r.push({doc:n.doc,level:n.level,...n.cause===void 0?{}:{cause:n.cause}}));return{content:c,attachments:g,tree:ne(w,o)}}l(R,"renderGrouped");function I(e){return{segment:e,own:null,dirs:new Map,leaves:new Map,hidden:0,renders:!1,count:0}}l(I,"newDir");const ee=l(e=>k(e,"name"),"visible");function M(e,s){let t=e.hidden;for(const o of e.dirs.values())t+=M(o,e.segment==="");return e.renders=e.own!==null||e.leaves.size>0||[...e.dirs.values()].some(o=>o.renders)||s||e.segment==="",e.count=e.renders?t:0,e.renders?0:t}l(M,"resolveDir");function G(e,s,t){const o=e.level==="preview"?e.doc.preview.trim():"";return o===""?`${t}${s}`:`${t}${s}  # read when: ${o}`}l(G,"entryLine");function K(e,s,t){const o=[...[...e.dirs.values()].filter(r=>r.renders).map(r=>({name:r.segment,dir:r})),...[...e.leaves].map(([r,a])=>({name:r,leaf:a}))].sort((r,a)=>r.name.localeCompare(a.name));e.count>0&&o.push({name:"",more:e.count}),o.forEach((r,a)=>{const i=a===o.length-1,c=s+(i?"\u2514\u2500 ":"\u251C\u2500 ");if("more"in r)t.push(`${c}[+${r.more} more]`);else if(r.dir!==void 0){const d=`${r.dir.segment}/`;t.push(r.dir.own===null?`${c}${d}`:G(r.dir.own,d,c)),K(r.dir,s+(i?"   ":"\u2502  "),t)}else t.push(G(r.leaf,r.name,c))})}l(K,"renderChildren");function ne(e,s){if(e.length===0)return"";const t=I(""),o=l(i=>{let c=t;for(const d of i){let u=c.dirs.get(d);u===void 0&&c.dirs.set(d,u=I(d)),c=u}return c},"dirAt"),r=new Set(e.map(i=>i.doc.displayName));for(const i of e){const c=i.doc.displayName.split("/"),d=[...r].some(u=>u.startsWith(`${i.doc.displayName}/`));ee(i.level)?d?o(c).own=i:o(c.slice(0,-1)).leaves.set(c[c.length-1],i):o(d?c:c.slice(0,-1)).hidden+=1}M(t,!1);const a=[s];return K(t,"",a),a.join(`
-`)}l(ne,"buildTree");function N(e,s){const{reader:t}=e;return t.class==="node"?z(s,t.node.id,t.app.name):s}l(N,"interpolate");function W(e){return e.shipped}l(W,"isShipped");function U(e){const s=e.content.filter(W).map(o=>o.body().trim()).filter(o=>o!==""),t=e.content.filter(o=>!W(o)).map(o=>o.body().trim()===""?"":`<preference name="${o.displayName}">
+var Y=Object.defineProperty;var l=(e,s)=>Y(e,"name",{value:s,configurable:!0});import{heldAtOrAbove as $,hold as _,freezePreferences as F}from"../../graph/exposures.js";import{interpolateNodePaths as z}from"../../canvas/paths.js";import{buildSubPersonaMenu as B}from"./sub-persona-menu.js";import{rungAtLeast as k}from"../schema.js";import{loadCorpus as A}from"./corpus.js";import{listingPrefixes as H}from"./listings.js";import{bootPartitionOf as O,planDelivery as P}from"./plan.js";import{linkedDocs as q,renderEvent as S}from"./render-event.js";import{mapAsync as J}from"../../async-array.js";const E="Each %s below shows either its full content (indented beneath its name), a `# read when:` line telling you when to read the full document, or simply its name.",Q="Preferences are how the user wants you to behave \u2014 standing directives and corrections. To read a preference, run `crtr canvas read <name>`. "+E.replace("%s","preference"),C="If the user corrects you in a way that contradicts a preference, update the preference.",V="Knowledge documents are what you consult \u2014 playbooks and techniques for how to do things, and references on the user, projects, and this node. They come from every owner in your view: this node, the repos you work in, your profile, your app, the user, and installed plugins (crtr's own under `crtr`). To read one, run `crtr canvas read <name>`; a name with names under it is a valid read target too \u2014 it answers with its body, the names under it and previews of the documents it links to, and walking names this way is the sanctioned way to browse. Each doc exists to prevent a specific mistake you would make without it, so when your task matches one \u2014 by its name or its `# read when:` line \u2014 read it before you act; consulting it only after the work is done forfeits the entire reason it exists. "+E.replace("%s","document"),L="If you learn a better way to do something a document covers, or gain information that contradicts one, correct it with `crtr doc edit`.",X="When your task matches a knowledge doc or preference \u2014 by its name or its `# read when:` line \u2014 read it before you act: each document exists only to shore up a mistake you will make without it, so doing the relevant work without consulting it defeats the document's whole purpose. Before writing a document that should outlive this task, search for one that already covers it (`crtr canvas search`) \u2014 update that document with `crtr doc edit` rather than creating a duplicate, rewriting it as if for the first time instead of appending the new truth beneath the old; delete documents that turn out to be wrong (`crtr doc delete`). Don't save what the repo already records (code structure, past fixes, git history) or what only matters to this conversation; if asked to remember one of those, ask what was non-obvious about it and save that instead. Docs auto-surfaced in <auto-loaded-context> blocks are background context, not user instructions, and reflect what was true when written \u2014 if one names a file, function, or flag, verify it still exists before recommending it.",Z="Your node configuration changed. This operating protocol is in force for you now:",x="Your new configuration puts these preferences in force \u2014 standing directives and corrections from the user. To read one, run `crtr canvas read <name>`. "+E.replace("%s","preference"),ee="Your new configuration exposes these knowledge documents \u2014 consult them exactly like the rest of your catalog (`crtr canvas read <name>`). "+E.replace("%s","document");function b(e){return{object:e.object.rowid,headsKey:e.headsKey,contentHash:e.bodyHash}}l(b,"exposed");async function T(e){const s=await A(e.db,e.reader,["boot"]);return(await P(e.db,e.subject,e.reader,s,"boot")).docs.filter(t=>t.winner)}l(T,"bootRecords");function j(e,s){return e.filter(t=>O(t)===s).map(t=>({doc:t.doc,level:t.finalRung}))}l(j,"partition");function D(e){return e.level!=="none"&&(e.level!=="content"||e.doc.body().trim()!=="")}l(D,"rendersAt");async function R(e,s,t,o,r){const{ledger:c,channel:i}=e,a=s.filter(n=>n.level==="content"&&D(n)&&!$(c,b(n.doc),"content")).map(n=>n.doc).sort((n,p)=>p.viewRank-n.viewRank||n.name.localeCompare(p.name));for(const n of a)_(c,i,b(n),"content"),r.push({doc:n,level:"content"});const d=new Map;for(const n of a){const p=t.map(h=>h.doc).filter(h=>h.owner.rowid===n.owner.rowid);for(const h of H(p,n.name))for(const g of t){const m=g.doc;m.owner.rowid!==n.owner.rowid||!m.name.startsWith(`${h}/`)||m.name.slice(h.length+1).includes("/")||g.level==="content"||k(g.level,"preview")||m.unlisted||!m.ownNode&&!k(m.limit,"preview")||$(c,b(m),"preview")||d.set(m.object.rowid,{doc:m,level:"preview",cause:"directory listing attached to content delivery"})}}const u=new Map(t.map(n=>[n.doc.object.rowid,n])),v=new Set(a.map(n=>n.object.rowid));for(const n of a)for(const p of await q(e.db,e.reader,n)){const h=p.object.rowid,g=u.get(h);d.has(h)||v.has(h)||g!==void 0&&k(g.level,"preview")||O({doc:p})===O({doc:n})&&(!p.ownNode&&!k(p.limit,"preview")||$(c,b(p),"preview")||d.set(h,{doc:g?.doc??p,level:"preview",cause:"link preview attached to content delivery"}))}const y=(await J(a,async n=>await S(e,"document-read",{doc:n}))).flatMap(({content:n,delivered:p})=>(r.push(...p),n===""?[]:[n])),w=s.filter(n=>n.level!=="content").map(n=>d.get(n.doc.object.rowid)??n),f=new Set(w.map(n=>n.doc.object.rowid));w.push(...[...d.values()].filter(n=>!f.has(n.doc.object.rowid)));for(const n of w)D(n)&&(_(c,i,b(n.doc),n.level),r.push({doc:n.doc,level:n.level,...n.cause===void 0?{}:{cause:n.cause}}));return{content:a,attachments:y,tree:te(w,o)}}l(R,"renderGrouped");function I(e){return{segment:e,own:null,dirs:new Map,leaves:new Map,hidden:0,renders:!1,count:0}}l(I,"newDir");const ne=l(e=>k(e,"name"),"visible");function M(e,s){let t=e.hidden;for(const o of e.dirs.values())t+=M(o,e.segment==="");return e.renders=e.own!==null||e.leaves.size>0||[...e.dirs.values()].some(o=>o.renders)||s||e.segment==="",e.count=e.renders?t:0,e.renders?0:t}l(M,"resolveDir");function G(e,s,t){const o=e.level==="preview"?e.doc.preview.trim():"";return o===""?`${t}${s}`:`${t}${s}  # read when: ${o}`}l(G,"entryLine");function K(e,s,t){const o=[...[...e.dirs.values()].filter(r=>r.renders).map(r=>({name:r.segment,dir:r})),...[...e.leaves].map(([r,c])=>({name:r,leaf:c}))].sort((r,c)=>r.name.localeCompare(c.name));e.count>0&&o.push({name:"",more:e.count}),o.forEach((r,c)=>{const i=c===o.length-1,a=s+(i?"\u2514\u2500 ":"\u251C\u2500 ");if("more"in r)t.push(`${a}[+${r.more} more]`);else if(r.dir!==void 0){const d=`${r.dir.segment}/`;t.push(r.dir.own===null?`${a}${d}`:G(r.dir.own,d,a)),K(r.dir,s+(i?"   ":"\u2502  "),t)}else t.push(G(r.leaf,r.name,a))})}l(K,"renderChildren");function te(e,s){if(e.length===0)return"";const t=I(""),o=l(i=>{let a=t;for(const d of i){let u=a.dirs.get(d);u===void 0&&a.dirs.set(d,u=I(d)),a=u}return a},"dirAt"),r=new Set(e.map(i=>i.doc.displayName));for(const i of e){const a=i.doc.displayName.split("/"),d=[...r].some(u=>u.startsWith(`${i.doc.displayName}/`));ne(i.level)?d?o(a).own=i:o(a.slice(0,-1)).leaves.set(a[a.length-1],i):o(d?a:a.slice(0,-1)).hidden+=1}M(t,!1);const c=[s];return K(t,"",c),c.join(`
+`)}l(te,"buildTree");function N(e,s){const{reader:t}=e;return t.class==="node"?z(s,t.node.id,t.app.name):s}l(N,"interpolate");function W(e){return e.shipped}l(W,"isShipped");function U(e){const s=e.content.filter(W).map(o=>o.body().trim()).filter(o=>o!==""),t=e.content.filter(o=>!W(o)).map(o=>o.body().trim()===""?"":`<preference name="${o.displayName}">
 ${o.body().trim()}
-</preference>`).filter(o=>o!=="");return{shipped:s,editable:t}}l(U,"preferenceParts");function ue(e){if(e.ledger.preferenceSnapshot!==null)return{content:e.ledger.preferenceSnapshot,delivered:[]};const s={...e,channel:"system"},t=[];let o=[],r=V;if(e.subject!==null){const i=j(T(s),"preference"),c=R(s,i,i,"preferences",t),{shipped:d,editable:u}=U(c),v=B(e.subject.kind);o=[...d,...c.attachments,...v===""?[]:[v]],(u.length>0||c.tree!=="")&&(r+=`
+</preference>`).filter(o=>o!=="");return{shipped:s,editable:t}}l(U,"preferenceParts");async function pe(e){if(e.ledger.preferenceSnapshot!==null)return{content:e.ledger.preferenceSnapshot,delivered:[]};const s={...e,channel:"system"},t=[];let o=[],r=X;if(e.subject!==null){const i=j(await T(s),"preference"),a=await R(s,i,i,"preferences",t),{shipped:d,editable:u}=U(a),v=B(e.subject.kind);o=[...d,...a.attachments,...v===""?[]:[v]],(u.length>0||a.tree!=="")&&(r+=`
 
-${J}`,u.length>0&&(r+=`
+${Q}`,u.length>0&&(r+=`
 
 ${u.join(`
 
-`)}`),c.tree!==""&&(r+=`
+`)}`),a.tree!==""&&(r+=`
 
-${c.tree}`),r+=`
+${a.tree}`),r+=`
 
-${C}`)}const a=[...o,`<memory kind="preference">
+${C}`)}const c=[...o,`<memory kind="preference">
 ${r}
 </memory>`].join(`
 
-`);return{content:F(e.ledger,N(e,a)),delivered:t}}l(ue,"renderPreferences");function fe(e){const s=[],t=j(T(e),"knowledge"),o=R(e,t,t,"knowledge",s),r=[...o.content.map(i=>i.body().trim()),...o.attachments].filter(i=>i!=="");if(r.length===0&&o.tree==="")return{content:"",delivered:s};let a=Q;return r.length>0&&(a+=`
+`);return{content:F(e.ledger,N(e,c)),delivered:t}}l(pe,"renderPreferences");async function he(e){const s=[],t=j(await T(e),"knowledge"),o=await R(e,t,t,"knowledge",s),r=[...o.content.map(i=>i.body().trim()),...o.attachments].filter(i=>i!=="");if(r.length===0&&o.tree==="")return{content:"",delivered:s};let c=V;return r.length>0&&(c+=`
 
 ${r.join(`
 
-`)}`),o.tree!==""&&(a+=`
+`)}`),o.tree!==""&&(c+=`
 
-${o.tree}`),a+=`
+${o.tree}`),c+=`
 
 ${L}`,{content:N(e,`<memory kind="knowledge">
-${a}
-</memory>`),delivered:s}}l(fe,"renderKnowledge");function pe(e){const s=A(e.db,e.reader,["workspace-open"]),t=P(e.db,e.subject,e.reader,s,"workspace-open").docs.filter(a=>a.winner).map(a=>a.doc).sort((a,i)=>i.viewRank-a.viewRank||a.object.rowid-i.object.rowid),{content:o,delivered:r}=S(e,"workspace-open",{},t);return{content:N(e,o),delivered:r}}l(pe,"renderWorkspaceOpen");function he(e){const{ledger:s}=e,t=[],o=T(e),r=l(f=>f.filter(n=>D(n)&&!$(s,b(n.doc),n.level)),"fresh"),a=j(o,"preference"),i=R(e,r(a),a,"preferences",t),{shipped:c,editable:d}=U(i),u=[];if((c.length>0||i.attachments.length>0)&&u.push(`${X}
+${c}
+</memory>`),delivered:s}}l(he,"renderKnowledge");async function me(e){const s=await A(e.db,e.reader,["workspace-open"]),t=(await P(e.db,e.subject,e.reader,s,"workspace-open")).docs.filter(c=>c.winner).map(c=>c.doc).sort((c,i)=>i.viewRank-c.viewRank||c.object.rowid-i.object.rowid),{content:o,delivered:r}=await S(e,"workspace-open",{},t);return{content:N(e,o),delivered:r}}l(me,"renderWorkspaceOpen");async function we(e){const{ledger:s}=e,t=[],o=await T(e),r=l(f=>f.filter(n=>D(n)&&!$(s,b(n.doc),n.level)),"fresh"),c=j(o,"preference"),i=await R(e,r(c),c,"preferences",t),{shipped:a,editable:d}=U(i),u=[];if((a.length>0||i.attachments.length>0)&&u.push(`${Z}
 
-${[...c,...i.attachments].join(`
+${[...a,...i.attachments].join(`
 
-`)}`),d.length>0||i.tree!==""){let f=Z;d.length>0&&(f+=`
+`)}`),d.length>0||i.tree!==""){let f=x;d.length>0&&(f+=`
 
 ${d.join(`
 
@@ -39,16 +39,16 @@ ${i.tree}`),f+=`
 
 ${C}`,u.push(`<memory kind="preference">
 ${f}
-</memory>`)}const v=j(o,"knowledge"),g=R(e,r(v),v,"knowledge",t),w=[...g.content.map(f=>f.body().trim()),...g.attachments].filter(f=>f!=="");if(w.length>0||g.tree!==""){let f=x;w.length>0&&(f+=`
+</memory>`)}const v=j(o,"knowledge"),y=await R(e,r(v),v,"knowledge",t),w=[...y.content.map(f=>f.body().trim()),...y.attachments].filter(f=>f!=="");if(w.length>0||y.tree!==""){let f=ee;w.length>0&&(f+=`
 
 ${w.join(`
 
-`)}`),g.tree!==""&&(f+=`
+`)}`),y.tree!==""&&(f+=`
 
-${g.tree}`),f+=`
+${y.tree}`),f+=`
 
 ${L}`,u.push(`<memory kind="knowledge">
 ${f}
 </memory>`)}return{content:u.length===0?"":N(e,u.join(`
 
-`)),delivered:t}}l(he,"renderConfigDelta");export{he as renderConfigDelta,fe as renderKnowledge,ue as renderPreferences,pe as renderWorkspaceOpen};
+`)),delivered:t}}l(we,"renderConfigDelta");export{we as renderConfigDelta,he as renderKnowledge,pe as renderPreferences,me as renderWorkspaceOpen};

package/dist/core/substrate/delivery/render-event.d.ts

@@ -1,17 +1,10 @@
-/** Event rendering for the row-backed delivery engine: plan an activity, render
- *  each winner the ledger does not already hold, and for every content
- *  delivery attach its prefix listings and link previews and chain its `document-read` rules
- *  until nothing new is delivered. Every rendered document is held in the
- *  in-memory `ledger`; persisting it is the caller's. Envelope markup is the
- *  `<memory>` / `<memory-listing>` / `<auto-loaded-context>` shape that
- *  `pi-extensions/envelope-merge.ts` parses. */
-import type { DatabaseSync } from 'node:sqlite';
 import { type Channel, type Ledger } from '../../graph/exposures.js';
 import type { Reader, RuleOn } from '../../graph/types.js';
 import type { Rung } from '../schema.js';
 import type { NodeConfigSubject } from '../subject-fields.js';
 import { type DeliveryPayload } from './plan.js';
 import type { DeliveryDoc } from './types.js';
+import type { CanvasDb } from '../../canvas/db.js';
 export type DeliveryCause = 'directory listing attached to content delivery' | 'link preview attached to content delivery' | 'memory-read companion of content delivery';
 export interface DeliveredDoc {
     doc: DeliveryDoc;
@@ -20,7 +13,7 @@ export interface DeliveredDoc {
     cause?: DeliveryCause;
 }
 export interface RenderContext {
-    db: DatabaseSync;
+    db: CanvasDb;
     reader: Reader;
     subject: NodeConfigSubject | null;
     ledger: Ledger;
@@ -33,22 +26,22 @@ export declare function wrapAutoLoaded(blocks: readonly string[]): string;
 /** The live documents `doc`'s current revision links to that the reader may
  *  read, in link order, without `doc` itself. Remote and unresolved links have
  *  no `links-to` edge, so they never appear. */
-export declare function linkedDocs(db: DatabaseSync, reader: Reader, doc: DeliveryDoc): DeliveryDoc[];
+export declare function linkedDocs(db: CanvasDb, reader: Reader, doc: DeliveryDoc): Promise<DeliveryDoc[]>;
 /** Deliver one activity. `corpus` overrides the reader's own corpus for `on`
  *  (the file-read corpus also carries the rules of repos enclosing the file). */
-export declare function renderEvent(ctx: RenderContext, on: RuleOn, payload: DeliveryPayload, corpus?: readonly DeliveryDoc[]): {
+export declare function renderEvent(ctx: RenderContext, on: RuleOn, payload: DeliveryPayload, corpus?: readonly DeliveryDoc[]): Promise<{
     content: string;
     delivered: DeliveredDoc[];
-};
+}>;
 /** What a document the node read on purpose brings with it: its own prefix
  *  listing unfiltered (`listing`), the documents it links to not yet held at
  *  preview (`linked`, held at preview now), enclosing listings and chained
  *  `document-read` deliveries (`attachments`, wrapped). With `ownAsBlock`
  *  (a caller that renders only `attachments`), the own set rides there as a
  *  block instead. The read document itself is held at content in `ledger`. */
-export declare function renderExplicitRead(ctx: RenderContext, doc: DeliveryDoc, ownAsBlock?: boolean): {
+export declare function renderExplicitRead(ctx: RenderContext, doc: DeliveryDoc, ownAsBlock?: boolean): Promise<{
     attachments: string;
     listing?: string[];
     linked: DeliveryDoc[];
     delivered: DeliveredDoc[];
-};
+}>;

package/dist/core/substrate/delivery/render-event.js

@@ -1,8 +1,8 @@
-var A=Object.defineProperty;var s=(e,n)=>A(e,"name",{value:n,configurable:!0});import{prepared as D}from"../../sqlite-statements.js";import{canRead as E}from"../../graph/access.js";import{heldAtOrAbove as y,hold as b,holdListing as O,listedAtOrAbove as H}from"../../graph/exposures.js";import{deliveryDocOf as K,listingCorpus as L,loadCorpus as w}from"./corpus.js";import{listingBlock as R,ownSetBlock as C,listingKey as P,listingLabel as x,listingPrefixes as S,renderListing as k}from"./listings.js";import{planDelivery as B}from"./plan.js";function g(e){return e.replace(/&/g,"&amp;").replace(/"/g,"&quot;").replace(/</g,"&lt;").replace(/>/g,"&gt;")}s(g,"attr");function M(e,n){let t=`kind="${g(e.kind)}" name="${g(e.displayName)}"`;if(n==="content"){const i=e.body().trim();if(i!=="")return`<memory ${t}>
+var N=Object.defineProperty;var s=(e,n)=>N(e,"name",{value:n,configurable:!0});import{canRead as D}from"../../graph/access.js";import{heldAtOrAbove as b,hold as y,holdListing as E,listedAtOrAbove as O}from"../../graph/exposures.js";import{deliveryDocOf as H,listingCorpus as K,loadCorpus as g}from"./corpus.js";import{listingBlock as L,ownSetBlock as R,listingKey as C,listingLabel as x,listingPrefixes as P,renderListing as k}from"./listings.js";import{planDelivery as B}from"./plan.js";import{filterAsync as M,mapAsync as S}from"../../async-array.js";function v(e){return e.replace(/&/g,"&amp;").replace(/"/g,"&quot;").replace(/</g,"&lt;").replace(/>/g,"&gt;")}s(v,"attr");function W(e,n){let t=`kind="${v(e.kind)}" name="${v(e.displayName)}"`;if(n==="content"){const i=e.body().trim();if(i!=="")return`<memory ${t}>
 ${i}
-</memory>`}else n==="preview"&&e.preview.trim()!==""&&(t+=` readWhen="${g(e.preview.trim())}"`);return`<memory ${t} />`}s(M,"renderEnvelope");function j(e){return e.length===0?"":`<auto-loaded-context>
+</memory>`}else n==="preview"&&e.preview.trim()!==""&&(t+=` readWhen="${v(e.preview.trim())}"`);return`<memory ${t} />`}s(W,"renderEnvelope");function j(e){return e.length===0?"":`<auto-loaded-context>
 ${e.join(`
 `)}
-</auto-loaded-context>`}s(j,"wrapAutoLoaded");function W(e,n){let t=e.members.get(n.owner.rowid);return t===void 0&&(t=L(e.ctx.db,e.ctx.reader,n.owner),e.members.set(n.owner.rowid,t)),t}s(W,"membersOf");function I(e,n,t){return D(e,`SELECT o.* FROM edges e JOIN objects o ON o.rowid = e.dst
+</auto-loaded-context>`}s(j,"wrapAutoLoaded");async function I(e,n){let t=e.members.get(n.owner.rowid);return t===void 0&&(t=await K(e.ctx.db,e.ctx.reader,n.owner),e.members.set(n.owner.rowid,t)),t}s(I,"membersOf");async function _(e,n,t){const i=await e.prepare(`SELECT o.* FROM edges e JOIN objects o ON o.rowid = e.dst
     WHERE e.type = 'links-to' AND e.src = ? AND o.type = 'document' AND o.deleted_at IS NULL AND o.rowid <> ?
-    ORDER BY e.written_as`).all(t.object.rowid,t.object.rowid).filter(o=>E(e,n,o)).map(o=>K(e,n,o))}s(I,"linkedDocs");function _(e,n){return n.owner.rowid===e.owner.rowid&&n.name.startsWith(`${e.name}/`)&&!n.name.slice(e.name.length+1).includes("/")}s(_,"underOwnPrefix");function q(e,n){const{ledger:t,channel:i}=e.ctx,o=[],c=[];for(const r of I(e.ctx.db,e.ctx.reader,n)){if(_(n,r)&&!r.unlisted)continue;const a={object:r.object.rowid,headsKey:r.headsKey,contentHash:r.bodyHash};if(y(t,a,"preview"))continue;b(t,i,a,"preview"),e.delivered.push({doc:r,level:"preview",cause:"link preview attached to content delivery"}),c.push(r);const d=r.preview.trim();o.push(d===""?`[[${r.displayName}]]`:`[[${r.displayName}]]: ${d}`)}return{lines:o,linked:c}}s(q,"linkPreviews");function $(e,n,t){const{ledger:i,channel:o}=e.ctx,c=W(e,n),r=[];let a,d=[];for(const m of S(c,n.name)){const p=m===n.name,f=P(n,m);if(!(p&&t)&&H(i,f,"preview"))continue;const{lines:l,previewed:u}=k(c,m,i,o,!(p&&t));for(const v of u)e.delivered.push({doc:v,level:"preview",cause:"directory listing attached to content delivery"});l.length!==0&&(O(i,o,f,"preview"),p?d=l:r.push(R(x(n,m),l)))}const h=q(e,n);return t?d.length>0&&(a=d):d.length+h.lines.length>0&&r.unshift(C(x(n,n.name),d,h.lines)),e.chainCorpus??=w(e.ctx.db,e.ctx.reader,["document-read"]),r.push(...N(e,e.chainCorpus,"document-read",{doc:n},"memory-read companion of content delivery")),{blocks:r,...a===void 0?{}:{listing:a},linked:h.linked}}s($,"attachments");function N(e,n,t,i,o){const{db:c,reader:r,subject:a,ledger:d,channel:h}=e.ctx,m=B(c,a,r,n,t,i),p=[];for(const f of m.docs){const l=f.finalRung;if(!f.winner||l==="none")continue;const{doc:u}=f,v={object:u.object.rowid,headsKey:u.headsKey,contentHash:u.bodyHash};y(d,v,l)||(b(d,h,v,l),e.delivered.push({doc:u,level:l,...o===void 0?{}:{cause:o}}),l==="content"&&p.push(...$(e,u,!1).blocks),p.push(M(u,l)))}return p}s(N,"renderPlan");function Q(e,n,t,i=w(e.db,e.reader,[n])){const o={ctx:e,delivered:[],members:new Map};return{content:j(N(o,i,n,t)),delivered:o.delivered}}s(Q,"renderEvent");function V(e,n,t=!1){const i={ctx:e,delivered:[],members:new Map};b(e.ledger,e.channel,{object:n.object.rowid,headsKey:n.headsKey,contentHash:n.bodyHash},"content");const{blocks:o,listing:c,linked:r}=$(i,n,!t);return{attachments:j(o),...c===void 0?{}:{listing:c},linked:r,delivered:i.delivered}}s(V,"renderExplicitRead");export{I as linkedDocs,M as renderEnvelope,Q as renderEvent,V as renderExplicitRead,j as wrapAutoLoaded};
+    ORDER BY e.written_as`).all(t.object.rowid,t.object.rowid);return await S(await M(i,async o=>await D(e,n,o)),async o=>await H(e,n,o))}s(_,"linkedDocs");function q(e,n){return n.owner.rowid===e.owner.rowid&&n.name.startsWith(`${e.name}/`)&&!n.name.slice(e.name.length+1).includes("/")}s(q,"underOwnPrefix");async function F(e,n){const{ledger:t,channel:i}=e.ctx,o=[],c=[];for(const r of await _(e.ctx.db,e.ctx.reader,n)){if(q(n,r)&&!r.unlisted)continue;const l={object:r.object.rowid,headsKey:r.headsKey,contentHash:r.bodyHash};if(b(t,l,"preview"))continue;y(t,i,l,"preview"),e.delivered.push({doc:r,level:"preview",cause:"link preview attached to content delivery"}),c.push(r);const a=r.preview.trim();o.push(a===""?`[[${r.displayName}]]`:`[[${r.displayName}]]: ${a}`)}return{lines:o,linked:c}}s(F,"linkPreviews");async function A(e,n,t){const{ledger:i,channel:o}=e.ctx,c=await I(e,n),r=[];let l,a=[];for(const m of P(c,n.name)){const p=m===n.name,f=C(n,m);if(!(p&&t)&&O(i,f,"preview"))continue;const{lines:d,previewed:u}=k(c,m,i,o,!(p&&t));for(const w of u)e.delivered.push({doc:w,level:"preview",cause:"directory listing attached to content delivery"});d.length!==0&&(E(i,o,f,"preview"),p?a=d:r.push(L(x(n,m),d)))}const h=await F(e,n);return t?a.length>0&&(l=a):a.length+h.lines.length>0&&r.unshift(R(x(n,n.name),a,h.lines)),e.chainCorpus??=await g(e.ctx.db,e.ctx.reader,["document-read"]),r.push(...await $(e,e.chainCorpus,"document-read",{doc:n},"memory-read companion of content delivery")),{blocks:r,...l===void 0?{}:{listing:l},linked:h.linked}}s(A,"attachments");async function $(e,n,t,i,o){const{db:c,reader:r,subject:l,ledger:a,channel:h}=e.ctx,m=await B(c,l,r,n,t,i),p=[];for(const f of m.docs){const d=f.finalRung;if(!f.winner||d==="none")continue;const{doc:u}=f,w={object:u.object.rowid,headsKey:u.headsKey,contentHash:u.bodyHash};b(a,w,d)||(y(a,h,w,d),e.delivered.push({doc:u,level:d,...o===void 0?{}:{cause:o}}),d==="content"&&p.push(...(await A(e,u,!1)).blocks),p.push(W(u,d)))}return p}s($,"renderPlan");async function V(e,n,t,i){i??=await g(e.db,e.reader,[n]);const o={ctx:e,delivered:[],members:new Map};return{content:j(await $(o,i,n,t)),delivered:o.delivered}}s(V,"renderEvent");async function X(e,n,t=!1){const i={ctx:e,delivered:[],members:new Map};y(e.ledger,e.channel,{object:n.object.rowid,headsKey:n.headsKey,contentHash:n.bodyHash},"content");const{blocks:o,listing:c,linked:r}=await A(i,n,!t);return{attachments:j(o),...c===void 0?{}:{listing:c},linked:r,delivered:i.delivered}}s(X,"renderExplicitRead");export{_ as linkedDocs,W as renderEnvelope,V as renderEvent,X as renderExplicitRead,j as wrapAutoLoaded};

package/dist/core/substrate/subject.d.ts

@@ -6,8 +6,8 @@ export type { NodeConfigSubject } from './subject-fields.js';
  *  walking the `parent` chain (canvas-db rows) until a row with no parent (the
  *  root). The root is depth 0. Cycle-guarded (parents must not cycle, but never
  *  loop forever) — mirrors `rootOfSpine` in runtime/placement.ts. */
-export declare function spineDepth(nodeId: string): number;
+export declare function spineDepth(nodeId: string): Promise<number>;
 /** Assemble the node-config subject for `nodeId` from its `NodeMeta` + the
  *  derived fields. Returns `null` when the node has no canvas-db row (an
  *  unknown id). Pure aside from the canvas-db + profile-manifest reads. */
-export declare function assembleNodeSubject(nodeId: string, repos?: readonly ObjectRow[]): NodeConfigSubject | null;
+export declare function assembleNodeSubject(nodeId: string, repos?: readonly ObjectRow[]): Promise<NodeConfigSubject | null>;

package/dist/core/substrate/subject.js

@@ -1 +1 @@
-var c=Object.defineProperty;var n=(r,o)=>c(r,"name",{value:o,configurable:!0});import{getNode as i,getRow as l}from"../canvas/index.js";import{openDb as s}from"../canvas/db.js";import{checkoutsForCwd as f}from"../graph/repo-sync/repos.js";import{liveLookups as m,viewRepos as u}from"../graph/reader.js";import{effectiveScopes as a,scopeForCwd as d,profileNameFor as w}from"./subject-fields.js";import{effectiveScopes as j,scopeForCwd as y,profileNameFor as D}from"./subject-fields.js";function b(r){let o=r;const e=new Set;let t=0;for(;!e.has(o);){e.add(o);const p=l(o);if(p===null||p.parent==null)break;o=p.parent,t++}return t}n(b,"spineDepth");function h(r,o){const e=s(),t=u(r,o,p=>f(e,p),m(e));return[...t.repos,...t.projectRepos]}n(h,"eligibleRepos");function S(r,o){const e=i(r);return e===null?null:{kind:e.kind,mode:e.mode,lifecycle:e.lifecycle,hasManager:(e.parent??null)!==null,cwd:e.cwd,scope:d(e.cwd),orchestration:{depth:b(r)},profile:w(e.profile_id),scopes:a(e.scopes),repo:(o??h(e.cwd,e.profile_id??null)).map(t=>t.name)}}n(S,"assembleNodeSubject");export{S as assembleNodeSubject,j as effectiveScopes,D as profileNameFor,y as scopeForCwd,b as spineDepth};
+var p=Object.defineProperty;var n=(r,o)=>p(r,"name",{value:o,configurable:!0});import{getNode as a,getRow as c}from"../canvas/index.js";import{openDb as s}from"../canvas/db.js";import{checkoutsForCwd as l}from"../graph/repo-sync/repos.js";import{liveLookups as f,viewRepos as m}from"../graph/reader.js";import{effectiveScopes as w,scopeForCwd as u,profileNameFor as d}from"./subject-fields.js";import{effectiveScopes as C,scopeForCwd as j,profileNameFor as D}from"./subject-fields.js";async function b(r){let o=r;const e=new Set;let t=0;for(;!e.has(o);){e.add(o);const i=await c(o);if(i===null||i.parent==null)break;o=i.parent,t++}return t}n(b,"spineDepth");async function h(r,o){const e=await s(),t=await m(r,o,async i=>await l(e,i),f(e));return[...t.repos,...t.projectRepos]}n(h,"eligibleRepos");async function R(r,o){const e=await a(r);return e===null?null:{kind:e.kind,mode:e.mode,lifecycle:e.lifecycle,hasManager:(e.parent??null)!==null,cwd:e.cwd,scope:u(e.cwd),orchestration:{depth:await b(r)},profile:d(e.profile_id),scopes:w(e.scopes),repo:(o??await h(e.cwd,e.profile_id??null)).map(t=>t.name)}}n(R,"assembleNodeSubject");export{R as assembleNodeSubject,C as effectiveScopes,D as profileNameFor,j as scopeForCwd,b as spineDepth};

package/dist/core/usage/ledger.d.ts

@@ -1,4 +1,4 @@
-import type { DatabaseSync } from 'node:sqlite';
+import { type CanvasDb } from '../canvas/db.js';
 import type { SpendUsageDTO } from '../../api/dto/usage.js';
 /** The person's own agent. Its grant carries the directory's default cap, but the
  *  cap bounds what an app spends of the person's subscription, never the person's
@@ -23,15 +23,15 @@ export interface UsageRecord {
     usd_equivalent: number | null;
 }
 /** Add one completion's or receipt's usage to its grantee's month, inside the caller's write. */
-export declare function addUsage(db: DatabaseSync, record: UsageRecord, at?: Date): void;
+export declare function addUsage(db: CanvasDb, record: UsageRecord, at?: Date): Promise<void>;
 /** Record one model completion for `grantee`. */
 export declare function recordModelUsage(grantee: string, payer: Payer, servedModel: string, usage: {
     input: number;
     output: number;
     cacheRead: number;
-}, usdEquivalent: number | null): void;
+}, usdEquivalent: number | null): Promise<void>;
 /** The grantee's user-paid month-to-date model spend; provider receipts are not in it. */
-export declare function monthSpend(grantee: string, month?: string): number;
+export declare function monthSpend(grantee: string, month?: string): Promise<number>;
 /** Who a user-paid call bills, and the cap that bounds it (`null` = uncapped). */
 export interface SpendTarget {
     grantee: string;
@@ -42,8 +42,8 @@ export declare function effectiveCap(target: SpendTarget): number | null;
 /** Refuse a user-paid call once the grantee's month spend reached its cap (SPD-2).
  *  The check runs before the call; one response may overshoot the cap (no
  *  reserve-then-settle), and the next call is refused. */
-export declare function assertUnderCap(target: SpendTarget | undefined, at?: Date): void;
+export declare function assertUnderCap(target: SpendTarget | undefined, at?: Date): Promise<void>;
 /** `usage.get` for one grantee and month. */
-export declare function usageFor(grantee: string, spendCap: number | null, month?: string): SpendUsageDTO;
+export declare function usageFor(grantee: string, spendCap: number | null, month?: string): Promise<SpendUsageDTO>;
 /** A `month` query value: `YYYY-MM` with a real month, years 1000-9999; absent means the current month. */
 export declare function parseUsageMonth(value: string | null): string;

package/dist/core/usage/ledger.js

@@ -1,10 +1,10 @@
-var q=Object.defineProperty;var s=(e,t)=>q(e,"name",{value:t,configurable:!0});import{prepared as i}from"../sqlite-statements.js";import{openDb as _,withCanvasWrite as k}from"../canvas/db.js";import{RunError as l}from"../runs/operations.js";const N="app:terminal";function p(e=new Date){return e.toISOString().slice(0,7)}s(p,"usageMonth");function c(e){const[t,n]=e.split("-").map(Number);return new Date(Date.UTC(t,n,1)).toISOString()}s(c,"resetAt");function S(e,t,n=new Date){const u=p(n);i(e,`INSERT INTO usage (grantee, month, payer, source, served_model, input_tokens, output_tokens, cached_tokens, usd_equivalent)
+var h=Object.defineProperty;var a=(e,t)=>h(e,"name",{value:t,configurable:!0});import{withCanvasWrite as q,openDb as d}from"../canvas/db.js";import{RunError as _}from"../runs/operations.js";const w="app:terminal";function r(e=new Date){return e.toISOString().slice(0,7)}a(r,"usageMonth");function l(e){const[t,n]=e.split("-").map(Number);return new Date(Date.UTC(t,n,1)).toISOString()}a(l,"resetAt");async function k(e,t,n=new Date){const u=r(n);await e.prepare(`INSERT INTO usage (grantee, month, payer, source, served_model, input_tokens, output_tokens, cached_tokens, usd_equivalent)
     VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
     ON CONFLICT(grantee, month, payer, source, served_model) DO UPDATE SET
       input_tokens = input_tokens + excluded.input_tokens,
       output_tokens = output_tokens + excluded.output_tokens,
       cached_tokens = cached_tokens + excluded.cached_tokens,
       usd_equivalent = CASE WHEN usd_equivalent IS NULL AND excluded.usd_equivalent IS NULL THEN NULL
-        ELSE COALESCE(usd_equivalent, 0) + COALESCE(excluded.usd_equivalent, 0) END`).run(t.grantee,u,t.payer,t.source,t.served_model,t.input_tokens,t.output_tokens,t.cached_tokens,t.usd_equivalent),t.payer==="user"&&t.source==="model"&&t.usd_equivalent!==null&&t.usd_equivalent>0&&i(e,`INSERT INTO grantee_usage (grantee, month, usd_equivalent) VALUES (?, ?, ?)
-      ON CONFLICT(grantee, month) DO UPDATE SET usd_equivalent = usd_equivalent + excluded.usd_equivalent`).run(t.grantee,u,t.usd_equivalent)}s(S,"addUsage");function L(e,t,n,u,o){k(d=>S(d,{grantee:e,payer:t,source:"model",served_model:n,input_tokens:u.input,output_tokens:u.output,cached_tokens:u.cacheRead,usd_equivalent:o}))}s(L,"recordModelUsage");function m(e,t=p()){return i(_(),"SELECT usd_equivalent FROM grantee_usage WHERE grantee = ? AND month = ?").get(e,t)?.usd_equivalent??0}s(m,"monthSpend");function E(e){return e.grantee===N?null:e.spend_cap}s(E,"effectiveCap");function O(e,t=new Date){if(!e)return;const n=E(e);if(n===null)return;const u=p(t),o=m(e.grantee,u);if(!(o<n))throw new l(402,"cap_exhausted",`${e.grantee} reached its monthly usage limit`,void 0,{spend_cap:n,usd_equivalent:o,reset_at:c(u)})}s(O,"assertUnderCap");function T(e,t,n=p()){const u=i(_(),`SELECT payer, source, served_model, input_tokens, output_tokens, usd_equivalent
-    FROM usage WHERE grantee = ? AND month = ? ORDER BY served_model`).all(e,n),o=s(r=>u.filter(a=>a.payer===r&&a.source==="model").map(({served_model:a,input_tokens:v,output_tokens:f,usd_equivalent:h})=>({served_model:a,input_tokens:v,output_tokens:f,usd_equivalent:h})),"byModel"),d=u.filter(r=>r.payer==="app").reduce((r,a)=>r+(a.usd_equivalent??0),0);return{grantee:e,month:n,usd_equivalent:m(e,n),by_model:o("user"),app_paid:{usd_equivalent:d,by_model:o("app")},spend_cap:E({grantee:e,spend_cap:t}),reset_at:c(n)}}s(T,"usageFor");function A(e){if(e===null)return p();if(!/^[1-9]\d{3}-(0[1-9]|1[0-2])$/.test(e))throw new l(400,"invalid_request","month must be YYYY-MM","month");return e}s(A,"parseUsageMonth");export{N as UNCAPPED_GRANTEE,S as addUsage,O as assertUnderCap,E as effectiveCap,m as monthSpend,A as parseUsageMonth,L as recordModelUsage,c as resetAt,T as usageFor,p as usageMonth};
+        ELSE COALESCE(usd_equivalent, 0) + COALESCE(excluded.usd_equivalent, 0) END`).run(t.grantee,u,t.payer,t.source,t.served_model,t.input_tokens,t.output_tokens,t.cached_tokens,t.usd_equivalent),t.payer==="user"&&t.source==="model"&&t.usd_equivalent!==null&&t.usd_equivalent>0&&await e.prepare(`INSERT INTO grantee_usage (grantee, month, usd_equivalent) VALUES (?, ?, ?)
+      ON CONFLICT(grantee, month) DO UPDATE SET usd_equivalent = usd_equivalent + excluded.usd_equivalent`).run(t.grantee,u,t.usd_equivalent)}a(k,"addUsage");async function g(e,t,n,u,s){await q(async p=>await k(p,{grantee:e,payer:t,source:"model",served_model:n,input_tokens:u.input,output_tokens:u.output,cached_tokens:u.cacheRead,usd_equivalent:s}))}a(g,"recordModelUsage");async function c(e,t=r()){return(await(await d()).prepare("SELECT usd_equivalent FROM grantee_usage WHERE grantee = ? AND month = ?").get(e,t))?.usd_equivalent??0}a(c,"monthSpend");function m(e){return e.grantee===w?null:e.spend_cap}a(m,"effectiveCap");async function x(e,t=new Date){if(!e)return;const n=m(e);if(n===null)return;const u=r(t),s=await c(e.grantee,u);if(!(s<n))throw new _(402,"cap_exhausted",`${e.grantee} reached its monthly usage limit`,void 0,{spend_cap:n,usd_equivalent:s,reset_at:l(u)})}a(x,"assertUnderCap");async function C(e,t,n=r()){const u=await(await d()).prepare(`SELECT payer, source, served_model, input_tokens, output_tokens, usd_equivalent
+    FROM usage WHERE grantee = ? AND month = ? ORDER BY served_model`).all(e,n),s=a(i=>u.filter(o=>o.payer===i&&o.source==="model").map(({served_model:o,input_tokens:E,output_tokens:v,usd_equivalent:f})=>({served_model:o,input_tokens:E,output_tokens:v,usd_equivalent:f})),"byModel"),p=u.filter(i=>i.payer==="app").reduce((i,o)=>i+(o.usd_equivalent??0),0);return{grantee:e,month:n,usd_equivalent:await c(e,n),by_model:s("user"),app_paid:{usd_equivalent:p,by_model:s("app")},spend_cap:m({grantee:e,spend_cap:t}),reset_at:l(n)}}a(C,"usageFor");function D(e){if(e===null)return r();if(!/^[1-9]\d{3}-(0[1-9]|1[0-2])$/.test(e))throw new _(400,"invalid_request","month must be YYYY-MM","month");return e}a(D,"parseUsageMonth");export{w as UNCAPPED_GRANTEE,k as addUsage,x as assertUnderCap,m as effectiveCap,c as monthSpend,D as parseUsageMonth,g as recordModelUsage,l as resetAt,C as usageFor,r as usageMonth};

package/dist/core/worktree-close.js

@@ -1,6 +1,6 @@
-var P=Object.defineProperty;var c=(t,r)=>P(t,"name",{value:r,configurable:!0});import{existsSync as $,realpathSync as R}from"node:fs";import{resolve as q}from"node:path";import{getNode as v,recordDisposalGrant as B,recordLandIntent as M}from"./canvas/index.js";import{withExclusiveDirectoryLockAsync as O}from"./exclusive-lock.js";import{gitAsync as i}from"./git.js";import{proveBranchContained as x}from"./worktree-containment.js";import{concludeAbsentManagedWorktreeAsync as F}from"./worktree-mutation-async.js";import{parseStatusPorcelain as G,planLandIntoCheckout as I}from"./worktree-landing.js";import{WORKTREE_LOCK_WAIT_MS as T,checkoutPathForBranchInList as N,missingWorktreeRecoveryHint as j,persistClosedWorktreeState as A,samePath as K,worktreeLockPathForCommonDir as z,WorktreeError as h}from"./worktree.js";import{shellQuote as E}from"../shared/shell-quote.js";function p(t){return(t.stderr.trim()||t.stdout.trim()).trim()}c(p,"detailOf");async function u(t,r,e,o){const a=await i(r,t);if(a.status!==0)throw new h(e,`git ${r.join(" ")} failed`,o,p(a));return a.stdout.trim()}c(u,"runGit");async function H(t){const r=await u(t,["rev-parse","--git-common-dir"],"git_common_dir_failed","Inspect the repository git metadata, then retry.");return R(q(t,r))}c(H,"commonGitDir");async function Q(t,r){const e=`refs/heads/${r}`,o=await i(["show-ref","--verify","--quiet",e],t);if(o.status===1&&o.executionFailed!==!0)throw new h("missing_base_branch",`managed worktree base '${r}' does not name an existing local branch`,"The base must be a local branch that landing can fast-forward \u2014 freshen your local branch from origin first (rebase-not-merge), then base on it.");if(o.status!==0){const a=o.processError===void 0?"":`
+var P=Object.defineProperty;var c=(t,r)=>P(t,"name",{value:r,configurable:!0});import{existsSync as $,realpathSync as R}from"node:fs";import{resolve as q}from"node:path";import{getNode as v,recordDisposalGrant as B,recordLandIntent as M}from"./canvas/index.js";import{withExclusiveDirectoryLockAsync as O}from"./exclusive-lock.js";import{gitAsync as i}from"./git.js";import{proveBranchContained as x}from"./worktree-containment.js";import{concludeAbsentManagedWorktreeAsync as F}from"./worktree-mutation-async.js";import{parseStatusPorcelain as G,planLandIntoCheckout as I}from"./worktree-landing.js";import{WORKTREE_LOCK_WAIT_MS as T,checkoutPathForBranchInList as N,missingWorktreeRecoveryHint as j,persistClosedWorktreeState as A,samePath as K,worktreeLockPathForCommonDir as z,WorktreeError as h}from"./worktree.js";import{shellQuote as E}from"../shared/shell-quote.js";function w(t){return(t.stderr.trim()||t.stdout.trim()).trim()}c(w,"detailOf");async function u(t,r,e,o){const a=await i(r,t);if(a.status!==0)throw new h(e,`git ${r.join(" ")} failed`,o,w(a));return a.stdout.trim()}c(u,"runGit");async function H(t){const r=await u(t,["rev-parse","--git-common-dir"],"git_common_dir_failed","Inspect the repository git metadata, then retry.");return R(q(t,r))}c(H,"commonGitDir");async function Q(t,r){const e=`refs/heads/${r}`,o=await i(["show-ref","--verify","--quiet",e],t);if(o.status===1&&o.executionFailed!==!0)throw new h("missing_base_branch",`managed worktree base '${r}' does not name an existing local branch`,"The base must be a local branch that landing can fast-forward \u2014 freshen your local branch from origin first (rebase-not-merge), then base on it.");if(o.status!==0){const a=o.processError===void 0?"":`
 process error: ${o.processError}`;throw new h("base_branch_inspection_failed",`could not inspect local base branch '${r}' (git show-ref exited with status ${o.status})`,"Inspect the repository and its Git metadata, then retry.",`status: ${o.status}
 stderr: ${o.stderr.trim()||"<empty>"}${a}`)}return u(t,["rev-parse","--verify",e],"base_branch_resolve_failed","Inspect the local base branch, then retry.")}c(Q,"resolveLandableBase");async function J(t){for(const r of["rebase-merge","rebase-apply"]){const e=await u(t,["rev-parse","--git-path",r],"git_path_failed","Inspect the worktree manually, then retry.");if($(e))return!0}return!1}c(J,"rebaseInProgress");async function L(t,r,e){const o=await i(["worktree","list","--porcelain"],t);if(o.status!==0)return!1;let a=null;for(const n of o.stdout.split(`
-`))if(n.startsWith("worktree "))a=n.slice(9).trim();else if(a!==null&&K(a,r)&&n===`branch refs/heads/${e}`)return!0;return!1}c(L,"registeredWorktree");function D(t){return{worktree_removed:!1,worktree_remove_error:`cleanup pending: the caller checkout at ${t.path} remains intact. After its node exits, run \`git -C ${E(t.repo_root)} worktree remove ${E(t.path)}\` after confirming it is safe to delete.`,branch_deleted:!1,branch_delete_error:`cleanup pending: local branch ${t.branch} remains checked out at ${t.path}; delete it only after that checkout is removed and its landed commit is still contained in ${t.base_ref}.`}}c(D,"deferredCleanupResult");function U(t,r){const e=v(t)?.managed_worktree;e==null||e.state!=="open"||M(t,{at:new Date().toISOString(),blocked:r})}c(U,"recordBlockedLandIntent");async function W(t,r){const e=await i(["rev-parse","--verify","--quiet","refs/stash"],t);e.status===0&&e.stdout.trim()===r&&await i(["stash","drop"],t)}c(W,"dropStashIfStillTip");async function V(t,r,e,o){const a=await i(["status","--porcelain"],t);if(a.status!==0)return{ok:!1,detail:p(a)};const n=await i(["diff","--name-only",e,o],t);if(n.status!==0)return{ok:!1,detail:p(n)};const f=n.stdout.split(`
-`).map(_=>_.trim()).filter(_=>_!==""),k=I(G(a.stdout),f);if(k.kind==="refuse")return{ok:!1,detail:`untracked files in ${t} would be overwritten by the incoming commits: ${k.collisions.join(", ")}`};const w=c(async()=>{const _=await i(["merge","--ff-only",o],t);return _.status===0?{ok:!0}:{ok:!1,detail:p(_)}},"merge");if(k.kind==="direct")return w();const b=await i(["rev-parse","--verify","--quiet","refs/stash"],t),g=b.status===0?b.stdout.trim():null,y=await i(["stash","push","--message",`crtr landing ${r}`],t);if(y.status!==0)return{ok:!1,detail:p(y)};const m=await i(["rev-parse","--verify","--quiet","refs/stash"],t),l=m.status===0?m.stdout.trim():null;if(l===null||l===g)return w();const s=`local changes from ${t} are retained in stash ${l}; recover them with \`git -C ${E(t)} stash apply ${l}\` and resolve any conflict.`,d=await w();return d.ok?(await i(["stash","apply",l],t)).status===0?(await W(t,l),{ok:!0}):(await i(["reset","--hard",o],t),{ok:!0,stash:`the shared base checkout was reset to landed commit ${o} because local changes conflicted with it. ${s}`}):(await i(["stash","apply",l],t)).status===0?(await W(t,l),d):{ok:!1,detail:`${d.detail}
-${s}`}}c(V,"landIntoBaseCheckout");async function S(t){const r=v(t);if(r===null)throw new h("unknown_node",`unknown node: ${t}`,"Run this from a live node, or pass a real node id once that command supports it.");const e=r?.managed_worktree?.state==="open"?r.managed_worktree:null;if(e===null)throw new h("no_managed_worktree",`node ${t} has no open managed worktree`,"Nothing to close for this node.");if(!$(e.path))throw new h("worktree_missing",`managed worktree path is missing: ${e.path}`,j(e));if(await J(e.path))throw new h("rebase_in_progress","this managed worktree is mid-rebase",`Resolve conflicts in ${e.path}, run \`git rebase --continue\` there, then rerun \`crtr node worktree close\`.`);if(await u(e.path,["status","--porcelain"],"status_failed","Inspect the worktree manually, then retry.")!=="")throw new h("dirty_worktree","managed worktree has uncommitted changes",`Commit the work in ${e.path}, then rerun \`crtr node worktree close\`.`);const a=await u(e.path,["rev-parse","--abbrev-ref","HEAD"],"branch_check_failed","Inspect the worktree manually, then retry."),n=await u(e.path,["rev-parse","HEAD"],"landed_sha_failed","Inspect the worktree checkout manually, then rerun `crtr node worktree close`.");if(a!==e.branch){if((await i(["show-ref","--verify","--quiet",`refs/heads/${e.branch}`],e.path)).status===0||a==="HEAD"||!await L(e.repo_root,e.path,a))throw new h("wrong_branch",`managed worktree is not on its recorded branch (expected ${e.branch}, found ${a==="HEAD"?"detached HEAD":a})`,`Inspect ${e.path}, then rerun \`crtr node worktree close\`.`);if(await x(e.path,e,n)===null)throw new h("branch_moved_unlanded",`managed worktree's recorded branch ${e.branch} no longer exists; its checkout is now on ${a} at ${n}, which carries content local base branch '${e.base_ref}' does not yet contain`,`Land or push ${a} through its own workflow before closing.`);const d=await H(e.path);if(!await L(e.repo_root,e.path,a)||await u(e.path,["rev-parse","--abbrev-ref","HEAD"],"branch_check_failed","Inspect the worktree manually, then retry.")!==a||await u(e.path,["rev-parse","HEAD"],"branch_check_failed","Inspect the worktree manually, then retry.")!==n)throw new h("wrong_branch",`managed worktree at ${e.path} changed while closing`,`Inspect ${e.path}, then rerun \`crtr node worktree close\`.`);return B(t,{observed_branch:a,observed_sha:n,common_dir:d,authorized:new Date().toISOString()}),A(t,e,"pending"),{node_id:t,branch:a,worktree_path:e.path,landed_sha:n,...D(e),branch_delete_error:`${a} is not a crtr-managed branch and will never be deleted automatically; it is preserved once the checkout above is removed.`}}if(await x(e.path,e,n)!==null)return A(t,e,"pending"),{node_id:t,branch:e.branch,worktree_path:e.path,landed_sha:n,...D(e)};let f;try{f=await Q(e.path,e.base_ref)}catch(s){if(!(s instanceof h)||s.code!=="missing_base_branch"||n!==e.base_sha)throw s;return A(t,e,"pending"),{node_id:t,branch:e.branch,worktree_path:e.path,landed_sha:e.base_sha,...D(e)}}const k=await i(["rebase",f],e.path);if(k.status!==0)throw new h("rebase_failed",`rebase onto local base branch '${e.base_ref}' did not complete`,`Resolve conflicts in ${e.path}, run \`git rebase --continue\` there, then rerun \`crtr node worktree close\`.`,p(k));const w=await u(e.path,["rev-parse","HEAD"],"landed_sha_failed","Inspect the worktree checkout manually, then rerun `crtr node worktree close`."),b=c((s,d,_)=>(U(t,s),new h("land_base_failed",s,d,_)),"blocked"),g=await i(["merge-base","--is-ancestor",f,w],e.path);if(g.status!==0)throw b(`rebased worktree is not a fast-forward of local base branch '${e.base_ref}'`,"Ask the user how to land this managed worktree.",p(g));const y=await u(e.path,["worktree","list","--porcelain"],"worktree_list_failed","Inspect the repository worktrees manually, then retry."),m=N(y,e.base_ref);let l;if(m!==null){const s=await i(["rev-parse","HEAD"],m);if(s.status!==0||s.stdout.trim()!==f)throw b(`local base branch '${e.base_ref}' changed while this worktree was closing`,`Reconcile the base checkout at ${m}, then rerun \`crtr node worktree close\`.`,s.status!==0?p(s):`expected ${f}, found ${s.stdout.trim()}`);const d=await V(m,e.branch,f,w);if(!d.ok)throw b(`could not fast-forward local base branch '${e.base_ref}' to this worktree`,`Local base branch '${e.base_ref}' is checked out at ${m} in a state that blocks a fast-forward.`,d.detail);l=d.stash}else{const s=await i(["update-ref",`refs/heads/${e.base_ref}`,w,f],e.path);if(s.status!==0)throw b(`could not fast-forward local base branch '${e.base_ref}' to this worktree`,"Ask the user how to land this managed worktree.",p(s))}return A(t,e,"pending"),{node_id:t,branch:e.branch,worktree_path:e.path,landed_sha:w,...D(e),...l===void 0?{}:{base_checkout_stash:l}}}c(S,"closeLocked");async function ie(t){const r=v(t)?.managed_worktree;if(r==null||r.state!=="open")return S(t);if(!$(r.path)){const n=await F(t);if(n!==null)return{node_id:t,branch:n.dropped.branch,worktree_path:n.dropped.worktree_path,landed_sha:n.landedSha,worktree_removed:!0,branch_deleted:n.dropped.branch_deleted,...n.dropped.branch_delete_error===void 0?{}:{branch_delete_error:n.dropped.branch_delete_error}}}const e=v(t)?.managed_worktree;if(e==null||e.state!=="open")return S(t);const o=$(e.path)?e.path:e.repo_root,a=await H(o);return O(z(a),()=>S(t),{timeoutMs:Math.min(T,25e3),timeoutError:c(()=>new h("worktree_lock_timeout",`timed out waiting to create a managed worktree in ${a}`,"Wait for the other managed-worktree operation to finish, then retry."),"timeoutError")})}c(ie,"closeManagedWorktreeAsync");export{ie as closeManagedWorktreeAsync};
+`))if(n.startsWith("worktree "))a=n.slice(9).trim();else if(a!==null&&K(a,r)&&n===`branch refs/heads/${e}`)return!0;return!1}c(L,"registeredWorktree");function D(t){return{worktree_removed:!1,worktree_remove_error:`cleanup pending: the caller checkout at ${t.path} remains intact. After its node exits, run \`git -C ${E(t.repo_root)} worktree remove ${E(t.path)}\` after confirming it is safe to delete.`,branch_deleted:!1,branch_delete_error:`cleanup pending: local branch ${t.branch} remains checked out at ${t.path}; delete it only after that checkout is removed and its landed commit is still contained in ${t.base_ref}.`}}c(D,"deferredCleanupResult");async function U(t,r){const e=(await v(t))?.managed_worktree;e==null||e.state!=="open"||await M(t,{at:new Date().toISOString(),blocked:r})}c(U,"recordBlockedLandIntent");async function W(t,r){const e=await i(["rev-parse","--verify","--quiet","refs/stash"],t);e.status===0&&e.stdout.trim()===r&&await i(["stash","drop"],t)}c(W,"dropStashIfStillTip");async function V(t,r,e,o){const a=await i(["status","--porcelain"],t);if(a.status!==0)return{ok:!1,detail:w(a)};const n=await i(["diff","--name-only",e,o],t);if(n.status!==0)return{ok:!1,detail:w(n)};const f=n.stdout.split(`
+`).map(_=>_.trim()).filter(_=>_!==""),k=I(G(a.stdout),f);if(k.kind==="refuse")return{ok:!1,detail:`untracked files in ${t} would be overwritten by the incoming commits: ${k.collisions.join(", ")}`};const p=c(async()=>{const _=await i(["merge","--ff-only",o],t);return _.status===0?{ok:!0}:{ok:!1,detail:w(_)}},"merge");if(k.kind==="direct")return p();const b=await i(["rev-parse","--verify","--quiet","refs/stash"],t),g=b.status===0?b.stdout.trim():null,y=await i(["stash","push","--message",`crtr landing ${r}`],t);if(y.status!==0)return{ok:!1,detail:w(y)};const m=await i(["rev-parse","--verify","--quiet","refs/stash"],t),l=m.status===0?m.stdout.trim():null;if(l===null||l===g)return p();const s=`local changes from ${t} are retained in stash ${l}; recover them with \`git -C ${E(t)} stash apply ${l}\` and resolve any conflict.`,d=await p();return d.ok?(await i(["stash","apply",l],t)).status===0?(await W(t,l),{ok:!0}):(await i(["reset","--hard",o],t),{ok:!0,stash:`the shared base checkout was reset to landed commit ${o} because local changes conflicted with it. ${s}`}):(await i(["stash","apply",l],t)).status===0?(await W(t,l),d):{ok:!1,detail:`${d.detail}
+${s}`}}c(V,"landIntoBaseCheckout");async function S(t){const r=await v(t);if(r===null)throw new h("unknown_node",`unknown node: ${t}`,"Run this from a live node, or pass a real node id once that command supports it.");const e=r?.managed_worktree?.state==="open"?r.managed_worktree:null;if(e===null)throw new h("no_managed_worktree",`node ${t} has no open managed worktree`,"Nothing to close for this node.");if(!$(e.path))throw new h("worktree_missing",`managed worktree path is missing: ${e.path}`,j(e));if(await J(e.path))throw new h("rebase_in_progress","this managed worktree is mid-rebase",`Resolve conflicts in ${e.path}, run \`git rebase --continue\` there, then rerun \`crtr node worktree close\`.`);if(await u(e.path,["status","--porcelain"],"status_failed","Inspect the worktree manually, then retry.")!=="")throw new h("dirty_worktree","managed worktree has uncommitted changes",`Commit the work in ${e.path}, then rerun \`crtr node worktree close\`.`);const a=await u(e.path,["rev-parse","--abbrev-ref","HEAD"],"branch_check_failed","Inspect the worktree manually, then retry."),n=await u(e.path,["rev-parse","HEAD"],"landed_sha_failed","Inspect the worktree checkout manually, then rerun `crtr node worktree close`.");if(a!==e.branch){if((await i(["show-ref","--verify","--quiet",`refs/heads/${e.branch}`],e.path)).status===0||a==="HEAD"||!await L(e.repo_root,e.path,a))throw new h("wrong_branch",`managed worktree is not on its recorded branch (expected ${e.branch}, found ${a==="HEAD"?"detached HEAD":a})`,`Inspect ${e.path}, then rerun \`crtr node worktree close\`.`);if(await x(e.path,e,n)===null)throw new h("branch_moved_unlanded",`managed worktree's recorded branch ${e.branch} no longer exists; its checkout is now on ${a} at ${n}, which carries content local base branch '${e.base_ref}' does not yet contain`,`Land or push ${a} through its own workflow before closing.`);const d=await H(e.path);if(!await L(e.repo_root,e.path,a)||await u(e.path,["rev-parse","--abbrev-ref","HEAD"],"branch_check_failed","Inspect the worktree manually, then retry.")!==a||await u(e.path,["rev-parse","HEAD"],"branch_check_failed","Inspect the worktree manually, then retry.")!==n)throw new h("wrong_branch",`managed worktree at ${e.path} changed while closing`,`Inspect ${e.path}, then rerun \`crtr node worktree close\`.`);return await B(t,{observed_branch:a,observed_sha:n,common_dir:d,authorized:new Date().toISOString()}),await A(t,e,"pending"),{node_id:t,branch:a,worktree_path:e.path,landed_sha:n,...D(e),branch_delete_error:`${a} is not a crtr-managed branch and will never be deleted automatically; it is preserved once the checkout above is removed.`}}if(await x(e.path,e,n)!==null)return await A(t,e,"pending"),{node_id:t,branch:e.branch,worktree_path:e.path,landed_sha:n,...D(e)};let f;try{f=await Q(e.path,e.base_ref)}catch(s){if(!(s instanceof h)||s.code!=="missing_base_branch"||n!==e.base_sha)throw s;return await A(t,e,"pending"),{node_id:t,branch:e.branch,worktree_path:e.path,landed_sha:e.base_sha,...D(e)}}const k=await i(["rebase",f],e.path);if(k.status!==0)throw new h("rebase_failed",`rebase onto local base branch '${e.base_ref}' did not complete`,`Resolve conflicts in ${e.path}, run \`git rebase --continue\` there, then rerun \`crtr node worktree close\`.`,w(k));const p=await u(e.path,["rev-parse","HEAD"],"landed_sha_failed","Inspect the worktree checkout manually, then rerun `crtr node worktree close`."),b=c(async(s,d,_)=>(await U(t,s),new h("land_base_failed",s,d,_)),"blocked"),g=await i(["merge-base","--is-ancestor",f,p],e.path);if(g.status!==0)throw await b(`rebased worktree is not a fast-forward of local base branch '${e.base_ref}'`,"Ask the user how to land this managed worktree.",w(g));const y=await u(e.path,["worktree","list","--porcelain"],"worktree_list_failed","Inspect the repository worktrees manually, then retry."),m=N(y,e.base_ref);let l;if(m!==null){const s=await i(["rev-parse","HEAD"],m);if(s.status!==0||s.stdout.trim()!==f)throw await b(`local base branch '${e.base_ref}' changed while this worktree was closing`,`Reconcile the base checkout at ${m}, then rerun \`crtr node worktree close\`.`,s.status!==0?w(s):`expected ${f}, found ${s.stdout.trim()}`);const d=await V(m,e.branch,f,p);if(!d.ok)throw await b(`could not fast-forward local base branch '${e.base_ref}' to this worktree`,`Local base branch '${e.base_ref}' is checked out at ${m} in a state that blocks a fast-forward.`,d.detail);l=d.stash}else{const s=await i(["update-ref",`refs/heads/${e.base_ref}`,p,f],e.path);if(s.status!==0)throw await b(`could not fast-forward local base branch '${e.base_ref}' to this worktree`,"Ask the user how to land this managed worktree.",w(s))}return await A(t,e,"pending"),{node_id:t,branch:e.branch,worktree_path:e.path,landed_sha:p,...D(e),...l===void 0?{}:{base_checkout_stash:l}}}c(S,"closeLocked");async function ie(t){const r=(await v(t))?.managed_worktree;if(r==null||r.state!=="open")return S(t);if(!$(r.path)){const n=await F(t);if(n!==null)return{node_id:t,branch:n.dropped.branch,worktree_path:n.dropped.worktree_path,landed_sha:n.landedSha,worktree_removed:!0,branch_deleted:n.dropped.branch_deleted,...n.dropped.branch_delete_error===void 0?{}:{branch_delete_error:n.dropped.branch_delete_error}}}const e=(await v(t))?.managed_worktree;if(e==null||e.state!=="open")return S(t);const o=$(e.path)?e.path:e.repo_root,a=await H(o);return O(z(a),()=>S(t),{timeoutMs:Math.min(T,25e3),timeoutError:c(()=>new h("worktree_lock_timeout",`timed out waiting to create a managed worktree in ${a}`,"Wait for the other managed-worktree operation to finish, then retry."),"timeoutError")})}c(ie,"closeManagedWorktreeAsync");export{ie as closeManagedWorktreeAsync};

package/dist/core/worktree-mutation-async.js

@@ -1,10 +1,10 @@
-var P=Object.defineProperty;var o=(e,r)=>P(e,"name",{value:r,configurable:!0});import{existsSync as p,mkdirSync as H,readFileSync as R,realpathSync as O,rmSync as B,writeFileSync as q}from"node:fs";import{dirname as N,join as j,resolve as G}from"node:path";import{abandonWorktreeAndRepoint as I,getNode as w}from"./canvas/index.js";import{isPidAlive as K}from"./canvas/pid.js";import{CONFIG_FILE as z,CRTR_DIR_NAME as x,STATE_FILE as J}from"../types.js";import{withExclusiveDirectoryLockAsync as S}from"./exclusive-lock.js";import{gitAsync as s}from"./git.js";import{WORKTREE_LOCK_WAIT_MS as Q,checkoutPathForBranchInList as U,isManagedWorktreeBase as V,managedWorktreePath as X,persistClosedWorktreeState as _,worktreeLockPathForCommonDir as D,WorktreeError as c}from"./worktree.js";import{proveBranchContained as Y}from"./worktree-containment.js";import{refDeleteTransactionStdin as Z}from"./worktree-landing.js";import{deleteTrashAsync as ee,removeWorktreeCheckoutAsync as te}from"./worktree-remove.js";const E=Math.min(Q,25e3);function v(e){return(e.stderr.trim()||e.stdout.trim()).trim()}o(v,"detailOf");async function h(e,r,a,n){const t=await s(r,e);if(t.status!==0)throw new c(a,`git ${r.join(" ")} failed`,n,v(t));return t.stdout.trim()}o(h,"runGit");async function W(e){return O(G(e,await h(e,["rev-parse","--git-common-dir"],"git_common_dir_failed","Inspect the repository git metadata, then retry.")))}o(W,"commonGitDir");async function k(e,r){const a=await W(e);return S(D(a),r,{timeoutMs:E,timeoutError:o(()=>new c("worktree_lock_timeout",`timed out waiting to create a managed worktree in ${a}`,"Wait for the other managed-worktree operation to finish, then retry."),"timeoutError")})}o(k,"withRepositoryLock");async function $(e,r){const a=`refs/heads/${r}`,n=await s(["show-ref","--verify","--quiet",a],e);if(n.status===1&&n.executionFailed!==!0)throw new c("missing_base_branch",`managed worktree base '${r}' does not name an existing local branch`,"The base must be a local branch that landing can fast-forward \u2014 freshen your local branch from origin first (rebase-not-merge), then base on it.");if(n.status!==0)throw new c("base_branch_inspection_failed",`could not inspect local base branch '${r}' (git show-ref exited with status ${n.status})`,"Inspect the repository and its Git metadata, then retry.",`status: ${n.status}
-stderr: ${n.stderr.trim()||"<empty>"}`);return h(e,["rev-parse","--verify",a],"base_branch_resolve_failed","Inspect the local base branch, then retry.")}o($,"resolveLandableBase");function re(e,r){try{const a=j(r,"info","exclude");H(N(a),{recursive:!0});let n="";try{n=R(a,"utf8")}catch{}const t=[`/${x}/${z}`,`/${x}/${J}`];if(t.every(i=>n.split(`
-`).map(l=>l.trim()).includes(i)))return;q(a,`${n}${n!==""&&!n.endsWith(`
+var P=Object.defineProperty;var o=(e,r)=>P(e,"name",{value:r,configurable:!0});import{existsSync as p,mkdirSync as H,readFileSync as R,realpathSync as O,rmSync as B,writeFileSync as q}from"node:fs";import{dirname as N,join as j,resolve as G}from"node:path";import{abandonWorktreeAndRepoint as I,getNode as m}from"./canvas/index.js";import{isPidAlive as K}from"./canvas/pid.js";import{CONFIG_FILE as z,CRTR_DIR_NAME as x,STATE_FILE as J}from"../types.js";import{withExclusiveDirectoryLockAsync as S}from"./exclusive-lock.js";import{gitAsync as i}from"./git.js";import{WORKTREE_LOCK_WAIT_MS as Q,checkoutPathForBranchInList as U,isManagedWorktreeBase as V,managedWorktreePath as X,persistClosedWorktreeState as _,worktreeLockPathForCommonDir as D,WorktreeError as c}from"./worktree.js";import{proveBranchContained as Y}from"./worktree-containment.js";import{refDeleteTransactionStdin as Z}from"./worktree-landing.js";import{deleteTrashAsync as ee,removeWorktreeCheckoutAsync as te}from"./worktree-remove.js";const E=Math.min(Q,25e3);function v(e){return(e.stderr.trim()||e.stdout.trim()).trim()}o(v,"detailOf");async function h(e,r,a,n){const t=await i(r,e);if(t.status!==0)throw new c(a,`git ${r.join(" ")} failed`,n,v(t));return t.stdout.trim()}o(h,"runGit");async function W(e){return O(G(e,await h(e,["rev-parse","--git-common-dir"],"git_common_dir_failed","Inspect the repository git metadata, then retry.")))}o(W,"commonGitDir");async function k(e,r){const a=await W(e);return S(D(a),r,{timeoutMs:E,timeoutError:o(()=>new c("worktree_lock_timeout",`timed out waiting to create a managed worktree in ${a}`,"Wait for the other managed-worktree operation to finish, then retry."),"timeoutError")})}o(k,"withRepositoryLock");async function $(e,r){const a=`refs/heads/${r}`,n=await i(["show-ref","--verify","--quiet",a],e);if(n.status===1&&n.executionFailed!==!0)throw new c("missing_base_branch",`managed worktree base '${r}' does not name an existing local branch`,"The base must be a local branch that landing can fast-forward \u2014 freshen your local branch from origin first (rebase-not-merge), then base on it.");if(n.status!==0)throw new c("base_branch_inspection_failed",`could not inspect local base branch '${r}' (git show-ref exited with status ${n.status})`,"Inspect the repository and its Git metadata, then retry.",`status: ${n.status}
+stderr: ${n.stderr.trim()||"<empty>"}`);return h(e,["rev-parse","--verify",a],"base_branch_resolve_failed","Inspect the local base branch, then retry.")}o($,"resolveLandableBase");function re(e,r){try{const a=j(r,"info","exclude");H(N(a),{recursive:!0});let n="";try{n=R(a,"utf8")}catch{}const t=[`/${x}/${z}`,`/${x}/${J}`];if(t.every(s=>n.split(`
+`).map(l=>l.trim()).includes(s)))return;q(a,`${n}${n!==""&&!n.endsWith(`
 `)?`
 `:""}# crtr: exclude crtr's own untracked project-scope bookkeeping (auto-added at managed-worktree creation)
-${t.filter(i=>!n.split(`
-`).map(l=>l.trim()).includes(i)).join(`
+${t.filter(s=>!n.split(`
+`).map(l=>l.trim()).includes(s)).join(`
 `)}
-`)}catch{}}o(re,"seedExclude");async function ye(e){await k(e.repo_root,async()=>{const r=await s(["rev-parse","--verify",`refs/heads/${e.branch}`],e.repo_root);if(r.status!==0||r.stdout.trim()!==e.base_sha)return;const a=await s(["worktree","list","--porcelain"],e.repo_root);if(a.status===0){if(a.stdout.split(`
-`).some(n=>n.trim()===`branch refs/heads/${e.branch}`)){if((await s(["worktree","remove","--force",e.path],e.repo_root)).status!==0)return}else if(p(e.path))try{B(e.path,{recursive:!0,force:!0})}catch{return}await s(["update-ref","-d",`refs/heads/${e.branch}`,e.base_sha],e.repo_root)}})}o(ye,"rollbackManagedWorktreeAsync");async function ge(e,r,a="main"){const n=await h(e,["rev-parse","--show-toplevel"],"not_git_repo","Pass --cwd <real repo> pointing inside a git repository.");if(V(n))throw new c("managed_worktree_base",`cwd ${n} is a managed worktree and cannot be used as a managed worktree base`,"Pass `--cwd` pointing at the repository\u2019s primary checkout and keep `--worktree` set to the desired existing local base branch, including the parent branch.");const t=await W(n);return S(D(t),async()=>{const i=await $(n,a),l=X(r),u=`crtr/${r}`;if(p(l))throw new c("worktree_path_exists",`managed worktree path already exists: ${l}`,"Remove the stale path or choose a fresh node id.");if((await s(["show-ref","--verify","--quiet",`refs/heads/${u}`],n)).status===0)throw new c("worktree_branch_exists",`managed worktree branch already exists: ${u}`,"Remove the stale branch or choose a fresh node id.");const b={state:"open",path:l,branch:u,repo_root:n,base_ref:a,base_sha:i,created:new Date().toISOString()};await h(n,["branch",u,i],"worktree_branch_create_failed","Inspect the git error, fix the repository/worktree state, then retry spawning with --worktree.");const f=await s(["worktree","add",l,u],n);if(f.status!==0)throw await s(["update-ref","-d",`refs/heads/${u}`,i],n),new c("worktree_add_failed","git worktree add failed","Inspect the git error, fix the repository/worktree state, then retry spawning with --worktree.",v(f));return re(n,t),b},{timeoutMs:E,timeoutError:o(()=>new c("worktree_lock_timeout",`timed out waiting to create a managed worktree in ${t}`,"Wait for the other managed-worktree operation to finish, then retry."),"timeoutError")})}o(ge,"createManagedWorktreeAsync");async function M(e){if(e.state!=="open"||!p(e.path))return null;const r=await s(["rev-parse","--abbrev-ref","HEAD"],e.path),a=await s(["status","--porcelain"],e.path),n=await s(["rev-parse","HEAD"],e.path);if(r.status!==0||r.stdout.trim()!==e.branch||a.status!==0||a.stdout.trim()!==""||n.status!==0)return null;const t=await s(["rev-parse","--git-path","rebase-merge"],e.path);return t.status!==0||p(t.stdout.trim())?null:n.stdout.trim()}o(M,"cleanTip");async function C(e,r){try{const a=await $(e.path,e.base_ref);return(await s(["merge-base","--is-ancestor",r,a],e.path)).status===0}catch(a){if(a instanceof c&&a.code==="missing_base_branch"&&r===e.base_sha)return!0;throw a}}o(C,"containedInLocalBase");function ae(e){return{node_id:"",branch:e.branch,worktree_path:e.path,worktree_removed:!1,worktree_remove_error:`cleanup pending: the caller checkout at ${e.path} remains intact.`,branch_deleted:!1,branch_delete_error:`cleanup pending: local branch ${e.branch} remains checked out at ${e.path}.`}}o(ae,"deferred");async function L(e){if(e.state!=="open"||p(e.path))return null;const r=`refs/heads/${e.branch}`,a=await s(["show-ref","--verify","--quiet",r],e.repo_root);if(a.status===1&&a.executionFailed!==!0)return{branchSha:null};if(a.status!==0)return null;const n=await s(["rev-parse","--verify",r],e.repo_root);if(n.status!==0)return null;const t=n.stdout.trim(),i=await s(["worktree","list","--porcelain"],e.repo_root);if(i.status!==0||U(i.stdout,e.branch)!==null)return null;const l=await Y(e.repo_root,e,t);return l===null?null:{branchSha:t,containment:l}}o(L,"proveAbsentPathManagedWorktree");async function ne(e,r,a){return p(r.path)?null:a.branchSha===null?(_(e,r,"complete"),{node_id:e,branch:r.branch,worktree_path:r.path,worktree_removed:!0,branch_deleted:!0}):a.containment===void 0?null:(_(e,r,"complete"),{node_id:e,branch:r.branch,worktree_path:r.path,worktree_removed:!0,branch_deleted:!1,branch_delete_error:`local branch ${r.branch} is delivered but retained because its checkout status can change outside crtr's repository lock.`})}o(ne,"autoDropAbsentPathManagedWorktreeLocked");async function oe(e){const r=w(e)?.managed_worktree;return r==null||r.state!=="open"||p(r.path)||await L(r)===null?null:k(r.repo_root,async()=>{const a=w(e)?.managed_worktree;if(a==null||a.state!=="open")return null;const n=await L(a);if(n===null)return null;const t=await ne(e,a,n);return t===null?null:{dropped:t,landedSha:n.branchSha??a.base_sha}})}o(oe,"concludeAbsentManagedWorktreeAsync");async function ve(e){const r=w(e)?.managed_worktree;if(r==null||r.state!=="open")return null;if(!p(r.path))return(await oe(e))?.dropped??null;const a=await M(r);return a===null||!await C(r,a)?null:k(r.path,async()=>{const n=w(e)?.managed_worktree;if(n==null||n.state!=="open")return null;const t=await M(n);return t===null||t!==a||!await C(n,t)?null:(_(e,n,"pending"),{...ae(n),node_id:e})})}o(ve,"autoDropCleanManagedWorktreeAsync");async function T(e){for(const r of["rebase-merge","rebase-apply"]){const a=await s(["rev-parse","--git-path",r],e);if(a.status!==0||p(a.stdout.trim()))return!0}return!1}o(T,"rebaseInProgress");function y(e,r,a,n,t,i=r.branch){I(e,{cwd:r.repo_root,abandoned:{branch:i,tip_sha:a,at:n,by:t}})}o(y,"persistAbandoned");async function $e(e,r){const a=w(e)?.managed_worktree;if(a==null||a.state!=="open")throw new c("no_managed_worktree",`node ${e} has no open managed worktree`,"Nothing to abandon for this node.");const n=[];try{return await k(a.path,()=>se(e,r,n))}finally{await ee(a.path,n[0])}}o($e,"abandonManagedWorktreeAsync");async function g(e,r){const{result:a,trash:n}=await te(e.repo_root,e.path);if(n!==void 0&&r.push(n),a.status!==0)throw new c("worktree_remove_failed",`git worktree remove ${e.path} failed`,"Inspect the worktree manually, then retry.",v(a))}o(g,"removeCheckout");async function se(e,r,a){const n=w(e),t=n?.managed_worktree;if(n===null||t===void 0||t===null||t.state!=="open")throw new c("no_managed_worktree",`node ${e} has no open managed worktree`,"Nothing to abandon for this node.");if(n.status==="active"||n.status==="idle"||K(n.pi_pid))throw new c("node_running",`node ${e} is still running`,"Abandon requires a stopped node with no live broker process. From the running owner, use `crtr node worktree close` to land locally, or make the checkout clean, push its current tip to origin, and rerun `crtr push final`.");if(!p(t.path))throw new c("worktree_missing",`managed worktree path is missing: ${t.path}`,"Inspect the branch and worktree registration, then retry.");const i=await h(t.path,["rev-parse","--abbrev-ref","HEAD"],"branch_check_failed","Inspect the worktree manually, then retry."),l=await s(["show-ref","--verify","--quiet",`refs/heads/${t.branch}`],t.path);if(i!==t.branch){if(l.status===0||i==="HEAD")throw new c("wrong_branch",`managed worktree is not on its recorded branch (expected ${t.branch}, found ${i==="HEAD"?"detached HEAD":i})`,`Inspect ${t.path}, then rerun \`crtr node worktree abandon\`.`);if(await T(t.path)||await h(t.path,["status","--porcelain"],"status_failed","Inspect the worktree manually, then retry.")!=="")throw new c("dirty_worktree","managed worktree has uncommitted changes",`Commit or stash them in ${t.path}, then rerun \`crtr node worktree abandon\`.`);const d=await h(t.path,["rev-parse","HEAD"],"abandon_tip_failed","Inspect the worktree manually, then retry.");await g(t,a);const m=new Date().toISOString();return y(e,t,d,m,r,i),{node_id:e,branch:i,tip_sha:d,worktree_path:t.path,branch_deleted:!1}}const u=await h(t.path,["rev-parse","HEAD"],"abandon_tip_failed","Inspect the branch manually, then retry.");let b=null;try{const d=await $(t.path,t.base_ref);(await s(["merge-base","--is-ancestor",u,d],t.path)).status===0&&(b=d)}catch(d){if(!(d instanceof c)||d.code!=="missing_base_branch")throw d}const f=new Date().toISOString(),F=await h(t.path,["status","--porcelain"],"status_failed","Inspect the worktree manually, then retry.");if(b!==null&&u===t.base_sha){const d=await h(t.repo_root,["rev-parse",`${u}^{tree}`],"abandon_tree_failed","Inspect the branch manually, then retry."),m=await h(t.repo_root,["-c","user.name=crtr-abandon","-c","user.email=crtr-abandon@localhost","commit-tree",d,"-p",u,"-m","crtr-abandon","-m",`Crtr-Abandon: ${e} ${f}`],"abandon_commit_failed","Inspect the branch manually, then retry.");return await h(t.repo_root,["update-ref",`refs/heads/${t.branch}`,m,u],"abandon_marker_failed","The branch changed while abandon was starting; inspect the worktree, then retry."),await g(t,a),(await s(["update-ref","--stdin"],t.repo_root,Z(t.branch,m,`refs/heads/${t.base_ref}`,b))).status===0?(_(e,t,"complete"),{node_id:e,branch:t.branch,tip_sha:m,worktree_path:t.path,branch_deleted:!0}):(y(e,t,m,f,r),{node_id:e,branch:t.branch,tip_sha:m,worktree_path:t.path,branch_deleted:!1})}if(!await T(t.path)&&F==="")return await g(t,a),y(e,t,u,f,r),{node_id:e,branch:t.branch,tip_sha:u,worktree_path:t.path,branch_deleted:!1};await h(t.path,["add","--all"],"abandon_stage_failed","Inspect the worktree manually, then retry."),await h(t.path,["-c","user.name=crtr-abandon","-c","user.email=crtr-abandon@localhost","commit","--allow-empty","-m","crtr-abandon","-m",`Crtr-Abandon: ${e} ${f}`],"abandon_commit_failed","Inspect the worktree manually, then retry.");const A=await h(t.path,["rev-parse","HEAD"],"abandon_tip_failed","Inspect the branch manually, then retry.");return await g(t,a),y(e,t,A,f,r),{node_id:e,branch:t.branch,tip_sha:A,worktree_path:t.path,branch_deleted:!1}}o(se,"abandonLocked");export{$e as abandonManagedWorktreeAsync,ve as autoDropCleanManagedWorktreeAsync,oe as concludeAbsentManagedWorktreeAsync,ge as createManagedWorktreeAsync,ye as rollbackManagedWorktreeAsync};
+`)}catch{}}o(re,"seedExclude");async function ye(e){await k(e.repo_root,async()=>{const r=await i(["rev-parse","--verify",`refs/heads/${e.branch}`],e.repo_root);if(r.status!==0||r.stdout.trim()!==e.base_sha)return;const a=await i(["worktree","list","--porcelain"],e.repo_root);if(a.status===0){if(a.stdout.split(`
+`).some(n=>n.trim()===`branch refs/heads/${e.branch}`)){if((await i(["worktree","remove","--force",e.path],e.repo_root)).status!==0)return}else if(p(e.path))try{B(e.path,{recursive:!0,force:!0})}catch{return}await i(["update-ref","-d",`refs/heads/${e.branch}`,e.base_sha],e.repo_root)}})}o(ye,"rollbackManagedWorktreeAsync");async function ge(e,r,a="main"){const n=await h(e,["rev-parse","--show-toplevel"],"not_git_repo","Pass --cwd <real repo> pointing inside a git repository.");if(V(n))throw new c("managed_worktree_base",`cwd ${n} is a managed worktree and cannot be used as a managed worktree base`,"Pass `--cwd` pointing at the repository\u2019s primary checkout and keep `--worktree` set to the desired existing local base branch, including the parent branch.");const t=await W(n);return S(D(t),async()=>{const s=await $(n,a),l=X(r),u=`crtr/${r}`;if(p(l))throw new c("worktree_path_exists",`managed worktree path already exists: ${l}`,"Remove the stale path or choose a fresh node id.");if((await i(["show-ref","--verify","--quiet",`refs/heads/${u}`],n)).status===0)throw new c("worktree_branch_exists",`managed worktree branch already exists: ${u}`,"Remove the stale branch or choose a fresh node id.");const b={state:"open",path:l,branch:u,repo_root:n,base_ref:a,base_sha:s,created:new Date().toISOString()};await h(n,["branch",u,s],"worktree_branch_create_failed","Inspect the git error, fix the repository/worktree state, then retry spawning with --worktree.");const f=await i(["worktree","add",l,u],n);if(f.status!==0)throw await i(["update-ref","-d",`refs/heads/${u}`,s],n),new c("worktree_add_failed","git worktree add failed","Inspect the git error, fix the repository/worktree state, then retry spawning with --worktree.",v(f));return re(n,t),b},{timeoutMs:E,timeoutError:o(()=>new c("worktree_lock_timeout",`timed out waiting to create a managed worktree in ${t}`,"Wait for the other managed-worktree operation to finish, then retry."),"timeoutError")})}o(ge,"createManagedWorktreeAsync");async function M(e){if(e.state!=="open"||!p(e.path))return null;const r=await i(["rev-parse","--abbrev-ref","HEAD"],e.path),a=await i(["status","--porcelain"],e.path),n=await i(["rev-parse","HEAD"],e.path);if(r.status!==0||r.stdout.trim()!==e.branch||a.status!==0||a.stdout.trim()!==""||n.status!==0)return null;const t=await i(["rev-parse","--git-path","rebase-merge"],e.path);return t.status!==0||p(t.stdout.trim())?null:n.stdout.trim()}o(M,"cleanTip");async function C(e,r){try{const a=await $(e.path,e.base_ref);return(await i(["merge-base","--is-ancestor",r,a],e.path)).status===0}catch(a){if(a instanceof c&&a.code==="missing_base_branch"&&r===e.base_sha)return!0;throw a}}o(C,"containedInLocalBase");function ae(e){return{node_id:"",branch:e.branch,worktree_path:e.path,worktree_removed:!1,worktree_remove_error:`cleanup pending: the caller checkout at ${e.path} remains intact.`,branch_deleted:!1,branch_delete_error:`cleanup pending: local branch ${e.branch} remains checked out at ${e.path}.`}}o(ae,"deferred");async function L(e){if(e.state!=="open"||p(e.path))return null;const r=`refs/heads/${e.branch}`,a=await i(["show-ref","--verify","--quiet",r],e.repo_root);if(a.status===1&&a.executionFailed!==!0)return{branchSha:null};if(a.status!==0)return null;const n=await i(["rev-parse","--verify",r],e.repo_root);if(n.status!==0)return null;const t=n.stdout.trim(),s=await i(["worktree","list","--porcelain"],e.repo_root);if(s.status!==0||U(s.stdout,e.branch)!==null)return null;const l=await Y(e.repo_root,e,t);return l===null?null:{branchSha:t,containment:l}}o(L,"proveAbsentPathManagedWorktree");async function ne(e,r,a){return p(r.path)?null:a.branchSha===null?(await _(e,r,"complete"),{node_id:e,branch:r.branch,worktree_path:r.path,worktree_removed:!0,branch_deleted:!0}):a.containment===void 0?null:(await _(e,r,"complete"),{node_id:e,branch:r.branch,worktree_path:r.path,worktree_removed:!0,branch_deleted:!1,branch_delete_error:`local branch ${r.branch} is delivered but retained because its checkout status can change outside crtr's repository lock.`})}o(ne,"autoDropAbsentPathManagedWorktreeLocked");async function oe(e){const r=(await m(e))?.managed_worktree;return r==null||r.state!=="open"||p(r.path)||await L(r)===null?null:k(r.repo_root,async()=>{const a=(await m(e))?.managed_worktree;if(a==null||a.state!=="open")return null;const n=await L(a);if(n===null)return null;const t=await ne(e,a,n);return t===null?null:{dropped:t,landedSha:n.branchSha??a.base_sha}})}o(oe,"concludeAbsentManagedWorktreeAsync");async function ve(e){const r=(await m(e))?.managed_worktree;if(r==null||r.state!=="open")return null;if(!p(r.path))return(await oe(e))?.dropped??null;const a=await M(r);return a===null||!await C(r,a)?null:k(r.path,async()=>{const n=(await m(e))?.managed_worktree;if(n==null||n.state!=="open")return null;const t=await M(n);return t===null||t!==a||!await C(n,t)?null:(await _(e,n,"pending"),{...ae(n),node_id:e})})}o(ve,"autoDropCleanManagedWorktreeAsync");async function T(e){for(const r of["rebase-merge","rebase-apply"]){const a=await i(["rev-parse","--git-path",r],e);if(a.status!==0||p(a.stdout.trim()))return!0}return!1}o(T,"rebaseInProgress");async function y(e,r,a,n,t,s=r.branch){await I(e,{cwd:r.repo_root,abandoned:{branch:s,tip_sha:a,at:n,by:t}})}o(y,"persistAbandoned");async function $e(e,r){const a=(await m(e))?.managed_worktree;if(a==null||a.state!=="open")throw new c("no_managed_worktree",`node ${e} has no open managed worktree`,"Nothing to abandon for this node.");const n=[];try{return await k(a.path,()=>ie(e,r,n))}finally{await ee(a.path,n[0])}}o($e,"abandonManagedWorktreeAsync");async function g(e,r){const{result:a,trash:n}=await te(e.repo_root,e.path);if(n!==void 0&&r.push(n),a.status!==0)throw new c("worktree_remove_failed",`git worktree remove ${e.path} failed`,"Inspect the worktree manually, then retry.",v(a))}o(g,"removeCheckout");async function ie(e,r,a){const n=await m(e),t=n?.managed_worktree;if(n===null||t===void 0||t===null||t.state!=="open")throw new c("no_managed_worktree",`node ${e} has no open managed worktree`,"Nothing to abandon for this node.");if(n.status==="active"||n.status==="idle"||K(n.pi_pid))throw new c("node_running",`node ${e} is still running`,"Abandon requires a stopped node with no live broker process. From the running owner, use `crtr node worktree close` to land locally, or make the checkout clean, push its current tip to origin, and rerun `crtr push final`.");if(!p(t.path))throw new c("worktree_missing",`managed worktree path is missing: ${t.path}`,"Inspect the branch and worktree registration, then retry.");const s=await h(t.path,["rev-parse","--abbrev-ref","HEAD"],"branch_check_failed","Inspect the worktree manually, then retry."),l=await i(["show-ref","--verify","--quiet",`refs/heads/${t.branch}`],t.path);if(s!==t.branch){if(l.status===0||s==="HEAD")throw new c("wrong_branch",`managed worktree is not on its recorded branch (expected ${t.branch}, found ${s==="HEAD"?"detached HEAD":s})`,`Inspect ${t.path}, then rerun \`crtr node worktree abandon\`.`);if(await T(t.path)||await h(t.path,["status","--porcelain"],"status_failed","Inspect the worktree manually, then retry.")!=="")throw new c("dirty_worktree","managed worktree has uncommitted changes",`Commit or stash them in ${t.path}, then rerun \`crtr node worktree abandon\`.`);const d=await h(t.path,["rev-parse","HEAD"],"abandon_tip_failed","Inspect the worktree manually, then retry.");await g(t,a);const w=new Date().toISOString();return await y(e,t,d,w,r,s),{node_id:e,branch:s,tip_sha:d,worktree_path:t.path,branch_deleted:!1}}const u=await h(t.path,["rev-parse","HEAD"],"abandon_tip_failed","Inspect the branch manually, then retry.");let b=null;try{const d=await $(t.path,t.base_ref);(await i(["merge-base","--is-ancestor",u,d],t.path)).status===0&&(b=d)}catch(d){if(!(d instanceof c)||d.code!=="missing_base_branch")throw d}const f=new Date().toISOString(),F=await h(t.path,["status","--porcelain"],"status_failed","Inspect the worktree manually, then retry.");if(b!==null&&u===t.base_sha){const d=await h(t.repo_root,["rev-parse",`${u}^{tree}`],"abandon_tree_failed","Inspect the branch manually, then retry."),w=await h(t.repo_root,["-c","user.name=crtr-abandon","-c","user.email=crtr-abandon@localhost","commit-tree",d,"-p",u,"-m","crtr-abandon","-m",`Crtr-Abandon: ${e} ${f}`],"abandon_commit_failed","Inspect the branch manually, then retry.");return await h(t.repo_root,["update-ref",`refs/heads/${t.branch}`,w,u],"abandon_marker_failed","The branch changed while abandon was starting; inspect the worktree, then retry."),await g(t,a),(await i(["update-ref","--stdin"],t.repo_root,Z(t.branch,w,`refs/heads/${t.base_ref}`,b))).status===0?(await _(e,t,"complete"),{node_id:e,branch:t.branch,tip_sha:w,worktree_path:t.path,branch_deleted:!0}):(await y(e,t,w,f,r),{node_id:e,branch:t.branch,tip_sha:w,worktree_path:t.path,branch_deleted:!1})}if(!await T(t.path)&&F==="")return await g(t,a),await y(e,t,u,f,r),{node_id:e,branch:t.branch,tip_sha:u,worktree_path:t.path,branch_deleted:!1};await h(t.path,["add","--all"],"abandon_stage_failed","Inspect the worktree manually, then retry."),await h(t.path,["-c","user.name=crtr-abandon","-c","user.email=crtr-abandon@localhost","commit","--allow-empty","-m","crtr-abandon","-m",`Crtr-Abandon: ${e} ${f}`],"abandon_commit_failed","Inspect the worktree manually, then retry.");const A=await h(t.path,["rev-parse","HEAD"],"abandon_tip_failed","Inspect the branch manually, then retry.");return await g(t,a),await y(e,t,A,f,r),{node_id:e,branch:t.branch,tip_sha:A,worktree_path:t.path,branch_deleted:!1}}o(ie,"abandonLocked");export{$e as abandonManagedWorktreeAsync,ve as autoDropCleanManagedWorktreeAsync,oe as concludeAbsentManagedWorktreeAsync,ge as createManagedWorktreeAsync,ye as rollbackManagedWorktreeAsync};

package/dist/core/worktree-quarantine.js

@@ -1 +1 @@
-var s=Object.defineProperty;var o=(a,t)=>s(a,"name",{value:t,configurable:!0});import{directorySizeBytes as r}from"./disk-usage.js";import{getNode as n,listNodes as p}from"./canvas/index.js";async function l(){const a=[];for(const t of p()){const e=n(t.node_id)?.managed_worktree;e?.sweep?.quarantined===!0&&a.push({node_id:t.node_id,path:e.path,branch:e.branch,repo_root:e.repo_root,reason:e.sweep.reason,...e.sweep.detail===void 0?{}:{detail:e.sweep.detail},attempts:e.sweep.attempts,last_attempt:e.sweep.last_attempt})}return a.sort((t,e)=>t.last_attempt.localeCompare(e.last_attempt)),Promise.all(a.map(async t=>({...t,size_bytes:await r(t.path)})))}o(l,"listQuarantinedManagedWorktrees");export{l as listQuarantinedManagedWorktrees};
+var s=Object.defineProperty;var o=(a,e)=>s(a,"name",{value:e,configurable:!0});import{directorySizeBytes as r}from"./disk-usage.js";import{getNode as n,listNodes as i}from"./canvas/index.js";async function l(){const a=[];for(const e of await i()){const t=(await n(e.node_id))?.managed_worktree;t?.sweep?.quarantined===!0&&a.push({node_id:e.node_id,path:t.path,branch:t.branch,repo_root:t.repo_root,reason:t.sweep.reason,...t.sweep.detail===void 0?{}:{detail:t.sweep.detail},attempts:t.sweep.attempts,last_attempt:t.sweep.last_attempt})}return a.sort((e,t)=>e.last_attempt.localeCompare(t.last_attempt)),Promise.all(a.map(async e=>({...e,size_bytes:await r(e.path)})))}o(l,"listQuarantinedManagedWorktrees");export{l as listQuarantinedManagedWorktrees};

package/dist/core/worktree-sweep.d.ts

@@ -40,7 +40,7 @@ export interface ReconcileGuard {
      *  every destructive step re-asks, and a false answer stops the pass where it
      *  stands, leaving the record incomplete for a later pass to resume. The
      *  implementation must not spawn a subprocess: this runs inside crtrd. */
-    stillEligible: () => boolean;
+    stillEligible: () => Promise<boolean>;
 }
 /** Dispose of one node's managed worktree, or explain why it must survive.
  *

package/dist/core/worktree-sweep.js

@@ -1,6 +1,6 @@
-var q=Object.defineProperty;var d=(e,t)=>q(e,"name",{value:t,configurable:!0});import{createHash as z}from"node:crypto";import{existsSync as y,realpathSync as K}from"node:fs";import{resolve as N}from"node:path";import{completeCleanup as U,getNode as v,recordSweepAttempt as C}from"./canvas/index.js";import{withExclusiveDirectoryLockAsync as Q}from"./exclusive-lock.js";import{gitAsync as c}from"./git.js";import{proveBranchContained as A,upstreamTip as V}from"./worktree-containment.js";import{parseStatusPorcelain as j,planLandIntoCheckout as G,refDeleteTransactionStdin as I}from"./worktree-landing.js";import{shellQuote as J}from"../shared/shell-quote.js";import{deleteTrashAsync as X,removeWorktreeCheckoutAsync as R}from"./worktree-remove.js";import{WORKTREE_LOCK_WAIT_MS as Y,checkoutPathForBranchInList as B,samePath as W,worktreeLockPathForCommonDir as Z}from"./worktree.js";const E=[2,5,15,30,60],ee=E.length;function D(e){return e==null||e.state==="abandoned"?!1:e.state==="open"||e.cleanup!=="complete"}d(D,"isReconcilable");function ve(e,t){const r=e.sweep?.next_attempt;if(r===void 0)return!0;const a=Date.parse(r);return Number.isNaN(a)||a<=t}d(ve,"isDueForSweep");async function m(e,t){const r=await c(["rev-parse","--verify","--quiet",t],e);return r.status===0?r.stdout.trim():null}d(m,"revParseRef");function h(e){return(e.stderr.trim()||e.stdout.trim()).trim()}d(h,"detailOf");async function L(e){const t=await c(["rev-parse","--git-common-dir"],e);if(t.status!==0)return null;try{return K(N(e,t.stdout.trim()))}catch{return null}}d(L,"commonGitDirAsync");async function te(e){for(const t of["rebase-merge","rebase-apply"]){const r=await c(["rev-parse","--git-path",t],e);if(r.status!==0)return null;if(y(N(e,r.stdout.trim())))return!0}return!1}d(te,"isRebaseInProgressAsync");function ae(e){for(const t of e.split(`
-`))if(t.startsWith("worktree "))return t.slice(9).trim();return null}d(ae,"mainWorktreePath");function re(e,t,r){let a=null;for(const s of e.split(`
-`))if(s.startsWith("worktree "))a=s.slice(9).trim();else if(a!==null&&s===`branch refs/heads/${r}`&&W(a,t))return a;return null}d(re,"registeredCheckoutPath");async function se(e){const t=y(e.path),r=t?e.path:e.repo_root,a=await m(r,`refs/heads/${e.base_ref}`),s=await V(r,e.base_ref),n=await m(r,`refs/heads/${e.branch}`);if(!t)return{base:a,upstream:s?.sha??null,branch:n,checkout:"absent"};const i=await c(["rev-parse","HEAD"],e.path),u=await c(["status","--porcelain"],e.path),o=i.status!==0||u.status!==0?null:z("sha256").update(`${i.stdout.trim()}
-${u.stdout}`).digest("hex");return{base:a,upstream:s?.sha??null,branch:n,checkout:o}}d(se,"observe");function ne(e,t){return e.checkout===null||t.checkout===null?!1:e.base===t.base&&e.upstream===t.upstream&&e.branch===t.branch&&e.checkout===t.checkout}d(ne,"sameObservation");function ie(e,t,r,a,s,n){if(r.status!=="refused"&&r.status!=="failed"||!n.stillEligible())return;const i=(t.sweep?.attempts??0)+1,u=E[Math.min(i,E.length)-1]??E[0],o=v(e)?.managed_worktree;o==null||!D(o)||C(e,{reason:r.reason,...r.detail===void 0?{}:{detail:r.detail},observed:a,attempts:i,lastAttemptAt:new Date(s).toISOString(),nextAttemptAt:new Date(s+u*6e4).toISOString(),quarantined:i>=ee})}d(ie,"recordUnfinished");async function oe(e,t,r,a,s){const n=await c(["status","--porcelain"],e);if(n.status!==0)return{ok:!1,detail:h(n)};const i=await c(["diff","--name-only",r,a],e);if(i.status!==0)return{ok:!1,detail:h(i)};const u=i.stdout.split(`
-`).map(p=>p.trim()).filter(p=>p!==""),o=G(j(n.stdout),u);if(o.kind==="refuse")return{ok:!1,detail:`untracked files in ${e} would be overwritten by the incoming commits: ${o.collisions.join(", ")}`};if(!s.stillEligible())return{ok:!1,detail:"node is no longer terminal",ineligible:!0};const l=d(async()=>{const p=await c(["merge","--ff-only",a],e);return p.status===0?{ok:!0}:{ok:!1,detail:h(p)}},"merge");if(o.kind==="direct")return l();const b=await m(e,"refs/stash"),g=await c(["stash","push","--message",`crtr landing ${t}`],e);if(g.status!==0)return{ok:!1,detail:h(g)};const f=await m(e,"refs/stash");if(f===null||f===b)return l();const k=`local changes from ${e} are retained in stash ${f}; recover them with \`git -C ${J(e)} stash apply ${f}\` and resolve any conflict.`,_=await l();return _.ok?(await c(["stash","apply",f],e)).status===0?(await M(e,f),{ok:!0}):(await c(["reset","--hard",a],e),{ok:!0,stash:`the shared base checkout was reset to landed commit ${a} because local changes conflicted with it. ${k}`}):(await c(["stash","apply",f],e)).status===0?(await M(e,f),_):{ok:!1,detail:`${_.detail}
-${k}`}}d(oe,"landIntoBaseCheckoutAsync");async function M(e,t){await m(e,"refs/stash")===t&&await c(["stash","drop"],e)}d(M,"dropStashIfStillTip");async function le(e,t,r){const a=await m(e.path,`refs/heads/${e.base_ref}`);if(a===null)return{ok:!1,detail:`local base branch '${e.base_ref}' does not resolve`};if(!r.stillEligible())return{ok:!1,detail:"node is no longer terminal",ineligible:!0};const s=await c(["rebase",a],e.path);if(s.status!==0)return await c(["rebase","--abort"],e.path),{ok:!1,detail:h(s)};const n=await m(e.path,"HEAD");if(n===null)return{ok:!1,detail:"could not read the rebased worktree tip"};if((await c(["merge-base","--is-ancestor",a,n],e.path)).status!==0)return{ok:!1,detail:`the rebased branch is not a fast-forward of '${e.base_ref}'`};const i=B(t,e.base_ref);if(i===null){if(!r.stillEligible())return{ok:!1,detail:"node is no longer terminal",ineligible:!0};const l=await c(["update-ref",`refs/heads/${e.base_ref}`,n,a],e.path);return l.status===0?{ok:!0,landedSha:n}:{ok:!1,detail:h(l)}}const u=await c(["rev-parse","HEAD"],i);if(u.status!==0||u.stdout.trim()!==a)return{ok:!1,detail:`base checkout ${i} is not at ${a}`};const o=await oe(i,e.branch,a,n,r);return o.ok?{ok:!0,landedSha:n,...o.stash===void 0?{}:{stash:o.stash}}:o}d(le,"finishBlockedLand");const $={status:"skipped",reason:"node_no_longer_terminal"};async function Ee(e,t,r=Date.now()){const a=v(e)?.managed_worktree;if(!D(a)||a==null)return{status:"skipped",reason:"already_reconciled"};const s=y(a.path)?a.path:a.repo_root;if(!y(s))return S(e,a,{status:"refused",reason:"repo_unavailable",detail:`neither the recorded checkout nor repository root exists, so ${a.branch} cannot be proved absent`},{base:null,upstream:null,branch:null,checkout:null},r,t);const n=await L(s);if(n===null)return S(e,a,{status:"failed",reason:"git_dir_unreadable",detail:`could not resolve the git common dir from ${s}`},{base:null,upstream:null,branch:null,checkout:null},r,t);let i={base:null,upstream:null,branch:null,checkout:null},u;const o=[];try{u=await Q(Z(n),async()=>{if(!t.stillEligible())return $;const l=v(e)?.managed_worktree;return!D(l)||l==null?{status:"skipped",reason:"already_reconciled"}:(i=await se(l),l.sweep!==void 0&&ne(l.sweep.observed,i)?{status:"refused",reason:l.sweep.reason,...l.sweep.detail===void 0?{}:{detail:l.sweep.detail},unchanged:!0}:y(l.path)?await ce(e,l,t,o):await ue(e,l,i,t))},{timeoutMs:Y,timeoutError:d(()=>new Error(`timed out waiting for the managed-worktree lock on ${n}`),"timeoutError")})}catch(l){u={status:"failed",reason:"lock_unavailable",detail:l instanceof Error?l.message:String(l)}}return await X(a.path,o[0]),S(e,a,u,i,r,t)}d(Ee,"reconcileManagedWorktree");function S(e,t,r,a,s,n){return ie(e,t,r,a,s,n),r}d(S,"finish");function x(e,t,r){if(!r.stillEligible())return $;const a=v(e)?.managed_worktree;return a==null||a.path!==t.path||a.branch!==t.branch?{status:"skipped",reason:"record_changed"}:(U(e),{status:"complete"})}d(x,"persistComplete");async function ue(e,t,r,a){const s=t.repo_root;if(r.branch===null){const o=await c(["show-ref","--verify","--quiet",`refs/heads/${t.branch}`],s);return o.status!==1?{status:"failed",reason:"branch_inspection_failed",detail:h(o)}:x(e,t,a)}const n=await c(["worktree","list","--porcelain"],s);if(n.status!==0)return{status:"failed",reason:"worktree_list_failed",detail:h(n)};const i=B(n.stdout,t.branch);if(i!==null)return{status:"refused",reason:"branch_checked_out_elsewhere",detail:`${t.branch} is checked out at ${i}`};const u=await A(s,t,r.branch);return u===null?{status:"refused",reason:"unlanded_work",detail:`${t.branch} carries content no base or upstream ref contains; its checkout is already gone, so the branch is the only copy`}:F(e,t,s,r.branch,u,a)}d(ue,"concludeAbsentCheckout");async function ce(e,t,r,a){const s=await c(["worktree","list","--porcelain"],t.path);if(s.status!==0)return{status:"failed",reason:"worktree_list_failed",detail:h(s)};const n=t.disposal,i=n?.observed_branch??t.branch,u=re(s.stdout,t.path,i);if(u===null)return{status:"refused",reason:"not_registered",detail:`${t.path} is not registered to refs/heads/${i}; crtr will not act on a path it cannot prove it owns`};const o=ae(s.stdout);if(o===null||W(o,u)||!y(o))return{status:"refused",reason:"repo_unavailable",detail:`the repository's main checkout is unavailable, so ${t.path} cannot be removed from outside itself`};const l=await te(t.path);if(l===null)return{status:"failed",reason:"git_path_failed",detail:`could not inspect in-progress operations in ${t.path}`};if(l)return{status:"refused",reason:"rebase_in_progress",detail:`${t.path} is mid-rebase`};const b=await c(["rev-parse","--abbrev-ref","HEAD"],t.path);if(b.status!==0)return{status:"failed",reason:"branch_check_failed",detail:h(b)};if(b.stdout.trim()!==i)return{status:"refused",reason:"wrong_branch",detail:`expected ${i}, found ${b.stdout.trim()==="HEAD"?"detached HEAD":b.stdout.trim()}`};const g=await c(["status","--porcelain"],t.path);if(g.status!==0)return{status:"failed",reason:"status_failed",detail:h(g)};if(g.stdout.trim()!=="")return{status:"refused",reason:"dirty_worktree",detail:`${t.path} has uncommitted changes`};let f=await m(t.path,"HEAD");if(f===null)return{status:"failed",reason:"head_unreadable",detail:`could not read HEAD in ${t.path}`};if(n!==void 0){if(await L(t.path)!==n.common_dir||f!==n.observed_sha)return{status:"refused",reason:"disposal_authorization_stale",detail:`${t.path} changed since \`close\` authorized its disposal; rerun \`crtr node worktree close\` from that node to re-authorize, or ask the user with \`crtr human send\``};if(!r.stillEligible())return $;const{result:H,trash:O}=await R(o,u);return O!==void 0&&a.push(O),H.status!==0?{status:"refused",reason:"worktree_remove_failed",detail:h(H)}:x(e,t,r)}let k=await A(t.path,t,f),_;if(k===null&&t.land_intent!==void 0){const w=await le(t,s.stdout,r);if(!w.ok)return w.ineligible===!0?$:{status:"refused",reason:"land_blocked",detail:w.detail};f=w.landedSha,_=w.stash,k=await A(t.path,t,f)}if(k===null)return{status:"refused",reason:"unlanded_work",detail:`${t.branch} carries commits its base does not contain, and this node never asked to land them`};if(!r.stillEligible())return $;const{result:p,trash:P}=await R(o,u);if(P!==void 0&&a.push(P),p.status!==0)return{status:"refused",reason:"worktree_remove_failed",detail:h(p)};const T=await F(e,t,o,f,k,r);return T.status==="complete"&&_!==void 0?{status:"complete",stash:_}:T}d(ce,"reconcilePresentCheckout");async function F(e,t,r,a,s,n){if(!n.stillEligible())return $;const i=I(t.branch,a,s.containingRef,s.containingSha),u=await c(["update-ref","--stdin"],r,i);return u.status!==0?{status:"refused",reason:"branch_delete_failed",detail:h(u)}:x(e,t,n)}d(F,"deleteBranchAndComplete");export{ve as isDueForSweep,D as isReconcilable,Ee as reconcileManagedWorktree};
+var q=Object.defineProperty;var d=(t,e)=>q(t,"name",{value:e,configurable:!0});import{createHash as z}from"node:crypto";import{existsSync as y,realpathSync as K}from"node:fs";import{resolve as N}from"node:path";import{completeCleanup as U,getNode as v,recordSweepAttempt as C}from"./canvas/index.js";import{withExclusiveDirectoryLockAsync as Q}from"./exclusive-lock.js";import{gitAsync as c}from"./git.js";import{proveBranchContained as A,upstreamTip as V}from"./worktree-containment.js";import{parseStatusPorcelain as j,planLandIntoCheckout as G,refDeleteTransactionStdin as I}from"./worktree-landing.js";import{shellQuote as J}from"../shared/shell-quote.js";import{deleteTrashAsync as X,removeWorktreeCheckoutAsync as R}from"./worktree-remove.js";import{WORKTREE_LOCK_WAIT_MS as Y,checkoutPathForBranchInList as B,samePath as W,worktreeLockPathForCommonDir as Z}from"./worktree.js";const E=[2,5,15,30,60],tt=E.length;function D(t){return t==null||t.state==="abandoned"?!1:t.state==="open"||t.cleanup!=="complete"}d(D,"isReconcilable");function vt(t,e){const r=t.sweep?.next_attempt;if(r===void 0)return!0;const a=Date.parse(r);return Number.isNaN(a)||a<=e}d(vt,"isDueForSweep");async function m(t,e){const r=await c(["rev-parse","--verify","--quiet",e],t);return r.status===0?r.stdout.trim():null}d(m,"revParseRef");function h(t){return(t.stderr.trim()||t.stdout.trim()).trim()}d(h,"detailOf");async function L(t){const e=await c(["rev-parse","--git-common-dir"],t);if(e.status!==0)return null;try{return K(N(t,e.stdout.trim()))}catch{return null}}d(L,"commonGitDirAsync");async function et(t){for(const e of["rebase-merge","rebase-apply"]){const r=await c(["rev-parse","--git-path",e],t);if(r.status!==0)return null;if(y(N(t,r.stdout.trim())))return!0}return!1}d(et,"isRebaseInProgressAsync");function at(t){for(const e of t.split(`
+`))if(e.startsWith("worktree "))return e.slice(9).trim();return null}d(at,"mainWorktreePath");function rt(t,e,r){let a=null;for(const s of t.split(`
+`))if(s.startsWith("worktree "))a=s.slice(9).trim();else if(a!==null&&s===`branch refs/heads/${r}`&&W(a,e))return a;return null}d(rt,"registeredCheckoutPath");async function st(t){const e=y(t.path),r=e?t.path:t.repo_root,a=await m(r,`refs/heads/${t.base_ref}`),s=await V(r,t.base_ref),n=await m(r,`refs/heads/${t.branch}`);if(!e)return{base:a,upstream:s?.sha??null,branch:n,checkout:"absent"};const i=await c(["rev-parse","HEAD"],t.path),u=await c(["status","--porcelain"],t.path),o=i.status!==0||u.status!==0?null:z("sha256").update(`${i.stdout.trim()}
+${u.stdout}`).digest("hex");return{base:a,upstream:s?.sha??null,branch:n,checkout:o}}d(st,"observe");function nt(t,e){return t.checkout===null||e.checkout===null?!1:t.base===e.base&&t.upstream===e.upstream&&t.branch===e.branch&&t.checkout===e.checkout}d(nt,"sameObservation");async function it(t,e,r,a,s,n){if(r.status!=="refused"&&r.status!=="failed"||!await n.stillEligible())return;const i=(e.sweep?.attempts??0)+1,u=E[Math.min(i,E.length)-1]??E[0],o=(await v(t))?.managed_worktree;o==null||!D(o)||await C(t,{reason:r.reason,...r.detail===void 0?{}:{detail:r.detail},observed:a,attempts:i,lastAttemptAt:new Date(s).toISOString(),nextAttemptAt:new Date(s+u*6e4).toISOString(),quarantined:i>=tt})}d(it,"recordUnfinished");async function ot(t,e,r,a,s){const n=await c(["status","--porcelain"],t);if(n.status!==0)return{ok:!1,detail:h(n)};const i=await c(["diff","--name-only",r,a],t);if(i.status!==0)return{ok:!1,detail:h(i)};const u=i.stdout.split(`
+`).map(p=>p.trim()).filter(p=>p!==""),o=G(j(n.stdout),u);if(o.kind==="refuse")return{ok:!1,detail:`untracked files in ${t} would be overwritten by the incoming commits: ${o.collisions.join(", ")}`};if(!await s.stillEligible())return{ok:!1,detail:"node is no longer terminal",ineligible:!0};const l=d(async()=>{const p=await c(["merge","--ff-only",a],t);return p.status===0?{ok:!0}:{ok:!1,detail:h(p)}},"merge");if(o.kind==="direct")return l();const b=await m(t,"refs/stash"),w=await c(["stash","push","--message",`crtr landing ${e}`],t);if(w.status!==0)return{ok:!1,detail:h(w)};const f=await m(t,"refs/stash");if(f===null||f===b)return l();const k=`local changes from ${t} are retained in stash ${f}; recover them with \`git -C ${J(t)} stash apply ${f}\` and resolve any conflict.`,_=await l();return _.ok?(await c(["stash","apply",f],t)).status===0?(await M(t,f),{ok:!0}):(await c(["reset","--hard",a],t),{ok:!0,stash:`the shared base checkout was reset to landed commit ${a} because local changes conflicted with it. ${k}`}):(await c(["stash","apply",f],t)).status===0?(await M(t,f),_):{ok:!1,detail:`${_.detail}
+${k}`}}d(ot,"landIntoBaseCheckoutAsync");async function M(t,e){await m(t,"refs/stash")===e&&await c(["stash","drop"],t)}d(M,"dropStashIfStillTip");async function lt(t,e,r){const a=await m(t.path,`refs/heads/${t.base_ref}`);if(a===null)return{ok:!1,detail:`local base branch '${t.base_ref}' does not resolve`};if(!await r.stillEligible())return{ok:!1,detail:"node is no longer terminal",ineligible:!0};const s=await c(["rebase",a],t.path);if(s.status!==0)return await c(["rebase","--abort"],t.path),{ok:!1,detail:h(s)};const n=await m(t.path,"HEAD");if(n===null)return{ok:!1,detail:"could not read the rebased worktree tip"};if((await c(["merge-base","--is-ancestor",a,n],t.path)).status!==0)return{ok:!1,detail:`the rebased branch is not a fast-forward of '${t.base_ref}'`};const i=B(e,t.base_ref);if(i===null){if(!await r.stillEligible())return{ok:!1,detail:"node is no longer terminal",ineligible:!0};const l=await c(["update-ref",`refs/heads/${t.base_ref}`,n,a],t.path);return l.status===0?{ok:!0,landedSha:n}:{ok:!1,detail:h(l)}}const u=await c(["rev-parse","HEAD"],i);if(u.status!==0||u.stdout.trim()!==a)return{ok:!1,detail:`base checkout ${i} is not at ${a}`};const o=await ot(i,t.branch,a,n,r);return o.ok?{ok:!0,landedSha:n,...o.stash===void 0?{}:{stash:o.stash}}:o}d(lt,"finishBlockedLand");const $={status:"skipped",reason:"node_no_longer_terminal"};async function Et(t,e,r=Date.now()){const a=(await v(t))?.managed_worktree;if(!D(a)||a==null)return{status:"skipped",reason:"already_reconciled"};const s=y(a.path)?a.path:a.repo_root;if(!y(s))return await S(t,a,{status:"refused",reason:"repo_unavailable",detail:`neither the recorded checkout nor repository root exists, so ${a.branch} cannot be proved absent`},{base:null,upstream:null,branch:null,checkout:null},r,e);const n=await L(s);if(n===null)return await S(t,a,{status:"failed",reason:"git_dir_unreadable",detail:`could not resolve the git common dir from ${s}`},{base:null,upstream:null,branch:null,checkout:null},r,e);let i={base:null,upstream:null,branch:null,checkout:null},u;const o=[];try{u=await Q(Z(n),async()=>{if(!await e.stillEligible())return $;const l=(await v(t))?.managed_worktree;return!D(l)||l==null?{status:"skipped",reason:"already_reconciled"}:(i=await st(l),l.sweep!==void 0&&nt(l.sweep.observed,i)?{status:"refused",reason:l.sweep.reason,...l.sweep.detail===void 0?{}:{detail:l.sweep.detail},unchanged:!0}:y(l.path)?await ct(t,l,e,o):await ut(t,l,i,e))},{timeoutMs:Y,timeoutError:d(()=>new Error(`timed out waiting for the managed-worktree lock on ${n}`),"timeoutError")})}catch(l){u={status:"failed",reason:"lock_unavailable",detail:l instanceof Error?l.message:String(l)}}return await X(a.path,o[0]),await S(t,a,u,i,r,e)}d(Et,"reconcileManagedWorktree");async function S(t,e,r,a,s,n){return await it(t,e,r,a,s,n),r}d(S,"finish");async function x(t,e,r){if(!await r.stillEligible())return $;const a=(await v(t))?.managed_worktree;return a==null||a.path!==e.path||a.branch!==e.branch?{status:"skipped",reason:"record_changed"}:(await U(t),{status:"complete"})}d(x,"persistComplete");async function ut(t,e,r,a){const s=e.repo_root;if(r.branch===null){const o=await c(["show-ref","--verify","--quiet",`refs/heads/${e.branch}`],s);return o.status!==1?{status:"failed",reason:"branch_inspection_failed",detail:h(o)}:await x(t,e,a)}const n=await c(["worktree","list","--porcelain"],s);if(n.status!==0)return{status:"failed",reason:"worktree_list_failed",detail:h(n)};const i=B(n.stdout,e.branch);if(i!==null)return{status:"refused",reason:"branch_checked_out_elsewhere",detail:`${e.branch} is checked out at ${i}`};const u=await A(s,e,r.branch);return u===null?{status:"refused",reason:"unlanded_work",detail:`${e.branch} carries content no base or upstream ref contains; its checkout is already gone, so the branch is the only copy`}:F(t,e,s,r.branch,u,a)}d(ut,"concludeAbsentCheckout");async function ct(t,e,r,a){const s=await c(["worktree","list","--porcelain"],e.path);if(s.status!==0)return{status:"failed",reason:"worktree_list_failed",detail:h(s)};const n=e.disposal,i=n?.observed_branch??e.branch,u=rt(s.stdout,e.path,i);if(u===null)return{status:"refused",reason:"not_registered",detail:`${e.path} is not registered to refs/heads/${i}; crtr will not act on a path it cannot prove it owns`};const o=at(s.stdout);if(o===null||W(o,u)||!y(o))return{status:"refused",reason:"repo_unavailable",detail:`the repository's main checkout is unavailable, so ${e.path} cannot be removed from outside itself`};const l=await et(e.path);if(l===null)return{status:"failed",reason:"git_path_failed",detail:`could not inspect in-progress operations in ${e.path}`};if(l)return{status:"refused",reason:"rebase_in_progress",detail:`${e.path} is mid-rebase`};const b=await c(["rev-parse","--abbrev-ref","HEAD"],e.path);if(b.status!==0)return{status:"failed",reason:"branch_check_failed",detail:h(b)};if(b.stdout.trim()!==i)return{status:"refused",reason:"wrong_branch",detail:`expected ${i}, found ${b.stdout.trim()==="HEAD"?"detached HEAD":b.stdout.trim()}`};const w=await c(["status","--porcelain"],e.path);if(w.status!==0)return{status:"failed",reason:"status_failed",detail:h(w)};if(w.stdout.trim()!=="")return{status:"refused",reason:"dirty_worktree",detail:`${e.path} has uncommitted changes`};let f=await m(e.path,"HEAD");if(f===null)return{status:"failed",reason:"head_unreadable",detail:`could not read HEAD in ${e.path}`};if(n!==void 0){if(await L(e.path)!==n.common_dir||f!==n.observed_sha)return{status:"refused",reason:"disposal_authorization_stale",detail:`${e.path} changed since \`close\` authorized its disposal; rerun \`crtr node worktree close\` from that node to re-authorize, or ask the user with \`crtr human send\``};if(!await r.stillEligible())return $;const{result:H,trash:O}=await R(o,u);return O!==void 0&&a.push(O),H.status!==0?{status:"refused",reason:"worktree_remove_failed",detail:h(H)}:await x(t,e,r)}let k=await A(e.path,e,f),_;if(k===null&&e.land_intent!==void 0){const g=await lt(e,s.stdout,r);if(!g.ok)return g.ineligible===!0?$:{status:"refused",reason:"land_blocked",detail:g.detail};f=g.landedSha,_=g.stash,k=await A(e.path,e,f)}if(k===null)return{status:"refused",reason:"unlanded_work",detail:`${e.branch} carries commits its base does not contain, and this node never asked to land them`};if(!await r.stillEligible())return $;const{result:p,trash:P}=await R(o,u);if(P!==void 0&&a.push(P),p.status!==0)return{status:"refused",reason:"worktree_remove_failed",detail:h(p)};const T=await F(t,e,o,f,k,r);return T.status==="complete"&&_!==void 0?{status:"complete",stash:_}:T}d(ct,"reconcilePresentCheckout");async function F(t,e,r,a,s,n){if(!await n.stillEligible())return $;const i=I(e.branch,a,s.containingRef,s.containingSha),u=await c(["update-ref","--stdin"],r,i);return u.status!==0?{status:"refused",reason:"branch_delete_failed",detail:h(u)}:await x(t,e,n)}d(F,"deleteBranchAndComplete");export{vt as isDueForSweep,D as isReconcilable,Et as reconcileManagedWorktree};

package/dist/core/worktree.d.ts

@@ -13,7 +13,7 @@ export declare class WorktreeError extends Error {
 export declare function managedWorktreesRoot(): string;
 export declare function managedWorktreePath(nodeId: string): string;
 export declare function hasOpenManagedWorktree(node: NodeMeta | null | undefined): boolean;
-export declare function openManagedWorktreeForNode(nodeId: string): ManagedWorktree | null;
+export declare function openManagedWorktreeForNode(nodeId: string): Promise<ManagedWorktree | null>;
 export declare function isManagedWorktreeBase(repoRoot: string): boolean;
 /** Shared parse for a `git worktree list --porcelain` blob already in hand —
  *  callers that must not throw on a read failure (an absent-path proof that
@@ -67,8 +67,8 @@ export interface CloseManagedWorktreeResult {
  * revive launch fresh instead. Both closing paths MUST go through this helper
  * instead of hand-rolling the `updateNode` call, so neither can drift out of
  * sync. */
-export declare function persistClosedWorktreeState(nodeId: string, wt: ManagedWorktree, cleanup?: 'pending' | 'complete'): void;
-export declare function closeManagedWorktree(nodeId: string): CloseManagedWorktreeResult;
+export declare function persistClosedWorktreeState(nodeId: string, wt: ManagedWorktree, cleanup?: 'pending' | 'complete'): Promise<void>;
+export declare function closeManagedWorktree(nodeId: string): Promise<CloseManagedWorktreeResult>;
 export interface AbandonManagedWorktreeResult {
     node_id: string;
     branch: string;
@@ -114,7 +114,7 @@ export interface AutoDroppedWorktree {
  * inside the owner broker, so it has the same destructive-cwd boundary as
  * explicit close: removal and branch deletion are deferred until that owner
  * has exited. */
-export declare function autoDropCleanManagedWorktreeLocked(nodeId: string, wt: ManagedWorktree, proof: CleanEmptyProof): AutoDroppedWorktree | null;
+export declare function autoDropCleanManagedWorktreeLocked(nodeId: string, wt: ManagedWorktree, proof: CleanEmptyProof): Promise<AutoDroppedWorktree | null>;
 export declare function branchIsPushedAtCurrentTip(wt: ManagedWorktree): Promise<boolean>;
-export declare function autoDropCleanManagedWorktree(nodeId: string): AutoDroppedWorktree | null;
+export declare function autoDropCleanManagedWorktree(nodeId: string): Promise<AutoDroppedWorktree | null>;
 export {};