@lovek4d/kickflip 0.4.0 → 0.5.0

package/board/finish.mjs

@@ -1,3 +1,4 @@
-var C=Object.defineProperty;var p=(t,e)=>C(t,"name",{value:e,configurable:!0});import R from"node:fs";import w from"node:path";import{spawnSync as v}from"node:child_process";import*as n from"./store.mjs";import{builderRepo as T,git as l,holdingLandLock as x,land as A,passTests as D,worktreesDir as E}from"./worktree.mjs";import{readPermissions as I}from"./permissions.mjs";import{boardAt as L}from"../hub/boards.mjs";import{boardRepo as N}from"../hub/board-repo.mjs";const m=p(t=>{throw new n.BoardError(t)},"fail"),P=p(t=>typeof t=="string"&&t.trim()?t.trim():m("--text must be non-empty text"),"said");async function G(t,e,{text:r,ownerStep:o,repo:i}){const a=e.split("/")[1],d=await n.recordedWorktree(t,e),{repo:f,base:u,remote:$}=T(t,{repo:i??d?.repo}),s={path:d?.path??w.join(E(),a),branch:d?.branch??a},c=await n.cardName(t,e);return $?B(t,e,{...s,base:u,ref:c,text:P(r)}):x(c,async()=>{await n.checkClose(t,e,r,o),await n.checkCallsVerified(t,e),A({...s,repo:w.resolve(f),base:u,ref:c});const h=await n.setItem(t,e,{status:"done",text:r,ownerStep:o});return{said:o===void 0?"landed and done":`landed; waits on the owner step "${o.trim()}"`,lines:[...h.lines,...await q(t,e,f,u)]}})}p(G,"finishCard");async function q(t,e,r,o){if(!(await I(r)).pushMain)return[];const i=l(r,"push","--quiet","origin",o);if(i.ok)return[`pushed ${o} to origin`];const a=`${o} didn't reach origin: ${i.err}; push it with git -C ${r} push origin ${o}`;return await n.appendThread(t,e,{text:`Landed, but ${a}`}),[`landed, but ${a}`]}p(q,"pushBase");async function B(t,e,{path:r,branch:o,base:i,ref:a,text:d}){await n.checkCallsVerified(t,e),R.existsSync(r)||m(`no worktree at ${r}`),l(r,"status","--porcelain").out&&m(`${r} has uncommitted changes; commit them there first`),Number(l(r,"rev-list","--count",`refs/remotes/origin/${i}..HEAD`).out)===0&&m(`${o} has no commits beyond ${i}; nothing to send for review`),D(r,{outcome:"nothing was pushed"});const f=l(r,"push","--quiet","origin",`HEAD:refs/heads/${o}`);f.ok||m(`could not push ${o} to origin: ${f.err}`);const{github:u}=N(L(t).route);if(!u){const b=await n.setItem(t,e,{pushed:o});return await n.appendThread(t,e,{text:d}),{said:`pushed ${o} for its merge`,lines:b.lines}}const{title:$}=await n.briefFacts(t,e),s=v("gh",["pr","create","--draft","--repo",u,"--base",i,"--head",o,"--title",`${a}: ${$}`,"--body",d],{cwd:r,encoding:"utf8"}),c=`${s.stdout||""}
-${s.stderr||""}`,h=(s.status===0||/already exists/.test(c))&&/\/pull\/(\d+)/.exec(c)?.[1];h||m(`could not open a draft PR for ${o}: ${(s.stderr||s.error?.message||`gh exited ${s.status}`).trim().split(`
-`)[0]}`);const g=await n.setItem(t,e,{pr:Number(h)});return await n.appendThread(t,e,{text:d}),{said:`draft PR #${h} opened`,lines:g.lines}}p(B,"sendForReview");export{G as finishCard};
+var N=Object.defineProperty;var u=(t,a)=>N(t,"name",{value:a,configurable:!0});import W from"node:fs";import x from"node:path";import{spawnSync as j}from"node:child_process";import*as n from"./store.mjs";import{builderRepo as M,git as b,joiningLand as v,landInTurn as A,passTests as E,syncBase as B,worktreesDir as D}from"./worktree.mjs";import{readPermissions as F}from"./permissions.mjs";import{launchBuilder as H}from"./headless.mjs";import{boardAt as C}from"../hub/boards.mjs";import{boardRepo as R}from"../hub/board-repo.mjs";const w=u(t=>{throw new n.BoardError(t)},"fail"),L=u(t=>typeof t=="string"&&t.trim()?t.trim():w("--text must be non-empty text"),"said");async function I(t,a,{text:r,ownerStep:o,check:e,repo:i,onWait:d}){const m=a.split("/")[1],p=await n.recordedWorktree(t,a),{repo:c,base:s,remote:l}=M(t,{repo:i??p?.repo}),h={path:p?.path??x.join(D(),m),branch:p?.branch??m,repo:x.resolve(c),base:s},f=await n.cardName(t,a),g=await n.readBoardSettings(t),$=l?R(C(t).route).github:null;if(l&&(!$||g.prs))return V(t,a,{...h,ref:f,text:L(r)});const T=await v(f,()=>P(t,a,{tree:h,ref:f,base:s,remote:l,repo:c,settings:g,text:r,ownerStep:o,check:e,onWait:d}));return T.joined?await n.isFinished(t,a)?{said:"landed and done",lines:[]}:I(t,a,{text:r,ownerStep:o,check:e,repo:i,onWait:d}):T}u(I,"finishCard");async function P(t,a,{tree:r,ref:o,base:e,remote:i,repo:d,settings:m,text:p,ownerStep:c,check:s,onWait:l}){await n.checkClose(t,a,p,c,s),await n.checkCallsVerified(t,a),i&&(B(r.repo,e),b(r.repo,"branch","--unset-upstream",r.branch));const h=u($=>n.appendThread(t,a,{text:`Waiting for the test slot: ${$} is running the suite`,kind:"status"}),"onWaitTests"),f=m.auto_merge||!!(await n.heldMerge(t,a))?.tapped;if(await A({...r,ref:o},{hold:!f,onWait:l,onWaitTests:h,sync:u(()=>i&&B(r.repo,e),"sync")}),!f){const $=await n.setItem(t,a,{mergeReady:r.branch,ownerStep:c,check:s});return await n.appendThread(t,a,{text:p}),{said:"verified; waits for your Merge",lines:$.lines}}const g=await n.setItem(t,a,{status:"done",text:p,ownerStep:c,check:s});return{said:c===void 0?"landed and done":`landed; waits on the owner step "${c.trim()}"`,lines:[...g.lines,...await q(t,a,d,e)]}}u(P,"landCard");async function Y(t,a,{launch:r=H}={}){(await n.heldMerge(t,a))?.tapped||w(`${a} isn't waiting on a Merge tap`);try{const{base:e}=M(t,{repo:(await n.recordedWorktree(t,a))?.repo}),i=u(d=>n.appendThread(t,a,{text:`Waiting for ${d} to land`,kind:"status"}),"onWait");return await I(t,a,{text:`Landed on ${e} on your Merge.`,onWait:i})}catch(e){if(!(e instanceof n.BoardError))throw e;const i=e.message.split(`
+`)[0];if(/^rebasing .+ conflicts in |^tests failed in /.test(i)){await n.appendThread(t,a,{text:`Not merged yet: ${i}. A lander fixes it and lands it.`});try{await r(t,{key:a,model:await n.builderModel(t,a)},{lander:!0})}catch(d){await n.appendThread(t,a,{text:`Couldn't launch the lander headless (${d.message}); land it with board.mjs land ${a}.`})}}else await n.appendThread(t,a,{text:`Not merged: ${i}. Tap Merge again.`});throw e}}u(Y,"landHeld");async function q(t,a,r,o){if(!(await F(r)).pushMain)return[];const e=b(r,"push","--quiet","origin",o);if(e.ok)return[`pushed ${o} to origin`];const i=`${o} didn't reach origin: ${e.err}; push it with git -C ${r} push origin ${o}`;return await n.appendThread(t,a,{text:`Landed, but ${i}`}),[`landed, but ${i}`]}u(q,"pushBase");async function V(t,a,{path:r,branch:o,base:e,ref:i,text:d}){await n.checkCallsVerified(t,a),W.existsSync(r)||w(`no worktree at ${r}`),b(r,"status","--porcelain").out&&w(`${r} has uncommitted changes; commit them there first`),Number(b(r,"rev-list","--count",`refs/remotes/origin/${e}..HEAD`).out)===0&&w(`${o} has no commits beyond ${e}; nothing to send for review`),await E(r,{outcome:"nothing was pushed"});const m=b(r,"push","--quiet","origin",`HEAD:refs/heads/${o}`);m.ok||w(`could not push ${o} to origin: ${m.err}`);const{github:p}=R(C(t).route);if(!p){const g=await n.setItem(t,a,{pushed:o});return await n.appendThread(t,a,{text:d}),{said:`pushed ${o} for its merge`,lines:g.lines}}const{title:c}=await n.briefFacts(t,a),s=j("gh",["pr","create","--draft","--repo",p,"--base",e,"--head",o,"--title",`${i}: ${c}`,"--body",d],{cwd:r,encoding:"utf8"}),l=`${s.stdout||""}
+${s.stderr||""}`,h=(s.status===0||/already exists/.test(l))&&/\/pull\/(\d+)/.exec(l)?.[1];h||w(`could not open a draft PR for ${o}: ${(s.stderr||s.error?.message||`gh exited ${s.status}`).trim().split(`
+`)[0]}`);const f=await n.setItem(t,a,{pr:Number(h)});return await n.appendThread(t,a,{text:d}),{said:`draft PR #${h} opened`,lines:f.lines}}u(V,"sendForReview");export{I as finishCard,Y as landHeld};

