Merge branch 'main' into feature/hybrid-search
Resolved conflicts by: - Keeping feature/hybrid-search build process documentation in CLAUDE.md - Removing deleted plugin/scripts/search-server.js (intentionally deleted in feature branch) - Removing usage logging from worker-service.ts (telemetry captured at SDK level) - Rebuilt worker-service.cjs after resolving source file conflicts 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
Alex Newman
@@ -591,8 +591,8 @@ IMPORTANT: This is not the end of the session. You will receive more requests to
|
||||
WHERE up.claude_session_id = ?
|
||||
ORDER BY up.created_at_epoch DESC
|
||||
LIMIT 1
|
||||
`).get(c);o.close(),p&&this.chromaSync.syncUserPrompt(p.id,p.sdk_session_id,p.project,p.prompt_text,p.prompt_number,p.created_at_epoch).catch(f=>{Y.failure("WORKER","Failed to sync user_prompt to Chroma",{promptId:p.id},f),process.exit(1)}),u.generatorPromise=this.runSDKAgent(u).catch(f=>{Y.failure("WORKER","SDK agent error",{sessionId:t},f);let d=new Pr;d.markSessionFailed(t),d.close(),this.sessions.delete(t)}),Y.success("WORKER","Session initialized",{sessionId:t,port:this.port}),a.json({status:"initialized",sessionDbId:t,port:this.port})}handleObservation(e,a){let t=parseInt(e.params.sessionDbId,10),{tool_name:s,tool_input:i,tool_output:n,prompt_number:o}=e.body,l=this.sessions.get(t);if(!l){let p=new Pr,f=p.getSessionById(t);p.close(),l={sessionDbId:t,claudeSessionId:f.claude_session_id,sdkSessionId:null,project:f.project,userPrompt:f.user_prompt,pendingMessages:[],abortController:new AbortController,generatorPromise:null,lastPromptNumber:0,observationCounter:0,startTime:Date.now()},this.sessions.set(t,l),l.generatorPromise=this.runSDKAgent(l).catch(d=>{Y.failure("WORKER","SDK agent error",{sessionId:t},d);let v=new Pr;v.markSessionFailed(t),v.close(),this.sessions.delete(t)})}l.observationCounter++;let c=Y.correlationId(t,l.observationCounter),u=Y.formatTool(s,i);Y.dataIn("WORKER",`Observation queued: ${u}`,{correlationId:c,queue:l.pendingMessages.length+1}),l.pendingMessages.push({type:"observation",tool_name:s,tool_input:i,tool_output:n,prompt_number:o}),a.json({status:"queued",queueLength:l.pendingMessages.length})}handleSummarize(e,a){let t=parseInt(e.params.sessionDbId,10),{prompt_number:s}=e.body,i=this.sessions.get(t);if(!i){let n=new Pr,o=n.getSessionById(t);n.close(),i={sessionDbId:t,claudeSessionId:o.claude_session_id,sdkSessionId:null,project:o.project,userPrompt:o.user_prompt,pendingMessages:[],abortController:new AbortController,generatorPromise:null,lastPromptNumber:0,observationCounter:0,startTime:Date.now()},this.sessions.set(t,i),i.generatorPromise=this.runSDKAgent(i).catch(l=>{Y.failure("WORKER","SDK agent error",{sessionId:t},l);let c=new Pr;c.markSessionFailed(t),c.close(),this.sessions.delete(t)})}Y.dataIn("WORKER","Summary requested",{sessionId:t,promptNumber:s,queue:i.pendingMessages.length+1}),i.pendingMessages.push({type:"summarize",prompt_number:s}),a.json({status:"queued",queueLength:i.pendingMessages.length})}handleStatus(e,a){let t=parseInt(e.params.sessionDbId,10),s=this.sessions.get(t);if(!s){a.status(404).json({error:"Session not found"});return}a.json({sessionDbId:t,sdkSessionId:s.sdkSessionId,project:s.project,pendingMessages:s.pendingMessages.length})}async handleDelete(e,a){let t=parseInt(e.params.sessionDbId,10),s=this.sessions.get(t);if(!s){a.status(404).json({error:"Session not found"});return}Y.warn("WORKER","Session delete requested",{sessionId:t}),s.abortController.abort(),s.generatorPromise&&await Promise.race([s.generatorPromise,new Promise(n=>setTimeout(n,5e3))]);let i=new Pr;i.markSessionFailed(t),i.close(),this.sessions.delete(t),Y.info("WORKER","Session deleted",{sessionId:t}),a.json({status:"deleted"})}async runSDKAgent(e){Y.info("SDK","Agent starting",{sessionId:e.sessionDbId});let a=V5();Y.info("SDK",`Using Claude executable: ${a}`,{sessionId:e.sessionDbId});try{let t=Ab({prompt:this.createMessageGenerator(e),options:{model:H5,disallowedTools:B5,abortController:e.abortController,pathToClaudeCodeExecutable:a}});for await(let n of t)if(n.type==="assistant"){let o=n.message.content,l=Array.isArray(o)?o.filter(u=>u.type==="text").map(u=>u.text).join(`
|
||||
`):typeof o=="string"?o:"",c=l.length;Y.dataOut("SDK",`Response received (${c} chars)`,{sessionId:e.sessionDbId,promptNumber:e.lastPromptNumber}),Y.debug("SDK","Full response",{sessionId:e.sessionDbId},l),this.handleAgentMessage(e,l,e.lastPromptNumber)}let s=Date.now()-e.startTime;Y.success("SDK","Agent completed",{sessionId:e.sessionDbId,duration:`${(s/1e3).toFixed(1)}s`});let i=new Pr;i.markSessionCompleted(e.sessionDbId),i.close(),this.sessions.delete(e.sessionDbId)}catch(t){throw t.name==="AbortError"?Y.warn("SDK","Agent aborted",{sessionId:e.sessionDbId}):Y.failure("SDK","Agent error",{sessionId:e.sessionDbId},t),t}}async*createMessageGenerator(e){let a=cw(e.project,e.claudeSessionId,e.userPrompt);for(Y.dataIn("SDK",`Init prompt sent (${a.length} chars)`,{sessionId:e.sessionDbId,claudeSessionId:e.claudeSessionId,project:e.project}),Y.debug("SDK","Full init prompt",{sessionId:e.sessionDbId},a),yield{type:"user",session_id:e.claudeSessionId,parent_tool_use_id:null,message:{role:"user",content:a}};!e.abortController.signal.aborted;){if(e.pendingMessages.length===0){await new Promise(t=>setTimeout(t,100));continue}for(;e.pendingMessages.length>0;){let t=e.pendingMessages.shift();if(t.type==="summarize"){e.lastPromptNumber=t.prompt_number;let s=new Pr,i=s.getSessionById(e.sessionDbId);s.close();let n=uw(i);Y.dataIn("SDK",`Summary prompt sent (${n.length} chars)`,{sessionId:e.sessionDbId,promptNumber:t.prompt_number}),Y.debug("SDK","Full summary prompt",{sessionId:e.sessionDbId},n),yield{type:"user",session_id:e.claudeSessionId,parent_tool_use_id:null,message:{role:"user",content:n}}}else if(t.type==="observation"){e.lastPromptNumber=t.prompt_number;let s=lw({id:0,tool_name:t.tool_name,tool_input:t.tool_input,tool_output:t.tool_output,created_at_epoch:Date.now()}),i=Y.formatTool(t.tool_name,t.tool_input),n=Y.correlationId(e.sessionDbId,e.observationCounter);Y.dataIn("SDK",`Observation prompt: ${i}`,{correlationId:n,promptNumber:t.prompt_number,size:`${s.length} chars`}),Y.debug("SDK","Full observation prompt",{correlationId:n},s),yield{type:"user",session_id:e.claudeSessionId,parent_tool_use_id:null,message:{role:"user",content:s}}}}}}handleAgentMessage(e,a,t){let s=Y.correlationId(e.sessionDbId,e.observationCounter);Y.info("PARSER",`Processing response (${a.length} chars)`,{sessionId:e.sessionDbId,promptNumber:t,preview:a.substring(0,200)});let i=pw(a,s);i.length>0&&Y.info("PARSER",`Parsed ${i.length} observation(s)`,{correlationId:s,promptNumber:t,types:i.map(l=>l.type).join(", ")});let n=new Pr;for(let l of i){let{id:c,createdAtEpoch:u}=n.storeObservation(e.claudeSessionId,e.project,l,t);Y.success("DB","Observation stored",{correlationId:s,type:l.type,title:l.title,id:c}),this.chromaSync.syncObservation(c,e.claudeSessionId,e.project,l,t,u).then(()=>{Y.success("CHROMA","Observation synced",{correlationId:s,observationId:c})}).catch(p=>{Y.error("CHROMA","Observation sync failed - crashing worker",{correlationId:s,observationId:c},p),process.exit(1)})}Y.info("PARSER","Looking for summary tags...",{sessionId:e.sessionDbId});let o=dw(a,e.sessionDbId);if(o){Y.success("PARSER","Summary parsed successfully!",{sessionId:e.sessionDbId,promptNumber:t,hasRequest:!!o.request,hasInvestigated:!!o.investigated,hasLearned:!!o.learned,hasCompleted:!!o.completed,hasNextSteps:!!o.next_steps});let{id:l,createdAtEpoch:c}=n.storeSummary(e.claudeSessionId,e.project,o,t);Y.success("DB","\u{1F4DD} SUMMARY STORED IN DATABASE",{sessionId:e.sessionDbId,promptNumber:t,id:l}),this.chromaSync.syncSummary(l,e.claudeSessionId,e.project,o,t,c).then(()=>{Y.success("CHROMA","Summary synced",{sessionId:e.sessionDbId,summaryId:l})}).catch(u=>{Y.error("CHROMA","Summary sync failed - crashing worker",{sessionId:e.sessionDbId,summaryId:l},u),process.exit(1)})}else Y.warn("PARSER","NO SUMMARY TAGS FOUND in response",{sessionId:e.sessionDbId,promptNumber:t,contentSample:a.substring(0,500)});n.close()}};async function Z5(){await new Hc().start(),process.on("SIGINT",()=>{Y.warn("SYSTEM","Shutting down (SIGINT)"),process.exit(0)}),process.on("SIGTERM",()=>{Y.warn("SYSTEM","Shutting down (SIGTERM)"),process.exit(0)})}Z5().catch(r=>{Y.failure("SYSTEM","Fatal startup error",{},r),process.exit(1)});0&&(module.exports={WorkerService});
|
||||
`).get(c);o.close(),p&&this.chromaSync.syncUserPrompt(p.id,p.sdk_session_id,p.project,p.prompt_text,p.prompt_number,p.created_at_epoch).catch(f=>{Y.failure("WORKER","Failed to sync user_prompt to Chroma",{promptId:p.id},f),process.exit(1)}),u.generatorPromise=this.runSDKAgent(u).catch(f=>{Y.failure("WORKER","SDK agent error",{sessionId:t},f);let d=new Pr;d.markSessionFailed(t),d.close(),this.sessions.delete(t)}),Y.success("WORKER","Session initialized",{sessionId:t,port:this.port}),a.json({status:"initialized",sessionDbId:t,port:this.port})}handleObservation(e,a){let t=parseInt(e.params.sessionDbId,10),{tool_name:s,tool_input:i,tool_output:n,prompt_number:o}=e.body,l=this.sessions.get(t);if(!l){let p=new Pr,f=p.getSessionById(t);p.close(),l={sessionDbId:t,claudeSessionId:f.claude_session_id,sdkSessionId:null,project:f.project,userPrompt:f.user_prompt,pendingMessages:[],abortController:new AbortController,generatorPromise:null,lastPromptNumber:0,observationCounter:0,startTime:Date.now()},this.sessions.set(t,l),l.generatorPromise=this.runSDKAgent(l).catch(d=>{Y.failure("WORKER","SDK agent error",{sessionId:t},d);let v=new Pr;v.markSessionFailed(t),v.close(),this.sessions.delete(t)})}l.observationCounter++;let c=Y.correlationId(t,l.observationCounter),u=Y.formatTool(s,i);Y.dataIn("WORKER",`Observation queued: ${u}`,{correlationId:c,queue:l.pendingMessages.length+1}),l.pendingMessages.push({type:"observation",tool_name:s,tool_input:i,tool_output:n,prompt_number:o}),a.json({status:"queued",queueLength:l.pendingMessages.length})}handleSummarize(e,a){let t=parseInt(e.params.sessionDbId,10),{prompt_number:s}=e.body,i=this.sessions.get(t);if(!i){let n=new Pr,o=n.getSessionById(t);n.close(),i={sessionDbId:t,claudeSessionId:o.claude_session_id,sdkSessionId:null,project:o.project,userPrompt:o.user_prompt,pendingMessages:[],abortController:new AbortController,generatorPromise:null,lastPromptNumber:0,observationCounter:0,startTime:Date.now()},this.sessions.set(t,i),i.generatorPromise=this.runSDKAgent(i).catch(l=>{Y.failure("WORKER","SDK agent error",{sessionId:t},l);let c=new Pr;c.markSessionFailed(t),c.close(),this.sessions.delete(t)})}Y.dataIn("WORKER","Summary requested",{sessionId:t,promptNumber:s,queue:i.pendingMessages.length+1}),i.pendingMessages.push({type:"summarize",prompt_number:s}),a.json({status:"queued",queueLength:i.pendingMessages.length})}handleStatus(e,a){let t=parseInt(e.params.sessionDbId,10),s=this.sessions.get(t);if(!s){a.status(404).json({error:"Session not found"});return}a.json({sessionDbId:t,sdkSessionId:s.sdkSessionId,project:s.project,pendingMessages:s.pendingMessages.length})}async handleDelete(e,a){let t=parseInt(e.params.sessionDbId,10),s=this.sessions.get(t);if(!s){a.status(404).json({error:"Session not found"});return}Y.warn("WORKER","Session delete requested",{sessionId:t}),s.abortController.abort(),s.generatorPromise&&await Promise.race([s.generatorPromise,new Promise(n=>setTimeout(n,5e3))]);let i=new Pr;i.markSessionFailed(t),i.close(),this.sessions.delete(t),Y.info("WORKER","Session deleted",{sessionId:t}),a.json({status:"deleted"})}async runSDKAgent(e){Y.info("SDK","Agent starting",{sessionId:e.sessionDbId});let a=V5();Y.info("SDK",`Using Claude executable: ${a}`,{sessionId:e.sessionDbId});try{let t=Ab({prompt:this.createMessageGenerator(e),options:{model:H5,disallowedTools:B5,abortController:e.abortController,pathToClaudeCodeExecutable:a}});for await(let n of t){if(n.type==="assistant"){let o=n.message.content,l=Array.isArray(o)?o.filter(u=>u.type==="text").map(u=>u.text).join(`
|
||||
`):typeof o=="string"?o:"",c=l.length;Y.dataOut("SDK",`Response received (${c} chars)`,{sessionId:e.sessionDbId,promptNumber:e.lastPromptNumber}),Y.debug("SDK","Full response",{sessionId:e.sessionDbId},l),this.handleAgentMessage(e,l,e.lastPromptNumber)}n.type==="result"&&n.subtype}let s=Date.now()-e.startTime;Y.success("SDK","Agent completed",{sessionId:e.sessionDbId,duration:`${(s/1e3).toFixed(1)}s`});let i=new Pr;i.markSessionCompleted(e.sessionDbId),i.close(),this.sessions.delete(e.sessionDbId)}catch(t){throw t.name==="AbortError"?Y.warn("SDK","Agent aborted",{sessionId:e.sessionDbId}):Y.failure("SDK","Agent error",{sessionId:e.sessionDbId},t),t}}async*createMessageGenerator(e){let a=cw(e.project,e.claudeSessionId,e.userPrompt);for(Y.dataIn("SDK",`Init prompt sent (${a.length} chars)`,{sessionId:e.sessionDbId,claudeSessionId:e.claudeSessionId,project:e.project}),Y.debug("SDK","Full init prompt",{sessionId:e.sessionDbId},a),yield{type:"user",session_id:e.claudeSessionId,parent_tool_use_id:null,message:{role:"user",content:a}};!e.abortController.signal.aborted;){if(e.pendingMessages.length===0){await new Promise(t=>setTimeout(t,100));continue}for(;e.pendingMessages.length>0;){let t=e.pendingMessages.shift();if(t.type==="summarize"){e.lastPromptNumber=t.prompt_number;let s=new Pr,i=s.getSessionById(e.sessionDbId);s.close();let n=uw(i);Y.dataIn("SDK",`Summary prompt sent (${n.length} chars)`,{sessionId:e.sessionDbId,promptNumber:t.prompt_number}),Y.debug("SDK","Full summary prompt",{sessionId:e.sessionDbId},n),yield{type:"user",session_id:e.claudeSessionId,parent_tool_use_id:null,message:{role:"user",content:n}}}else if(t.type==="observation"){e.lastPromptNumber=t.prompt_number;let s=lw({id:0,tool_name:t.tool_name,tool_input:t.tool_input,tool_output:t.tool_output,created_at_epoch:Date.now()}),i=Y.formatTool(t.tool_name,t.tool_input),n=Y.correlationId(e.sessionDbId,e.observationCounter);Y.dataIn("SDK",`Observation prompt: ${i}`,{correlationId:n,promptNumber:t.prompt_number,size:`${s.length} chars`}),Y.debug("SDK","Full observation prompt",{correlationId:n},s),yield{type:"user",session_id:e.claudeSessionId,parent_tool_use_id:null,message:{role:"user",content:s}}}}}}handleAgentMessage(e,a,t){let s=Y.correlationId(e.sessionDbId,e.observationCounter);Y.info("PARSER",`Processing response (${a.length} chars)`,{sessionId:e.sessionDbId,promptNumber:t,preview:a.substring(0,200)});let i=pw(a,s);i.length>0&&Y.info("PARSER",`Parsed ${i.length} observation(s)`,{correlationId:s,promptNumber:t,types:i.map(l=>l.type).join(", ")});let n=new Pr;for(let l of i){let{id:c,createdAtEpoch:u}=n.storeObservation(e.claudeSessionId,e.project,l,t);Y.success("DB","Observation stored",{correlationId:s,type:l.type,title:l.title,id:c}),this.chromaSync.syncObservation(c,e.claudeSessionId,e.project,l,t,u).then(()=>{Y.success("CHROMA","Observation synced",{correlationId:s,observationId:c})}).catch(p=>{Y.error("CHROMA","Observation sync failed - crashing worker",{correlationId:s,observationId:c},p),process.exit(1)})}Y.info("PARSER","Looking for summary tags...",{sessionId:e.sessionDbId});let o=dw(a,e.sessionDbId);if(o){Y.success("PARSER","Summary parsed successfully!",{sessionId:e.sessionDbId,promptNumber:t,hasRequest:!!o.request,hasInvestigated:!!o.investigated,hasLearned:!!o.learned,hasCompleted:!!o.completed,hasNextSteps:!!o.next_steps});let{id:l,createdAtEpoch:c}=n.storeSummary(e.claudeSessionId,e.project,o,t);Y.success("DB","\u{1F4DD} SUMMARY STORED IN DATABASE",{sessionId:e.sessionDbId,promptNumber:t,id:l}),this.chromaSync.syncSummary(l,e.claudeSessionId,e.project,o,t,c).then(()=>{Y.success("CHROMA","Summary synced",{sessionId:e.sessionDbId,summaryId:l})}).catch(u=>{Y.error("CHROMA","Summary sync failed - crashing worker",{sessionId:e.sessionDbId,summaryId:l},u),process.exit(1)})}else Y.warn("PARSER","NO SUMMARY TAGS FOUND in response",{sessionId:e.sessionDbId,promptNumber:t,contentSample:a.substring(0,500)});n.close()}};async function Z5(){await new Hc().start(),process.on("SIGINT",()=>{Y.warn("SYSTEM","Shutting down (SIGINT)"),process.exit(0)}),process.on("SIGTERM",()=>{Y.warn("SYSTEM","Shutting down (SIGTERM)"),process.exit(0)})}Z5().catch(r=>{Y.failure("SYSTEM","Fatal startup error",{},r),process.exit(1)});0&&(module.exports={WorkerService});
|
||||
/*! Bundled license information:
|
||||
|
||||
depd/index.js:
|
||||
|
||||
Reference in New Issue
Block a user