@automagik/genie 4.260406.5 → 4.260407.1

package/.claude-plugin/marketplace.json

@@ -10,7 +10,7 @@
   "plugins": [
     {
       "name": "genie",
-      "version": "4.260406.5",
+      "version": "4.260407.1",
       "source": "./plugins/genie",
       "description": "Human-AI partnership for Claude Code. Share a terminal, orchestrate workers, evolve together. Brainstorm ideas, wish them into plans, make with parallel agents, ship as one team. A coding genie that grows with your project."
     }

package/dist/genie.js

@@ -2007,30 +2007,37 @@ ${answer}
 You are responding to a WhatsApp message from ${senderName}.
 Your context is pre-set (instance: ${instanceId}, chat: ${chatId}) \u2014 do NOT use \`omni use\` or \`omni open\`.
 
-## Available Commands
+## Reply Channels
 
-- omni say 'text' \u2014 reply with a text message
-- omni speak 'text' \u2014 reply with a voice note
-- omni imagine 'prompt' \u2014 generate and send an image
-- omni react 'emoji' --message <id> \u2014 react to a message
-- omni history \u2014 see recent messages for context
-- omni done \u2014 end your turn (REQUIRED as the last action)
+You have two equivalent ways to send a reply to the user:
+
+1. **SendMessage** (preferred): \`SendMessage(recipient: "omni", message: "your reply")\` \u2014
+   intercepted by the omni bridge and delivered as a WhatsApp text message.
+   You may call SendMessage multiple times in one turn for multi-message replies.
+2. **omni done text='...'** \u2014 closes the turn AND sends a final text in one call.
+
+## Available Tools
+
+- SendMessage(recipient: "omni", message: '...') \u2014 send a text reply (repeatable)
+- omni done text='...' \u2014 send final text + close turn (use as the LAST action)
+- omni done react='emoji' \u2014 react instead of replying, then close turn
+- omni done media='/path' caption='...' \u2014 send media + close turn
+- omni done skip=true \u2014 close turn silently
 
 ## Rules
 
-1. Use \`omni say\` to send your response. You can send multiple messages.
-2. Use \`omni history\` to see recent messages if you need context.
-3. ALWAYS call \`omni done\` as your LAST action to close the turn.
-4. Do NOT generate bare text as your reply \u2014 it will go nowhere. Use omni say or omni done.
+1. Use \`SendMessage(recipient: "omni", ...)\` for normal text replies.
+2. ALWAYS call \`omni done\` as your LAST action to close the turn \u2014 even if you already sent SendMessage replies, call \`omni done skip=true\`.
+3. Do NOT generate bare text as your reply \u2014 it will go nowhere. Use SendMessage or omni done.
 `.trim()}async function loadSystemPrompt(entry){let identityPath=loadIdentity(entry);if(!identityPath)return;let{readFileSync:readFileSync22}=await import("fs");try{return readFileSync22(identityPath,"utf-8")}catch{return}}async function resolveSystemPrompt(entry,state,message,chatId){let prompt2=await loadSystemPrompt(entry),isTurnBased=Boolean(state.env.OMNI_INSTANCE);if(isTurnBased){let turnPrompt=buildTurnBasedPrompt(message.sender,state.env.OMNI_INSTANCE,state.env.OMNI_CHAT??chatId);prompt2=prompt2?`${turnPrompt}
 
 ${prompt2}`:turnPrompt}return{prompt:prompt2,isTurnBased}}function extractTextFromAssistant(msg){if(!msg.message)return[];return msg.message.content.filter((b2)=>b2.type==="text"&&b2.text).map((b2)=>b2.text)}async function collectQueryResult(queryMessages){let textParts=[],sessionId;try{for await(let msg of queryMessages){if(msg.type==="assistant")textParts.push(...extractTextFromAssistant(msg));if(msg.type==="result"&&msg.subtype==="success")sessionId=msg.session_id}}catch(err){if(err.name==="AbortError")return{text:""};throw err}return{text:textParts.join(`
-`).trim(),sessionId}}function buildReplyPayload(agent,chatId,instanceId,extra={}){return JSON.stringify({content:"",agent,chat_id:chatId,instance_id:instanceId,timestamp:new Date().toISOString(),...extra})}function resolveAction(params,env){if(params.skip)return{type:"skip",extra:{reason:params.reason},label:"Turn closed (skip)."};if(params.react)return{type:"react",extra:{react:String(params.react),message_id:env.OMNI_MESSAGE??""},label:`Reacted ${params.react} + turn closed.`};if(params.media)return{type:"media",extra:{content:params.caption?String(params.caption):params.text?String(params.text):"",media:String(params.media)},label:"Media sent + turn closed."};if(params.text)return{type:"text",extra:{content:String(params.text)},label:"Turn closed. Message delivered."};return{type:"skip",extra:{},label:"Turn closed (skip)."}}function handleDoneTool(params,env,natsPublish){let instanceId=env.OMNI_INSTANCE??"",chatId=env.OMNI_CHAT??"",agent=env.OMNI_AGENT??"",action=resolveAction(params,env);if(action.type==="skip"){if(natsPublish&&instanceId&&chatId)natsPublish(`omni.turn.done.${instanceId}.${chatId}`,JSON.stringify({action:"skip",...action.extra}));return action.label}if(!natsPublish||!instanceId||!chatId)return console.warn("[claude-sdk] No NATS publish available \u2014 reply dropped"),"Turn close attempted but NATS publish not available.";return natsPublish(`omni.reply.${instanceId}.${chatId}`,buildReplyPayload(agent,chatId,instanceId,action.extra)),action.label}async function createDoneMcpServer(env,natsPublish){let{createSdkMcpServer,tool}=await import("@anthropic-ai/claude-agent-sdk");return createSdkMcpServer({name:"genie-omni-tools",tools:[tool("done","Close this turn. REQUIRED after processing the user message. Sends a final response, reacts, or skips. Call exactly once per turn.",{text:exports_external.string().optional().describe("Final message to the user"),media:exports_external.string().optional().describe("File path for media attachment"),caption:exports_external.string().optional().describe("Caption for media"),react:exports_external.string().optional().describe("Emoji reaction (instead of text)"),skip:exports_external.boolean().optional().describe("Close turn without sending anything"),reason:exports_external.string().optional().describe("Internal reason for skipping")},async(args)=>{return{content:[{type:"text",text:handleDoneTool(args,env,natsPublish)}]}})]})}class ClaudeSdkOmniExecutor{sessions=new Map;safePgCall=null;natsPublish=null;deliveryQueues=new Map;pendingNudges=new Map;setSafePgCall(fn){this.safePgCall=fn}setNatsPublish(fn){this.natsPublish=fn}async injectNudge(session,text){if(!this.sessions.has(session.id))return;this.pendingNudges.set(session.id,text)}async spawn(agentName,chatId,env){if(!await resolve3(agentName))throw Error(`Agent "${agentName}" not found in genie directory`);let provider=new ClaudeSdkProvider,abortController=new AbortController,sessionId=`${agentName}:${chatId}`,registration=await this.registerInWorldA(agentName,chatId,env.OMNI_INSTANCE??"");if(this.sessions.set(sessionId,{abortController,running:!0,provider,executorId:registration?.executorId??null,claudeSessionId:registration?.claudeSessionId,dbSessionId:null,turnIndex:0,env}),registration?.executorId)await this.updateState(registration.executorId,"running",chatId);let now=Date.now();return{id:sessionId,agentName,chatId,tmuxSession:"",tmuxWindow:"",paneId:`sdk-${chatId}`,createdAt:now,lastActivityAt:now}}async registerInWorldA(agentName,chatId,instanceId){if(!this.safePgCall)return null;let agent=await this.safePgCall("sdk-find-or-create-agent",()=>findOrCreateAgent(agentName,"omni","omni"),null,{chatId});if(!agent)return null;let existing=await this.safePgCall("sdk-find-existing-executor",()=>findLatestByMetadata({agentId:agent.id,source:"omni",chatId}),null,{chatId});if(existing)return await this.safePgCall("sdk-relink-executor",()=>relinkExecutorToAgent(existing.id,agent.id),void 0,{executorId:existing.id,chatId}),await recordAuditEvent2(this.safePgCall,"session.resumed",{executor_id:existing.id,agent_id:agentName,chat_id:chatId,claude_session_id:existing.claudeSessionId}),{executorId:existing.id,claudeSessionId:existing.claudeSessionId??void 0};let executor=await this.safePgCall("sdk-create-executor",()=>createAndLinkExecutor(agent.id,"claude","api",{claudeSessionId:void 0,metadata:{source:"omni",chat_id:chatId,instance_id:instanceId}}),null,{chatId});if(executor)await recordAuditEvent2(this.safePgCall,"session.created_fresh",{executor_id:executor.id,agent_id:agentName,chat_id:chatId});return executor?{executorId:executor.id}:null}async updateState(executorId,state,chatId){if(!this.safePgCall)return;await this.safePgCall("sdk-update-executor-state",()=>updateExecutorState(executorId,state),void 0,{executorId,chatId})}async deliver(session,message){let state=this.sessions.get(session.id);if(!state)throw Error(`No SDK session found for ${session.id}`);let current=(this.deliveryQueues.get(session.id)??Promise.resolve()).then(()=>this._processDelivery(session,state,message));this.deliveryQueues.set(session.id,current.catch(()=>{}))}async _processDelivery(session,state,message){let resolved=await resolve3(session.agentName);if(!resolved)throw Error(`Agent "${session.agentName}" not found in genie directory`);let entry=resolved.entry,permissionConfig=resolvePermissionConfig(entry.permissions),{prompt:systemPrompt,isTurnBased}=await resolveSystemPrompt(entry,state,message,session.chatId);if(state.executorId)await this.updateState(state.executorId,"working",session.chatId);if(this.safePgCall)await recordAuditEvent2(this.safePgCall,"deliver.start",{executor_id:state.executorId??session.id,agent_id:session.agentName,chat_id:message.chatId,instance_id:message.instanceId});let doneMcp=await createDoneMcpServer(state.env,this.natsPublish),extraOptions={abortController:state.abortController,mcpServers:{"genie-omni-tools":doneMcp}};if(state.claudeSessionId)extraOptions.resume=state.claudeSessionId;let queryContent=message.content,pendingNudge=this.pendingNudges.get(session.id);if(pendingNudge)queryContent=`[system] ${pendingNudge}
+`).trim(),sessionId}}function buildReplyPayload(agent,chatId,instanceId,extra={}){return JSON.stringify({content:"",agent,chat_id:chatId,instance_id:instanceId,timestamp:new Date().toISOString(),...extra})}function resolveAction(params,env){if(params.skip)return{type:"skip",extra:{reason:params.reason},label:"Turn closed (skip)."};if(params.react)return{type:"react",extra:{react:String(params.react),message_id:env.OMNI_MESSAGE??""},label:`Reacted ${params.react} + turn closed.`};if(params.media)return{type:"media",extra:{content:params.caption?String(params.caption):params.text?String(params.text):"",media:String(params.media)},label:"Media sent + turn closed."};if(params.text)return{type:"text",extra:{content:String(params.text)},label:"Turn closed. Message delivered."};return{type:"skip",extra:{},label:"Turn closed (skip)."}}function handleDoneTool(params,env,natsPublish){let instanceId=env.OMNI_INSTANCE??"",chatId=env.OMNI_CHAT??"",agent=env.OMNI_AGENT??"",action=resolveAction(params,env);if(action.type==="skip"){if(natsPublish&&instanceId&&chatId)natsPublish(`omni.turn.done.${instanceId}.${chatId}`,JSON.stringify({action:"skip",...action.extra}));return action.label}if(!natsPublish||!instanceId||!chatId)return console.warn("[claude-sdk] No NATS publish available \u2014 reply dropped"),"Turn close attempted but NATS publish not available.";return natsPublish(`omni.reply.${instanceId}.${chatId}`,buildReplyPayload(agent,chatId,instanceId,action.extra)),action.label}function parseSendMessageInput(input){if(!input||typeof input!=="object")return{};let obj=input,recipient=typeof obj.recipient==="string"?obj.recipient:typeof obj.to==="string"?obj.to:void 0,body=typeof obj.message==="string"?obj.message:typeof obj.content==="string"?obj.content:void 0;return{recipient,body}}function createSendMessageOmniHook(env,natsPublish){return async(input)=>{let hookInput=input;if(hookInput.tool_name!=="SendMessage")return{};let{recipient,body}=parseSendMessageInput(hookInput.tool_input);if(recipient!=="omni")return{};let instanceId=env.OMNI_INSTANCE??"",chatId=env.OMNI_CHAT??"",agent=env.OMNI_AGENT??"";if(!instanceId||!chatId)return{};if(!body||body.trim()==="")return{hookSpecificOutput:{hookEventName:"PreToolUse",permissionDecision:"deny",permissionDecisionReason:'SendMessage(recipient: "omni") requires a non-empty `message` field. Retry with the reply text.'}};if(!natsPublish)return console.warn("[claude-sdk] SendMessage(to: omni) intercepted but NATS publish unavailable \u2014 message dropped"),{hookSpecificOutput:{hookEventName:"PreToolUse",permissionDecision:"deny",permissionDecisionReason:"Omni bridge unavailable \u2014 message could not be delivered."}};return natsPublish(`omni.reply.${instanceId}.${chatId}`,buildReplyPayload(agent,chatId,instanceId,{content:body})),{hookSpecificOutput:{hookEventName:"PreToolUse",permissionDecision:"deny",permissionDecisionReason:"Message delivered to user via omni bridge."}}}}async function createDoneMcpServer(env,natsPublish){let{createSdkMcpServer,tool}=await import("@anthropic-ai/claude-agent-sdk");return createSdkMcpServer({name:"genie-omni-tools",tools:[tool("done","Close this turn. REQUIRED after processing the user message. Sends a final response, reacts, or skips. Call exactly once per turn.",{text:exports_external.string().optional().describe("Final message to the user"),media:exports_external.string().optional().describe("File path for media attachment"),caption:exports_external.string().optional().describe("Caption for media"),react:exports_external.string().optional().describe("Emoji reaction (instead of text)"),skip:exports_external.boolean().optional().describe("Close turn without sending anything"),reason:exports_external.string().optional().describe("Internal reason for skipping")},async(args)=>{return{content:[{type:"text",text:handleDoneTool(args,env,natsPublish)}]}})]})}class ClaudeSdkOmniExecutor{sessions=new Map;safePgCall=null;natsPublish=null;deliveryQueues=new Map;pendingNudges=new Map;setSafePgCall(fn){this.safePgCall=fn}setNatsPublish(fn){this.natsPublish=fn}async injectNudge(session,text){if(!this.sessions.has(session.id))return;this.pendingNudges.set(session.id,text)}async spawn(agentName,chatId,env){if(!await resolve3(agentName))throw Error(`Agent "${agentName}" not found in genie directory`);let provider=new ClaudeSdkProvider,abortController=new AbortController,sessionId=`${agentName}:${chatId}`,registration=await this.registerInWorldA(agentName,chatId,env.OMNI_INSTANCE??"");if(this.sessions.set(sessionId,{abortController,running:!0,provider,executorId:registration?.executorId??null,claudeSessionId:registration?.claudeSessionId,dbSessionId:null,turnIndex:0,env}),registration?.executorId)await this.updateState(registration.executorId,"running",chatId);let now=Date.now();return{id:sessionId,agentName,chatId,tmuxSession:"",tmuxWindow:"",paneId:`sdk-${chatId}`,createdAt:now,lastActivityAt:now}}async registerInWorldA(agentName,chatId,instanceId){if(!this.safePgCall)return null;let agent=await this.safePgCall("sdk-find-or-create-agent",()=>findOrCreateAgent(agentName,"omni","omni"),null,{chatId});if(!agent)return null;let existing=await this.safePgCall("sdk-find-existing-executor",()=>findLatestByMetadata({agentId:agent.id,source:"omni",chatId}),null,{chatId});if(existing)return await this.safePgCall("sdk-relink-executor",()=>relinkExecutorToAgent(existing.id,agent.id),void 0,{executorId:existing.id,chatId}),await recordAuditEvent2(this.safePgCall,"session.resumed",{executor_id:existing.id,agent_id:agentName,chat_id:chatId,claude_session_id:existing.claudeSessionId}),{executorId:existing.id,claudeSessionId:existing.claudeSessionId??void 0};let executor=await this.safePgCall("sdk-create-executor",()=>createAndLinkExecutor(agent.id,"claude","api",{claudeSessionId:void 0,metadata:{source:"omni",chat_id:chatId,instance_id:instanceId}}),null,{chatId});if(executor)await recordAuditEvent2(this.safePgCall,"session.created_fresh",{executor_id:executor.id,agent_id:agentName,chat_id:chatId});return executor?{executorId:executor.id}:null}async updateState(executorId,state,chatId){if(!this.safePgCall)return;await this.safePgCall("sdk-update-executor-state",()=>updateExecutorState(executorId,state),void 0,{executorId,chatId})}async deliver(session,message){let state=this.sessions.get(session.id);if(!state)throw Error(`No SDK session found for ${session.id}`);let current=(this.deliveryQueues.get(session.id)??Promise.resolve()).then(()=>this._processDelivery(session,state,message));this.deliveryQueues.set(session.id,current.catch(()=>{}))}async _processDelivery(session,state,message){let resolved=await resolve3(session.agentName);if(!resolved)throw Error(`Agent "${session.agentName}" not found in genie directory`);let entry=resolved.entry,permissionConfig=resolvePermissionConfig(entry.permissions),{prompt:systemPrompt,isTurnBased}=await resolveSystemPrompt(entry,state,message,session.chatId);if(state.executorId)await this.updateState(state.executorId,"working",session.chatId);if(this.safePgCall)await recordAuditEvent2(this.safePgCall,"deliver.start",{executor_id:state.executorId??session.id,agent_id:session.agentName,chat_id:message.chatId,instance_id:message.instanceId});let doneMcp=await createDoneMcpServer(state.env,this.natsPublish),sendMessageHooks=isTurnBased?{PreToolUse:[{matcher:"SendMessage",hooks:[createSendMessageOmniHook(state.env,this.natsPublish)]}]}:void 0,extraOptions={abortController:state.abortController,mcpServers:{"genie-omni-tools":doneMcp},...sendMessageHooks&&{hooks:sendMessageHooks}};if(state.claudeSessionId)extraOptions.resume=state.claudeSessionId;let queryContent=message.content,pendingNudge=this.pendingNudges.get(session.id);if(pendingNudge)queryContent=`[system] ${pendingNudge}
 
-${message.content}`,this.pendingNudges.delete(session.id);let{messages:queryMessages}=state.provider.runQuery({agentId:session.agentName,executorId:session.id,team:"",role:session.agentName,cwd:entry.dir||process.cwd(),model:entry.model,systemPrompt:state.claudeSessionId&&!isTurnBased?void 0:systemPrompt},queryContent,permissionConfig,extraOptions,entry.sdk);await this.captureUserTurn(state,session.agentName,session.id,message.content);let result2=await collectQueryResult(queryMessages);if(result2.sessionId)await this.reconcileSessionId(state,session,result2.sessionId);if(await this.captureAssistantTurn(state,session.id,result2.sessionId,session.agentName,result2.text),session.lastActivityAt=Date.now(),this.safePgCall)await recordAuditEvent2(this.safePgCall,"deliver.end",{executor_id:state.executorId??session.id,agent_id:session.agentName,chat_id:message.chatId,instance_id:message.instanceId,turn_count:state.turnIndex});if(state.executorId)await this.updateState(state.executorId,"idle",session.chatId)}async reconcileSessionId(state,session,returnedSessionId){if(state.claudeSessionId&&returnedSessionId!==state.claudeSessionId&&this.safePgCall)await recordAuditEvent2(this.safePgCall,"session.resume_rejected",{executor_id:state.executorId??session.id,agent_id:session.agentName,chat_id:session.chatId,old_session_id:state.claudeSessionId,new_session_id:returnedSessionId});let execId=state.executorId;if(execId&&this.safePgCall&&returnedSessionId!==state.claudeSessionId)await this.safePgCall("sdk-update-claude-session",()=>updateClaudeSessionId(execId,returnedSessionId),void 0,{executorId:execId,chatId:session.chatId});state.claudeSessionId=returnedSessionId}async captureUserTurn(state,agentName,_sessionKey,content){if(!this.safePgCall)return;if(!state.dbSessionId&&state.executorId)state.dbSessionId=await startSession(this.safePgCall,state.executorId,state.claudeSessionId,agentName);if(state.dbSessionId)await recordTurn(this.safePgCall,state.dbSessionId,state.turnIndex++,"user",content)}async captureAssistantTurn(state,sessionKey2,claudeSessionId,agentName,replyText){if(!this.safePgCall)return;if(claudeSessionId&&state.dbSessionId?.startsWith("sdk-")){let newId=await startSession(this.safePgCall,state.executorId??sessionKey2,claudeSessionId,agentName);if(newId)state.dbSessionId=newId}if(state.dbSessionId&&replyText)await recordTurn(this.safePgCall,state.dbSessionId,state.turnIndex++,"assistant",replyText),await updateTurnCount(this.safePgCall,state.dbSessionId,state.turnIndex)}async waitForDeliveries(sessionId){if(sessionId)await this.deliveryQueues.get(sessionId);else await Promise.all([...this.deliveryQueues.values()])}async shutdown(session){let state=this.sessions.get(session.id);if(!state)return;if(state.abortController.abort(),state.running=!1,state.dbSessionId&&this.safePgCall)await endSession(this.safePgCall,state.dbSessionId,"completed");if(state.executorId&&this.safePgCall)await this.safePgCall("sdk-terminate-executor",()=>terminateExecutor(state.executorId),void 0,{executorId:state.executorId,chatId:session.chatId});this.sessions.delete(session.id),this.deliveryQueues.delete(session.id)}async isAlive(session){let state=this.sessions.get(session.id);if(!state)return!1;return state.running&&!state.abortController.signal.aborted}}var init_claude_sdk2=__esm(()=>{init_zod();init_agent_directory();init_agent_registry();init_executor_registry();init_claude_sdk_permissions();init_claude_sdk()});class TurnTracker{turns=new Map;open(sessionKey2,turnId,messageId){this.turns.set(sessionKey2,{turnId,sessionKey:sessionKey2,messageId,startedAt:Date.now(),closed:!1})}close(sessionKey2,action){let turn=this.turns.get(sessionKey2);if(turn&&!turn.closed)turn.closed=!0,turn.closedAction=action}isOpen(sessionKey2){let turn=this.turns.get(sessionKey2);return turn!==void 0&&!turn.closed}getTurnId(sessionKey2){return this.turns.get(sessionKey2)?.turnId}getByTurnId(turnId){for(let turn of this.turns.values())if(turn.turnId===turnId)return turn;return}delete(sessionKey2){this.turns.delete(sessionKey2)}}var exports_omni_bridge={};__export(exports_omni_bridge,{getBridge:()=>getBridge,OmniBridge:()=>OmniBridge});function getBridge(){return bridgeInstance}function withTimeout(p,ms,label){return new Promise((resolve9,reject)=>{let timer2=setTimeout(()=>reject(Error(`${label} timed out after ${ms}ms`)),ms);timer2.unref?.(),p.then((v)=>{clearTimeout(timer2),resolve9(v)},(err)=>{clearTimeout(timer2),reject(err)})})}function isPgConnectionError(err){if(!err||typeof err!=="object")return!1;let e=err,code=e.code??"";if(["ECONNREFUSED","ECONNRESET","ETIMEDOUT","ENOTFOUND","EPIPE","EHOSTUNREACH"].includes(code))return!0;let msg=e.message??String(err);return/ECONNREFUSED|ECONNRESET|ETIMEDOUT|ENOTFOUND|EPIPE|connection terminated|connection closed|server closed the connection|the database system is shutting down/i.test(msg)}class OmniBridge{nc=null;sub=null;executor;turnTracker=new TurnTracker;sessions=new Map;messageQueue=[];idleCheckTimer=null;sc=import_nats3.StringCodec();sql=null;pgAvailable=!1;pgProvider;natsConnectFn;natsUrl;idleTimeoutMs;maxConcurrent;executorType;constructor(config={}){if(this.natsUrl=config.natsUrl??process.env.GENIE_NATS_URL??DEFAULT_NATS_URL,this.idleTimeoutMs=config.idleTimeoutMs??(process.env.GENIE_IDLE_TIMEOUT_MS?Number(process.env.GENIE_IDLE_TIMEOUT_MS):DEFAULT_IDLE_TIMEOUT_MS2),this.maxConcurrent=config.maxConcurrent??(process.env.GENIE_MAX_CONCURRENT?Number(process.env.GENIE_MAX_CONCURRENT):DEFAULT_MAX_CONCURRENT),this.pgProvider=config.pgProvider??(async()=>{let{getConnection:getConnection2}=await Promise.resolve().then(() => (init_db(),exports_db));return await getConnection2()}),this.natsConnectFn=config.natsConnectFn??import_nats3.connect,this.executorType=resolveExecutorType(config.executorType),this.executorType==="sdk")this.executor=new ClaudeSdkOmniExecutor;else this.executor=new ClaudeCodeOmniExecutor}async start(){if(this.nc){console.log("[omni-bridge] Already running");return}console.log(`[omni-bridge] Connecting to NATS at ${this.natsUrl}...`),this.nc=await this.natsConnectFn({servers:this.natsUrl,name:"genie-omni-bridge",reconnect:!0,maxReconnectAttempts:-1,reconnectTimeWait:2000}),console.log("[omni-bridge] Connected to NATS"),await this.probePg(),this.executor.setSafePgCall(this.safePgCall.bind(this));let sc3=this.sc,nc2=this.nc;this.executor.setNatsPublish((topic,payload)=>{nc2.publish(topic,sc3.encode(payload))}),this.sub=this.nc.subscribe("omni.message.>"),this.processSubscription();let turnSubs=["omni.turn.open.>","omni.turn.done.>","omni.turn.nudge.>","omni.turn.timeout.>"];for(let topic of turnSubs){let sub=this.nc.subscribe(topic);this.processTurnEvents(sub)}this.idleCheckTimer=setInterval(()=>this.checkIdleSessions(),IDLE_CHECK_INTERVAL_MS),bridgeInstance=this,console.log(`[omni-bridge] Listening on omni.message.> (max_concurrent=${this.maxConcurrent}, idle_timeout=${this.idleTimeoutMs}ms)`)}async stop(){if(!this.nc){console.log("[omni-bridge] Not running");return}if(console.log("[omni-bridge] Shutting down..."),this.idleCheckTimer)clearInterval(this.idleCheckTimer),this.idleCheckTimer=null;for(let[key,entry]of this.sessions){if(entry.idleTimer)clearTimeout(entry.idleTimer);if(!entry.spawning&&entry.session)try{await this.executor.shutdown(entry.session)}catch(err){console.warn(`[omni-bridge] Error shutting down session ${key}:`,err)}}if(this.sessions.clear(),this.sub)this.sub.unsubscribe(),this.sub=null;try{await this.nc.drain()}catch{}this.nc=null,this.sql=null,this.pgAvailable=!1,bridgeInstance=null,console.log("[omni-bridge] Stopped")}async status(){let now=Date.now(),activeFromPg=null,executorIds=[];if(this.pgAvailable&&this.sql){let rows=await this.safePgCall("status_active_count",async(sql)=>sql`
+${message.content}`,this.pendingNudges.delete(session.id);let{messages:queryMessages}=state.provider.runQuery({agentId:session.agentName,executorId:session.id,team:"",role:session.agentName,cwd:entry.dir||process.cwd(),model:entry.model,systemPrompt:state.claudeSessionId&&!isTurnBased?void 0:systemPrompt},queryContent,permissionConfig,extraOptions,entry.sdk);await this.captureUserTurn(state,session.agentName,session.id,message.content);let result2=await collectQueryResult(queryMessages);if(result2.sessionId)await this.reconcileSessionId(state,session,result2.sessionId);if(await this.captureAssistantTurn(state,session.id,result2.sessionId,session.agentName,result2.text),session.lastActivityAt=Date.now(),this.safePgCall)await recordAuditEvent2(this.safePgCall,"deliver.end",{executor_id:state.executorId??session.id,agent_id:session.agentName,chat_id:message.chatId,instance_id:message.instanceId,turn_count:state.turnIndex});if(state.executorId)await this.updateState(state.executorId,"idle",session.chatId)}async reconcileSessionId(state,session,returnedSessionId){if(state.claudeSessionId&&returnedSessionId!==state.claudeSessionId&&this.safePgCall)await recordAuditEvent2(this.safePgCall,"session.resume_rejected",{executor_id:state.executorId??session.id,agent_id:session.agentName,chat_id:session.chatId,old_session_id:state.claudeSessionId,new_session_id:returnedSessionId});let execId=state.executorId;if(execId&&this.safePgCall&&returnedSessionId!==state.claudeSessionId)await this.safePgCall("sdk-update-claude-session",()=>updateClaudeSessionId(execId,returnedSessionId),void 0,{executorId:execId,chatId:session.chatId});state.claudeSessionId=returnedSessionId}async captureUserTurn(state,agentName,_sessionKey,content){if(!this.safePgCall)return;if(!state.dbSessionId&&state.executorId)state.dbSessionId=await startSession(this.safePgCall,state.executorId,state.claudeSessionId,agentName);if(state.dbSessionId)await recordTurn(this.safePgCall,state.dbSessionId,state.turnIndex++,"user",content)}async captureAssistantTurn(state,sessionKey2,claudeSessionId,agentName,replyText){if(!this.safePgCall)return;if(claudeSessionId&&state.dbSessionId?.startsWith("sdk-")){let newId=await startSession(this.safePgCall,state.executorId??sessionKey2,claudeSessionId,agentName);if(newId)state.dbSessionId=newId}if(state.dbSessionId&&replyText)await recordTurn(this.safePgCall,state.dbSessionId,state.turnIndex++,"assistant",replyText),await updateTurnCount(this.safePgCall,state.dbSessionId,state.turnIndex)}async waitForDeliveries(sessionId){if(sessionId)await this.deliveryQueues.get(sessionId);else await Promise.all([...this.deliveryQueues.values()])}async shutdown(session){let state=this.sessions.get(session.id);if(!state)return;if(state.abortController.abort(),state.running=!1,state.dbSessionId&&this.safePgCall)await endSession(this.safePgCall,state.dbSessionId,"completed");if(state.executorId&&this.safePgCall)await this.safePgCall("sdk-terminate-executor",()=>terminateExecutor(state.executorId),void 0,{executorId:state.executorId,chatId:session.chatId});this.sessions.delete(session.id),this.deliveryQueues.delete(session.id)}async isAlive(session){let state=this.sessions.get(session.id);if(!state)return!1;return state.running&&!state.abortController.signal.aborted}}var init_claude_sdk2=__esm(()=>{init_zod();init_agent_directory();init_agent_registry();init_executor_registry();init_claude_sdk_permissions();init_claude_sdk()});class TurnTracker{turns=new Map;open(sessionKey2,turnId,messageId){this.turns.set(sessionKey2,{turnId,sessionKey:sessionKey2,messageId,startedAt:Date.now(),closed:!1})}close(sessionKey2,action){let turn=this.turns.get(sessionKey2);if(turn&&!turn.closed)turn.closed=!0,turn.closedAction=action}isOpen(sessionKey2){let turn=this.turns.get(sessionKey2);return turn!==void 0&&!turn.closed}getTurnId(sessionKey2){return this.turns.get(sessionKey2)?.turnId}getByTurnId(turnId){for(let turn of this.turns.values())if(turn.turnId===turnId)return turn;return}delete(sessionKey2){this.turns.delete(sessionKey2)}}var exports_omni_bridge={};__export(exports_omni_bridge,{getBridge:()=>getBridge,OmniBridge:()=>OmniBridge});function getBridge(){return bridgeInstance}function withTimeout(p,ms,label){return new Promise((resolve9,reject)=>{let timer2=setTimeout(()=>reject(Error(`${label} timed out after ${ms}ms`)),ms);timer2.unref?.(),p.then((v)=>{clearTimeout(timer2),resolve9(v)},(err)=>{clearTimeout(timer2),reject(err)})})}function isPgConnectionError(err){if(!err||typeof err!=="object")return!1;let e=err,code=e.code??"";if(["ECONNREFUSED","ECONNRESET","ETIMEDOUT","ENOTFOUND","EPIPE","EHOSTUNREACH"].includes(code))return!0;let msg=e.message??String(err);return/ECONNREFUSED|ECONNRESET|ETIMEDOUT|ENOTFOUND|EPIPE|connection terminated|connection closed|server closed the connection|the database system is shutting down/i.test(msg)}class OmniBridge{nc=null;sub=null;executor;turnTracker=new TurnTracker;sessions=new Map;messageQueue=[];idleCheckTimer=null;sc=import_nats3.StringCodec();sql=null;pgAvailable=!1;pgProvider;natsConnectFn;natsUrl;idleTimeoutMs;maxConcurrent;executorType;constructor(config={}){if(this.natsUrl=config.natsUrl??process.env.GENIE_NATS_URL??DEFAULT_NATS_URL,this.idleTimeoutMs=config.idleTimeoutMs??(process.env.GENIE_IDLE_TIMEOUT_MS?Number(process.env.GENIE_IDLE_TIMEOUT_MS):DEFAULT_IDLE_TIMEOUT_MS2),this.maxConcurrent=config.maxConcurrent??(process.env.GENIE_MAX_CONCURRENT?Number(process.env.GENIE_MAX_CONCURRENT):DEFAULT_MAX_CONCURRENT),this.pgProvider=config.pgProvider??(async()=>{let{getConnection:getConnection2}=await Promise.resolve().then(() => (init_db(),exports_db));return await getConnection2()}),this.natsConnectFn=config.natsConnectFn??import_nats3.connect,this.executorType=resolveExecutorType(config.executorType),this.executorType==="sdk")this.executor=new ClaudeSdkOmniExecutor;else this.executor=new ClaudeCodeOmniExecutor}async start(){if(this.nc){console.log("[omni-bridge] Already running");return}console.log(`[omni-bridge] Connecting to NATS at ${this.natsUrl}...`),this.nc=await this.natsConnectFn({servers:this.natsUrl,name:"genie-omni-bridge",reconnect:!0,maxReconnectAttempts:-1,reconnectTimeWait:2000}),console.log("[omni-bridge] Connected to NATS"),await this.probePg(),this.executor.setSafePgCall(this.safePgCall.bind(this));let sc3=this.sc,nc2=this.nc;this.executor.setNatsPublish((topic,payload)=>{nc2.publish(topic,sc3.encode(payload))}),this.sub=this.nc.subscribe("omni.message.>"),this.processSubscription();let turnSubs=["omni.turn.open.>","omni.turn.done.>","omni.turn.nudge.>","omni.turn.timeout.>"];for(let topic of turnSubs){let sub=this.nc.subscribe(topic);this.processTurnEvents(sub)}let sessionResetSub=this.nc.subscribe("omni.session.reset.>");this.processSessionResetEvents(sessionResetSub),this.idleCheckTimer=setInterval(()=>this.checkIdleSessions(),IDLE_CHECK_INTERVAL_MS),bridgeInstance=this,console.log(`[omni-bridge] Listening on omni.message.> (max_concurrent=${this.maxConcurrent}, idle_timeout=${this.idleTimeoutMs}ms)`)}async stop(){if(!this.nc){console.log("[omni-bridge] Not running");return}if(console.log("[omni-bridge] Shutting down..."),this.idleCheckTimer)clearInterval(this.idleCheckTimer),this.idleCheckTimer=null;for(let[key,entry]of this.sessions){if(entry.idleTimer)clearTimeout(entry.idleTimer);if(!entry.spawning&&entry.session)try{await this.executor.shutdown(entry.session)}catch(err){console.warn(`[omni-bridge] Error shutting down session ${key}:`,err)}}if(this.sessions.clear(),this.sub)this.sub.unsubscribe(),this.sub=null;try{await this.nc.drain()}catch{}this.nc=null,this.sql=null,this.pgAvailable=!1,bridgeInstance=null,console.log("[omni-bridge] Stopped")}async status(){let now=Date.now(),activeFromPg=null,executorIds=[];if(this.pgAvailable&&this.sql){let rows=await this.safePgCall("status_active_count",async(sql)=>sql`
             SELECT id FROM executors
             WHERE ended_at IS NULL AND metadata->>'source' = 'omni'
-          `,null);if(rows)activeFromPg=rows.length,executorIds=rows.map((r)=>r.id)}return{connected:this.nc!==null,natsUrl:this.natsUrl,pgAvailable:this.pgAvailable,activeSessions:activeFromPg??this.sessions.size,maxConcurrent:this.maxConcurrent,idleTimeoutMs:this.idleTimeoutMs,queueDepth:this.messageQueue.length,executorType:this.executorType,executorIds,sessions:Array.from(this.sessions.entries()).map(([key,entry])=>({id:key,agentName:entry.session.agentName,chatId:entry.session.chatId,instanceId:entry.instanceId,paneId:entry.session.paneId,spawning:entry.spawning,idleMs:now-entry.session.lastActivityAt,bufferSize:entry.buffer.length}))}}async probePg(){try{let sql=await withTimeout(this.pgProvider(),PG_STARTUP_PROBE_TIMEOUT_MS,"PG provider startup");await withTimeout(Promise.resolve(sql`SELECT 1`),PG_STARTUP_PROBE_TIMEOUT_MS,"PG SELECT 1 probe"),this.sql=sql,this.pgAvailable=!0,console.log("[omni-bridge] PG reachable \u2014 session recovery enabled")}catch(err){this.sql=null,this.pgAvailable=!1;let msg=err instanceof Error?err.message:String(err);if(isPgConnectionError(err)){console.warn(`[omni-bridge] PG unavailable \u2014 session recovery disabled (${msg})`);return}throw Error(`[omni-bridge] PG schema mismatch or setup error: ${msg}. ${"Run `bun run migrate` (or the equivalent migration command) and retry."}`)}}async safePgCall(op,fn,fallback,ctx){if(!this.pgAvailable||!this.sql)return fallback;let sql=this.sql;try{return await withTimeout(fn(sql),PG_RUNTIME_QUERY_TIMEOUT_MS,`safePgCall(${op})`)}catch(err){let msg=err instanceof Error?err.message:String(err),execPart=ctx?.executorId?` executor_id=${ctx.executorId}`:"",chatPart=ctx?.chatId?` chat_id=${ctx.chatId}`:"";if(console.warn(`[omni-bridge] safePgCall(${op}) failed${execPart}${chatPart}: ${msg}`),isPgConnectionError(err))this.pgAvailable=!1,this.sql=null,console.warn("[omni-bridge] PG connection lost \u2014 switching to degraded mode");return fallback}}async processSubscription(){if(!this.sub)return;for await(let msg of this.sub)try{let data=this.sc.decode(msg.data),parsed=JSON.parse(data),parts=msg.subject.split(".");if(parts.length>=4)parsed.instanceId=parsed.instanceId||parts[2],parsed.chatId=parsed.chatId||parts[3];if(!parsed.chatId||!parsed.agent){console.warn("[omni-bridge] Dropping message: missing chatId or agent",msg.subject);continue}await this.routeMessage(parsed)}catch(err){console.error("[omni-bridge] Error processing message:",err)}}async processTurnEvents(sub){for await(let msg of sub)try{let payload=JSON.parse(this.sc.decode(msg.data)),parts=msg.subject.split("."),eventType=parts[2],instanceId=parts[3],chatId=parts.slice(4).join("."),sessionKey2=this.findSessionKey(instanceId,chatId);if(sessionKey2)await this.routeTurnEvent(eventType,sessionKey2,payload)}catch(err){console.warn("[omni-bridge] Error processing turn event:",err)}}async routeTurnEvent(eventType,sessionKey2,payload){switch(eventType){case"open":this.turnTracker.open(sessionKey2,payload.turnId,payload.messageId);break;case"done":this.turnTracker.close(sessionKey2,payload.action);break;case"nudge":await this.handleTurnNudge(sessionKey2,payload.message);break;case"timeout":await this.handleTurnTimeout(sessionKey2);break}}findSessionKey(instanceId,chatId){for(let[key,entry]of this.sessions)if(entry.instanceId===instanceId&&entry.session?.chatId===chatId)return key;return}async handleTurnNudge(sessionKey2,nudgeText){let entry=this.sessions.get(sessionKey2);if(!entry?.session)return;try{await this.executor.injectNudge(entry.session,nudgeText)}catch(err){console.warn(`[omni-bridge] Failed to inject nudge for ${sessionKey2}:`,err)}}async handleTurnTimeout(sessionKey2){let entry=this.sessions.get(sessionKey2);if(!entry?.session)return;console.warn(`[omni-bridge] Turn timed out for ${sessionKey2}, evicting session`),this.turnTracker.close(sessionKey2,"timeout");try{await this.executor.shutdown(entry.session)}catch(err){console.warn(`[omni-bridge] Error shutting down timed-out session ${sessionKey2}:`,err)}this.sessions.delete(sessionKey2)}async routeMessage(message){let key=`${message.agent}:${message.chatId}`,entry=this.sessions.get(key);if(entry){if(entry.spawning){if(entry.buffer.length<MAX_BUFFER_PER_CHAT)entry.buffer.push(message);else console.warn(`[omni-bridge] Buffer full (${MAX_BUFFER_PER_CHAT}) for ${key}, dropping message from ${message.sender}`),await this.publishBufferFullReply(message);return}if(await this.executor.isAlive(entry.session)){await this.executor.deliver(entry.session,message),this.resetIdleTimer(key);return}this.removeSession(key)}await this.spawnSession(message)}async spawnSession(message){let key=`${message.agent}:${message.chatId}`;if(this.sessions.size>=this.maxConcurrent){this.messageQueue.push(message),await this.publishAutoReply(message),console.log(`[omni-bridge] Max concurrent (${this.maxConcurrent}) reached, queued message for ${key}`);return}let placeholder={session:null,instanceId:message.instanceId,spawning:!0,buffer:[message],idleTimer:null};this.sessions.set(key,placeholder);try{let raw=message,payloadEnv=raw.env,spawnEnv={OMNI_API_KEY:payloadEnv?.OMNI_API_KEY??process.env.OMNI_API_KEY??"",OMNI_INSTANCE:payloadEnv?.OMNI_INSTANCE??message.instanceId,OMNI_CHAT:payloadEnv?.OMNI_CHAT??message.chatId,OMNI_MESSAGE:payloadEnv?.OMNI_MESSAGE??raw.messageId??"",OMNI_TURN_ID:payloadEnv?.OMNI_TURN_ID??""};console.log(`[omni-bridge] Spawning session for ${key}...`);let session=await this.executor.spawn(message.agent,message.chatId,spawnEnv);placeholder.session=session,placeholder.spawning=!1;for(let buffered of placeholder.buffer)await this.executor.deliver(session,buffered);placeholder.buffer=[],this.resetIdleTimer(key),console.log(`[omni-bridge] Session active: ${key} (pane=${session.paneId})`)}catch(err){console.error(`[omni-bridge] Failed to spawn session for ${key}:`,err);let lostMessages=placeholder.buffer;if(lostMessages.length>0)console.warn(`[omni-bridge] Re-queuing ${lostMessages.length} buffered message(s) from failed spawn for ${key}`),this.messageQueue.push(...lostMessages);this.sessions.delete(key)}}resetIdleTimer(key){let entry=this.sessions.get(key);if(!entry)return;if(entry.idleTimer)clearTimeout(entry.idleTimer);entry.idleTimer=setTimeout(async()=>{console.log(`[omni-bridge] Idle timeout for ${key}, shutting down...`);try{await this.executor.shutdown(entry.session)}catch{}this.removeSession(key),await this.drainQueue()},this.idleTimeoutMs)}async checkIdleSessions(){let now=Date.now();for(let[key,entry]of this.sessions){if(entry.spawning)continue;if(!await this.executor.isAlive(entry.session)){console.log(`[omni-bridge] Dead session detected: ${key}`),this.removeSession(key);continue}let idleMs=now-entry.session.lastActivityAt;if(idleMs>this.idleTimeoutMs){console.log(`[omni-bridge] Forcing idle shutdown: ${key} (idle ${Math.round(idleMs/1000)}s)`);try{await this.executor.shutdown(entry.session)}catch{}this.removeSession(key)}}}removeSession(key){let entry=this.sessions.get(key);if(entry?.idleTimer)clearTimeout(entry.idleTimer);this.sessions.delete(key)}async drainQueue(){while(this.messageQueue.length>0){if(this.sessions.size>=this.maxConcurrent)break;let message=this.messageQueue.shift();if(message)await this.spawnSession(message)}}async publishBufferFullReply(message){if(!this.nc)return;let topic=`omni.reply.${message.instanceId}.${message.chatId}`,reply2={content:"Fila de mensagens cheia, por favor aguarde e tente novamente.",agent:message.agent,chat_id:message.chatId,instance_id:message.instanceId,timestamp:new Date().toISOString(),auto_reply:!0};this.nc.publish(topic,this.sc.encode(JSON.stringify(reply2)))}async publishAutoReply(message){if(!this.nc)return;let topic=`omni.reply.${message.instanceId}.${message.chatId}`,reply2={content:"Aguarde um momento, estou atendendo outros clientes.",agent:message.agent,chat_id:message.chatId,instance_id:message.instanceId,timestamp:new Date().toISOString(),auto_reply:!0};this.nc.publish(topic,this.sc.encode(JSON.stringify(reply2)))}}var import_nats3,DEFAULT_NATS_URL="localhost:4222",DEFAULT_IDLE_TIMEOUT_MS2=900000,DEFAULT_MAX_CONCURRENT=20,MAX_BUFFER_PER_CHAT=50,IDLE_CHECK_INTERVAL_MS=30000,PG_STARTUP_PROBE_TIMEOUT_MS=5000,PG_RUNTIME_QUERY_TIMEOUT_MS=2000,bridgeInstance=null;var init_omni_bridge=__esm(()=>{init_executor_config();init_claude_code2();init_claude_sdk2();import_nats3=__toESM(require_mod4(),1)});var exports_task_close_merged={};__export(exports_task_close_merged,{parseSinceDate:()=>parseSinceDate,matchPRsToSlugs:()=>matchPRsToSlugs,fetchMergedPRs:()=>fetchMergedPRs,extractWishSlug:()=>extractWishSlug,extractSlugFromBranch:()=>extractSlugFromBranch,extractSlugFromBody:()=>extractSlugFromBody,closeMergedTasks:()=>closeMergedTasks});import{execSync as execSync15}from"child_process";function extractSlugFromBody(body){if(!body)return null;let match=body.match(/(?:wish|slug):\s*(\S+)/i);return match?match[1]:null}function extractSlugFromBranch(branch){if(!branch)return null;let match=branch.match(/^(?:feat|fix|chore|docs|refactor|test|dream)\/(.+)$/);return match?match[1]:null}function extractWishSlug(pr){return extractSlugFromBody(pr.body)??extractSlugFromBranch(pr.headRefName)}function parseSinceDate(since){let match=since.match(/^(\d+)([hd])$/);if(!match)throw Error(`Invalid --since format: "${since}". Use e.g. "24h" or "7d".`);let amount=Number.parseInt(match[1],10),unit=match[2],now=new Date;if(unit==="h")now.setHours(now.getHours()-amount);else now.setDate(now.getDate()-amount);return now.toISOString()}function fetchMergedPRs(since,repo){let sinceDate=parseSinceDate(since),cmd=`gh pr list --state merged --json number,title,body,headRefName,mergedAt --limit 100 ${repo?`--repo ${repo}`:""}`.trim(),output;try{output=execSync15(cmd,{encoding:"utf-8",stdio:["pipe","pipe","pipe"]})}catch(err){let message=err instanceof Error?err.message:String(err);throw Error(`Failed to fetch merged PRs: ${message}`)}return JSON.parse(output).filter((pr)=>new Date(pr.mergedAt)>=new Date(sinceDate))}function matchPRsToSlugs(prs){let matches=[];for(let pr of prs){let slug=extractWishSlug(pr);if(slug)matches.push({prNumber:pr.number,slug,mergedAt:pr.mergedAt})}return matches}async function closeMergedTasks(options={}){let{since="24h",dryRun=!1,repo,repoPath}=options,ts3=await Promise.resolve().then(() => (init_task_service(),exports_task_service)),prs=fetchMergedPRs(since,repo),slugMatches=matchPRsToSlugs(prs),result2={closed:0,alreadyShipped:0,prsScanned:prs.length,details:[]};if(slugMatches.length===0)return result2;let actor={actorType:"local",actorId:process.env.GENIE_AGENT_NAME??"cli"},processedTaskIds=new Set;for(let{prNumber,slug}of slugMatches){let tasks=await findTasksByWishSlug(slug,repoPath);for(let task of tasks){if(processedTaskIds.has(task.id))continue;if(processedTaskIds.add(task.id),task.stage==="ship"){result2.alreadyShipped++;continue}if(!dryRun)await ts3.moveTask(task.id,"ship",actor,void 0,task.repoPath),await ts3.commentOnTask(task.id,actor,`Auto-closed: PR #${prNumber} merged to dev`,task.repoPath);result2.closed++,result2.details.push({taskSeq:task.seq,taskTitle:task.title,prNumber,slug})}}return result2}async function findTasksByWishSlug(slug,repoPath){let{getConnection:getConnection2}=await Promise.resolve().then(() => (init_db(),exports_db)),sql=await getConnection2(),repo=repoPath??resolveRepoPath(),pattern=`%${slug}%`;return(await sql`
+          `,null);if(rows)activeFromPg=rows.length,executorIds=rows.map((r)=>r.id)}return{connected:this.nc!==null,natsUrl:this.natsUrl,pgAvailable:this.pgAvailable,activeSessions:activeFromPg??this.sessions.size,maxConcurrent:this.maxConcurrent,idleTimeoutMs:this.idleTimeoutMs,queueDepth:this.messageQueue.length,executorType:this.executorType,executorIds,sessions:Array.from(this.sessions.entries()).map(([key,entry])=>({id:key,agentName:entry.session.agentName,chatId:entry.session.chatId,instanceId:entry.instanceId,paneId:entry.session.paneId,spawning:entry.spawning,idleMs:now-entry.session.lastActivityAt,bufferSize:entry.buffer.length}))}}async probePg(){try{let sql=await withTimeout(this.pgProvider(),PG_STARTUP_PROBE_TIMEOUT_MS,"PG provider startup");await withTimeout(Promise.resolve(sql`SELECT 1`),PG_STARTUP_PROBE_TIMEOUT_MS,"PG SELECT 1 probe"),this.sql=sql,this.pgAvailable=!0,console.log("[omni-bridge] PG reachable \u2014 session recovery enabled")}catch(err){this.sql=null,this.pgAvailable=!1;let msg=err instanceof Error?err.message:String(err);if(isPgConnectionError(err)){console.warn(`[omni-bridge] PG unavailable \u2014 session recovery disabled (${msg})`);return}throw Error(`[omni-bridge] PG schema mismatch or setup error: ${msg}. ${"Run `bun run migrate` (or the equivalent migration command) and retry."}`)}}async safePgCall(op,fn,fallback,ctx){if(!this.pgAvailable||!this.sql)return fallback;let sql=this.sql;try{return await withTimeout(fn(sql),PG_RUNTIME_QUERY_TIMEOUT_MS,`safePgCall(${op})`)}catch(err){let msg=err instanceof Error?err.message:String(err),execPart=ctx?.executorId?` executor_id=${ctx.executorId}`:"",chatPart=ctx?.chatId?` chat_id=${ctx.chatId}`:"";if(console.warn(`[omni-bridge] safePgCall(${op}) failed${execPart}${chatPart}: ${msg}`),isPgConnectionError(err))this.pgAvailable=!1,this.sql=null,console.warn("[omni-bridge] PG connection lost \u2014 switching to degraded mode");return fallback}}async processSubscription(){if(!this.sub)return;for await(let msg of this.sub)try{let data=this.sc.decode(msg.data),parsed=JSON.parse(data),parts=msg.subject.split(".");if(parts.length>=4)parsed.instanceId=parsed.instanceId||parts[2],parsed.chatId=parsed.chatId||parts[3];if(!parsed.chatId||!parsed.agent){console.warn("[omni-bridge] Dropping message: missing chatId or agent",msg.subject);continue}await this.routeMessage(parsed)}catch(err){console.error("[omni-bridge] Error processing message:",err)}}async processTurnEvents(sub){for await(let msg of sub)try{let payload=JSON.parse(this.sc.decode(msg.data)),parts=msg.subject.split("."),eventType=parts[2],instanceId=parts[3],chatId=parts.slice(4).join("."),sessionKey2=this.findSessionKey(instanceId,chatId);if(sessionKey2)await this.routeTurnEvent(eventType,sessionKey2,payload)}catch(err){console.warn("[omni-bridge] Error processing turn event:",err)}}async routeTurnEvent(eventType,sessionKey2,payload){switch(eventType){case"open":this.turnTracker.open(sessionKey2,payload.turnId,payload.messageId);break;case"done":this.turnTracker.close(sessionKey2,payload.action);break;case"nudge":await this.handleTurnNudge(sessionKey2,payload.message);break;case"timeout":await this.handleTurnTimeout(sessionKey2);break}}findSessionKey(instanceId,chatId){for(let[key,entry]of this.sessions){if(entry.instanceId!==instanceId)continue;if(entry.session?.chatId===chatId)return key;if(entry.spawning&&key.endsWith(`:${chatId}`))return key}return}async handleTurnNudge(sessionKey2,nudgeText){let entry=this.sessions.get(sessionKey2);if(!entry?.session)return;try{await this.executor.injectNudge(entry.session,nudgeText)}catch(err){console.warn(`[omni-bridge] Failed to inject nudge for ${sessionKey2}:`,err)}}async processSessionResetEvents(sub){for await(let msg of sub)try{let parts=msg.subject.split(".");if(parts.length<5){console.warn(`[omni-bridge] Malformed session-reset subject: ${msg.subject}`);continue}let instanceId=parts[3],chatId=parts.slice(4).join("."),action;try{action=JSON.parse(this.sc.decode(msg.data)).action}catch{}await this.handleSessionReset(instanceId,chatId,action)}catch(err){console.warn("[omni-bridge] Error processing session reset event:",err)}}async handleSessionReset(instanceId,chatId,action){let sessionKey2=this.findSessionKey(instanceId,chatId);if(!sessionKey2){console.log(`[omni-bridge] Session reset for cold chat ${instanceId}/${chatId} \u2014 no-op`);return}let entry=this.sessions.get(sessionKey2);if(!entry)return;let actionTag=action?` (action=${action})`:"";if(entry.spawning){console.log(`[omni-bridge] Session reset for spawning ${sessionKey2}${actionTag}, marking cancelled`),entry.cancelled=!0,entry.buffer=[],this.turnTracker.close(sessionKey2,"reset"),this.removeSession(sessionKey2),await this.drainQueue();return}if(!entry.session)return;console.log(`[omni-bridge] Session reset for ${sessionKey2}${actionTag}, evicting`),this.turnTracker.close(sessionKey2,"reset");try{await this.executor.shutdown(entry.session)}catch(err){console.warn(`[omni-bridge] Error shutting down reset session ${sessionKey2}:`,err)}this.removeSession(sessionKey2),await this.drainQueue()}async handleTurnTimeout(sessionKey2){let entry=this.sessions.get(sessionKey2);if(!entry?.session)return;console.warn(`[omni-bridge] Turn timed out for ${sessionKey2}, evicting session`),this.turnTracker.close(sessionKey2,"timeout");try{await this.executor.shutdown(entry.session)}catch(err){console.warn(`[omni-bridge] Error shutting down timed-out session ${sessionKey2}:`,err)}this.sessions.delete(sessionKey2)}async routeMessage(message){let key=`${message.agent}:${message.chatId}`,entry=this.sessions.get(key);if(entry){if(entry.spawning){if(entry.buffer.length<MAX_BUFFER_PER_CHAT)entry.buffer.push(message);else console.warn(`[omni-bridge] Buffer full (${MAX_BUFFER_PER_CHAT}) for ${key}, dropping message from ${message.sender}`),await this.publishBufferFullReply(message);return}if(await this.executor.isAlive(entry.session)){await this.executor.deliver(entry.session,message),this.resetIdleTimer(key);return}this.removeSession(key)}await this.spawnSession(message)}async spawnSession(message){let key=`${message.agent}:${message.chatId}`;if(this.sessions.size>=this.maxConcurrent){this.messageQueue.push(message),await this.publishAutoReply(message),console.log(`[omni-bridge] Max concurrent (${this.maxConcurrent}) reached, queued message for ${key}`);return}let placeholder={session:null,instanceId:message.instanceId,spawning:!0,buffer:[message],idleTimer:null};this.sessions.set(key,placeholder);try{let raw=message,payloadEnv=raw.env,spawnEnv={OMNI_API_KEY:payloadEnv?.OMNI_API_KEY??process.env.OMNI_API_KEY??"",OMNI_INSTANCE:payloadEnv?.OMNI_INSTANCE??message.instanceId,OMNI_CHAT:payloadEnv?.OMNI_CHAT??message.chatId,OMNI_MESSAGE:payloadEnv?.OMNI_MESSAGE??raw.messageId??"",OMNI_TURN_ID:payloadEnv?.OMNI_TURN_ID??""};console.log(`[omni-bridge] Spawning session for ${key}...`);let session=await this.executor.spawn(message.agent,message.chatId,spawnEnv);if(placeholder.cancelled){console.log(`[omni-bridge] Spawn for ${key} completed but was cancelled by reset, shutting down`);try{await this.executor.shutdown(session)}catch(err){console.warn(`[omni-bridge] Error shutting down cancelled spawn for ${key}:`,err)}return}placeholder.session=session,placeholder.spawning=!1;for(let buffered of placeholder.buffer)await this.executor.deliver(session,buffered);placeholder.buffer=[],this.resetIdleTimer(key),console.log(`[omni-bridge] Session active: ${key} (pane=${session.paneId})`)}catch(err){console.error(`[omni-bridge] Failed to spawn session for ${key}:`,err);let lostMessages=placeholder.buffer;if(lostMessages.length>0)console.warn(`[omni-bridge] Re-queuing ${lostMessages.length} buffered message(s) from failed spawn for ${key}`),this.messageQueue.push(...lostMessages);this.sessions.delete(key)}}resetIdleTimer(key){let entry=this.sessions.get(key);if(!entry)return;if(entry.idleTimer)clearTimeout(entry.idleTimer);entry.idleTimer=setTimeout(async()=>{console.log(`[omni-bridge] Idle timeout for ${key}, shutting down...`);try{await this.executor.shutdown(entry.session)}catch{}this.removeSession(key),await this.drainQueue()},this.idleTimeoutMs)}async checkIdleSessions(){let now=Date.now();for(let[key,entry]of this.sessions){if(entry.spawning)continue;if(!await this.executor.isAlive(entry.session)){console.log(`[omni-bridge] Dead session detected: ${key}`),this.removeSession(key);continue}let idleMs=now-entry.session.lastActivityAt;if(idleMs>this.idleTimeoutMs){console.log(`[omni-bridge] Forcing idle shutdown: ${key} (idle ${Math.round(idleMs/1000)}s)`);try{await this.executor.shutdown(entry.session)}catch{}this.removeSession(key)}}}removeSession(key){let entry=this.sessions.get(key);if(entry?.idleTimer)clearTimeout(entry.idleTimer);this.sessions.delete(key)}async drainQueue(){while(this.messageQueue.length>0){if(this.sessions.size>=this.maxConcurrent)break;let message=this.messageQueue.shift();if(message)await this.spawnSession(message)}}async publishBufferFullReply(message){if(!this.nc)return;let topic=`omni.reply.${message.instanceId}.${message.chatId}`,reply2={content:"Fila de mensagens cheia, por favor aguarde e tente novamente.",agent:message.agent,chat_id:message.chatId,instance_id:message.instanceId,timestamp:new Date().toISOString(),auto_reply:!0};this.nc.publish(topic,this.sc.encode(JSON.stringify(reply2)))}async publishAutoReply(message){if(!this.nc)return;let topic=`omni.reply.${message.instanceId}.${message.chatId}`,reply2={content:"Aguarde um momento, estou atendendo outros clientes.",agent:message.agent,chat_id:message.chatId,instance_id:message.instanceId,timestamp:new Date().toISOString(),auto_reply:!0};this.nc.publish(topic,this.sc.encode(JSON.stringify(reply2)))}}var import_nats3,DEFAULT_NATS_URL="localhost:4222",DEFAULT_IDLE_TIMEOUT_MS2=900000,DEFAULT_MAX_CONCURRENT=20,MAX_BUFFER_PER_CHAT=50,IDLE_CHECK_INTERVAL_MS=30000,PG_STARTUP_PROBE_TIMEOUT_MS=5000,PG_RUNTIME_QUERY_TIMEOUT_MS=2000,bridgeInstance=null;var init_omni_bridge=__esm(()=>{init_executor_config();init_claude_code2();init_claude_sdk2();import_nats3=__toESM(require_mod4(),1)});var exports_task_close_merged={};__export(exports_task_close_merged,{parseSinceDate:()=>parseSinceDate,matchPRsToSlugs:()=>matchPRsToSlugs,fetchMergedPRs:()=>fetchMergedPRs,extractWishSlug:()=>extractWishSlug,extractSlugFromBranch:()=>extractSlugFromBranch,extractSlugFromBody:()=>extractSlugFromBody,closeMergedTasks:()=>closeMergedTasks});import{execSync as execSync15}from"child_process";function extractSlugFromBody(body){if(!body)return null;let match=body.match(/(?:wish|slug):\s*(\S+)/i);return match?match[1]:null}function extractSlugFromBranch(branch){if(!branch)return null;let match=branch.match(/^(?:feat|fix|chore|docs|refactor|test|dream)\/(.+)$/);return match?match[1]:null}function extractWishSlug(pr){return extractSlugFromBody(pr.body)??extractSlugFromBranch(pr.headRefName)}function parseSinceDate(since){let match=since.match(/^(\d+)([hd])$/);if(!match)throw Error(`Invalid --since format: "${since}". Use e.g. "24h" or "7d".`);let amount=Number.parseInt(match[1],10),unit=match[2],now=new Date;if(unit==="h")now.setHours(now.getHours()-amount);else now.setDate(now.getDate()-amount);return now.toISOString()}function fetchMergedPRs(since,repo){let sinceDate=parseSinceDate(since),cmd=`gh pr list --state merged --json number,title,body,headRefName,mergedAt --limit 100 ${repo?`--repo ${repo}`:""}`.trim(),output;try{output=execSync15(cmd,{encoding:"utf-8",stdio:["pipe","pipe","pipe"]})}catch(err){let message=err instanceof Error?err.message:String(err);throw Error(`Failed to fetch merged PRs: ${message}`)}return JSON.parse(output).filter((pr)=>new Date(pr.mergedAt)>=new Date(sinceDate))}function matchPRsToSlugs(prs){let matches=[];for(let pr of prs){let slug=extractWishSlug(pr);if(slug)matches.push({prNumber:pr.number,slug,mergedAt:pr.mergedAt})}return matches}async function closeMergedTasks(options={}){let{since="24h",dryRun=!1,repo,repoPath}=options,ts3=await Promise.resolve().then(() => (init_task_service(),exports_task_service)),prs=fetchMergedPRs(since,repo),slugMatches=matchPRsToSlugs(prs),result2={closed:0,alreadyShipped:0,prsScanned:prs.length,details:[]};if(slugMatches.length===0)return result2;let actor={actorType:"local",actorId:process.env.GENIE_AGENT_NAME??"cli"},processedTaskIds=new Set;for(let{prNumber,slug}of slugMatches){let tasks=await findTasksByWishSlug(slug,repoPath);for(let task of tasks){if(processedTaskIds.has(task.id))continue;if(processedTaskIds.add(task.id),task.stage==="ship"){result2.alreadyShipped++;continue}if(!dryRun)await ts3.moveTask(task.id,"ship",actor,void 0,task.repoPath),await ts3.commentOnTask(task.id,actor,`Auto-closed: PR #${prNumber} merged to dev`,task.repoPath);result2.closed++,result2.details.push({taskSeq:task.seq,taskTitle:task.title,prNumber,slug})}}return result2}async function findTasksByWishSlug(slug,repoPath){let{getConnection:getConnection2}=await Promise.resolve().then(() => (init_db(),exports_db)),sql=await getConnection2(),repo=repoPath??resolveRepoPath(),pattern=`%${slug}%`;return(await sql`
     SELECT id, seq, title, stage, repo_path
     FROM tasks
     WHERE repo_path = ${repo}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automagik/genie",
-  "version": "4.260406.5",
+  "version": "4.260407.1",
   "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.260406.5",
+  "version": "4.260407.1",
   "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.260406.5",
+  "version": "4.260407.1",
   "private": true,
   "description": "Runtime dependencies for genie bundled CLIs",
   "type": "module",

package/src/services/__tests__/omni-bridge.test.ts

@@ -705,3 +705,309 @@ describe('OmniBridge — session lifecycle (Group 2)', () => {
     }
   });
 });
+
+// ============================================================================
+// Session reset subscription — issue #1089
+// ============================================================================
+
+describe('OmniBridge — session reset (#1089)', () => {
+  /** Pre-populate a live session entry on the bridge for reset tests. */
+  function injectSession(
+    bridge: OmniBridge,
+    key: string,
+    instanceId: string,
+    session: OmniSession,
+  ): { entry: { idleTimer: ReturnType<typeof setTimeout> | null } } {
+    const idleTimer = setTimeout(() => {}, 60_000);
+    const entry = {
+      session,
+      instanceId,
+      spawning: false,
+      buffer: [],
+      idleTimer,
+    };
+    (bridge as any).sessions.set(key, entry);
+    return { entry };
+  }
+
+  it('shuts down the executor and removes the session on reset for a hot chat', async () => {
+    const { executor, calls, makeSession } = makeMockExecutor();
+    const bridge = new OmniBridge({
+      natsUrl: 'test://fake',
+      pgProvider: degradedPgProvider,
+      natsConnectFn: (async () => makeFakeNats()) as any,
+    });
+    (bridge as any).executor = executor;
+    await bridge.start();
+
+    try {
+      const session = makeSession('test-agent', 'chat-1');
+      injectSession(bridge, 'test-agent:chat-1', 'inst-1', session);
+
+      await (bridge as any).handleSessionReset('inst-1', 'chat-1', 'kill');
+
+      expect(calls.shutdown.length).toBe(1);
+      expect(calls.shutdown[0].chatId).toBe('chat-1');
+      expect((bridge as any).sessions.size).toBe(0);
+    } finally {
+      await bridge.stop();
+    }
+  });
+
+  it('no-ops on reset for a cold chat (no live session)', async () => {
+    const { executor, calls } = makeMockExecutor();
+    const bridge = new OmniBridge({
+      natsUrl: 'test://fake',
+      pgProvider: degradedPgProvider,
+      natsConnectFn: (async () => makeFakeNats()) as any,
+    });
+    (bridge as any).executor = executor;
+    await bridge.start();
+
+    try {
+      // Sessions map is empty — reset must not throw and must not call shutdown.
+      await (bridge as any).handleSessionReset('inst-1', 'chat-cold');
+
+      expect(calls.shutdown.length).toBe(0);
+      expect((bridge as any).sessions.size).toBe(0);
+    } finally {
+      await bridge.stop();
+    }
+  });
+
+  it('clears the idle timer when evicting a reset session', async () => {
+    const { executor, makeSession } = makeMockExecutor();
+    const bridge = new OmniBridge({
+      natsUrl: 'test://fake',
+      pgProvider: degradedPgProvider,
+      natsConnectFn: (async () => makeFakeNats()) as any,
+    });
+    (bridge as any).executor = executor;
+    await bridge.start();
+
+    try {
+      const session = makeSession('test-agent', 'chat-1');
+      const { entry } = injectSession(bridge, 'test-agent:chat-1', 'inst-1', session);
+      const timerBefore = entry.idleTimer;
+      expect(timerBefore).not.toBeNull();
+
+      await (bridge as any).handleSessionReset('inst-1', 'chat-1');
+
+      // Session removed → idle timer no longer reachable from sessions map
+      expect((bridge as any).sessions.has('test-agent:chat-1')).toBe(false);
+    } finally {
+      await bridge.stop();
+    }
+  });
+
+  it('parses subject with dotted chatId (e.g. WhatsApp +5511...@s.whatsapp.net)', async () => {
+    const { executor, calls, makeSession } = makeMockExecutor();
+    const bridge = new OmniBridge({
+      natsUrl: 'test://fake',
+      pgProvider: degradedPgProvider,
+      natsConnectFn: (async () => makeFakeNats()) as any,
+    });
+    (bridge as any).executor = executor;
+    await bridge.start();
+
+    try {
+      const dottedChat = '+5511999999999@s.whatsapp.net';
+      const session = makeSession('test-agent', dottedChat);
+      injectSession(bridge, `test-agent:${dottedChat}`, 'inst-x', session);
+
+      // Build a fake NATS message and feed it through the dispatch path the way
+      // processSessionResetEvents would: subject + JSON-encoded payload bytes.
+      const fakeMsg = {
+        subject: `omni.session.reset.inst-x.${dottedChat}`,
+        data: new TextEncoder().encode(JSON.stringify({ action: 'kill' })),
+      };
+      // Drive a single iteration through processSessionResetEvents using a one-shot iterator.
+      const oneShot = {
+        [Symbol.asyncIterator]: async function* () {
+          yield fakeMsg;
+        },
+      } as any;
+      await (bridge as any).processSessionResetEvents(oneShot);
+
+      expect(calls.shutdown.length).toBe(1);
+      expect(calls.shutdown[0].chatId).toBe(dottedChat);
+    } finally {
+      await bridge.stop();
+    }
+  });
+
+  it('tolerates malformed JSON payload by routing on subject alone', async () => {
+    const { executor, calls, makeSession } = makeMockExecutor();
+    const bridge = new OmniBridge({
+      natsUrl: 'test://fake',
+      pgProvider: degradedPgProvider,
+      natsConnectFn: (async () => makeFakeNats()) as any,
+    });
+    (bridge as any).executor = executor;
+    await bridge.start();
+
+    try {
+      const session = makeSession('test-agent', 'chat-1');
+      injectSession(bridge, 'test-agent:chat-1', 'inst-1', session);
+
+      const fakeMsg = {
+        subject: 'omni.session.reset.inst-1.chat-1',
+        data: new TextEncoder().encode('not-json-at-all'),
+      };
+      const oneShot = {
+        [Symbol.asyncIterator]: async function* () {
+          yield fakeMsg;
+        },
+      } as any;
+      await (bridge as any).processSessionResetEvents(oneShot);
+
+      // Subject-only routing still kills the session.
+      expect(calls.shutdown.length).toBe(1);
+    } finally {
+      await bridge.stop();
+    }
+  });
+
+  it('warns and skips on malformed subject with too few segments', async () => {
+    const { executor, calls } = makeMockExecutor();
+    const bridge = new OmniBridge({
+      natsUrl: 'test://fake',
+      pgProvider: degradedPgProvider,
+      natsConnectFn: (async () => makeFakeNats()) as any,
+    });
+    (bridge as any).executor = executor;
+    await bridge.start();
+
+    try {
+      const fakeMsg = {
+        subject: 'omni.session.reset',
+        data: new TextEncoder().encode('{}'),
+      };
+      const oneShot = {
+        [Symbol.asyncIterator]: async function* () {
+          yield fakeMsg;
+        },
+      } as any;
+      await (bridge as any).processSessionResetEvents(oneShot);
+
+      expect(calls.shutdown.length).toBe(0);
+    } finally {
+      await bridge.stop();
+    }
+  });
+
+  it('cancels a spawning session on reset and tears down the freshly-spawned executor', async () => {
+    // Hold the spawn promise open so we can fire reset mid-spawn.
+    let releaseSpawn!: (s: OmniSession) => void;
+    const spawnGate = new Promise<OmniSession>((resolve) => {
+      releaseSpawn = resolve;
+    });
+
+    const { executor, calls, makeSession } = makeMockExecutor({
+      spawnFn: async (agentName, chatId) => {
+        // Block until the test releases the spawn.
+        const session = await spawnGate;
+        return session ?? makeSession(agentName, chatId);
+      },
+    });
+    const bridge = new OmniBridge({
+      natsUrl: 'test://fake',
+      pgProvider: degradedPgProvider,
+      natsConnectFn: (async () => makeFakeNats()) as any,
+    });
+    (bridge as any).executor = executor;
+    await bridge.start();
+
+    try {
+      // Kick off the spawn — routeMessage will block on spawnGate.
+      const routePromise = (bridge as any).routeMessage(makeMsg({ content: 'first' }));
+
+      // Yield so spawnSession installs the placeholder before we reset.
+      await new Promise((r) => setTimeout(r, 5));
+      expect((bridge as any).sessions.has('test-agent:chat-1')).toBe(true);
+      expect((bridge as any).sessions.get('test-agent:chat-1').spawning).toBe(true);
+
+      // Fire the reset while spawn is still in flight.
+      await (bridge as any).handleSessionReset('inst-1', 'chat-1', 'kill');
+
+      // Placeholder is gone — the spawn-in-flight has been logically cancelled.
+      expect((bridge as any).sessions.has('test-agent:chat-1')).toBe(false);
+
+      // Now release the spawn — spawnSession should detect cancelled and tear it down.
+      releaseSpawn(makeSession('test-agent', 'chat-1'));
+      await routePromise;
+
+      // executor.shutdown was called for the freshly-spawned (cancelled) session.
+      expect(calls.shutdown.length).toBe(1);
+      expect(calls.shutdown[0].chatId).toBe('chat-1');
+
+      // Buffered triggering message must NOT be delivered to the killed session.
+      expect(calls.deliver.length).toBe(0);
+    } finally {
+      await bridge.stop();
+    }
+  });
+
+  it('drains the message queue after evicting a reset session', async () => {
+    const { executor, calls, makeSession } = makeMockExecutor();
+    const bridge = new OmniBridge({
+      natsUrl: 'test://fake',
+      pgProvider: degradedPgProvider,
+      natsConnectFn: (async () => makeFakeNats()) as any,
+    });
+    (bridge as any).executor = executor;
+    // Force the bridge to look fully saturated so a reset opens a slot.
+    (bridge as any).maxConcurrent = 1;
+    await bridge.start();
+
+    try {
+      const session = makeSession('test-agent', 'chat-1');
+      injectSession(bridge, 'test-agent:chat-1', 'inst-1', session);
+
+      // Park a queued message that's waiting for a free slot.
+      (bridge as any).messageQueue.push(makeMsg({ chatId: 'chat-2', agent: 'agent-b' }));
+
+      await (bridge as any).handleSessionReset('inst-1', 'chat-1', 'kill');
+
+      // Original session is gone, queued message picked up its slot, drainQueue spawned it.
+      expect((bridge as any).sessions.has('test-agent:chat-1')).toBe(false);
+      expect((bridge as any).messageQueue.length).toBe(0);
+      expect(calls.spawn.length).toBe(1);
+      expect(calls.spawn[0].chatId).toBe('chat-2');
+    } finally {
+      await bridge.stop();
+    }
+  });
+
+  it('subscribes to omni.session.reset.> on start()', async () => {
+    const subscribeCalls: string[] = [];
+    const fakeSub: Partial<Subscription> & AsyncIterable<never> = {
+      unsubscribe: () => {},
+      [Symbol.asyncIterator]: async function* () {},
+    };
+    const nc: Partial<NatsConnection> = {
+      info: undefined,
+      closed: async () => undefined,
+      close: async () => undefined,
+      drain: async () => undefined,
+      publish: () => {},
+      subscribe: (subject: string) => {
+        subscribeCalls.push(subject);
+        return fakeSub as Subscription;
+      },
+    };
+
+    const bridge = new OmniBridge({
+      natsUrl: 'test://fake',
+      pgProvider: degradedPgProvider,
+      natsConnectFn: (async () => nc as NatsConnection) as any,
+    });
+
+    try {
+      await bridge.start();
+      expect(subscribeCalls).toContain('omni.session.reset.>');
+    } finally {
+      await bridge.stop();
+    }
+  });
+});

package/src/services/executors/__tests__/claude-sdk.test.ts

@@ -26,7 +26,7 @@ import { afterEach, beforeEach, describe, expect, it, mock } from 'bun:test';
 // — recordAuditEvent / session-capture route through safePgCall, which is
 // mocked per-test via setSafePgCall() (or guarded null for no-bridge tests).
 
-const { ClaudeSdkOmniExecutor } = await import('../claude-sdk.js');
+const { ClaudeSdkOmniExecutor, createSendMessageOmniHook } = await import('../claude-sdk.js');
 const directory = await import('../../../lib/agent-directory.js');
 
 describe('ClaudeSdkOmniExecutor', () => {
@@ -474,7 +474,7 @@ describe('ClaudeSdkOmniExecutor', () => {
       // Verify turn-based prompt content
       expect(systemPrompt).toContain('WhatsApp');
       expect(systemPrompt).toContain('Alice');
-      expect(systemPrompt).toContain('omni say');
+      expect(systemPrompt).toContain('SendMessage');
       expect(systemPrompt).toContain('omni done');
       expect(systemPrompt).toContain('inst-wb');
     });
@@ -496,8 +496,248 @@ describe('ClaudeSdkOmniExecutor', () => {
       const systemPrompt = callArgs.options?.systemPrompt ?? '';
 
       expect(systemPrompt).not.toContain('WhatsApp');
-      expect(systemPrompt).not.toContain('omni say');
-      expect(systemPrompt).not.toContain('omni done');
+      expect(systemPrompt).not.toContain('SendMessage');
+    });
+  });
+
+  // ==========================================================================
+  // SendMessage(to: omni) NATS routing — issue #1088
+  // ==========================================================================
+
+  describe('SendMessage omni interception', () => {
+    const omniEnv = { OMNI_INSTANCE: 'inst-x', OMNI_CHAT: 'chat-x', OMNI_AGENT: 'eugenia' };
+    const dummyMeta = { signal: new AbortController().signal };
+
+    it('publishes to omni.reply.{instance}.{chat} and denies the tool when recipient is "omni"', async () => {
+      const publishCalls: Array<[string, string]> = [];
+      const natsPublish = (subject: string, payload: string) => {
+        publishCalls.push([subject, payload]);
+      };
+      const hook = createSendMessageOmniHook(omniEnv, natsPublish);
+
+      const result = await hook(
+        {
+          hook_event_name: 'PreToolUse',
+          tool_name: 'SendMessage',
+          tool_input: { recipient: 'omni', message: 'Olá Cezar!' },
+          tool_use_id: 'tu-1',
+        } as never,
+        'tu-1',
+        dummyMeta,
+      );
+
+      expect(publishCalls).toHaveLength(1);
+      expect(publishCalls[0][0]).toBe('omni.reply.inst-x.chat-x');
+      const payload = JSON.parse(publishCalls[0][1]);
+      expect(payload).toMatchObject({
+        agent: 'eugenia',
+        chat_id: 'chat-x',
+        instance_id: 'inst-x',
+        content: 'Olá Cezar!',
+      });
+      expect(result).not.toBeNull();
+      const out = result as { hookSpecificOutput?: { permissionDecision?: string; permissionDecisionReason?: string } };
+      expect(out.hookSpecificOutput?.permissionDecision).toBe('deny');
+      expect(out.hookSpecificOutput?.permissionDecisionReason).toMatch(/delivered.*omni bridge/i);
+    });
+
+    it('accepts the alternate "to" + "content" field shape', async () => {
+      const publishCalls: Array<[string, string]> = [];
+      const hook = createSendMessageOmniHook(omniEnv, (s, p) => {
+        publishCalls.push([s, p]);
+      });
+
+      await hook(
+        {
+          hook_event_name: 'PreToolUse',
+          tool_name: 'SendMessage',
+          tool_input: { to: 'omni', content: 'second shape' },
+          tool_use_id: 'tu-2',
+        } as never,
+        'tu-2',
+        dummyMeta,
+      );
+
+      expect(publishCalls).toHaveLength(1);
+      expect(JSON.parse(publishCalls[0][1]).content).toBe('second shape');
+    });
+
+    it('passes through (no decision) when recipient is not "omni"', async () => {
+      const publishCalls: Array<[string, string]> = [];
+      const hook = createSendMessageOmniHook(omniEnv, (s, p) => {
+        publishCalls.push([s, p]);
+      });
+
+      const result = await hook(
+        {
+          hook_event_name: 'PreToolUse',
+          tool_name: 'SendMessage',
+          tool_input: { recipient: 'reviewer', message: 'peer ping' },
+          tool_use_id: 'tu-3',
+        } as never,
+        'tu-3',
+        dummyMeta,
+      );
+
+      expect(publishCalls).toHaveLength(0);
+      expect((result as Record<string, unknown>).hookSpecificOutput).toBeUndefined();
+    });
+
+    it('passes through for non-SendMessage tool calls', async () => {
+      const publishCalls: Array<[string, string]> = [];
+      const hook = createSendMessageOmniHook(omniEnv, (s, p) => {
+        publishCalls.push([s, p]);
+      });
+
+      const result = await hook(
+        {
+          hook_event_name: 'PreToolUse',
+          tool_name: 'Read',
+          tool_input: { file_path: '/tmp/x' },
+          tool_use_id: 'tu-4',
+        } as never,
+        'tu-4',
+        dummyMeta,
+      );
+
+      expect(publishCalls).toHaveLength(0);
+      expect((result as Record<string, unknown>).hookSpecificOutput).toBeUndefined();
+    });
+
+    it('denies with bridge-unavailable reason when natsPublish is null but env is set', async () => {
+      const hook = createSendMessageOmniHook(omniEnv, null);
+
+      const result = await hook(
+        {
+          hook_event_name: 'PreToolUse',
+          tool_name: 'SendMessage',
+          tool_input: { recipient: 'omni', message: 'oops' },
+          tool_use_id: 'tu-5',
+        } as never,
+        'tu-5',
+        dummyMeta,
+      );
+
+      const out = result as { hookSpecificOutput?: { permissionDecision?: string; permissionDecisionReason?: string } };
+      expect(out.hookSpecificOutput?.permissionDecision).toBe('deny');
+      expect(out.hookSpecificOutput?.permissionDecisionReason).toMatch(/bridge unavailable/i);
+    });
+
+    it('denies with retry-prompting reason when message body is missing', async () => {
+      const publishCalls: Array<[string, string]> = [];
+      const hook = createSendMessageOmniHook(omniEnv, (s, p) => {
+        publishCalls.push([s, p]);
+      });
+
+      // Model emits the wrong field name (e.g. `text` instead of `message`/`content`)
+      const result = await hook(
+        {
+          hook_event_name: 'PreToolUse',
+          tool_name: 'SendMessage',
+          tool_input: { recipient: 'omni', text: 'wrong field' },
+          tool_use_id: 'tu-empty-1',
+        } as never,
+        'tu-empty-1',
+        dummyMeta,
+      );
+
+      expect(publishCalls).toHaveLength(0);
+      const out = result as { hookSpecificOutput?: { permissionDecision?: string; permissionDecisionReason?: string } };
+      expect(out.hookSpecificOutput?.permissionDecision).toBe('deny');
+      expect(out.hookSpecificOutput?.permissionDecisionReason).toMatch(/non-empty.*message/i);
+    });
+
+    it('denies with retry-prompting reason when message body is whitespace-only', async () => {
+      const publishCalls: Array<[string, string]> = [];
+      const hook = createSendMessageOmniHook(omniEnv, (s, p) => {
+        publishCalls.push([s, p]);
+      });
+
+      const result = await hook(
+        {
+          hook_event_name: 'PreToolUse',
+          tool_name: 'SendMessage',
+          tool_input: { recipient: 'omni', message: '   \n\t  ' },
+          tool_use_id: 'tu-empty-2',
+        } as never,
+        'tu-empty-2',
+        dummyMeta,
+      );
+
+      expect(publishCalls).toHaveLength(0);
+      const out = result as { hookSpecificOutput?: { permissionDecision?: string; permissionDecisionReason?: string } };
+      expect(out.hookSpecificOutput?.permissionDecision).toBe('deny');
+      expect(out.hookSpecificOutput?.permissionDecisionReason).toMatch(/non-empty.*message/i);
+    });
+
+    it('passes through when OMNI_INSTANCE is missing (non-bridge SDK session)', async () => {
+      const publishCalls: Array<[string, string]> = [];
+      const hook = createSendMessageOmniHook({}, (s, p) => {
+        publishCalls.push([s, p]);
+      });
+
+      const result = await hook(
+        {
+          hook_event_name: 'PreToolUse',
+          tool_name: 'SendMessage',
+          tool_input: { recipient: 'omni', message: 'no bridge' },
+          tool_use_id: 'tu-6',
+        } as never,
+        'tu-6',
+        dummyMeta,
+      );
+
+      expect(publishCalls).toHaveLength(0);
+      expect((result as Record<string, unknown>).hookSpecificOutput).toBeUndefined();
+    });
+
+    it('wires the SendMessage hook into runQuery options when OMNI_INSTANCE is set', async () => {
+      const session = await executor.spawn('test-agent', 'chat-wire', {
+        OMNI_INSTANCE: 'inst-wire',
+        OMNI_CHAT: 'chat-wire',
+        OMNI_AGENT: 'wirebot',
+      });
+
+      await executor.deliver(session, {
+        content: 'Hi',
+        sender: 'Alice',
+        instanceId: 'inst-wire',
+        chatId: 'chat-wire',
+        agent: 'test-agent',
+      });
+      await executor.waitForDeliveries(session.id);
+
+      expect(queryMock).toHaveBeenCalled();
+      const callArgs = (
+        queryMock.mock.calls.at(-1) as unknown as [{ options?: { hooks?: Record<string, unknown[]> } }]
+      )[0];
+      const preToolUseHooks = callArgs.options?.hooks?.PreToolUse;
+      expect(Array.isArray(preToolUseHooks)).toBe(true);
+      // permission gate matcher (*) + SendMessage matcher
+      const matchers = (preToolUseHooks as Array<{ matcher?: string }>).map((h) => h.matcher);
+      expect(matchers).toContain('SendMessage');
+    });
+
+    it('does NOT wire the SendMessage hook when OMNI_INSTANCE is absent', async () => {
+      const session = await executor.spawn('test-agent', 'chat-nowire', {});
+
+      await executor.deliver(session, {
+        content: 'Hi',
+        sender: 'bob',
+        instanceId: 'inst-1',
+        chatId: 'chat-nowire',
+        agent: 'test-agent',
+      });
+      await executor.waitForDeliveries(session.id);
+
+      const callArgs = (
+        queryMock.mock.calls.at(-1) as unknown as [
+          { options?: { hooks?: Record<string, Array<{ matcher?: string }>> } },
+        ]
+      )[0];
+      const preToolUseHooks = callArgs.options?.hooks?.PreToolUse ?? [];
+      const matchers = preToolUseHooks.map((h) => h.matcher);
+      expect(matchers).not.toContain('SendMessage');
     });
   });
 });

package/src/services/executors/claude-sdk.ts

@@ -1,4 +1,10 @@
-import type { Query } from '@anthropic-ai/claude-agent-sdk';
+import type {
+  HookCallback,
+  HookCallbackMatcher,
+  PreToolUseHookInput,
+  Query,
+  SyncHookJSONOutput,
+} from '@anthropic-ai/claude-agent-sdk';
 
 import { z } from 'zod';
 import * as directory from '../../lib/agent-directory.js';
@@ -153,6 +159,95 @@ export function handleDoneTool(
   return action.label;
 }
 
+// ============================================================================
+// SendMessage interception — route SendMessage(to: "omni") to NATS reply path
+// ============================================================================
+
+/**
+ * Extract `recipient` and `message content` from a SendMessage tool input.
+ *
+ * Both field name variants are supported defensively:
+ * - recipient: `recipient` (CC native) or `to` (genie internal)
+ * - body:      `message`   (CC native) or `content` (genie internal)
+ *
+ * Returns `{ recipient: undefined }` when the input is not parseable.
+ */
+function parseSendMessageInput(input: unknown): { recipient?: string; body?: string } {
+  if (!input || typeof input !== 'object') return {};
+  const obj = input as Record<string, unknown>;
+  const recipient = typeof obj.recipient === 'string' ? obj.recipient : typeof obj.to === 'string' ? obj.to : undefined;
+  const body =
+    typeof obj.message === 'string' ? obj.message : typeof obj.content === 'string' ? obj.content : undefined;
+  return { recipient, body };
+}
+
+/**
+ * Build a PreToolUse hook that intercepts `SendMessage` to recipient "omni"
+ * and routes the message through NATS to the omni reply path.
+ *
+ * Mirrors `handleDoneTool`'s text-action publish so agents can use a single
+ * messaging interface (`SendMessage`) regardless of executor transport.
+ *
+ * Behavior:
+ * - tool_name !== 'SendMessage' → no decision (handler chain continues)
+ * - recipient !== 'omni'         → no decision (native delivery proceeds)
+ * - OMNI_INSTANCE missing in env → no decision (not bridge mode)
+ * - matched                      → publish + deny with success-equivalent reason
+ */
+export function createSendMessageOmniHook(
+  env: Record<string, string>,
+  natsPublish: NatsPublishFn | null,
+): HookCallback {
+  return async (input): Promise<SyncHookJSONOutput> => {
+    const hookInput = input as PreToolUseHookInput;
+    if (hookInput.tool_name !== 'SendMessage') return {};
+
+    const { recipient, body } = parseSendMessageInput(hookInput.tool_input);
+    if (recipient !== 'omni') return {};
+
+    const instanceId = env.OMNI_INSTANCE ?? '';
+    const chatId = env.OMNI_CHAT ?? '';
+    const agent = env.OMNI_AGENT ?? '';
+
+    if (!instanceId || !chatId) return {};
+
+    // Reject empty/missing message bodies with an explicit error so the agent
+    // retries with a real payload — otherwise we'd publish an empty reply and
+    // the model would believe delivery succeeded.
+    if (!body || body.trim() === '') {
+      return {
+        hookSpecificOutput: {
+          hookEventName: 'PreToolUse',
+          permissionDecision: 'deny',
+          permissionDecisionReason:
+            'SendMessage(recipient: "omni") requires a non-empty `message` field. Retry with the reply text.',
+        },
+      };
+    }
+
+    if (!natsPublish) {
+      console.warn('[claude-sdk] SendMessage(to: omni) intercepted but NATS publish unavailable — message dropped');
+      return {
+        hookSpecificOutput: {
+          hookEventName: 'PreToolUse',
+          permissionDecision: 'deny',
+          permissionDecisionReason: 'Omni bridge unavailable — message could not be delivered.',
+        },
+      };
+    }
+
+    natsPublish(`omni.reply.${instanceId}.${chatId}`, buildReplyPayload(agent, chatId, instanceId, { content: body }));
+
+    return {
+      hookSpecificOutput: {
+        hookEventName: 'PreToolUse',
+        permissionDecision: 'deny',
+        permissionDecisionReason: 'Message delivered to user via omni bridge.',
+      },
+    };
+  };
+}
+
 async function createDoneMcpServer(env: Record<string, string>, natsPublish: NatsPublishFn | null) {
   const { createSdkMcpServer, tool } = await import('@anthropic-ai/claude-agent-sdk');
   return createSdkMcpServer({
@@ -350,9 +445,20 @@ export class ClaudeSdkOmniExecutor implements IExecutor {
     }
 
     const doneMcp = await createDoneMcpServer(state.env, this.natsPublish);
+    const sendMessageHooks: Partial<Record<string, HookCallbackMatcher[]>> | undefined = isTurnBased
+      ? {
+          PreToolUse: [
+            {
+              matcher: 'SendMessage',
+              hooks: [createSendMessageOmniHook(state.env, this.natsPublish)],
+            },
+          ],
+        }
+      : undefined;
     const extraOptions: Record<string, unknown> = {
       abortController: state.abortController,
       mcpServers: { 'genie-omni-tools': doneMcp },
+      ...(sendMessageHooks && { hooks: sendMessageHooks }),
     };
     if (state.claudeSessionId) {
       extraOptions.resume = state.claudeSessionId;

package/src/services/executors/turn-based-prompt.ts

@@ -12,20 +12,27 @@ export function buildTurnBasedPrompt(senderName: string, instanceId: string, cha
 You are responding to a WhatsApp message from ${senderName}.
 Your context is pre-set (instance: ${instanceId}, chat: ${chatId}) — do NOT use \`omni use\` or \`omni open\`.
 
-## Available Commands
+## Reply Channels
 
-- omni say 'text' — reply with a text message
-- omni speak 'text' — reply with a voice note
-- omni imagine 'prompt' — generate and send an image
-- omni react 'emoji' --message <id> — react to a message
-- omni history — see recent messages for context
-- omni done — end your turn (REQUIRED as the last action)
+You have two equivalent ways to send a reply to the user:
+
+1. **SendMessage** (preferred): \`SendMessage(recipient: "omni", message: "your reply")\` —
+   intercepted by the omni bridge and delivered as a WhatsApp text message.
+   You may call SendMessage multiple times in one turn for multi-message replies.
+2. **omni done text='...'** — closes the turn AND sends a final text in one call.
+
+## Available Tools
+
+- SendMessage(recipient: "omni", message: '...') — send a text reply (repeatable)
+- omni done text='...' — send final text + close turn (use as the LAST action)
+- omni done react='emoji' — react instead of replying, then close turn
+- omni done media='/path' caption='...' — send media + close turn
+- omni done skip=true — close turn silently
 
 ## Rules
 
-1. Use \`omni say\` to send your response. You can send multiple messages.
-2. Use \`omni history\` to see recent messages if you need context.
-3. ALWAYS call \`omni done\` as your LAST action to close the turn.
-4. Do NOT generate bare text as your reply — it will go nowhere. Use omni say or omni done.
+1. Use \`SendMessage(recipient: "omni", ...)\` for normal text replies.
+2. ALWAYS call \`omni done\` as your LAST action to close the turn — even if you already sent SendMessage replies, call \`omni done skip=true\`.
+3. Do NOT generate bare text as your reply — it will go nowhere. Use SendMessage or omni done.
 `.trim();
 }

package/src/services/omni-bridge.ts

@@ -63,6 +63,12 @@ interface SessionEntry {
   spawning: boolean;
   buffer: OmniMessage[];
   idleTimer: ReturnType<typeof setTimeout> | null;
+  /**
+   * Set when a reset arrives while the entry is still in the spawning state.
+   * `spawnSession` checks this flag after `executor.spawn` resolves and tears
+   * down the freshly-created session instead of putting it into rotation.
+   */
+  cancelled?: boolean;
 }
 
 export interface BridgeStatus {
@@ -263,6 +269,13 @@ export class OmniBridge {
       this.processTurnEvents(sub);
     }
 
+    // Session reset events from Omni — kill the agent's executor session when the user
+    // sends a reset token (e.g. 🗑️). Paired with omni-side publisher in
+    // automagik-dev/omni#361. Subject hierarchy: omni.session.reset.{instance}.{chat}
+    // (recursive `>` because WhatsApp chat ids contain dots).
+    const sessionResetSub = this.nc.subscribe('omni.session.reset.>');
+    this.processSessionResetEvents(sessionResetSub);
+
     // Start idle session checker
     this.idleCheckTimer = setInterval(() => this.checkIdleSessions(), IDLE_CHECK_INTERVAL_MS);
 
@@ -550,9 +563,14 @@ export class OmniBridge {
    */
   private findSessionKey(instanceId: string, chatId: string): string | undefined {
     for (const [key, entry] of this.sessions) {
-      if (entry.instanceId === instanceId && entry.session?.chatId === chatId) {
-        return key;
-      }
+      if (entry.instanceId !== instanceId) continue;
+      // Live entry — match against the spawned session's chatId.
+      if (entry.session?.chatId === chatId) return key;
+      // Spawning entry — session is null, so match against the map key suffix
+      // (`${agent}:${chatId}`). Without this fallback, a reset arriving in the
+      // narrow window between placeholder insertion and spawn completion would
+      // be misclassified as a cold chat and ignored.
+      if (entry.spawning && key.endsWith(`:${chatId}`)) return key;
     }
     return undefined;
   }
@@ -570,6 +588,93 @@ export class OmniBridge {
     }
   }
 
+  /**
+   * Process incoming session reset events from NATS.
+   *
+   * Subject shape: `omni.session.reset.{instanceId}.{chatId}` — chatId may
+   * contain dots (WhatsApp ids look like `+5511...@s.whatsapp.net`), so we
+   * splice from index 4 onward.
+   *
+   * Payload is best-effort: malformed JSON is tolerated and treated as `{}`,
+   * because the routing decision lives in the subject, not the body. The
+   * `action` field is read for observability only — the only behavior today
+   * is "kill the session".
+   */
+  private async processSessionResetEvents(sub: Subscription): Promise<void> {
+    for await (const msg of sub) {
+      try {
+        const parts = msg.subject.split('.');
+        if (parts.length < 5) {
+          console.warn(`[omni-bridge] Malformed session-reset subject: ${msg.subject}`);
+          continue;
+        }
+        const instanceId = parts[3];
+        const chatId = parts.slice(4).join('.');
+
+        let action: string | undefined;
+        try {
+          const payload = JSON.parse(this.sc.decode(msg.data)) as { action?: string };
+          action = payload.action;
+        } catch {
+          // Malformed/empty payload — proceed with subject-only routing.
+        }
+
+        await this.handleSessionReset(instanceId, chatId, action);
+      } catch (err) {
+        console.warn('[omni-bridge] Error processing session reset event:', err);
+      }
+    }
+  }
+
+  /**
+   * Handle a session reset request — evict the session and shut down the executor.
+   *
+   * Defensive: no-op when the session is unknown (cold chat), so a user can
+   * tap reset on a chat that has no live agent without producing an error.
+   *
+   * Mirrors `handleTurnTimeout`'s cleanup so the session map, idle timer, and
+   * executor stay coherent.
+   */
+  private async handleSessionReset(instanceId: string, chatId: string, action?: string): Promise<void> {
+    const sessionKey = this.findSessionKey(instanceId, chatId);
+    if (!sessionKey) {
+      // Cold chat — nothing to reset, but acknowledge in logs for traceability.
+      console.log(`[omni-bridge] Session reset for cold chat ${instanceId}/${chatId} — no-op`);
+      return;
+    }
+
+    const entry = this.sessions.get(sessionKey);
+    if (!entry) return;
+
+    const actionTag = action ? ` (action=${action})` : '';
+
+    // Spawning sessions: we cannot interrupt the in-flight executor.spawn call,
+    // but we can flag the entry so spawnSession tears down the freshly-created
+    // session as soon as the await resolves. The placeholder is removed from
+    // the map immediately so subsequent messages spawn a fresh session.
+    if (entry.spawning) {
+      console.log(`[omni-bridge] Session reset for spawning ${sessionKey}${actionTag}, marking cancelled`);
+      entry.cancelled = true;
+      entry.buffer = []; // Drop buffered messages — user explicitly reset.
+      this.turnTracker.close(sessionKey, 'reset');
+      this.removeSession(sessionKey);
+      await this.drainQueue();
+      return;
+    }
+
+    if (!entry.session) return;
+
+    console.log(`[omni-bridge] Session reset for ${sessionKey}${actionTag}, evicting`);
+    this.turnTracker.close(sessionKey, 'reset');
+    try {
+      await this.executor.shutdown(entry.session);
+    } catch (err) {
+      console.warn(`[omni-bridge] Error shutting down reset session ${sessionKey}:`, err);
+    }
+    this.removeSession(sessionKey);
+    await this.drainQueue();
+  }
+
   /**
    * Handle a turn timeout event — evict the session and shut down the executor.
    */
@@ -667,6 +772,19 @@ export class OmniBridge {
       console.log(`[omni-bridge] Spawning session for ${key}...`);
       const session = await this.executor.spawn(message.agent, message.chatId, spawnEnv);
 
+      // Reset arrived while spawn was in flight — tear down the freshly-created
+      // session and bail. The placeholder was already removed from the map by
+      // handleSessionReset, so we don't need to clean it up here.
+      if (placeholder.cancelled) {
+        console.log(`[omni-bridge] Spawn for ${key} completed but was cancelled by reset, shutting down`);
+        try {
+          await this.executor.shutdown(session);
+        } catch (err) {
+          console.warn(`[omni-bridge] Error shutting down cancelled spawn for ${key}:`, err);
+        }
+        return;
+      }
+
       placeholder.session = session;
       placeholder.spawning = false;