package/board/headless.mjs

@@ -1,3 +1,4 @@
-var $=Object.defineProperty;var d=(e,r)=>$(e,"name",{value:r,configurable:!0});import u from"node:fs";import g from"node:os";import h from"node:path";import{spawn as w}from"node:child_process";import{fileURLToPath as v}from"node:url";import{claudeBin as R,inherited as k}from"../hub/sessions.mjs";import{boardAt as y}from"../hub/boards.mjs";import{readHubRules as x}from"../hub/rules.mjs";import{builderRepo as j}from"./worktree.mjs";import{appendThread as T,briefFacts as B,readBoardRules as S}from"./store.mjs";import{modelName as A}from"./domain.mjs";const I=v(new URL("./bin/board.mjs",import.meta.url)),m=d(e=>`node ${I} --site ${e}`,"cli"),O=d(e=>`git -c core.commentChar=';' rebase ${e}`,"rebase"),W=d(e=>e.length?["Rules from the hub and this board:",...e.map(r=>`- ${r}`),""]:[],"ruleLines"),f=d(({route:e,key:r,worktree:c,base:o})=>[`- With no unverified calls, done finishes the card itself: it rebases onto ${o}, reruns the full test suite, fast-forwards ${o} and closes the card (on a board with pull requests it pushes the branch and opens a draft PR instead).`,`- On a conflict it undoes its rebase and names the files: run \`${O(o)}\` in ${c}, resolve each conflict keeping both sides' intent, continue with \`git -c core.commentChar=';' rebase --continue\`, rerun the tests, and run done again.`,"- On failing tests, fix them, commit, and run done again.","- While another card is landing it refuses, naming that card: wait a minute and run done again.",`- Finishing never goes to the orchestrator. If done refuses for a reason you can't fix, record it with \`${m(e)} builder call ${r} "<why>"\` and run done again: with the call it hands the card back.`],"finishSteps"),b=d(({route:e,key:r})=>`\`${m(e)} builder done ${r} --text "<what you checked>"\``,"finishCommand");function C({route:e,key:r,ref:c,title:o,notes:i,worktree:s,base:n,rules:t=[]}){const a=m(e);return[`You are the headless builder for card ${c} (${r}, "${o}") on the kickflip board /${e}. The board launched you; nobody watches this session, so never wait on a person. Work only in ${s}. Never restart the hub or a board server, and never push.`,"",`1. Run \`${a} builder start ${r} --kind build\`. If it refuses, stop.`,`2. Report progress with \`${a} builder progress ${r} --phase reading|building|testing|checking|landing "<plain, 80 characters or fewer>"\`, at least every 10 minutes.`,`3. To ask the orchestrator something, run \`${a} builder ask ${r} "<question>"\` and carry on; read its replies with \`${a} builder asks ${r}\`. Never block on a reply.`,`4. Record each judgment call the notes leave open with \`${a} builder call ${r} "<call>"\` instead of guessing silently.`,"",i?`Spec: the card's notes, ${i}, all sections, where later sections override earlier ones.`:"The card has no notes file: build from its title, and record what you had to decide as calls.","",...W(t),"Write tests first, and run the full suite once, in the foreground, at the end. Where the repo keeps ADRs, write one named with a timestamp: docs/adr/YYYY-MM-DD-HHMM-<slug>.md.",`Commit with \`git -c core.commentChar=';' commit -F <file>\`, the subject "${c}: <what the card now does>".`,"",`To finish, run ${b({route:e,key:r})}.`,"- If you recorded a judgment call, it hands the card back for the orchestrator to verify your calls; stop there: the orchestrator's verification finishes the card.",...f({route:e,key:r,worktree:s,base:n}),"","Never push."].join(`
-`)}d(C,"builderBrief");function H({route:e,key:r,ref:c,title:o,worktree:i,base:s,answers:n=[]}){const t=m(e);return[`You are the headless lander for card ${c} (${r}, "${o}") on the kickflip board /${e}. Its build is done and the orchestrator verified its judgment calls; it waits only to land. Nobody watches this session, so never wait on a person. Work only in ${i}, never restart the hub or a board server, and never push.`,"",`1. Run \`${t} builder start ${r} --kind build --label Lander\`. If it refuses, stop.`,`2. Report progress with \`${t} builder progress ${r} --phase landing "<plain, 80 characters or fewer>"\`.`,...n.length?["3. The owner answered the builder's deferred asks. Where an answer changes the build, change it, with its tests, and commit:",...n.map(a=>`- ${a.ask} "${a.question}": ${a.answer}`)]:[],"",`To finish, run ${b({route:e,key:r})}.`,...f({route:e,key:r,worktree:i,base:s}),"","Never push."].join(`
-`)}d(H,"landerBrief");function L({bin:e=R(),cwd:r,prompt:c,model:o,log:i}){u.mkdirSync(h.dirname(i),{recursive:!0});const s=u.openSync(i,"a"),n=Object.fromEntries(Object.entries(process.env).filter(([t])=>!k(t)));return h.isAbsolute(e)&&(n.PATH=`${h.dirname(e)}:${n.PATH||""}`),new Promise((t,a)=>{const l=w(e,["-p",c,"--permission-mode","auto","--model",o],{cwd:r,env:n,detached:!0,stdio:["ignore",s,s]});l.once("spawn",()=>{u.closeSync(s),l.unref(),t({pid:l.pid,log:i})}),l.once("error",p=>{u.closeSync(s),a(p)})})}d(L,"launchHeadless");const N=d(e=>{try{return process.kill(e,0),!0}catch(r){return r.code==="EPERM"}},"pidAlive");async function Q(e,r,{launch:c,handBack:o,alive:i=N}){const s={};for(const[n,t]of Object.entries(e))if(r.has(n)){if(t.pid!==null&&i(t.pid)){s[n]=t;continue}if(t.pid!==null&&t.relaunched){await o(t.model?{key:n,model:t.model}:{key:n});continue}s[n]={model:t.model,...await c({key:n,model:t.model}),relaunched:t.pid!==null}}return s}d(Q,"reviveBuilders");const P=d((e,r)=>h.join(g.homedir(),".claude","kickflip","logs",`${r}-${e}-${new Date().toISOString().replace(/[:.]/g,"-")}.log`),"logFile");async function V(e,{key:r,model:c},{lander:o=!1}={}){const i=await B(e,r),s=y(e)?.route??h.basename(e),n=[...x(),...await S(e)].map(p=>p.text),t={...i,route:s,base:j(e).base,rules:n},a=c||"opus",l=await L({cwd:i.worktree,prompt:o?H(t):C(t),model:a,log:P(r.split("/")[1],o?"lander":"builder")});return await T(e,r,{text:`${o?"Lander":"Builder"} launched headless on ${A({model:a})} in ${i.worktree}.`,log:h.basename(l.log)}),l}d(V,"launchBuilder");export{I as BOARD_CLI,C as builderBrief,H as landerBrief,V as launchBuilder,L as launchHeadless,Q as reviveBuilders};
+var q=Object.defineProperty;var d=(t,e)=>q(t,"name",{value:e,configurable:!0});import g from"node:fs";import A from"node:os";import $ from"node:path";import{spawn as O}from"node:child_process";import{fileURLToPath as L}from"node:url";import{claudeBin as N,inherited as P}from"../hub/sessions.mjs";import{boardAt as S}from"../hub/boards.mjs";import{readHubRules as F}from"../hub/rules.mjs";import{builderRepo as W}from"./worktree.mjs";import{appendThread as Y,briefFacts as D,readBoardRules as H}from"./store.mjs";import{modelName as M,plans as E}from"./domain.mjs";const _=L(new URL("./bin/board.mjs",import.meta.url)),b=d(t=>`node ${_} --site ${t}`,"cli"),K=d(t=>`git -c core.commentChar=';' rebase ${t}`,"rebase"),T=d(t=>t.length?["Rules from the hub and this board:",...t.map(e=>`- ${e}`),""]:[],"ruleLines"),j=d(({route:t,key:e,worktree:n,base:a})=>[`- With no unverified calls, done finishes the card itself: it rebases onto ${a}, reruns the full test suite, fast-forwards ${a} and closes the card (on a board with pull requests it pushes the branch and opens a draft PR instead; with Auto-merge off it stops before the fast-forward, and the card waits for the owner's Merge).`,`- On a conflict it undoes its rebase and names the files: run \`${K(a)}\` in ${n}, resolve each conflict keeping both sides' intent, continue with \`git -c core.commentChar=';' rebase --continue\`, rerun the tests, and run done again.`,"- On failing tests, fix them, commit, and run done again.","- While another card is landing, done waits its turn and then lands; leave it running.",`- Finishing never goes to the orchestrator. If done refuses for a reason you can't fix, record it with \`${b(t)} builder call ${e} "<why>"\` and run done again: with the call it hands the card back.`],"finishSteps"),B=d(({route:t,key:e})=>`\`${b(t)} builder done ${e} --text "<what you checked>"\``,"finishCommand");function U({route:t,key:e,ref:n,title:a,notes:c,worktree:i,base:s,rules:r=[]}){const o=b(t);return[`You are the headless builder for card ${n} (${e}, "${a}") on the kickflip board /${t}. The board launched you; nobody watches this session, so never wait on a person. Work only in ${i}. Never restart the hub or a board server, and never push.`,"",`1. Run \`${o} builder start ${e} --kind build\`. If it refuses, stop.`,`2. Report progress with \`${o} builder progress ${e} --phase reading|building|testing|checking|landing "<plain, 80 characters or fewer>"\`, at least every 10 minutes.`,`3. To ask the orchestrator something, run \`${o} builder ask ${e} "<question>"\` and carry on; read its replies with \`${o} builder asks ${e}\`. Never block on a reply.`,`4. Record each judgment call the notes leave open with \`${o} builder call ${e} "<call>"\` instead of guessing silently.`,"",c?`Spec: the card's notes, ${c}, all sections, where later sections override earlier ones.`:"The card has no notes file: build from its title, and record what you had to decide as calls.","",...T(r),"Write tests first, and run the full suite once, in the foreground, at the end. Where the repo keeps ADRs, write one named with a timestamp: docs/adr/YYYY-MM-DD-HHMM-<slug>.md.",`Commit with \`git -c core.commentChar=';' commit -F <file>\`, the subject "${n}: <what the card now does>".`,"",`To finish, run ${B({route:t,key:e})}.`,"- If you recorded a judgment call, it hands the card back for the orchestrator to verify your calls; stop there: the orchestrator's verification finishes the card.",...j({route:t,key:e,worktree:i,base:s}),"","Never push."].join(`
+`)}d(U,"builderBrief");function X({route:t,key:e,ref:n,title:a,worktree:c,base:i,answers:s=[]}){const r=b(t);return[`You are the headless lander for card ${n} (${e}, "${a}") on the kickflip board /${t}. Its build is done and the orchestrator verified its judgment calls; it waits only to land. Nobody watches this session, so never wait on a person. Work only in ${c}, never restart the hub or a board server, and never push.`,"",`1. Run \`${r} builder start ${e} --kind build --label Lander\`. If it refuses, stop.`,`2. Report progress with \`${r} builder progress ${e} --phase landing "<plain, 80 characters or fewer>"\`.`,...s.length?["3. The owner answered the builder's deferred asks. Where an answer changes the build, change it, with its tests, and commit:",...s.map(o=>`- ${o.ask} "${o.question}": ${o.answer}`)]:[],"",`To finish, run ${B({route:t,key:e})}.`,...j({route:t,key:e,worktree:c,base:i}),"","Never push."].join(`
+`)}d(X,"landerBrief");function G({route:t,key:e,ref:n,title:a,notes:c,kind:i,repo:s,rules:r=[],text:o,files:u=[],question:l,note:p,choice:w}){const h=b(t),f=i==="grill";return[`You are the headless ${f?"grill":"prototype"} planner for card ${n} (${e}, "${a}") on the kickflip board /${t}. The board launched you; nobody watches this session, so never wait on a person: the owner answers on the board, and a later planner or builder picks up from their answers. Read and run in ${s}; write no output code there, never restart the hub or a board server, and never push.`,"",`1. Run \`${h} builder start ${e} --kind ${i}\`. If it refuses, stop.`,`2. Gather the context yourself: ${c?`the card's notes, ${c}, all sections, where later sections override earlier ones; `:"the card has no notes file yet; "}its thread, in the board site's data/threads folder, the repo's docs/adr and CONTEXT.md, and the cards its notes and thread link.`,`3. Report progress with \`${h} builder progress ${e} "<plain, 80 characters or fewer>"\` at least every 10 minutes.`,f?`4. Follow the grilling skill: find every decision the card leaves open, and post each as a question for the owner with \`${h} question add --file <json>\` on topic item:${e}, one per decision, your recommendation first.`:`4. Follow the prototype skill: record the prototype with \`${h} prototype add <topic> --card ${e} --take <K>:<label> \u2026\`, write one take per option, built from the board's real components fed fake data, and post one question whose url opens it with \`${h} question add --file <json>\` on topic item:${e}.`,...o?[`   The owner asked for this ${f?"grill":"prototype"}, writing: "${o}"`]:[],...u.length?[`   The owner attached: ${u.map(m=>m.path).join(", ")}.`]:[],...l?[`   The owner asked for prototypes of question ${l}${p?`, noting "${p}"`:""}${w?`, leaning to option ${w}`:""}: draw that question's next round, its question naming round_of ${l}.`]:[],`5. Record what you learned in the card's notes with \`${h} item set ${e} --notes-file <file.md>\`, naming each answered question's id.`,"",...T(r),`To finish, run \`${h} builder done ${e} --text "<what you asked>"\`.`,"","Never push."].join(`
+`)}d(G,"plannerBrief");const z=d(()=>process.env.KICKFLIP_CODEX||"codex","codexBin"),J=d(({kind:t,prompt:e,model:n,cwd:a})=>t==="codex"?["exec","--sandbox","danger-full-access","--cd",a,e]:["-p",e,"--permission-mode","auto","--model",n,"--output-format","stream-json","--verbose"],"agentArgs");function Q({kind:t="claude",bin:e=t==="codex"?z():N(),cwd:n,prompt:a,model:c,log:i}){g.mkdirSync($.dirname(i),{recursive:!0});const s=g.openSync(i,"a"),r=Object.fromEntries(Object.entries(process.env).filter(([o])=>!P(o)));return $.isAbsolute(e)&&(r.PATH=`${$.dirname(e)}:${r.PATH||""}`),new Promise((o,u)=>{const l=O(e,J({kind:t,prompt:a,model:c,cwd:n}),{cwd:n,env:r,detached:!0,stdio:["ignore",s,s]});l.once("spawn",()=>{g.closeSync(s),l.unref(),o({pid:l.pid,log:i})}),l.once("error",p=>{g.closeSync(s),u(p)})})}d(Q,"launchHeadless");const V=d(t=>{try{return process.kill(t,0),!0}catch(e){return e.code==="EPERM"}},"pidAlive");async function ue(t,e,{launch:n,handBack:a,alive:c=V}){const i={};for(const[s,r]of Object.entries(t)){if(!e.has(s))continue;if(r.pid!==null&&c(r.pid)){i[s]=r;continue}const o={key:s,...r.kind?{kind:r.kind}:{},...r.model?{model:r.model}:{}};if(r.pid!==null&&r.relaunched){await a(o);continue}const{key:u,...l}=o;i[s]={...l,...await n(o),relaunched:r.pid!==null}}return i}d(ue,"reviveBuilders");const Z=d((t,e)=>$.join(A.homedir(),".claude","kickflip","logs",`${e}-${t}-${new Date().toISOString().replace(/[:.]/g,"-")}.log`),"logFile");async function pe(t,{key:e,kind:n="claude",model:a,text:c,files:i,question:s,note:r,choice:o},{lander:u=!1}={}){const l=await D(t,e),p=S(t)?.route??$.basename(t),w=[...F(),...await H(t)].map(I=>I.text),{base:h,repo:f}=W(t),m=E({kind:n}),v={...l,route:p,base:h,repo:f,rules:w,kind:n,text:c,files:i,question:s,note:r,choice:o},x=n==="codex"?"codex":a||"opus",y=m?"Planner":u?"Lander":"Builder",R=m?f:l.worktree,C=m?G(v):u?X(v):U(v),k=await Q({kind:m?"claude":n,cwd:R,prompt:C,model:x,log:Z(e.split("/")[1],y.toLowerCase())});return await Y(t,e,{text:`${y} launched on ${M({kind:n,model:x})} in ${R}.`,log:$.basename(k.log)}),k}d(pe,"launchBuilder");export{_ as BOARD_CLI,U as builderBrief,X as landerBrief,pe as launchBuilder,Q as launchHeadless,V as pidAlive,G as plannerBrief,ue as reviveBuilders};

