@automagik/genie 4.260427.4 → 4.260427.5

package/README.md

@@ -25,7 +25,7 @@
 -->
 
 <!-- METRICS:START -->
-**🚀 121 commits** this week · **7 releases** · **+28.1K LoC** · **6 contributors**
+**🚀 113 commits** this week · **3 releases** · **+12.5K LoC** · **5 contributors**
 
 ![Commits per day (30d, all branches)](.genie/assets/commits-30d.svg)
 

package/dist/genie.js

@@ -236,7 +236,7 @@ ${readFileSync5(params.extraArgs[fileIdx+1],"utf-8")}`,params.extraArgs.splice(f
 `).slice(0,10);for(let line of lines){if(!line.includes("custom-title"))continue;let entry=JSON.parse(line);if(entry.type==="custom-title"&&entry.customTitle?.toLowerCase()===needle)return!0}}catch{}return!1}function sessionExists(name,cwd){try{let home=process.env.HOME??"/root",projectDir=ccProjectDirName(cwd??process.cwd()),projectPath=join9(home,".claude","projects",projectDir),files;try{files=readdirSync3(projectPath).filter((f)=>f.endsWith(".jsonl"))}catch{return!1}let needle=name.toLowerCase();return files.some((file)=>{let full=join9(projectPath,file);return fileHasSessionName(full,needle)||fileHasSessionName(full,`${needle}-${needle}`)})}catch{return!1}}var init_team_lead_command=__esm(()=>{init_claude_native_teams();init_genie_config2()});var exports_tmux_wrapper={};__export(exports_tmux_wrapper,{prependEnvVars:()=>prependEnvVars,genieTmuxPrefix:()=>genieTmuxPrefix,genieTmuxCmd:()=>genieTmuxCmd,executeTmux:()=>executeTmux});import{exec as execCallback}from"child_process";import{existsSync as existsSync7,mkdirSync as mkdirSync5}from"fs";import{homedir as homedir6}from"os";import{join as join10}from"path";import{promisify}from"util";function resolveGenieTmuxConf(){let home=homedir6(),genieHome3=process.env.GENIE_HOME??join10(home,".genie");return[join10(genieHome3,"tmux.conf"),join10(__dirname,"..","..","scripts","tmux","genie.tmux.conf"),join10(home,".bun","install","global","node_modules","@automagik","genie","scripts","tmux","genie.tmux.conf")].find((p)=>existsSync7(p))??"/dev/null"}function genieTmuxPrefix(){return["-L",GENIE_TMUX_SOCKET,"-f",resolveGenieTmuxConf()]}function genieTmuxCmd(subcommand){return`${tmuxBin()} ${genieTmuxPrefix().join(" ")} ${subcommand}`}function prependEnvVars(command,env){if(!env||Object.keys(env).length===0)return command;return`env ${Object.entries(env).map(([k,v])=>`${k}=${v}`).join(" ")} ${command}`}function getLogDir(){let logDir=join10(homedir6(),".genie","logs","tmux");if(!existsSync7(logDir))mkdirSync5(logDir,{recursive:!0});return logDir}function stripVerboseFlags(args){return args.filter((arg)=>!/^-v+$/.test(arg))}function isTmuxDebugEnabled(){return process.env.GENIE_TMUX_DEBUG==="1"}async function executeTmux(args){let argList=typeof args==="string"?args.split(/\s+/).filter(Boolean):args,finalArgs=stripVerboseFlags(argList),debugMode=isTmuxDebugEnabled(),options={};if(debugMode)finalArgs=["-v",...finalArgs],options.cwd=getLogDir();finalArgs=[...genieTmuxPrefix(),...finalArgs];let command=`${tmuxBin()} ${finalArgs.join(" ")}`,{stdout}=await exec(command,options);return stdout.trim()}var __dirname="/home/runner/_work/genie/genie/src/lib",exec,GENIE_TMUX_SOCKET;var init_tmux_wrapper=__esm(()=>{init_ensure_tmux();exec=promisify(execCallback),GENIE_TMUX_SOCKET=process.env.GENIE_TMUX_SOCKET||"genie"});var exports_tmux={};__export(exports_tmux,{setWindowEnv:()=>setWindowEnv,resolveRepoSession:()=>resolveRepoSession,listWindows:()=>listWindows,listPanes:()=>listPanes,killWindow:()=>killWindow,killSession:()=>killSession,isTmuxServerReachable:()=>isTmuxServerReachable,isPaneProcessRunning:()=>isPaneProcessRunning,isPaneAlive:()=>isPaneAlive,getWindowEnv:()=>getWindowEnv,getCurrentSessionName:()=>getCurrentSessionName,findWindowByName:()=>findWindowByName,findSessionByName:()=>findSessionByName,executeTmux:()=>executeTmux2,ensureTeamWindow:()=>ensureTeamWindow,createSession:()=>createSession,capturePaneContent:()=>capturePaneContent,applyPaneColor:()=>applyPaneColor,TmuxUnreachableError:()=>TmuxUnreachableError});import{existsSync as existsSync8}from"fs";import{basename as basename2,join as join11}from"path";async function executeTmux2(tmuxCommand){let{executeTmux:wrapperExec}=await Promise.resolve().then(() => (init_tmux_wrapper(),exports_tmux_wrapper));try{return await wrapperExec(tmuxCommand)}catch(error){let message=error instanceof Error?error.message:String(error);throw Error(`Failed to execute tmux command: ${message}`)}}async function getCurrentSessionName(hint){if(process.env.TMUX)try{return(await executeTmux2("display-message -p '#{session_name}'")).trim()||null}catch{return null}try{let sessions=await listSessions();if(sessions.length===0)return null;if(hint){let match=sessions.find((s)=>s.name.includes(hint));if(match)return match.name}return sessions[0].name}catch{return null}}async function listSessions(){try{let output=await executeTmux2("list-sessions -F '#{session_id}:#{session_name}:#{?session_attached,1,0}:#{session_windows}'");if(!output)return[];return output.split(`
 `).map((line)=>{let[id,name,attached,windows]=line.split(":");return{id,name,attached:attached==="1",windows:Number.parseInt(windows,10)}})}catch(error){if((error instanceof Error?error.message:String(error)).includes("no server running"))return[];throw error}}async function findSessionByName(name){try{return(await listSessions()).find((session)=>session.name===name)||null}catch(_error){return null}}async function getWindowEnv(target,varName){try{let output=await executeTmux2(`show-environment -t ${shellQuote(target)} ${shellQuote(varName)}`),prefix=`${varName}=`;if(output?.startsWith(prefix))return output.slice(prefix.length).trim();return null}catch{return null}}async function setWindowEnv(target,varName,value){await executeTmux2(`set-environment -t ${shellQuote(target)} ${shellQuote(varName)} ${shellQuote(value)}`)}async function killSession(sessionId){await executeTmux2(`kill-session -t '${sessionId}'`)}async function listWindows(sessionId){try{let output=await executeTmux2(`list-windows -t '=${sessionId}' -F '#{window_id}:#{window_name}:#{window_index}:#{?window_active,1,0}'`);if(!output)return[];return output.split(`
 `).map((line)=>{let[id,name,indexStr,active]=line.split(":");return{id,name,index:Number.parseInt(indexStr,10),active:active==="1",sessionId}})}catch(error){let message=error instanceof Error?error.message:String(error);if(message.includes("no server running")||message.includes("session not found"))return[];throw error}}async function listPanes(windowId){try{let output=await executeTmux2(`list-panes -t '${windowId}' -F '#{pane_id}:#{pane_title}:#{?pane_active,1,0}'`);if(!output)return[];return output.split(`
-`).map((line)=>{let[id,title,active]=line.split(":");return{id,windowId,title,active:active==="1"}})}catch(error){let message=error instanceof Error?error.message:String(error);if(message.includes("no server running")||message.includes("window not found"))return[];throw error}}async function capturePaneContent(paneId,lines=200,includeColors=!1){try{return await executeTmux2(`capture-pane -p ${includeColors?"-e":""} -t '${paneId}' -S -${lines} -E -`)}catch(error){let message=error instanceof Error?error.message:String(error);if(message.includes("no server running")||message.includes("pane not found"))return"";throw error}}async function createSession(name){return await executeTmux2(`new-session -d -s "${name}" -e LC_ALL=C.UTF-8 -e LANG=C.UTF-8`),findSessionByName(name)}async function createWindow(sessionId,name,workingDir){let cdFlag=workingDir?` -c '${workingDir.replace(/'/g,"'\\''")}'`:"",output=await executeTmux2(`new-window -d -P -F '#{window_id}:#{window_index}' -t '${sessionId}:' -n '${name}'${cdFlag}`),[windowId,indexStr]=output.trim().split(":");if(!windowId)return null;try{await executeTmux2(`set-window-option -t '${windowId}' automatic-rename off`)}catch{}return{id:windowId,name,index:Number.parseInt(indexStr,10)||0,active:!1,sessionId}}async function findWindowByName(sessionId,name){return(await listWindows(sessionId)).find((w)=>w.name===name)||null}async function ensureMasterWindow(session,masterName){try{let windows=await listWindows(session);if(windows.length<2)return;let masterWindow=windows.find((w)=>w.name===masterName);if(!masterWindow)return;let minIndex=Math.min(...windows.map((w)=>w.index));if(masterWindow.index===minIndex)return;await executeTmux2(`swap-window -s '${session}:${masterWindow.index}' -t '${session}:${minIndex}'`)}catch{}}async function ensureSessionExists(name){try{await executeTmux2(`new-session -d -s "${name}" -e LC_ALL=C.UTF-8 -e LANG=C.UTF-8`)}catch(error){if((error instanceof Error?error.message:String(error)).includes("duplicate session"))return;throw error}}async function ensureTeamWindow(session,teamName,workingDir){for(let attempt=0;attempt<3;attempt++)try{return await ensureTeamWindowOnce(session,teamName,workingDir)}catch(error){let message=error instanceof Error?error.message:String(error);if(message.includes("no server running")||message.includes("server exited")||message.includes("error connecting")){if(attempt<2){let delay=250*2**attempt;console.warn(`[genie-tmux] tmux server unreachable (attempt ${attempt+1}/3), retrying in ${delay}ms...`),await new Promise((resolve2)=>setTimeout(resolve2,delay));continue}}throw error}throw Error("Failed to ensure team window after 3 attempts")}async function ensureTeamWindowOnce(session,teamName,workingDir){await ensureSessionExists(session);let existing=await findWindowByName(session,teamName);if(existing){try{await executeTmux2(`set-window-option -t '${existing.id}' automatic-rename off`)}catch{}await rehydratePaneColorHook(existing.id);let panes2=await listPanes(existing.id),paneId2=panes2.length>0?panes2[0].id:`${session}:${teamName}.0`;return{windowId:existing.id,windowName:teamName,paneId:paneId2,created:!1}}let windowsBefore=await listWindows(session),masterBefore=windowsBefore.length>0?windowsBefore.reduce((a,b)=>a.index<=b.index?a:b):null,newWindow=await createWindow(session,teamName,workingDir);if(!newWindow)throw Error(`Failed to create team window "${teamName}" in session "${session}"`);if(masterBefore)await ensureMasterWindow(session,masterBefore.name);await rehydratePaneColorHook(newWindow.id);let panes=await listPanes(newWindow.id),paneId=panes.length>0?panes[0].id:`${session}:${teamName}.0`;return{windowId:newWindow.id,windowName:teamName,paneId,created:!0}}function ensurePaneColorScript(){let{existsSync:existsSync9,writeFileSync:writeFileSync6,mkdirSync:mkdirSync6,chmodSync:chmodSync2}=__require("fs"),{dirname:dirname4}=__require("path");if(existsSync9(PANE_COLOR_SCRIPT))return;mkdirSync6(dirname4(PANE_COLOR_SCRIPT),{recursive:!0});let bin=tmuxBin();writeFileSync6(PANE_COLOR_SCRIPT,`#!/bin/bash
+`).map((line)=>{let[id,title,active]=line.split(":");return{id,windowId,title,active:active==="1"}})}catch(error){let message=error instanceof Error?error.message:String(error);if(message.includes("no server running")||message.includes("window not found"))return[];throw error}}async function capturePaneContent(paneId,lines=200,includeColors=!1){try{return await executeTmux2(`capture-pane -p ${includeColors?"-e":""} -t '${paneId}' -S -${lines} -E -`)}catch(error){let message=error instanceof Error?error.message:String(error);if(message.includes("no server running")||message.includes("pane not found"))return"";throw error}}async function createSession(name){return await executeTmux2(`new-session -d -s "${name}" -e LC_ALL=C.UTF-8 -e LANG=C.UTF-8`),findSessionByName(name)}async function createWindow(sessionId,name,workingDir){let cdFlag=workingDir?` -c '${workingDir.replace(/'/g,"'\\''")}'`:"",output=await executeTmux2(`new-window -d -P -F '#{window_id}:#{window_index}' -t '${sessionId}:' -n '${name}'${cdFlag}`),[windowId,indexStr]=output.trim().split(":");if(!windowId)return null;try{await executeTmux2(`set-window-option -t '${windowId}' automatic-rename off`)}catch{}return{id:windowId,name,index:Number.parseInt(indexStr,10)||0,active:!1,sessionId}}async function findWindowByName(sessionId,name){return(await listWindows(sessionId)).find((w)=>w.name===name)||null}async function ensureMasterWindow(session,masterName){try{let windows=await listWindows(session);if(windows.length<2)return;let masterWindow=windows.find((w)=>w.name===masterName);if(!masterWindow)return;let minIndex=Math.min(...windows.map((w)=>w.index));if(masterWindow.index===minIndex)return;await executeTmux2(`swap-window -s '${session}:${masterWindow.index}' -t '${session}:${minIndex}'`)}catch{}}async function ensureSessionExists(name){if(/^[@$]\d+$/.test(name))throw Error(`Refused to create tmux session with id-shaped name "${name}". Names matching /^[@$]\\d+$/ collide with tmux's window-id (@N) and session-id ($N) notation, producing ghost sessions that cannot be safely targeted. Pass a human-readable session name (e.g. the team or agent name) instead.`);try{await executeTmux2(`new-session -d -s "${name}" -e LC_ALL=C.UTF-8 -e LANG=C.UTF-8`)}catch(error){if((error instanceof Error?error.message:String(error)).includes("duplicate session"))return;throw error}}async function ensureTeamWindow(session,teamName,workingDir){for(let attempt=0;attempt<3;attempt++)try{return await ensureTeamWindowOnce(session,teamName,workingDir)}catch(error){let message=error instanceof Error?error.message:String(error);if(message.includes("no server running")||message.includes("server exited")||message.includes("error connecting")){if(attempt<2){let delay=250*2**attempt;console.warn(`[genie-tmux] tmux server unreachable (attempt ${attempt+1}/3), retrying in ${delay}ms...`),await new Promise((resolve2)=>setTimeout(resolve2,delay));continue}}throw error}throw Error("Failed to ensure team window after 3 attempts")}async function ensureTeamWindowOnce(session,teamName,workingDir){await ensureSessionExists(session);let existing=await findWindowByName(session,teamName);if(existing){try{await executeTmux2(`set-window-option -t '${existing.id}' automatic-rename off`)}catch{}await rehydratePaneColorHook(existing.id);let panes2=await listPanes(existing.id),paneId2=panes2.length>0?panes2[0].id:`${session}:${teamName}.0`;return{windowId:existing.id,windowName:teamName,sessionName:session,paneId:paneId2,created:!1}}let windowsBefore=await listWindows(session),masterBefore=windowsBefore.length>0?windowsBefore.reduce((a,b)=>a.index<=b.index?a:b):null,newWindow=await createWindow(session,teamName,workingDir);if(!newWindow)throw Error(`Failed to create team window "${teamName}" in session "${session}"`);if(masterBefore)await ensureMasterWindow(session,masterBefore.name);await rehydratePaneColorHook(newWindow.id);let panes=await listPanes(newWindow.id),paneId=panes.length>0?panes[0].id:`${session}:${teamName}.0`;return{windowId:newWindow.id,windowName:teamName,sessionName:session,paneId,created:!0}}function ensurePaneColorScript(){let{existsSync:existsSync9,writeFileSync:writeFileSync6,mkdirSync:mkdirSync6,chmodSync:chmodSync2}=__require("fs"),{dirname:dirname4}=__require("path");if(existsSync9(PANE_COLOR_SCRIPT))return;mkdirSync6(dirname4(PANE_COLOR_SCRIPT),{recursive:!0});let bin=tmuxBin();writeFileSync6(PANE_COLOR_SCRIPT,`#!/bin/bash
 # Genie tmux pane color router \u2014 reads @genie_color pane option
 PANE_ID="$1"
 COLOR=$(${bin} display-message -p -t "$PANE_ID" '#{@genie_color}' 2>/dev/null)
@@ -1962,7 +1962,7 @@ process.on('SIGTERM', () => { server.close(); process.exit(0); });
 process.on('SIGINT', () => { server.close(); process.exit(0); });
 `,{mode:420});let{spawn:spawnChild}=__require("child_process");spawnChild("node",[scriptFile],{detached:!0,stdio:"ignore"}).unref();for(let i2=0;i2<30;i2++)if(await new Promise((r)=>setTimeout(r,100)),isRelayAlive(pidFile))return!0;return!1}catch{return!1}}async function generateWorkerId2(team,role){let base=role?`${team}-${role}`:team;if(!(await list()).some((w)=>w.id===base))return base;let suffix=crypto.randomUUID().slice(0,8);return`${base}-${suffix}`}async function capturePanePid2(paneId){if(paneId==="inline")return null;try{let{execSync:execSync10}=__require("child_process"),output=execSync10(genieTmuxCmd(`display -t '${paneId}' -p '#{pane_pid}'`),{encoding:"utf-8"}).trim(),pid=Number.parseInt(output,10);return pid>0?pid:null}catch{return null}}function resolveExecutorTransport2(provider,spawnTransport){if(provider==="codex")return"api";if(provider==="claude-sdk")return"process";return spawnTransport==="inline"?"process":"tmux"}async function terminateActiveExecutorWithCleanup(agentIdentityId){try{let currentExec=await getCurrentExecutor(agentIdentityId);if(!currentExec||currentExec.state==="terminated"||currentExec.state==="done")return;let provider=getProvider(currentExec.provider);if(provider)try{await provider.terminate(currentExec)}catch{}await terminateActiveExecutor(agentIdentityId)}catch{}}async function createAndLinkExecutor2(agentIdentityId,provider,transport,opts){try{let executor=await createExecutor(agentIdentityId,provider,transport,opts);return await setCurrentExecutor(agentIdentityId,executor.id),executor.id}catch{return null}}async function registerSpawnWorker(ctx,paneId,windowInfo){let nt=ctx.validated.nativeTeam,workerEntry={id:ctx.workerId,paneId,session:ctx.validated.team,provider:ctx.validated.provider,transport:ctx.transport,role:ctx.validated.role,skill:ctx.validated.skill,team:ctx.validated.team,worktree:null,startedAt:ctx.now,state:"spawning",lastStateChange:ctx.now,repoPath:ctx.cwd,nativeTeamEnabled:nt?.enabled??!1,nativeAgentId:`${ctx.agentName}@${ctx.validated.team}`,nativeColor:nt?.color??ctx.spawnColor,parentSessionId:nt?.parentSessionId??ctx.parentSessionId,window:windowInfo?.windowName,windowName:windowInfo?.windowName,windowId:windowInfo?.windowId,autoResume:ctx.autoResume===!1?!1:void 0,resumeAttempts:0};await register(workerEntry);let role=ctx.validated.role??ctx.agentName;if(role!=="council")try{await hireAgent(ctx.validated.team,role)}catch{}return workerEntry}async function notifySpawnJoin(ctx,paneId){let nt=ctx.validated.nativeTeam;if(!nt?.enabled)return;await registerNativeMember(ctx.validated.team,{agentName:ctx.agentName,agentType:nt.agentType??ctx.validated.role??"general-purpose",color:nt.color??ctx.spawnColor??"blue",tmuxPaneId:paneId,cwd:ctx.cwd,planModeRequired:nt.planModeRequired});let leaderName=await resolveTeamLeaderName(ctx.validated.team);await writeNativeInbox(ctx.validated.team,leaderName,{from:ctx.agentName,text:`Worker ${ctx.agentName} (${ctx.validated.provider}) joined team ${ctx.validated.team}. cwd: ${ctx.cwd}. Ready for tasks.`,summary:`${ctx.agentName} (${ctx.validated.provider}) joined`,timestamp:new Date().toISOString(),color:nt.color??ctx.spawnColor??"blue",read:!1})}function registerOtelRelayPane(workerId,paneId,agentName,spawnColor,repoPath){let{writeFileSync:wfs}=__require("fs"),{join:pjoin}=__require("path"),{homedir:hdir}=__require("os"),rd=pjoin(hdir(),".genie","relay");wfs(pjoin(rd,`${workerId}-pane`),paneId),wfs(pjoin(rd,`${workerId}-meta`),JSON.stringify({agent:agentName,color:spawnColor,repoPath}))}function printSpawnInfo(ctx,paneId,workerEntry){let nt=ctx.validated.nativeTeam;if(console.log(`Agent "${ctx.workerId}" spawned.`),console.log(`  Provider: ${ctx.launch.provider}`),console.log(`  Command:  ${ctx.fullCommand}`),console.log(`  Team:     ${ctx.validated.team}`),console.log(`  Pane:     ${paneId}`),ctx.validated.role)console.log(`  Role:     ${ctx.validated.role}`);if(ctx.executorId)console.log(`  Executor: ${ctx.executorId}`);if(ctx.validated.skill)console.log(`  Skill:    ${ctx.validated.skill}`);if(ctx.claudeSessionId)console.log(`  Session:  ${ctx.claudeSessionId}`);if(console.log(`  Layout:   ${ctx.layoutMode}`),nt?.enabled)console.log("  Native:   enabled"),console.log(`  AgentID:  ${workerEntry.nativeAgentId}`),console.log(`  Color:    ${nt.color}`);if(ctx.otelRelayActive)console.log(`  OTel:     relay on port ${OTEL_RELAY_PORT}`)}function shellQuote2(arg){return`'${arg.replace(/'/g,"'\\''")}'`}function writeTmuxLaunchScript(workerId,fullCommand){let{chmodSync:chmodSync3,mkdirSync:mkdirSync14,writeFileSync:writeFileSync13}=__require("fs"),{join:join41}=__require("path"),{homedir:homedir27}=__require("os"),dir=join41(homedir27(),".genie","spawn-scripts");mkdirSync14(dir,{recursive:!0});let safeId=workerId.replace(/[^a-zA-Z0-9._-]/g,"-"),scriptPath=join41(dir,`${safeId}-${Date.now().toString(36)}.sh`);return writeFileSync13(scriptPath,`#!/bin/sh
 exec ${fullCommand}
-`,{mode:448}),chmodSync3(scriptPath,448),scriptPath}function buildInitialSplitWindowCommand(windowId,cwd,fullCommand){let cwdFlag=cwd?` -c ${shellQuote2(cwd)}`:"";return genieTmuxCmd(`split-window -d -t ${shellQuote2(windowId)}${cwdFlag} -P -F '#{pane_id}' ${shellQuote2(fullCommand)}`)}async function resolveSpawnTeamWindow(team,cwd,sessionOverride){if(!team)return null;try{let sessionName=sessionOverride;if(!sessionName)sessionName=(await getTeam(team))?.tmuxSessionName;if(!sessionName)sessionName=await resolveRepoSession(cwd);if(!sessionName)sessionName=team;return await ensureTeamWindow(sessionName,team,cwd)}catch(err){return console.warn(`Warning: could not ensure team window for "${team}": ${err instanceof Error?err.message:err}`),null}}async function autoConfirmTrustPrompt(paneId){let{execSync:execSync10}=__require("child_process"),maxWaitMs=15000,pollMs=500,start=Date.now();while(Date.now()-start<15000){await new Promise((r)=>setTimeout(r,500));let content;try{content=execSync10(genieTmuxCmd(`capture-pane -t '${paneId}' -p`),{encoding:"utf-8"})}catch{return}if(content.includes("trust this folder")||content.includes("Quick safety check")){try{execSync10(genieTmuxCmd(`send-keys -t '${paneId}' Enter`),{encoding:"utf-8"})}catch{}return}if(content.includes("Claude Code")||content.includes("\u276F")||content.includes("Churning"))return}}function createTmuxPane(ctx,teamWindow){let{execSync:execSync10}=__require("child_process"),useLaunchScript=ctx.validated.provider==="claude"&&Boolean(ctx.validated.nativeTeam?.enabled),tmuxCommand=useLaunchScript?shellQuote2(writeTmuxLaunchScript(ctx.workerId,ctx.fullCommand)):shellQuote2(ctx.fullCommand),tmuxPrefix=genieTmuxCmd("");if(ctx.validated.windowTarget){let cwdFlag2=ctx.cwd?` -c ${shellQuote2(ctx.cwd)}`:"",cmd=`${tmuxPrefix}split-window -d -t ${shellQuote2(ctx.validated.windowTarget)}${cwdFlag2} -P -F '#{pane_id}' ${tmuxCommand}`;return execSync10(cmd,{encoding:"utf-8"}).trim()}if(ctx.validated.newWindow){let session=ctx.sessionOverride??teamWindow?.windowId?.split(":")[0]??ctx.validated.team,cwdFlag2=ctx.cwd?` -c ${shellQuote2(ctx.cwd)}`:"",sessionExists2=!1;try{execSync10(`${tmuxPrefix}has-session -t ${shellQuote2(`=${session}`)}`,{stdio:"ignore"}),sessionExists2=!0}catch{sessionExists2=!1}if(!sessionExists2)execSync10(`${tmuxPrefix}new-session -d -s ${shellQuote2(session)} -n home${cwdFlag2}`,{stdio:"ignore"});let cmd=`${tmuxPrefix}new-window -a -d -t ${shellQuote2(`${session}:`)} -n claude${cwdFlag2} -P -F '#{pane_id}' ${tmuxCommand}`;return execSync10(cmd,{encoding:"utf-8"}).trim()}if(teamWindow?.created){let cwdFlag2=ctx.cwd?` -c ${shellQuote2(ctx.cwd)}`:"",paneId=execSync10(`${tmuxPrefix}split-window -d -t ${shellQuote2(teamWindow.windowId)}${cwdFlag2} -P -F '#{pane_id}' ${tmuxCommand}`,{encoding:"utf-8"}).trim();try{execSync10(genieTmuxCmd(`kill-pane -t '${teamWindow.paneId}'`),{stdio:"ignore"})}catch{}return paneId}let callerPane=process.env.TMUX_PANE;if(!teamWindow&&!callerPane)throw Error("createTmuxPane: refusing to split with no target \u2014 neither teamWindow nor TMUX_PANE is set. "+"This indicates a missing --team or --window flag, or a caller outside tmux. See ~/.genie/reports/trace-genie-spawn-wrong-window.md");let splitTarget=teamWindow?`-t '${teamWindow.windowId}'`:`-t '${callerPane}'`,cwdFlag=ctx.cwd?`-c '${ctx.cwd}'`:"";if(useLaunchScript){let splitCmd2=`${tmuxPrefix}split-window -d ${splitTarget} ${cwdFlag} -P -F '#{pane_id}' ${tmuxCommand}`;return execSync10(splitCmd2,{encoding:"utf-8"}).trim()}let escapedCmd=ctx.fullCommand.replace(/'/g,"'\\''"),splitCmd=`${tmuxPrefix}split-window -d ${splitTarget} ${cwdFlag} -P -F '#{pane_id}' '${escapedCmd}'`;return execSync10(splitCmd,{encoding:"utf-8"}).trim()}async function applySpawnLayout(ctx,teamWindow){let{execSync:execSync10}=__require("child_process"),session=await getCurrentSessionName()??ctx.validated.team,layoutTarget=`${session}:${teamWindow?.windowName??""}`;if(!teamWindow){let wins=await listWindows(session);layoutTarget=wins[0]?wins[0].id:`${session}:`}try{execSync10(genieTmuxCmd(buildLayoutCommand(layoutTarget,ctx.layoutMode)),{stdio:"ignore"})}catch{}}async function createTmuxExecutor(ctx,paneId,pid,teamWindow){if(!ctx.agentIdentityId||!ctx.executorId)return;await createAndLinkExecutor2(ctx.agentIdentityId,ctx.validated.provider,resolveExecutorTransport2(ctx.validated.provider,"tmux"),{id:ctx.executorId,pid,tmuxSession:ctx.validated.team,tmuxPaneId:paneId,tmuxWindow:teamWindow?.windowName??null,tmuxWindowId:teamWindow?.windowId??null,claudeSessionId:ctx.claudeSessionId??null,state:"spawning",repoPath:ctx.cwd,paneColor:ctx.spawnColor})}async function finalizeTmuxSpawn(ctx,paneId,teamWindow,workerEntry){if(ctx.spawnColor&&paneId!=="inline")await applyPaneColor(paneId,ctx.spawnColor,teamWindow?.windowId);if(await saveTemplate({id:ctx.validated.role??ctx.workerId,provider:ctx.validated.provider,team:ctx.validated.team,role:ctx.validated.role,skill:ctx.validated.skill,cwd:ctx.cwd,extraArgs:ctx.extraArgs,nativeTeamEnabled:workerEntry.nativeTeamEnabled,lastSpawnedAt:new Date().toISOString()}),ctx.otelRelayActive&&paneId!=="%0")registerOtelRelayPane(ctx.workerId,paneId,ctx.agentName,ctx.spawnColor,ctx.cwd);if(teamWindow)console.log(`  Window:   ${teamWindow.windowName} (${teamWindow.windowId})`);printSpawnInfo(ctx,paneId,workerEntry)}async function awaitAgentReadiness(paneId){if(paneId==="inline")return;let result2=await waitForAgentReady(paneId);if(result2.ready)console.log(`  \u2713 Agent ready (${(result2.elapsedMs/1000).toFixed(1)}s)`);else console.log(`  \u26A0 Agent readiness timeout (${Math.round(result2.elapsedMs/1000)}s) \u2014 proceeding anyway`)}async function launchTmuxSpawn(ctx){let isolatedSessionSpawn=ctx.validated.newWindow===!0&&Boolean(ctx.sessionOverride),teamWindow=ctx.spawnIntoCurrentWindow||isolatedSessionSpawn?null:await resolveSpawnTeamWindow(ctx.validated.team,ctx.cwd,ctx.sessionOverride),paneId;try{paneId=createTmuxPane(ctx,teamWindow)}catch(err){return console.error(`Failed to create tmux pane: ${err instanceof Error?err.message:"unknown error"}`),process.exit(1)}let pid=await capturePanePid2(paneId);if(await createTmuxExecutor(ctx,paneId,pid,teamWindow),await applySpawnLayout(ctx,teamWindow),ctx.validated.provider==="claude")await autoConfirmTrustPrompt(paneId);let workerEntry=await registerSpawnWorker(ctx,paneId,teamWindow);if(await notifySpawnJoin(ctx,paneId),await finalizeTmuxSpawn(ctx,paneId,teamWindow,workerEntry),await awaitAgentReadiness(paneId),ctx.executorId)await updateExecutorState(ctx.executorId,"running").catch(()=>{});return await update(ctx.workerId,{state:"idle"}).catch(()=>{}),paneId}async function runSdkQuery(ctx,permConfig,streamOpts,sdkConfig,runtimeExtraOptions){let{ClaudeSdkProvider:ClaudeSdkProvider2}=await Promise.resolve().then(() => (init_claude_sdk(),exports_claude_sdk)),{startSession:startSession2,recordTurn:recordTurn2,updateTurnCount:updateTurnCount2,endSession:endSession2}=await Promise.resolve().then(() => exports_sdk_session_capture),{getConnection:getConnection2}=await Promise.resolve().then(() => (init_db(),exports_db)),sdkProvider=new ClaudeSdkProvider2,spawnContext={agentId:ctx.agentIdentityId??ctx.workerId,executorId:ctx.executorId??crypto.randomUUID(),team:ctx.validated.team,role:ctx.validated.role,skill:ctx.validated.skill,cwd:ctx.cwd,model:ctx.validated.model,systemPrompt:ctx.validated.systemPrompt,systemPromptFile:ctx.validated.systemPromptFile,initialPrompt:ctx.validated.initialPrompt,name:ctx.validated.name},safePgCall=async(_op,fn,fallback)=>{try{let sql=await getConnection2();return await fn(sql)}catch{return fallback}},prompt2=ctx.validated.initialPrompt??`You are ${ctx.validated.role??"an agent"} on team "${ctx.validated.team}". Awaiting instructions.`,resumeSessionId=typeof runtimeExtraOptions?.resume==="string"?runtimeExtraOptions.resume:void 0,dbSessionId=null,turnIndex=0;if(resumeSessionId){let resolvedClaudeSessionId=resumeSessionId,byPgId=await safePgCall("resolve-session-resume",(sql)=>sql`
+`,{mode:448}),chmodSync3(scriptPath,448),scriptPath}function buildInitialSplitWindowCommand(windowId,cwd,fullCommand){let cwdFlag=cwd?` -c ${shellQuote2(cwd)}`:"";return genieTmuxCmd(`split-window -d -t ${shellQuote2(windowId)}${cwdFlag} -P -F '#{pane_id}' ${shellQuote2(fullCommand)}`)}async function resolveSpawnTeamWindow(team,cwd,sessionOverride){if(!team)return null;try{let sessionName=sessionOverride;if(!sessionName)sessionName=(await getTeam(team))?.tmuxSessionName;if(!sessionName)sessionName=await resolveRepoSession(cwd);if(!sessionName)sessionName=team;return await ensureTeamWindow(sessionName,team,cwd)}catch(err){return console.warn(`Warning: could not ensure team window for "${team}": ${err instanceof Error?err.message:err}`),null}}async function autoConfirmTrustPrompt(paneId){let{execSync:execSync10}=__require("child_process"),maxWaitMs=15000,pollMs=500,start=Date.now();while(Date.now()-start<15000){await new Promise((r)=>setTimeout(r,500));let content;try{content=execSync10(genieTmuxCmd(`capture-pane -t '${paneId}' -p`),{encoding:"utf-8"})}catch{return}if(content.includes("trust this folder")||content.includes("Quick safety check")){try{execSync10(genieTmuxCmd(`send-keys -t '${paneId}' Enter`),{encoding:"utf-8"})}catch{}return}if(content.includes("Claude Code")||content.includes("\u276F")||content.includes("Churning"))return}}function createTmuxPane(ctx,teamWindow){let{execSync:execSync10}=__require("child_process"),useLaunchScript=ctx.validated.provider==="claude"&&Boolean(ctx.validated.nativeTeam?.enabled),tmuxCommand=useLaunchScript?shellQuote2(writeTmuxLaunchScript(ctx.workerId,ctx.fullCommand)):shellQuote2(ctx.fullCommand),tmuxPrefix=genieTmuxCmd("");if(ctx.validated.windowTarget){let cwdFlag2=ctx.cwd?` -c ${shellQuote2(ctx.cwd)}`:"",cmd=`${tmuxPrefix}split-window -d -t ${shellQuote2(ctx.validated.windowTarget)}${cwdFlag2} -P -F '#{pane_id}' ${tmuxCommand}`;return execSync10(cmd,{encoding:"utf-8"}).trim()}if(ctx.validated.newWindow){let session=ctx.sessionOverride??teamWindow?.sessionName??ctx.validated.team,cwdFlag2=ctx.cwd?` -c ${shellQuote2(ctx.cwd)}`:"",sessionExists2=!1;try{execSync10(`${tmuxPrefix}has-session -t ${shellQuote2(`=${session}`)}`,{stdio:"ignore"}),sessionExists2=!0}catch{sessionExists2=!1}if(!sessionExists2)execSync10(`${tmuxPrefix}new-session -d -s ${shellQuote2(session)} -n home${cwdFlag2}`,{stdio:"ignore"});let cmd=`${tmuxPrefix}new-window -a -d -t ${shellQuote2(`${session}:`)} -n claude${cwdFlag2} -P -F '#{pane_id}' ${tmuxCommand}`;return execSync10(cmd,{encoding:"utf-8"}).trim()}if(teamWindow?.created){let cwdFlag2=ctx.cwd?` -c ${shellQuote2(ctx.cwd)}`:"",paneId=execSync10(`${tmuxPrefix}split-window -d -t ${shellQuote2(teamWindow.windowId)}${cwdFlag2} -P -F '#{pane_id}' ${tmuxCommand}`,{encoding:"utf-8"}).trim();try{execSync10(genieTmuxCmd(`kill-pane -t '${teamWindow.paneId}'`),{stdio:"ignore"})}catch{}return paneId}let callerPane=process.env.TMUX_PANE;if(!teamWindow&&!callerPane)throw Error("createTmuxPane: refusing to split with no target \u2014 neither teamWindow nor TMUX_PANE is set. "+"This indicates a missing --team or --window flag, or a caller outside tmux. See ~/.genie/reports/trace-genie-spawn-wrong-window.md");let splitTarget=teamWindow?`-t '${teamWindow.windowId}'`:`-t '${callerPane}'`,cwdFlag=ctx.cwd?`-c '${ctx.cwd}'`:"";if(useLaunchScript){let splitCmd2=`${tmuxPrefix}split-window -d ${splitTarget} ${cwdFlag} -P -F '#{pane_id}' ${tmuxCommand}`;return execSync10(splitCmd2,{encoding:"utf-8"}).trim()}let escapedCmd=ctx.fullCommand.replace(/'/g,"'\\''"),splitCmd=`${tmuxPrefix}split-window -d ${splitTarget} ${cwdFlag} -P -F '#{pane_id}' '${escapedCmd}'`;return execSync10(splitCmd,{encoding:"utf-8"}).trim()}async function applySpawnLayout(ctx,teamWindow){let{execSync:execSync10}=__require("child_process"),session=await getCurrentSessionName()??ctx.validated.team,layoutTarget=`${session}:${teamWindow?.windowName??""}`;if(!teamWindow){let wins=await listWindows(session);layoutTarget=wins[0]?wins[0].id:`${session}:`}try{execSync10(genieTmuxCmd(buildLayoutCommand(layoutTarget,ctx.layoutMode)),{stdio:"ignore"})}catch{}}async function createTmuxExecutor(ctx,paneId,pid,teamWindow){if(!ctx.agentIdentityId||!ctx.executorId)return;await createAndLinkExecutor2(ctx.agentIdentityId,ctx.validated.provider,resolveExecutorTransport2(ctx.validated.provider,"tmux"),{id:ctx.executorId,pid,tmuxSession:ctx.validated.team,tmuxPaneId:paneId,tmuxWindow:teamWindow?.windowName??null,tmuxWindowId:teamWindow?.windowId??null,claudeSessionId:ctx.claudeSessionId??null,state:"spawning",repoPath:ctx.cwd,paneColor:ctx.spawnColor})}async function finalizeTmuxSpawn(ctx,paneId,teamWindow,workerEntry){if(ctx.spawnColor&&paneId!=="inline")await applyPaneColor(paneId,ctx.spawnColor,teamWindow?.windowId);if(await saveTemplate({id:ctx.validated.role??ctx.workerId,provider:ctx.validated.provider,team:ctx.validated.team,role:ctx.validated.role,skill:ctx.validated.skill,cwd:ctx.cwd,extraArgs:ctx.extraArgs,nativeTeamEnabled:workerEntry.nativeTeamEnabled,lastSpawnedAt:new Date().toISOString()}),ctx.otelRelayActive&&paneId!=="%0")registerOtelRelayPane(ctx.workerId,paneId,ctx.agentName,ctx.spawnColor,ctx.cwd);if(teamWindow)console.log(`  Window:   ${teamWindow.windowName} (${teamWindow.windowId})`);printSpawnInfo(ctx,paneId,workerEntry)}async function awaitAgentReadiness(paneId){if(paneId==="inline")return;let result2=await waitForAgentReady(paneId);if(result2.ready)console.log(`  \u2713 Agent ready (${(result2.elapsedMs/1000).toFixed(1)}s)`);else console.log(`  \u26A0 Agent readiness timeout (${Math.round(result2.elapsedMs/1000)}s) \u2014 proceeding anyway`)}async function launchTmuxSpawn(ctx){let isolatedSessionSpawn=ctx.validated.newWindow===!0&&Boolean(ctx.sessionOverride),teamWindow=ctx.spawnIntoCurrentWindow||isolatedSessionSpawn?null:await resolveSpawnTeamWindow(ctx.validated.team,ctx.cwd,ctx.sessionOverride),paneId;try{paneId=createTmuxPane(ctx,teamWindow)}catch(err){return console.error(`Failed to create tmux pane: ${err instanceof Error?err.message:"unknown error"}`),process.exit(1)}let pid=await capturePanePid2(paneId);if(await createTmuxExecutor(ctx,paneId,pid,teamWindow),await applySpawnLayout(ctx,teamWindow),ctx.validated.provider==="claude")await autoConfirmTrustPrompt(paneId);let workerEntry=await registerSpawnWorker(ctx,paneId,teamWindow);if(await notifySpawnJoin(ctx,paneId),await finalizeTmuxSpawn(ctx,paneId,teamWindow,workerEntry),await awaitAgentReadiness(paneId),ctx.executorId)await updateExecutorState(ctx.executorId,"running").catch(()=>{});return await update(ctx.workerId,{state:"idle"}).catch(()=>{}),paneId}async function runSdkQuery(ctx,permConfig,streamOpts,sdkConfig,runtimeExtraOptions){let{ClaudeSdkProvider:ClaudeSdkProvider2}=await Promise.resolve().then(() => (init_claude_sdk(),exports_claude_sdk)),{startSession:startSession2,recordTurn:recordTurn2,updateTurnCount:updateTurnCount2,endSession:endSession2}=await Promise.resolve().then(() => exports_sdk_session_capture),{getConnection:getConnection2}=await Promise.resolve().then(() => (init_db(),exports_db)),sdkProvider=new ClaudeSdkProvider2,spawnContext={agentId:ctx.agentIdentityId??ctx.workerId,executorId:ctx.executorId??crypto.randomUUID(),team:ctx.validated.team,role:ctx.validated.role,skill:ctx.validated.skill,cwd:ctx.cwd,model:ctx.validated.model,systemPrompt:ctx.validated.systemPrompt,systemPromptFile:ctx.validated.systemPromptFile,initialPrompt:ctx.validated.initialPrompt,name:ctx.validated.name},safePgCall=async(_op,fn,fallback)=>{try{let sql=await getConnection2();return await fn(sql)}catch{return fallback}},prompt2=ctx.validated.initialPrompt??`You are ${ctx.validated.role??"an agent"} on team "${ctx.validated.team}". Awaiting instructions.`,resumeSessionId=typeof runtimeExtraOptions?.resume==="string"?runtimeExtraOptions.resume:void 0,dbSessionId=null,turnIndex=0;if(resumeSessionId){let resolvedClaudeSessionId=resumeSessionId,byPgId=await safePgCall("resolve-session-resume",(sql)=>sql`
         SELECT s.id, s.total_turns, COALESCE(s.claude_session_id, e.claude_session_id) as csid
         FROM sessions s
         LEFT JOIN executors e ON e.id = s.executor_id

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automagik/genie",
-  "version": "4.260427.4",
+  "version": "4.260427.5",
   "description": "Collaborative terminal toolkit for human + AI workflows",
   "type": "module",
   "bin": {

package/plugins/genie/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "genie",
-  "version": "4.260427.4",
+  "version": "4.260427.5",
   "description": "Human-AI partnership for Claude Code. Share a terminal, orchestrate workers, evolve together. Brainstorm ideas, turn them into wishes, execute with /work, validate with /review, and ship as one team.",
   "author": {
     "name": "Namastex Labs"

package/plugins/genie/package.json

@@ -1,6 +1,6 @@
 {
   "name": "genie-plugin",
-  "version": "4.260427.4",
+  "version": "4.260427.5",
   "private": true,
   "description": "Runtime dependencies for genie bundled CLIs",
   "type": "module",

package/src/db/migrations/053_master_backfill_and_shadow_cleanup.sql

@@ -0,0 +1,161 @@
+-- 053_master_backfill_and_shadow_cleanup.sql
+--
+-- master-aware-spawn wish, Wave 2, Group 14 (sub-deliverables 14a + 14b).
+--
+-- The 2026-04-25 power-outage post-mortem surfaced that masters today fall
+-- into two shadow patterns in PG (twin's analysis at
+-- /tmp/genie-recover/group-1-shadow-analysis.json):
+--
+--   Type A — `dir:<name>` + bare-name pair (only `email` today). Both rows
+--           exist; `findLiveWorkerFuzzy(name)` returns the bare row first,
+--           so Group 1's `worker?.id ?? \`dir:\${recipientId}\`` chokepoint
+--           fallback never fires. Result: master `email` re-spawns fresh
+--           every time the live worker dies.
+--
+--   Type B — UUID + bare-name pair, NO `dir:<name>` row (`felipe`, `genie`,
+--           `genie-pgserve`). The bare row's `custom_name=''` blocks the
+--           jsonl-scan fallback (Group 7), and there is no `dir:` row for
+--           Group 1's chokepoint to anchor on. Result: post-`unregister`
+--           recovery is impossible without manual surgery.
+--
+-- This migration closes both gaps in two passes:
+--
+--   1. **14b — master backfill:** for every agent row with
+--      `kind='permanent' AND repo_path != ''` whose canonical name (custom_name
+--      or role fallback) lacks a `dir:<name>` peer, create the missing
+--      directory row using the bare row's identity columns. Brings
+--      `dir:felipe`, `dir:genie`, `dir:genie-pgserve` into existence.
+--
+--   2. **14a — bare-name shadow cleanup:** for every `dir:<name>` row that
+--      pairs with a non-UUID, non-dir bare-name row whose
+--      `current_executor_id IS NULL`, archive (state='archived',
+--      auto_resume=false) the bare row. **Heal-not-wipe** — never DELETE.
+--      The Group 3 guardrail in `src/lib/agent-directory.ts:rm()` blocks
+--      DELETE on `kind='permanent' AND repo_path != ''` regardless, but
+--      a SQL-side UPDATE bypasses that lock by design.
+--
+-- 14b runs before 14a so the dir-rows we just created can pair with their
+-- bare shadows in the same migration. After this migration runs:
+--
+--   - `dir:email`, `dir:felipe`, `dir:genie`, `dir:genie-pgserve` all exist
+--     and carry `repo_path`. Group 1's chokepoint extension covers all four.
+--   - bare `email`, `felipe`, `genie`, `genie-pgserve` rows with
+--     `current_executor_id IS NULL` are archived. registry.get(name) now
+--     returns either nothing (so worker is null → Group 1 fallback fires) or
+--     the dir:<name> row directly.
+--
+-- Idempotent: each pass gates on a NOT-EXISTS / DISTINCT-FROM-archived
+-- predicate. Re-running the migration affects zero additional rows.
+--
+-- Audit: every backfilled row emits `directory.master_backfilled`; every
+-- archived bare shadow emits `state_changed` with reason
+-- `bare_name_shadow_archived`.
+
+-- ---------------------------------------------------------------------------
+-- Pass 1 (14b): backfill dir:<name> rows for masters that lack one.
+-- ---------------------------------------------------------------------------
+WITH
+  -- Pick one canonical source row per "name" equivalence class. The bare
+  -- row of a Type-B pair (custom_name='' but role + repo_path set) is the
+  -- only source carrying repo_path, so we filter on repo_path-non-empty
+  -- candidates here. Prefer rows with non-empty custom_name when both
+  -- candidates exist (NULLIF + ORDER BY in DISTINCT ON).
+  backfill_targets AS (
+    SELECT DISTINCT ON (COALESCE(NULLIF(a.custom_name, ''), a.role))
+      COALESCE(NULLIF(a.custom_name, ''), a.role) AS name,
+      a.role,
+      a.team,
+      a.repo_path
+    FROM agents a
+    WHERE a.kind = 'permanent'
+      AND a.id NOT LIKE 'dir:%'
+      AND a.repo_path IS NOT NULL AND a.repo_path <> ''
+      AND COALESCE(NULLIF(a.custom_name, ''), a.role) IS NOT NULL
+      AND a.auto_resume = true
+      AND a.state IS DISTINCT FROM 'archived'
+      AND NOT EXISTS (
+        SELECT 1 FROM agents d
+        WHERE d.id = 'dir:' || COALESCE(NULLIF(a.custom_name, ''), a.role)
+      )
+    ORDER BY
+      COALESCE(NULLIF(a.custom_name, ''), a.role),
+      -- Prefer rows that already populate custom_name (UUID peer in Type B),
+      -- so role/team fields come from the canonical identity row.
+      (CASE WHEN a.custom_name IS NOT NULL AND a.custom_name <> '' THEN 0 ELSE 1 END),
+      a.id
+  ),
+  inserted AS (
+    INSERT INTO agents (id, role, custom_name, team, repo_path, started_at, state, metadata)
+    SELECT
+      'dir:' || c.name,
+      c.role,
+      -- The unique partial index `idx_agents_custom_name_team` requires
+      -- (custom_name, team) to be unique when both are non-null. If a peer
+      -- already owns that slot (Type B production: UUID peer with
+      -- custom_name=name, team=team), set custom_name=NULL on the dir row
+      -- so the new row sits outside the unique index. Session-sync's
+      -- `getAgentByName(name, team)` lookup will route to the UUID peer
+      -- while it lives; once the peer is unregistered, an UPDATE
+      -- backfill (separate migration if the slot ever frees) can repopulate.
+      CASE
+        WHEN c.team IS NOT NULL AND EXISTS (
+          SELECT 1 FROM agents x
+          WHERE x.custom_name = c.name AND x.team = c.team
+            AND x.id <> 'dir:' || c.name
+        ) THEN NULL
+        ELSE c.name
+      END,
+      c.team,
+      c.repo_path,
+      now(),
+      NULL,
+      '{}'::jsonb
+    FROM backfill_targets c
+    ON CONFLICT (id) DO NOTHING
+    RETURNING id
+  )
+INSERT INTO audit_events (entity_type, entity_id, event_type, actor, details)
+SELECT 'agent', i.id, 'directory.master_backfilled',
+       'migration:053_master_backfill_and_shadow_cleanup',
+       jsonb_build_object('reason', 'master_backfill',
+                          'wish', 'master-aware-spawn',
+                          'group', '14b')
+FROM inserted i;
+
+-- ---------------------------------------------------------------------------
+-- Pass 2 (14a): archive bare-name shadows whose dir:<name> peer now exists.
+-- Heal-not-wipe — never DELETE. Idempotent via state IS DISTINCT FROM.
+-- ---------------------------------------------------------------------------
+WITH archived AS (
+  UPDATE agents bare
+  SET state = 'archived',
+      auto_resume = false,
+      last_state_change = now()
+  FROM agents dir
+  WHERE dir.id = 'dir:' || bare.id
+    AND bare.id NOT LIKE 'dir:%'
+    -- Exclude UUID-shaped ids (4 hyphens). Same heuristic as migration 050.
+    AND bare.id NOT LIKE '%-%-%-%-%'
+    AND bare.current_executor_id IS NULL
+    AND bare.state IS DISTINCT FROM 'archived'
+    AND bare.repo_path IS NOT NULL
+    AND bare.repo_path <> ''
+    -- Belt-and-suspenders identity match: the bare row's role or id must
+    -- agree with the dir's custom_name. Prevents archiving an unrelated
+    -- bare row whose id happens to suffix a dir: id.
+    AND (
+      bare.role = dir.custom_name
+      OR bare.id = dir.custom_name
+      OR bare.custom_name = dir.custom_name
+    )
+  RETURNING bare.id
+)
+INSERT INTO audit_events (entity_type, entity_id, event_type, actor, details)
+SELECT 'worker', a.id, 'state_changed',
+       'migration:053_master_backfill_and_shadow_cleanup',
+       jsonb_build_object('reason', 'bare_name_shadow_archived',
+                          'state', 'archived',
+                          'auto_resume', false,
+                          'wish', 'master-aware-spawn',
+                          'group', '14a')
+FROM archived a;

package/src/db/migrations/agents-kind.test.ts

@@ -187,6 +187,11 @@ describe.skipIf(!DB_AVAILABLE)('migration 049 — agents.kind GENERATED column',
           `--glob '!src/db/migrations/049_agents_kind_generated.sql' ` +
           `--glob '!src/db/migrations/046_dir_agents_state_null.sql' ` +
           `--glob '!src/db/migrations/agents-kind.test.ts' ` +
+          // Migration 053's test file (master-aware-spawn Group 14a+b)
+          // legitimately queries `id LIKE 'dir:%'` to verify dir-row
+          // backfill + bare-shadow archive shape post-migration. Distinguishing
+          // dir-shape vs bare-shape is the whole point — not permanence inference.
+          `--glob '!src/db/migrations/master-backfill-and-shadow-cleanup.test.ts' ` +
           // The state-machine invariants test file legitimately references
           // the pattern in test descriptions, comments, and the rg pattern
           // it itself constructs.

package/src/db/migrations/master-backfill-and-shadow-cleanup.test.ts

@@ -0,0 +1,310 @@
+/**
+ * Integration tests for migration 053 — master_backfill_and_shadow_cleanup.
+ *
+ * Covers Group 14 sub-deliverables 14a (bare-name shadow archival) and 14b
+ * (master backfill of dir:<name> rows).
+ */
+
+import { afterAll, beforeAll, beforeEach, describe, expect, test } from 'bun:test';
+import { readFile } from 'node:fs/promises';
+import { join } from 'node:path';
+import { getConnection } from '../../lib/db.js';
+import { DB_AVAILABLE, setupTestDatabase } from '../../lib/test-db.js';
+
+const MIGRATION_PATH = join(import.meta.dir, '053_master_backfill_and_shadow_cleanup.sql');
+
+async function applyMigrationManually(): Promise<void> {
+  const sql = await getConnection();
+  const body = await readFile(MIGRATION_PATH, 'utf-8');
+  await sql.unsafe(body);
+}
+
+describe.skipIf(!DB_AVAILABLE)('migration 053 — master_backfill_and_shadow_cleanup', () => {
+  let cleanup: () => Promise<void>;
+
+  beforeAll(async () => {
+    cleanup = await setupTestDatabase();
+  });
+
+  afterAll(async () => {
+    await cleanup();
+  });
+
+  beforeEach(async () => {
+    const sql = await getConnection();
+    await sql`DELETE FROM audit_events WHERE actor = 'migration:053_master_backfill_and_shadow_cleanup'`;
+    await sql`DELETE FROM assignments`;
+    await sql`DELETE FROM executors`;
+    await sql`DELETE FROM agents`;
+  });
+
+  // ==========================================================================
+  // 14b — master backfill: dir:<name> created from existing canonical fields
+  // ==========================================================================
+
+  test('14b: backfills dir:felipe from a bare felipe row (Type-B shape)', async () => {
+    const sql = await getConnection();
+    // Twin's analysis: the bare row is the only candidate carrying
+    // repo_path. `custom_name` is empty/null in production (the partial
+    // unique index `idx_agents_custom_name_team` requires it to be unique
+    // when populated alongside team — bare rows skirt that by leaving it
+    // null); role is the canonical identity.
+    await sql`
+      INSERT INTO agents (id, role, custom_name, team, repo_path, started_at, state, auto_resume, reports_to)
+      VALUES ('felipe', 'felipe', NULL, 'felipe', '/home/genie/workspace/agents/felipe', now(), NULL, true, NULL)
+    `;
+
+    await applyMigrationManually();
+
+    const dirRow = await sql<
+      { id: string; role: string; custom_name: string | null; team: string; repo_path: string }[]
+    >`
+      SELECT id, role, custom_name, team, repo_path
+      FROM agents WHERE id = 'dir:felipe'
+    `;
+    expect(dirRow.length).toBe(1);
+    expect(dirRow[0].role).toBe('felipe');
+    expect(dirRow[0].custom_name).toBe('felipe');
+    expect(dirRow[0].team).toBe('felipe');
+    expect(dirRow[0].repo_path).toBe('/home/genie/workspace/agents/felipe');
+
+    const audit = await sql<{ details: { reason: string; group: string } }[]>`
+      SELECT details FROM audit_events
+       WHERE actor = 'migration:053_master_backfill_and_shadow_cleanup'
+         AND entity_id = 'dir:felipe'
+         AND event_type = 'directory.master_backfilled'
+    `;
+    expect(audit.length).toBe(1);
+    expect(audit[0].details.reason).toBe('master_backfill');
+    expect(audit[0].details.group).toBe('14b');
+  });
+
+  test('14b: backfills dir:genie and dir:genie-pgserve from twin-shape masters', async () => {
+    const sql = await getConnection();
+    await sql`
+      INSERT INTO agents (id, role, custom_name, team, repo_path, started_at, state, auto_resume, reports_to)
+      VALUES
+        ('genie', 'genie', NULL, 'genie', '/home/genie/workspace/agents/genie', now(), 'idle', true, NULL),
+        ('genie-pgserve', 'genie-pgserve', NULL, 'genie', '/home/genie/workspace/agents/genie-pgserve', now(), NULL, true, NULL)
+    `;
+
+    await applyMigrationManually();
+
+    const created = await sql<{ id: string }[]>`
+      SELECT id FROM agents WHERE id LIKE 'dir:%' ORDER BY id
+    `;
+    expect(created.map((r: { id: string }) => r.id)).toEqual(['dir:genie', 'dir:genie-pgserve']);
+
+    const repoPaths = await sql<{ id: string; repo_path: string }[]>`
+      SELECT id, repo_path FROM agents WHERE id LIKE 'dir:%' ORDER BY id
+    `;
+    const byId = new Map(repoPaths.map((r: { id: string; repo_path: string }) => [r.id, r.repo_path]));
+    expect(byId.get('dir:genie')).toBe('/home/genie/workspace/agents/genie');
+    expect(byId.get('dir:genie-pgserve')).toBe('/home/genie/workspace/agents/genie-pgserve');
+  });
+
+  test('14b: NULLs custom_name when (name, team) slot is held by another live peer', async () => {
+    const sql = await getConnection();
+    // Production Type-B: UUID peer holds (custom_name='felipe', team='felipe')
+    // in the unique partial index. The bare row lacks dir:<name>. Backfilling
+    // dir:felipe with custom_name='felipe' team='felipe' would conflict with
+    // the index, so the migration must NULL custom_name on the new row.
+    await sql`
+      INSERT INTO agents (id, role, custom_name, team, repo_path, started_at, state, auto_resume, reports_to)
+      VALUES
+        ('00000000-0000-0000-0000-feedfacefeed', 'felipe', 'felipe', 'felipe', '/some/uuid/path', now(), 'idle', true, NULL),
+        ('felipe', 'felipe', NULL, 'felipe', '/home/genie/workspace/agents/felipe', now(), 'idle', true, NULL)
+    `;
+
+    await applyMigrationManually();
+
+    const dirRow = await sql<{ custom_name: string | null }[]>`
+      SELECT custom_name FROM agents WHERE id = 'dir:felipe'
+    `;
+    expect(dirRow.length).toBe(1);
+    expect(dirRow[0].custom_name).toBeNull();
+  });
+
+  test('14b: skips agents that already have a dir:<name> peer (no duplicate insert)', async () => {
+    const sql = await getConnection();
+    await sql`
+      INSERT INTO agents (id, role, custom_name, team, repo_path, started_at, state, auto_resume, reports_to)
+      VALUES ('dir:email', 'email', 'email', 'felipe', '/home/genie/workspace/agents/email', now(), NULL, true, NULL)
+    `;
+    await sql`
+      INSERT INTO agents (id, role, custom_name, team, repo_path, started_at, state, auto_resume, reports_to)
+      VALUES ('email', 'email', NULL, 'felipe', '/home/genie/workspace/agents/email', now(), NULL, true, NULL)
+    `;
+
+    await applyMigrationManually();
+
+    const dirRows = await sql<{ id: string }[]>`
+      SELECT id FROM agents WHERE id LIKE 'dir:%' ORDER BY id
+    `;
+    expect(dirRows.length).toBe(1);
+    expect(dirRows[0].id).toBe('dir:email');
+  });
+
+  test('14b: skips bare task-shaped rows (kind=task / archived / no repo_path)', async () => {
+    const sql = await getConnection();
+    await sql`
+      INSERT INTO agents (id, role, custom_name, team, repo_path, started_at, state, auto_resume, reports_to)
+      VALUES
+        ('engineer-w2g3', 'engineer', 'engineer', 'master-aware-spawn', '/some/path', now(), 'idle', true, 'team-lead-uuid'),
+        ('archived-master', 'archived', '', 'archived', '/some/path', now(), 'archived', true, NULL),
+        ('no-repo-master', 'foo', '', 'foo', NULL, now(), NULL, true, NULL)
+    `;
+
+    await applyMigrationManually();
+
+    const dirRows = await sql<{ id: string }[]>`SELECT id FROM agents WHERE id LIKE 'dir:%'`;
+    expect(dirRows.length).toBe(0);
+  });
+
+  // ==========================================================================
+  // 14a — bare-name shadow cleanup (heal-not-wipe)
+  // ==========================================================================
+
+  test('14a: archives bare-name shadow when dir:<name> peer exists (no executor)', async () => {
+    const sql = await getConnection();
+    await sql`
+      INSERT INTO agents (id, role, custom_name, team, repo_path, started_at, state, auto_resume, reports_to)
+      VALUES
+        ('dir:email', 'email', 'email', 'felipe', '/home/genie/workspace/agents/email', now(), NULL, false, NULL),
+        ('email', 'email', NULL, 'felipe', '/home/genie/workspace/agents/email', now(), NULL, true, NULL)
+    `;
+
+    await applyMigrationManually();
+
+    const bare = await sql<{ state: string | null; auto_resume: boolean }[]>`
+      SELECT state, auto_resume FROM agents WHERE id = 'email'
+    `;
+    expect(bare[0].state).toBe('archived');
+    expect(bare[0].auto_resume).toBe(false);
+
+    // dir: row left intact.
+    const dir = await sql<{ state: string | null; repo_path: string }[]>`
+      SELECT state, repo_path FROM agents WHERE id = 'dir:email'
+    `;
+    expect(dir[0].state).toBeNull();
+    expect(dir[0].repo_path).toBe('/home/genie/workspace/agents/email');
+
+    const audit = await sql<{ details: { reason: string; group: string } }[]>`
+      SELECT details FROM audit_events
+       WHERE actor = 'migration:053_master_backfill_and_shadow_cleanup'
+         AND entity_id = 'email'
+         AND event_type = 'state_changed'
+    `;
+    expect(audit.length).toBe(1);
+    expect(audit[0].details.reason).toBe('bare_name_shadow_archived');
+    expect(audit[0].details.group).toBe('14a');
+  });
+
+  test('14a: NEVER deletes bare-name shadow rows (heal-not-wipe contract)', async () => {
+    const sql = await getConnection();
+    await sql`
+      INSERT INTO agents (id, role, custom_name, team, repo_path, started_at, state, auto_resume, reports_to)
+      VALUES
+        ('dir:email', 'email', 'email', 'felipe', '/home/genie/workspace/agents/email', now(), NULL, false, NULL),
+        ('email', 'email', NULL, 'felipe', '/home/genie/workspace/agents/email', now(), NULL, true, NULL)
+    `;
+
+    await applyMigrationManually();
+
+    // Row still exists (just archived). Wholesale deletion is the failure
+    // mode the master-aware-spawn wish was born from.
+    const stillThere = await sql<{ id: string; state: string | null }[]>`
+      SELECT id, state FROM agents WHERE id = 'email'
+    `;
+    expect(stillThere.length).toBe(1);
+    expect(stillThere[0].state).toBe('archived');
+  });
+
+  test('14a: leaves bare-name shadow alone when current_executor_id is set (live peer)', async () => {
+    const sql = await getConnection();
+    await sql`
+      INSERT INTO agents (id, role, custom_name, team, repo_path, started_at, state, auto_resume, reports_to)
+      VALUES
+        ('dir:email', 'email', 'email', 'felipe', '/some/path', now(), NULL, false, NULL),
+        ('email', 'email', NULL, 'felipe', '/some/path', now(), 'idle', true, NULL)
+    `;
+    // Attach a live executor to the bare row.
+    await sql`
+      INSERT INTO executors (id, agent_id, provider, transport, state)
+      VALUES ('exec-live', 'email', 'claude', 'tmux', 'running')
+    `;
+    await sql`UPDATE agents SET current_executor_id = 'exec-live' WHERE id = 'email'`;
+
+    await applyMigrationManually();
+
+    const bare = await sql<{ state: string | null }[]>`
+      SELECT state FROM agents WHERE id = 'email'
+    `;
+    expect(bare[0].state).toBe('idle');
+  });
+
+  test('14a: never archives UUID-shaped rows even if dir:<uuid> exists', async () => {
+    const sql = await getConnection();
+    const uuid = '11111111-2222-3333-4444-555555555555';
+    await sql`
+      INSERT INTO agents (id, role, custom_name, team, repo_path, started_at, state, auto_resume, reports_to)
+      VALUES
+        (${`dir:${uuid}`}, 'weird', 'weird', 'team-dir', '/p', now(), NULL, false, NULL),
+        (${uuid}, 'weird', 'weird', 'team-uuid', '/p', now(), 'idle', true, NULL)
+    `;
+
+    await applyMigrationManually();
+
+    const uuidRow = await sql<{ state: string | null }[]>`
+      SELECT state FROM agents WHERE id = ${uuid}
+    `;
+    expect(uuidRow[0].state).toBe('idle');
+  });
+
+  // ==========================================================================
+  // Composite + idempotency
+  // ==========================================================================
+
+  test('14a + 14b run in one pass: bare felipe gets archived AFTER dir:felipe is backfilled', async () => {
+    const sql = await getConnection();
+    // Only the bare row exists; the migration must first create dir:felipe
+    // (14b) and only THEN archive the bare felipe shadow (14a).
+    await sql`
+      INSERT INTO agents (id, role, custom_name, team, repo_path, started_at, state, auto_resume, reports_to)
+      VALUES ('felipe', 'felipe', NULL, 'felipe', '/home/genie/workspace/agents/felipe', now(), 'idle', true, NULL)
+    `;
+
+    await applyMigrationManually();
+
+    const dir = await sql<{ id: string }[]>`SELECT id FROM agents WHERE id = 'dir:felipe'`;
+    expect(dir.length).toBe(1);
+
+    const bare = await sql<{ state: string | null; auto_resume: boolean }[]>`
+      SELECT state, auto_resume FROM agents WHERE id = 'felipe'
+    `;
+    expect(bare[0].state).toBe('archived');
+    expect(bare[0].auto_resume).toBe(false);
+  });
+
+  test('idempotent: re-running the migration touches zero new rows', async () => {
+    const sql = await getConnection();
+    await sql`
+      INSERT INTO agents (id, role, custom_name, team, repo_path, started_at, state, auto_resume, reports_to)
+      VALUES ('felipe', 'felipe', NULL, 'felipe', '/home/genie/workspace/agents/felipe', now(), 'idle', true, NULL)
+    `;
+
+    await applyMigrationManually();
+    const firstAuditCount = await sql<{ cnt: number }[]>`
+      SELECT count(*)::int AS cnt FROM audit_events
+       WHERE actor = 'migration:053_master_backfill_and_shadow_cleanup'
+    `;
+
+    await applyMigrationManually();
+    const secondAuditCount = await sql<{ cnt: number }[]>`
+      SELECT count(*)::int AS cnt FROM audit_events
+       WHERE actor = 'migration:053_master_backfill_and_shadow_cleanup'
+    `;
+
+    expect(secondAuditCount[0].cnt).toBe(firstAuditCount[0].cnt);
+  });
+});