package/board/merge3.mjs

@@ -0,0 +1 @@
+var A=Object.defineProperty;var d=(o,t)=>A(o,"name",{value:t,configurable:!0});import{isDeepStrictEqual as y}from"node:util";const p=d(o=>o!==null&&typeof o=="object"&&!Array.isArray(o),"isObject"),g=d(o=>Array.isArray(o)&&o.every(t=>p(t)&&typeof t.id=="string")&&new Set(o.map(t=>t.id)).size===o.length,"byId");function j(o,t,f){if(y(t,o))return f;if(y(f,o))return t;if(p(o)&&p(t)&&p(f)){const c={};for(const n of new Set([...Object.keys(f),...Object.keys(t)])){if(!(n in t)){(!(n in o)||!y(o[n],f[n]))&&(c[n]=f[n]);continue}if(!(n in f)){(!(n in o)||!y(o[n],t[n]))&&(c[n]=t[n]);continue}c[n]=j(o[n],t[n],f[n])}return c}if(g(o)&&g(t)&&g(f)){const c=d((r,u)=>r.find(i=>i.id===u),"find"),n=[];for(const r of f){const u=c(o,r.id),i=c(t,r.id);if(!i){(!u||!y(u,r))&&n.push(r);continue}n.push(u?j(u,i,r):i)}return[...n,...t.filter(r=>!c(f,r.id)&&!c(o,r.id))]}return t}d(j,"merge3");export{j as merge3};

package/board/on-host.mjs

@@ -1 +1 @@
-var l=Object.defineProperty;var r=(e,s)=>l(e,"name",{value:s,configurable:!0});import f from"node:os";import{execFile as u}from"node:child_process";import{promisify as m}from"node:util";const g=m(u),p=r(e=>String(e||"").trim().replace(/^::ffff:/,""),"bare"),d=r(()=>Object.values(f.networkInterfaces()).flat().map(e=>e.address),"interfaceAddresses");async function i(){try{const{stdout:e}=await g("tailscale",["status","--json"],{timeout:5e3}),{Self:s,User:n}=JSON.parse(e);return{login:n?.[s.UserID]?.LoginName,addresses:s.TailscaleIPs||[]}}catch{return null}}r(i,"tailnetNode");const c=r(e=>{const s=e.headers["x-forwarded-for"];return p(s?String(s).split(",").at(-1):e.socket.remoteAddress)},"clientOf");async function S(e,s={addresses:d,node:i}){const n=e.headers["x-forwarded-for"],t=c(e);if(s.addresses().includes(t))return!0;const a=e.headers["tailscale-user-login"];if(!n||!a)return!1;const o=await s.node();return!!o&&o.login===a&&o.addresses.includes(t)}r(S,"fromHost");async function h(e,s={addresses:d,node:i}){if(s.addresses().includes(c(e)))return!0;const n=e.headers["tailscale-user-login"];if(!n)return!1;const t=await s.node();return!!t&&t.login===n}r(h,"fromOwner");export{S as fromHost,h as fromOwner};
+var g=Object.defineProperty;var t=(e,r)=>g(e,"name",{value:r,configurable:!0});import w from"node:os";import{execFile as p}from"node:child_process";import{promisify as h}from"node:util";import{tailscaleBin as x}from"../shared/tailscale.mjs";const y=h(p),I=t(e=>String(e||"").trim().replace(/^::ffff:/,""),"bare"),c=t(()=>Object.values(w.networkInterfaces()).flat().map(e=>e.address),"interfaceAddresses");async function u(){const e=x();if(!e)return null;try{const{stdout:r}=await y(e,["status","--json"],{timeout:5e3}),{Self:s,User:n}=JSON.parse(r);return{login:n?.[s.UserID]?.LoginName,addresses:s.TailscaleIPs||[]}}catch{return null}}t(u,"tailnetNode");const f=t(e=>{const r=e.headers["x-forwarded-for"];return I(r?String(r).split(",").at(-1):e.socket.remoteAddress)},"clientOf");async function j(e,r={addresses:c,node:u}){const s=e.headers["x-forwarded-for"],n=f(e);if(r.addresses().includes(n))return!0;const o=e.headers["tailscale-user-login"];if(!s||!o)return!1;const a=await r.node();return!!a&&a.login===o&&a.addresses.includes(n)}t(j,"fromHost");function S(e={addresses:c,node:u},{now:r=Date.now,retryMs:s=5e3}={}){let n=null,o=null,a=-1/0;const m=t(()=>n||r()-a<s?n:(o||=e.node().then(i=>(o=null,i?.login?n=i.login:a=r(),n)),o),"ownerLogin");return async i=>{if(e.addresses().includes(f(i)))return"owner";const l=i.headers["tailscale-user-login"];if(!l)return"other";const d=await m();return d?d===l?"owner":"other":"unread"}}t(S,"ownerGate");const B=S();export{j as fromHost,B as hubGate,S as ownerGate};

package/board/permissions.mjs

@@ -1,2 +1,2 @@
-var S=Object.defineProperty;var a=(s,t)=>S(s,"name",{value:t,configurable:!0});import c from"node:fs/promises";import p from"node:path";import{BoardError as d}from"./store.mjs";const u=[{id:"pushMain",name:"Push main after a land",allows:"Pushes main to origin as each card lands, and lets the session push it.",rule:"Bash(git push origin main)"},{id:"pushTags",name:"Push release tags",allows:"Lets the session push a v* release tag.",rule:"Bash(git push origin v*)"},{id:"draftPr",name:"Open draft PRs",allows:"Lets the session open a PR as a draft.",rule:"Bash(gh pr create --draft *)"}];function f(s){if(typeof s!="string"||!p.isAbsolute(s))throw new d("This board has no repo folder recorded, so it has no settings.local.json to write. Set its repo first.");return p.join(s,".claude","settings.local.json")}a(f,"settingsFile");const m=a(s=>p.join(s,"data","permission-refusals.json"),"refusalsFile");async function y(s,t,e){let n;try{n=await c.readFile(s,"utf8")}catch(i){if(i.code==="ENOENT")return t;throw i}try{const i=JSON.parse(n);if(i&&typeof i=="object"&&!Array.isArray(i))return i}catch{}throw new d(`${e} isn\u2019t a JSON object, so the hub leaves it as it is. Fix it by hand first.`)}a(y,"readJSON");async function g(s,t){await c.mkdir(p.dirname(s),{recursive:!0});const e=`${s}.${process.pid}.${Date.now()}.tmp`;await c.writeFile(e,JSON.stringify(t,null,2)+`
-`),await c.rename(e,s)}a(g,"writeJSON");const j=a(s=>Array.isArray(s.permissions?.allow)?s.permissions.allow:[],"allowOf");async function x(s){const t=j(await y(f(s),{},f(s)));return Object.fromEntries(u.map(e=>[e.id,t.includes(e.rule)]))}a(x,"readPermissions");async function A(s,t,e,n){const i=u.find(l=>l.id===e);if(!i||typeof n!="boolean")throw new d(`Send {id, on} with id one of ${u.map(l=>l.id).join(", ")} and on true or false.`);const r=f(s),o=await y(r,{},r);if(o.permissions!==void 0&&(typeof o.permissions!="object"||Array.isArray(o.permissions)||o.permissions===null))throw new d(`${r}\u2019s permissions isn\u2019t an object, so the hub leaves it as it is. Fix it by hand first.`);const w=j(o);w.includes(i.rule)!==n&&(o.permissions={...o.permissions,allow:n?[...w,i.rule]:w.filter(l=>l!==i.rule)},await g(r,o));const h=await b(t);return h[e]&&(delete h[e],await g(m(t),h)),x(s)}a(A,"setPermission");const b=a(s=>y(m(s),{},m(s)),"readRefusals");function O(s){return typeof s!="string"?null:u.find(t=>{const e=/^Bash\((.*)\)$/.exec(t.rule)[1];return new RegExp(`^${e.split("*").map(n=>n.replace(/[.*+?^${}()|[\]\\]/g,"\\$&")).join(".*")}$`).test(s.trim())})||null}a(O,"permissionFor");async function F(s,t,e,n=new Date){if(e?.tool_name!=="Bash")return null;const i=O(e.tool_input?.command);if(!i||!(await x(s))[i.id])return null;const r=await b(t);return r[i.id]={command:e.tool_input.command,how:e.hook_event_name==="PermissionDenied"?"denied":"asked",at:n.toISOString()},await g(m(t),r),i.id}a(F,"recordRefusal");async function B(s,t,e){const[n,i]=await Promise.all([x(s),b(t)]);return{owner:e,file:f(s),permissions:u.map(r=>({...r,on:n[r.id],refused:n[r.id]&&i[r.id]||null}))}}a(B,"permissionsView");export{u as PERMISSIONS,O as permissionFor,B as permissionsView,x as readPermissions,b as readRefusals,F as recordRefusal,A as setPermission,f as settingsFile};
+var S=Object.defineProperty;var r=(s,t)=>S(s,"name",{value:t,configurable:!0});import c from"node:fs/promises";import p from"node:path";import{BoardError as d}from"./store.mjs";const u=[{id:"pushMain",name:"Push main after a land",allows:"Pushes main to origin as each card lands, and lets the session push it.",rule:"Bash(git push origin main)"},{id:"pushTags",name:"Push release tags",allows:"Lets the session push a v* release tag.",rule:"Bash(git push origin v*)"},{id:"draftPr",name:"Open draft PRs",allows:"Lets the session open a PR as a draft.",rule:"Bash(gh pr create --draft *)"}];function f(s){if(typeof s!="string"||!p.isAbsolute(s))throw new d("This board has no repo folder recorded, so it has no settings.local.json to write. Set its repo first.");return p.join(s,".claude","settings.local.json")}r(f,"settingsFile");const m=r(s=>p.join(s,"data","permission-refusals.json"),"refusalsFile");async function y(s,t,i){let n;try{n=await c.readFile(s,"utf8")}catch(e){if(e.code==="ENOENT")return t;throw e}try{const e=JSON.parse(n);if(e&&typeof e=="object"&&!Array.isArray(e))return e}catch{}throw new d(`${i} isn\u2019t a JSON object, so the hub leaves it as it is. Fix it by hand first.`)}r(y,"readJSON");async function g(s,t){await c.mkdir(p.dirname(s),{recursive:!0});const i=`${s}.${process.pid}.${Date.now()}.tmp`;await c.writeFile(i,JSON.stringify(t,null,2)+`
+`),await c.rename(i,s)}r(g,"writeJSON");const j=r(s=>Array.isArray(s.permissions?.allow)?s.permissions.allow:[],"allowOf");async function x(s){const t=j(await y(f(s),{},f(s)));return Object.fromEntries(u.map(i=>[i.id,t.includes(i.rule)]))}r(x,"readPermissions");async function A(s,t,i,n){const e=u.find(l=>l.id===i);if(!e||typeof n!="boolean")throw new d(`Send {id, on} with id one of ${u.map(l=>l.id).join(", ")} and on true or false.`);const o=f(s),a=await y(o,{},o);if(a.permissions!==void 0&&(typeof a.permissions!="object"||Array.isArray(a.permissions)||a.permissions===null))throw new d(`${o}\u2019s permissions isn\u2019t an object, so the hub leaves it as it is. Fix it by hand first.`);const w=j(a);w.includes(e.rule)!==n&&(a.permissions={...a.permissions,allow:n?[...w,e.rule]:w.filter(l=>l!==e.rule)},await g(o,a));const h=await b(t);return h[i]&&(delete h[i],await g(m(t),h)),x(s)}r(A,"setPermission");const b=r(s=>y(m(s),{},m(s)),"readRefusals");function O(s){return typeof s!="string"?null:u.find(t=>{const i=/^Bash\((.*)\)$/.exec(t.rule)[1];return new RegExp(`^${i.split("*").map(n=>n.replace(/[.*+?^${}()|[\]\\]/g,"\\$&")).join(".*")}$`).test(s.trim())})||null}r(O,"permissionFor");async function F(s,t,i,n=new Date){if(i?.tool_name!=="Bash")return null;const e=O(i.tool_input?.command);if(!e||!(await x(s))[e.id])return null;const o=await b(t);return o[e.id]={command:i.tool_input.command,how:i.hook_event_name==="PermissionDenied"?"denied":"asked",at:n.toISOString()},await g(m(t),o),e.id}r(F,"recordRefusal");async function B(s,t){const[i,n]=await Promise.all([x(s),b(t)]);return{file:f(s),permissions:u.map(e=>({...e,on:i[e.id],refused:i[e.id]&&n[e.id]||null}))}}r(B,"permissionsView");export{u as PERMISSIONS,O as permissionFor,B as permissionsView,x as readPermissions,b as readRefusals,F as recordRefusal,A as setPermission,f as settingsFile};

package/board/public/app-asks.js

@@ -1,102 +1,19 @@
-// New tasks on the board view: the + sheet that sends one as an ask event, and bump, edit and delete for a New card or a
+// New tasks on the board view: bump, edit and delete for a New card or a
 // pending thread message (docs/adr/2026-10-29-1639-a-pending-ask-can-be-deleted-or-bumped.md,
 // docs/adr/2026-10-29-1639-the-plus-makes-a-new-card.md). Needs app-core.js and app-threads.js.
 BoardView.part((B) => {
-  const { $, store, state, toast, quieted, sendDraft } = B;
-  const { attachButton, waitOn } = BoardUI;
+  const { $, state, toast } = B;
+  const { waitOn } = BoardUI;
 
-  // The ask box is a bottom sheet: a <dialog> opened from the + button. Closing keeps the draft.
-  const sheet = $('#sheet');
-  const reduceMotion = matchMedia('(prefers-reduced-motion: reduce)');
-  if (!$('#askForm .row .attach')) $('#askForm .row').insertAdjacentHTML('afterbegin', attachButton());
-  // Files picked before the app shell switched away from this board are still attached, so they show again.
-  BoardAttach.paint('ask', B.site.root);
-  const isMac = /Mac|iPhone|iPad/.test(navigator.platform || navigator.userAgent);
-  if (!$('#askForm .send-hint')) $('#askForm button[type=submit]').insertAdjacentHTML('beforebegin', `<span class="send-hint" aria-hidden="true">${isMac ? '⌘↵' : 'Ctrl+↵'}</span>`);
-  // ⌘↵ (Ctrl+↵ off a Mac) sends from any composer: the ask, a thread reply, an edit.
+  // ⌘↵ (Ctrl+↵ off a Mac) sends a thread reply or an edit from its box; the ask's own is new-task.js's.
   B.on(B.root, 'keydown', (ev) => {
     if (ev.key !== 'Enter' || !(ev.metaKey || ev.ctrlKey) || ev.isComposing) return;
-    const form = ev.target instanceof HTMLTextAreaElement ? ev.target.closest('form[data-composer], form.edit-form') : null;
+    const form = ev.target instanceof HTMLTextAreaElement ? ev.target.closest('form[data-reply], form.edit-form') : null;
     if (!form) return;
     ev.preventDefault();
     form.requestSubmit();
   });
-  $('#askText').value = store.get('draft:ask', '');
-  B.on($('#askText'), 'input', (e) => { if (!quieted('draft:ask', e.target)) store.set('draft:ask', e.target.value); });
-  let stopFitting = null;
-  const stopFit = () => { stopFitting?.(); stopFitting = null; };
-  B.on(sheet, 'close', stopFit);
-  B.atUnmount(stopFit);
-  function openSheet() {
-    if (sheet.open) return;
-    stopFit();
-    stopFitting = BoardDialogs.fitSheet(sheet);
-    sheet.classList.remove('closing');
-    sheet.showModal();
-    $('#askText').focus();
-    $('#compose').setAttribute('aria-expanded', 'true');
-  }
-  function closeSheet() {
-    if (!sheet.open || sheet.classList.contains('closing')) return;
-    $('#compose').setAttribute('aria-expanded', 'false');
-    if (reduceMotion.matches) { sheet.close(); return; }
-    sheet.classList.add('closing');
-    B.later(180, () => { sheet.classList.remove('closing'); sheet.close(); });
-  }
-  B.on($('#compose'), 'click', openSheet);
-  // n pressed twice opens the sheet, as the + button's tooltip says, unless a field or another dialog has focus. With
-  // nothing focused the key goes to <body>, outside the view, so this listens on the document. A key switch mode
-  // used (sidebar.js) comes defaultPrevented and doesn't count.
-  const TWICE_MS = 500;
-  let lastN = -Infinity;
-  B.on(document, 'keydown', (ev) => {
-    if (ev.defaultPrevented) { lastN = -Infinity; return; }
-    if (ev.key !== 'n' || ev.metaKey || ev.ctrlKey || ev.altKey || ev.repeat || ev.isComposing) return;
-    const field = ev.target instanceof Element && ev.target.closest('input, textarea, select, [contenteditable]:not([contenteditable="false"])');
-    if (field || document.querySelector('dialog[open]') || B.root.classList.contains('offline')) { lastN = -Infinity; return; }
-    if (ev.timeStamp - lastN > TWICE_MS) { lastN = ev.timeStamp; return; }
-    lastN = -Infinity;
-    ev.preventDefault();
-    openSheet();
-  });
-  B.on($('#sheetClose'), 'click', closeSheet);
-  B.on(sheet, 'click', (ev) => { if (ev.target === sheet) closeSheet(); });
-  B.on(sheet, 'cancel', (ev) => { ev.preventDefault(); closeSheet(); });
-  // Discuss or Quick build, above Send: Discuss, the default, has the session grill or prototype the task at once; Quick
-  // build sends the ask with quick: true, and the session marks the card ready. Each send goes back to Discuss
-  // (docs/adr/2026-11-04-0131-every-new-task-is-grilled-or-prototyped-at-once.md).
-  const CHOICE_HELP = {
-    discuss: 'Discuss: Claude grills or prototypes it first, then waits for you.',
-    quick: 'Quick build: for changes you’re sure about; Claude marks it ready and builds.',
-  };
-  let quick = false;
-  function choose(isQuick) {
-    quick = isQuick;
-    $('#askDiscuss').setAttribute('aria-pressed', String(!quick));
-    $('#askQuick').setAttribute('aria-pressed', String(quick));
-    $('#askChoiceHelp').textContent = CHOICE_HELP[quick ? 'quick' : 'discuss'];
-  }
-  choose(false);
-  B.on(B.root, 'click', (ev) => {
-    const b = ev.target.closest('#askDiscuss, #askQuick');
-    if (b) choose(b.id === 'askQuick');
-  });
-  B.on($('#askForm'), 'submit', async (ev) => {
-    ev.preventDefault();
-    $('#askText').blur();
-    const text = $('#askText').value.trim();
-    const files = BoardAttach.files('ask', B.site.root);
-    if ((!text && !files.length) || BoardAttach.busy('ask', B.site.root)) return;
-    $('#askStatus').textContent = '';
-    try {
-      await waitOn($('#askForm button[type="submit"]'), sendDraft('draft:ask', $('#askText'), () => $('#askText'), () => B.send('ask', { text, ...(files.length ? { files } : {}), ...(quick ? { quick: true } : {}) })));
-      BoardAttach.clear('ask', B.site.root);
-      choose(false);
-      $('#askStatus').textContent = '';
-      closeSheet();
-      toast('Sent');
-    } catch { $('#askStatus').textContent = 'Could not send'; }
-  });
+  BoardNewTask.wire(B);
 
   // A bump moves the New card to the top once the server has recorded it, button (its icon, or the prototype button
   // that bumps it) waiting meanwhile (docs/adr/2026-11-03-1850-a-tap-waits-for-the-server-to-record-it.md).

package/board/public/app-cards.js

@@ -263,9 +263,9 @@ BoardView.part((B) => {
   const CONFIRM = {
     resume: (it, ref) => `Unhold ${ref}?${it.heldUntil ? ` It's held until ${heldUntilWords(it.heldUntil)}.` : ''} It can start again once nothing blocks it.`,
     nudge: () => 'Nudge Claude to check this implementer?',
-    grill: (it, ref) => `Ask Claude for questions about ${ref}?`,
-    prototype: (it, ref) => `Ask Claude for prototypes of ${ref}?`,
-    merge: (it, ref) => (openPRs(it).length > 1
+    // docs/adr/2026-11-04-2100-a-land-waits-for-your-merge.md
+    merge: (it, ref) => (it.mergeReady ? `Merge ${ref}? The board rebases ${it.mergeReady.branch} onto ${it.mergeReady.base} as it is now, reruns the tests if  moved, and lands it.`
+      : openPRs(it).length > 1
       ? `Merge ${ref}? Claude squash-merges ${openPRs(it).map(prName).join(', ')} in turn if they are still approved, green and clean.`
       : `Merge ${ref}? Claude squash-merges ${openPRs(it).map(prName).join('')} if it is still approved, green and clean.`),
     'card-build': (it, ref) => (it.blockedBy?.length
@@ -294,21 +294,21 @@ BoardView.part((B) => {
   const ACTION_BUTTONS = {
     [BUTTON.openQuestions]: (it) => `<a${classes(it, BUTTON.openQuestions, 'button')} href="questions.html#${esc(it.questions.first)}">Open questions</a>`,
     [BUTTON.markDone]: (it) => `<button${classes(it, BUTTON.markDone)} data-confirm="finish" data-key="${esc(it.key)}">Mark as done</button>`,
-    // Grill and Prototype each ask for a planner; both wait while either is under way.
-    [BUTTON.grill]: (it) => ['grill', 'prototype'].map((act) => `<button data-confirm="${act}" data-key="${esc(it.key)}"${it.grilling || it.prototyping ? ' disabled' : ''}>${act === 'grill' ? 'Grill' : 'Prototype'}</button>`).join(''),
   };
   const actionButton = (it) => ACTION_BUTTONS[it.actionButton]?.(it) || '';
 
   // The latest bump among New cards takes no second bump (docs/adr/2026-10-29-1639-a-pending-ask-can-be-deleted-or-bumped.md).
   const latestBump = (it) => Boolean(it.isNew && it.bumpedAt) && !state.board.items.some((i) => i.isNew && (i.bumpedAt || '') > it.bumpedAt);
   // band {step, actions} draws the card in a wave band (app-lanes.js).
-  // Its open questions asked since this browser last opened it count as new, as its messages do.
+  // Its open questions asked since this browser last opened it are one more unread message: the thread's "N new
+  // questions" line (app-threads.js; docs/adr/2026-11-04-2130-a-button-tap-is-a-status-line-or-a-message-footer.md).
   function card(it, band = {}) {
     const unseen = (times) => (state.openItems.has(it.key) ? 0 : unreadCount(times, seen[it.key]));
+    const unread = unseen(it.othersAt) + Math.min(1, unseen(it.questions?.askedAt));
     return `<details class="item" data-key="${esc(it.key)}" ${state.openItems.has(it.key) ? 'open' : ''}>
           <summary class="work">
             <span class="status ${it.lane}"></span>
-            <div class="title-wrap">${workLines(it, { unread: unseen(it.othersAt), newQuestions: unseen(it.questions?.askedAt), top: latestBump(it), ...band })}</div>
+            <div class="title-wrap">${workLines(it, { unread, top: latestBump(it), ...band })}</div>
           </summary>
           ${state.openItems.has(it.key) ? detail(it) : ''}
         </details>`;
@@ -450,7 +450,7 @@ BoardView.part((B) => {
     if (!it || !(await B.confirm(CONFIRM[act](it, it.ref)))) return;
     // Unhold, Merge (docs/adr/2026-10-29-1752-auto-merge-is-a-board-setting-off-by-default.md), Implement and Done wait while the
     // server records them (docs/adr/2026-11-03-1850-a-tap-waits-for-the-server-to-record-it.md).
-    const sent = { grill: ['grill-more', { key }], prototype: ['prototype-request', { key }], resume: ['card-hold', { key, hold: false }], merge: ['card-merge', { key }], 'card-build': ['card-build', { key }],
+    const sent = { resume: ['card-hold', { key, hold: false }], merge: ['card-merge', { key }], 'card-build': ['card-build', { key }],
       finish: it.kind === 'ask' ? ['ask-done', { id: it.id }] : ['card-done', { key }] }[act];
     if (sent) {
       // Done closes its card once the server answers, before the answer's board lands, or app-core.js steady would
@@ -461,8 +461,17 @@ BoardView.part((B) => {
         state.openItems.delete(key);
         store.set('openItems', [...state.openItems]);
       } : null;
-      try { await waitOn(b, B.sentHere(key, () => B.send(...sent, close))); if (act === 'grill' || act === 'prototype') B.loadThread(key, { force: true }); }
-      catch (e) { B.failed(e); }
+      // docs/adr/2026-11-04-2320-a-merge-tap-waits-its-turn-to-land.md: Merge spins until a board shows the card left
+      // In Review, or no longer merging there, which is its refusal.
+      const pend = act === 'merge' ? `${key}:merge` : null;
+      if (pend) BoardUI.pending.start(pend, (board) => { const c = board.items.find((i) => i.key === key); return !c || c.lane !== 'review' || !c.merging; });
+      try {
+        const out = await waitOn(b, B.sentHere(key, () => B.send(...sent, close)));
+        if (pend) { BoardUI.pending.answered(pend, out.board.generatedAt); B.render(); }
+      } catch (e) {
+        if (pend) { BoardUI.pending.drop(pend); B.render(); }
+        B.failed(e);
+      }
       if (act === 'finish') B.syncDone(key);
       return;
     }

package/board/public/app-core.js

@@ -95,25 +95,6 @@ BoardView.part((B) => {
     store.set('seenThreads', seen);
   }
 
-  // iOS commits a pending predictive-text word after Send clears the box, which would refill it and resave the draft.
-  // So Send blurs first, and input is dropped while the send runs and for a moment after it succeeds.
-  const quiet = new Map();
-  function quieted(draftKey, ta) {
-    const until = quiet.get(draftKey) || 0;
-    if (until <= Date.now()) return false;
-    if (until !== Infinity) ta.value = '';
-    return true;
-  }
-  async function sendDraft(draftKey, ta, current, send) {
-    ta.blur();
-    quiet.set(draftKey, Infinity);
-    try { await send(); } catch (e) { quiet.delete(draftKey); store.set(draftKey, (current() || ta).value); throw e; }
-    store.set(draftKey, '');
-    const now = current();
-    if (now) now.value = '';
-    quiet.set(draftKey, Date.now() + 1000);
-  }
-
   // The ui-links.js linkContext for text shown on item `key`'s card or thread.
   const links = (key) => BoardUI.linkContext(state.board?.items || [], key);
   const svg = (body, size = 20) => `<svg width="${size}" height="${size}" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true">${body}</svg>`;
@@ -124,5 +105,5 @@ BoardView.part((B) => {
   const confirm = (message, labels) => dialogs.confirm(message, { ...labels, signal: controller.signal });
   const notice = dialogs.notice;
 
-  Object.assign(B, { steady, restorePlace, plural, seen, markSeen, quieted, sendDraft, links, svg, confirm, notice });
+  Object.assign(B, { steady, restorePlace, plural, seen, markSeen, links, svg, confirm, notice });
 });

package/board/public/app-reader.js

@@ -0,0 +1,174 @@
+// The reader sheet (docs/adr/2026-11-04-2345-a-builders-log-and-notes-open-in-a-sheet.md): a thread's "Open the log →"
+// (ui-threads.js) and a card's or a lineup's Notes (app-cards.js, app-lanes.js) open over the board in one sheet in
+// place of log.html and notes.html, which still open on their own. It closes on its ✕, Escape, a tap on the dim area
+// and Back, through a history entry of its own that carries the board's URL, so the router's pop keeps the board.
+// A link in it closes it first, then opens through the shell.
+// A log written as a stream (headless.mjs: one stream-json event per line) reads as lines, what Claude says and each
+// tool call, with a raw toggle for the file as it is; any other log reads as its text. It is re-read every 3 seconds
+// until the run's result arrives, and follows new lines while read at its end.
+BoardView.part((B) => {
+  const { $, state } = B;
+  const { esc, markdown, linkContext } = BoardUI;
+  const sheet = $('#readerSheet');
+  const body = sheet.querySelector('.reader-body');
+  const tools = sheet.querySelector('.reader-tools');
+  const more = sheet.querySelector('.reader-new');
+  let opened = 0;
+  let pushed = false;
+  let pending = null;
+  let log = null;
+  let stopReading = null;
+
+  // → the log's lines, each a stream event or, for a line that isn't one, its text; null when no line is an event.
+  function streamOf(text) {
+    const lines = text.split('\n');
+    if (lines.at(-1) === '') lines.pop();
+    const read = (line) => { try { const e = JSON.parse(line); return typeof e?.type === 'string' ? e : null; } catch { return null; } };
+    const events = lines.map(read);
+    return events.some(Boolean) ? lines.map((line, i) => events[i] ?? line) : null;
+  }
+  const short = (v) => (v.length > 400 ? `${v.slice(0, 400)}…` : v);
+  const textOf = (content) => (typeof content === 'string' ? content : content.map((part) => part.text ?? '').join('\n'));
+  const callOf = (input) => input.command ?? input.file_path ?? input.pattern ?? input.url ?? input.description ?? JSON.stringify(input);
+  // A stream line's readable rows {kind, label, body}. Thinking and events other than the start, messages and the
+  // result have none; the raw view shows them.
+  function rowsOf(e) {
+    if (typeof e === 'string') return [{ kind: 'out', body: e }];
+    if (e.type === 'system') return e.subtype === 'init' ? [{ kind: 'sys', label: 'start', body: `${e.model} in ${e.cwd}` }] : [];
+    if (e.type === 'result') return [{ kind: 'text end', label: e.is_error ? 'stopped' : 'done', body: e.result ?? e.subtype }];
+    if (e.type !== 'assistant' && e.type !== 'user') return [];
+    const content = e.message.content;
+    if (typeof content === 'string') return [{ kind: 'text', body: content }];
+    return content.flatMap((c) => (c.type === 'text' ? [{ kind: 'text', body: c.text }]
+      : c.type === 'tool_use' ? [{ kind: 'tool', label: c.name.toLowerCase(), body: callOf(c.input) }]
+      : c.type === 'tool_result' ? [{ kind: 'out', body: short(textOf(c.content)) }] : []));
+  }
+  const rowHtml = (r) => `<div class="reader-row ${r.kind}">${r.label ? `<span class="reader-tag">${esc(r.label)}</span>` : ''}${esc(r.body)}</div>`;
+
+  const atEnd = () => body.scrollHeight - body.scrollTop - body.clientHeight < 40;
+  const toEnd = () => { body.scrollTop = body.scrollHeight; };
+  function drawTools() {
+    if (!log?.stream) { tools.innerHTML = ''; return; }
+    const word = log.finished ? 'finished' : log.following ? 'following' : 'paused';
+    tools.innerHTML = `<span class="reader-status${word === 'following' ? ' on' : ''}">${word}</span><button type="button" data-reader="raw" aria-pressed="${log.raw}">raw</button>`;
+  }
+  function drawMore() {
+    more.hidden = !log?.unseen;
+    if (log?.unseen) more.textContent = `${log.unseen} new ${log.unseen === 1 ? 'line' : 'lines'} ↓`;
+  }
+  function drawLog() {
+    const { text, stream, raw } = log;
+    body.innerHTML = !text ? '<p class="muted reader-empty">The log is empty so far.</p>'
+      : !stream ? `<pre class="reader-text">${esc(text)}</pre>`
+      : raw ? `<pre class="reader-raw">${esc(text)}</pre>`
+      : stream.flatMap(rowsOf).map(rowHtml).join('');
+    drawTools();
+    drawMore();
+  }
+  function follow() {
+    log.following = true;
+    log.unseen = 0;
+    toEnd();
+    drawTools();
+    drawMore();
+  }
+
+  async function readLog(n) {
+    let answer;
+    try {
+      const r = await fetch(B.site.url(`api/log?file=${encodeURIComponent(log.file)}`), { cache: 'no-store' });
+      answer = { ok: r.ok, ...(await r.json()) };
+    } catch { answer = null; }
+    if (n !== opened) return;
+    if (answer && !answer.ok) { body.innerHTML = `<p class="muted">${esc(answer.error || 'Could not load this log.')}</p>`; return; }
+    if (answer && answer.size !== log.size) {
+      const before = log.stream?.length ?? 0;
+      const stream = streamOf(answer.text);
+      Object.assign(log, { size: answer.size, text: answer.text, stream, finished: Boolean(stream?.some((e) => e.type === 'result')) });
+      if (!log.following) log.unseen += Math.max(0, (stream?.length ?? 0) - before);
+      drawLog();
+      if (log.following) toEnd();
+    }
+    if (!log.finished) stopReading = B.later(3000, () => readLog(n));
+  }
+
+  function show(title, ref) {
+    opened++;
+    stopReading?.();
+    log = null;
+    sheet.querySelector('#readerTitle').textContent = title;
+    sheet.querySelector('.reader-ref').textContent = ref;
+    tools.innerHTML = '';
+    more.hidden = true;
+    body.innerHTML = '<p class="muted">Loading…</p>';
+    sheet.showModal();
+    history.pushState({ ...history.state, idx: history.state.idx + 1, reader: true }, '', location.href);
+    pushed = true;
+    return opened;
+  }
+  function openLog(file) {
+    const n = show(`${file.split('-')[0]} log`, file);
+    log = { file, size: -1, text: '', stream: null, raw: false, following: true, unseen: 0, finished: false };
+    readLog(n);
+  }
+  async function openNotes(search) {
+    const wave = new URLSearchParams(search).has('wave');
+    const n = show('notes', '');
+    let html;
+    try {
+      const r = await fetch(B.site.url(`api/notes${search}`), { cache: 'no-store' });
+      const answer = await r.json();
+      if (!r.ok) throw new Error(answer.error || `notes ${r.status}`);
+      if (n !== opened) return;
+      sheet.querySelector('.reader-ref').textContent = `${wave ? answer.title : answer.ref} notes`;
+      html = `<article class="plan reader-md">${markdown(answer.markdown, linkContext(state.board?.items || [], answer.key ?? null))}</article>`;
+    } catch (e) { html = `<p class="muted">Could not load these notes: ${esc(e.message)}</p>`; }
+    if (n === opened) body.innerHTML = html;
+  }
+  function close() {
+    if (!sheet.open) return;
+    sheet.close();
+    opened++;
+    stopReading?.();
+    if (pushed) { pushed = false; history.back(); }
+  }
+
+  const plainTap = (ev) => !ev.defaultPrevented && ev.button === 0 && !ev.metaKey && !ev.ctrlKey && !ev.shiftKey && !ev.altKey;
+  B.on(B.root, 'click', (ev) => {
+    if (!plainTap(ev)) return;
+    const a = ev.target.closest('a[href^="log.html?"], a[href^="notes.html?"]');
+    if (!a) return;
+    ev.preventDefault();
+    const href = a.getAttribute('href');
+    if (href.startsWith('log.html')) openLog(new URLSearchParams(href.slice(href.indexOf('?'))).get('file'));
+    else openNotes(href.slice(href.indexOf('?')));
+  });
+  B.on(sheet, 'click', (ev) => {
+    if (ev.target === sheet) { close(); return; }
+    const act = ev.target.closest('[data-reader]')?.dataset.reader;
+    if (act === 'close') close();
+    else if (act === 'raw') { log.raw = !log.raw; drawLog(); follow(); }
+    else if (act === 'end') follow();
+    const a = ev.target.closest('a[href]');
+    if (!a || !plainTap(ev) || (a.target && a.target !== '_self')) return;
+    ev.preventDefault();
+    pending = new URL(a.getAttribute('href'), location.href).href;
+    close();
+  });
+  B.on(sheet, 'cancel', (ev) => { ev.preventDefault(); close(); });
+  B.on(body, 'scroll', () => {
+    if (!log?.stream) return;
+    log.following = atEnd();
+    if (log.following) log.unseen = 0;
+    drawTools();
+    drawMore();
+  });
+  // Back while it's open: the router has kept the board, as the entry under it holds the same URL.
+  B.on(window, 'popstate', () => {
+    if (pushed) { pushed = false; sheet.close(); opened++; stopReading?.(); }
+    if (!pending) return;
+    const href = pending;
+    pending = null;
+    if (!AppShell.open(href)) location.assign(href);
+  });
+});