airkjw/claude-mem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
f837a9eb77348d23eb79e4a0502b9425a7319f38
claude-mem/plugin/scripts/new-hook.js
T
bigphoot f837a9eb77 feat: multi-turn conversations and Claude fallback for Gemini provider 
Major improvements to Gemini provider:

**Shared Conversation History**
- Add ConversationMessage interface for provider-agnostic history
- Both Claude and Gemini agents read/write shared conversationHistory
- Context persists across provider switches via claudeSessionId linkage

**Multi-Turn Gemini API**
- Replace stateless single-query with full conversation context
- queryGeminiMultiTurn() sends entire history for coherent responses
- Maps 'assistant' role to 'model' for Gemini API compatibility

**Automatic Fallback to Claude**
- Detect rate limits (429), server errors (5xx), network failures
- Fall back to Claude SDK when Gemini API fails
- Reset 'processing' messages to 'pending' before fallback

**Mid-Session Provider Switching**
- Track currentProvider on ActiveSession
- Provider changes take effect after current generator finishes
- Avoids race conditions from aborting active generators

Files changed:
- worker-types.ts: Add ConversationMessage, currentProvider tracking
- GeminiAgent.ts: Multi-turn queries, fallback logic
- SDKAgent.ts: Capture messages to shared history
- SessionManager.ts: Initialize new session fields
- SessionRoutes.ts: Provider selection and switching logic
- worker-service.ts: Wire up fallback agent dependency

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
2025-12-24 11:03:14 -08:00

29 lines
16 KiB
JavaScript
Executable File
Raw Blame History

#!/usr/bin/env bun
import{stdin as J}from"process";var M=JSON.stringify({continue:!0,suppressOutput:!0});import w from"path";import{homedir as dt}from"os";import{spawnSync as _t}from"child_process";import{existsSync as St,writeFileSync as ht,readFileSync as Tt,mkdirSync as Ot}from"fs";import{readFileSync as Q,writeFileSync as Z,existsSync as tt}from"fs";import{join as et}from"path";import{homedir as rt}from"os";var N="bugfix,feature,refactor,discovery,decision,change",x="how-it-works,why-it-exists,what-changed,problem-solution,gotcha,pattern,trade-off";var p=class{static DEFAULTS={CLAUDE_MEM_MODEL:"claude-sonnet-4-5",CLAUDE_MEM_CONTEXT_OBSERVATIONS:"50",CLAUDE_MEM_WORKER_PORT:"37777",CLAUDE_MEM_WORKER_HOST:"127.0.0.1",CLAUDE_MEM_SKIP_TOOLS:"ListMcpResourcesTool,SlashCommand,Skill,TodoWrite,AskUserQuestion",CLAUDE_MEM_PROVIDER:"claude",CLAUDE_MEM_GEMINI_API_KEY:"",CLAUDE_MEM_GEMINI_MODEL:"gemini-2.0-flash-exp",CLAUDE_MEM_DATA_DIR:et(rt(),".claude-mem"),CLAUDE_MEM_LOG_LEVEL:"INFO",CLAUDE_MEM_PYTHON_VERSION:"3.13",CLAUDE_CODE_PATH:"",CLAUDE_MEM_MODE:"code",CLAUDE_MEM_CONTEXT_SHOW_READ_TOKENS:"true",CLAUDE_MEM_CONTEXT_SHOW_WORK_TOKENS:"true",CLAUDE_MEM_CONTEXT_SHOW_SAVINGS_AMOUNT:"true",CLAUDE_MEM_CONTEXT_SHOW_SAVINGS_PERCENT:"true",CLAUDE_MEM_CONTEXT_OBSERVATION_TYPES:N,CLAUDE_MEM_CONTEXT_OBSERVATION_CONCEPTS:x,CLAUDE_MEM_CONTEXT_FULL_COUNT:"5",CLAUDE_MEM_CONTEXT_FULL_FIELD:"narrative",CLAUDE_MEM_CONTEXT_SESSION_COUNT:"10",CLAUDE_MEM_CONTEXT_SHOW_LAST_SUMMARY:"true",CLAUDE_MEM_CONTEXT_SHOW_LAST_MESSAGE:"false"};static getAllDefaults(){return{...this.DEFAULTS}}static get(t){return this.DEFAULTS[t]}static getInt(t){let e=this.get(t);return parseInt(e,10)}static getBool(t){return this.get(t)==="true"}static loadFromFile(t){try{if(!tt(t))return this.getAllDefaults();let e=Q(t,"utf-8"),r=JSON.parse(e),n=r;if(r.env&&typeof r.env=="object"){n=r.env;try{Z(t,JSON.stringify(n,null,2),"utf-8"),l.info("SETTINGS","Migrated settings file from nested to flat schema",{settingsPath:t})}catch(i){l.warn("SETTINGS","Failed to auto-migrate settings file",{settingsPath:t},i)}}let s={...this.DEFAULTS};for(let i of Object.keys(this.DEFAULTS))n[i]!==void 0&&(s[i]=n[i]);return s}catch(e){return l.warn("SETTINGS","Failed to load settings, using defaults",{settingsPath:t},e),this.getAllDefaults()}}};var C=(s=>(s[s.DEBUG=0]="DEBUG",s[s.INFO=1]="INFO",s[s.WARN=2]="WARN",s[s.ERROR=3]="ERROR",s[s.SILENT=4]="SILENT",s))(C||{}),L=class{level=null;useColor;constructor(){this.useColor=process.stdout.isTTY??!1}getLevel(){if(this.level===null){let t=p.get("CLAUDE_MEM_LOG_LEVEL").toUpperCase();this.level=C[t]??1}return this.level}correlationId(t,e){return`obs-${t}-${e}`}sessionId(t){return`session-${t}`}formatData(t){if(t==null)return"";if(typeof t=="string")return t;if(typeof t=="number"||typeof t=="boolean")return t.toString();if(typeof t=="object"){if(t instanceof Error)return this.getLevel()===0?`${t.message}
${t.stack}`:t.message;if(Array.isArray(t))return`[${t.length} items]`;let e=Object.keys(t);return e.length===0?"{}":e.length<=3?JSON.stringify(t):`{${e.length} keys: ${e.slice(0,3).join(", ")}...}`}return String(t)}formatTool(t,e){if(!e)return t;let r=typeof e=="string"?JSON.parse(e):e;if(t==="Bash"&&r.command)return`${t}(${r.command})`;if(r.file_path)return`${t}(${r.file_path})`;if(r.notebook_path)return`${t}(${r.notebook_path})`;if(t==="Glob"&&r.pattern)return`${t}(${r.pattern})`;if(t==="Grep"&&r.pattern)return`${t}(${r.pattern})`;if(r.url)return`${t}(${r.url})`;if(r.query)return`${t}(${r.query})`;if(t==="Task"){if(r.subagent_type)return`${t}(${r.subagent_type})`;if(r.description)return`${t}(${r.description})`}return t==="Skill"&&r.skill?`${t}(${r.skill})`:t==="LSP"&&r.operation?`${t}(${r.operation})`:t}formatTimestamp(t){let e=t.getFullYear(),r=String(t.getMonth()+1).padStart(2,"0"),n=String(t.getDate()).padStart(2,"0"),s=String(t.getHours()).padStart(2,"0"),i=String(t.getMinutes()).padStart(2,"0"),a=String(t.getSeconds()).padStart(2,"0"),c=String(t.getMilliseconds()).padStart(3,"0");return`${e}-${r}-${n} ${s}:${i}:${a}.${c}`}log(t,e,r,n,s){if(t<this.getLevel())return;let i=this.formatTimestamp(new Date),a=C[t].padEnd(5),c=e.padEnd(6),u="";n?.correlationId?u=`[${n.correlationId}] `:n?.sessionId&&(u=`[session-${n.sessionId}] `);let E="";s!=null&&(this.getLevel()===0&&typeof s=="object"?E=`
`+JSON.stringify(s,null,2):E=" "+this.formatData(s));let m="";if(n){let{sessionId:O,sdkSessionId:Lt,correlationId:Pt,...U}=n;Object.keys(U).length>0&&(m=` {${Object.entries(U).map(([q,z])=>`${q}=${z}`).join(", ")}}`)}let _=`[${i}] [${a}] [${c}] ${u}${r}${m}${E}`;t===3?console.error(_):console.log(_)}debug(t,e,r,n){this.log(0,t,e,r,n)}info(t,e,r,n){this.log(1,t,e,r,n)}warn(t,e,r,n){this.log(2,t,e,r,n)}error(t,e,r,n){this.log(3,t,e,r,n)}dataIn(t,e,r,n){this.info(t,`\u2192 ${e}`,r,n)}dataOut(t,e,r,n){this.info(t,`\u2190 ${e}`,r,n)}success(t,e,r,n){this.info(t,`\u2713 ${e}`,r,n)}failure(t,e,r,n){this.error(t,`\u2717 ${e}`,r,n)}timing(t,e,r,n){this.info(t,`\u23F1 ${e}`,n,{duration:`${r}ms`})}happyPathError(t,e,r,n,s=""){let u=((new Error().stack||"").split(`
`)[2]||"").match(/at\s+(?:.*\s+)?\(?([^:]+):(\d+):(\d+)\)?/),E=u?`${u[1].split("/").pop()}:${u[2]}`:"unknown",m={...r,location:E};return this.warn(t,`[HAPPY-PATH] ${e}`,m,n),s}},l=new L;var D={DEFAULT:5e3,HEALTH_CHECK:1e3,WORKER_STARTUP_WAIT:1e3,WORKER_STARTUP_RETRIES:15,PRE_RESTART_SETTLE_DELAY:2e3,WINDOWS_MULTIPLIER:1.5};function P(o){return process.platform==="win32"?Math.round(o*D.WINDOWS_MULTIPLIER):o}import{existsSync as I,readFileSync as ut,writeFileSync as lt,unlinkSync as pt,mkdirSync as j}from"fs";import{createWriteStream as gt}from"fs";import{join as h}from"path";import{spawn as ft,spawnSync as mt}from"child_process";import{homedir as Et}from"os";import{join as f,dirname as nt,basename as jt}from"path";import{homedir as st}from"os";import{fileURLToPath as ot}from"url";function it(){return typeof __dirname<"u"?__dirname:nt(ot(import.meta.url))}var Xt=it(),g=p.get("CLAUDE_MEM_DATA_DIR"),b=process.env.CLAUDE_CONFIG_DIR||f(st(),".claude"),Yt=f(g,"archives"),Jt=f(g,"logs"),qt=f(g,"trash"),zt=f(g,"backups"),Qt=f(g,"modes"),Zt=f(g,"settings.json"),te=f(g,"claude-mem.db"),ee=f(g,"vector-db"),re=f(b,"settings.json"),ne=f(b,"commands"),se=f(b,"CLAUDE.md");import{spawnSync as at}from"child_process";import{existsSync as ct}from"fs";import{join as W}from"path";import{homedir as F}from"os";function R(){let o=process.platform==="win32";try{if(at("bun",["--version"],{encoding:"utf-8",stdio:["pipe","pipe","pipe"],shell:!1}).status===0)return"bun"}catch{}let t=o?[W(F(),".bun","bin","bun.exe")]:[W(F(),".bun","bin","bun"),"/usr/local/bin/bun","/opt/homebrew/bin/bun","/home/linuxbrew/.linuxbrew/bin/bun"];for(let e of t)if(ct(e))return e;return null}function H(){return R()!==null}var S=h(g,"worker.pid"),K=h(g,"logs"),k=h(Et(),".claude","plugins","marketplaces","thedotmack"),T=class{static async start(t){if(isNaN(t)||t<1024||t>65535)return{success:!1,error:`Invalid port ${t}. Must be between 1024 and 65535`};if(await this.isRunning())return{success:!0,pid:this.getPidInfo()?.pid};j(K,{recursive:!0});let e=process.platform==="win32"?"worker-wrapper.cjs":"worker-service.cjs",r=h(k,"plugin","scripts",e);if(!I(r))return{success:!1,error:`Worker script not found at ${r}`};let n=this.getLogFilePath();return this.startWithBun(r,n,t)}static isBunAvailable(){return H()}static escapePowerShellString(t){return t.replace(/'/g,"''")}static async startWithBun(t,e,r){let n=R();if(!n)return{success:!1,error:"Bun is required but not found in PATH or common installation paths. Install from https://bun.sh"};try{if(process.platform==="win32"){let i=this.escapePowerShellString(n),a=this.escapePowerShellString(t),c=this.escapePowerShellString(k),u=this.escapePowerShellString(e),m=`${`$env:CLAUDE_MEM_WORKER_PORT='${r}'`}; Start-Process -FilePath '${i}' -ArgumentList '${a}' -WorkingDirectory '${c}' -WindowStyle Hidden -RedirectStandardOutput '${u}' -RedirectStandardError '${u}.err' -PassThru | Select-Object -ExpandProperty Id`,_=mt("powershell",["-Command",m],{stdio:"pipe",timeout:1e4,windowsHide:!0});if(_.status!==0)return{success:!1,error:`PowerShell spawn failed: ${_.stderr?.toString()||"unknown error"}`};let O=parseInt(_.stdout.toString().trim(),10);return isNaN(O)?{success:!1,error:"Failed to get PID from PowerShell"}:(this.writePidFile({pid:O,port:r,startedAt:new Date().toISOString(),version:process.env.npm_package_version||"unknown"}),this.waitForHealth(O,r))}else{let i=ft(n,[t],{detached:!0,stdio:["ignore","pipe","pipe"],env:{...process.env,CLAUDE_MEM_WORKER_PORT:String(r)},cwd:k}),a=gt(e,{flags:"a"});return i.stdout?.pipe(a),i.stderr?.pipe(a),i.unref(),i.pid?(this.writePidFile({pid:i.pid,port:r,startedAt:new Date().toISOString(),version:process.env.npm_package_version||"unknown"}),this.waitForHealth(i.pid,r)):{success:!1,error:"Failed to get PID from spawned process"}}}catch(s){return{success:!1,error:s instanceof Error?s.message:String(s)}}}static async stop(t=5e3){let e=this.getPidInfo();if(process.platform==="win32"){let r=e?.port??this.getPortFromSettings();if(await this.tryHttpShutdown(r))return this.removePidFile(),!0;if(!e)return!0;let{execSync:s}=await import("child_process");try{s(`taskkill /PID ${e.pid} /T /F`,{timeout:1e4,stdio:"ignore"})}catch{}try{await this.waitForExit(e.pid,t)}catch{}return this.isProcessAlive(e.pid)||this.removePidFile(),!0}else{if(!e)return!0;try{process.kill(e.pid,"SIGTERM"),await this.waitForExit(e.pid,t)}catch{try{process.kill(e.pid,"SIGKILL")}catch{}}return this.removePidFile(),!0}}static async restart(t){return await this.stop(),this.start(t)}static async status(){let t=this.getPidInfo();if(!t)return{running:!1};let e=this.isProcessAlive(t.pid);return{running:e,pid:e?t.pid:void 0,port:e?t.port:void 0,uptime:e?this.formatUptime(t.startedAt):void 0}}static async isRunning(){let t=this.getPidInfo();if(!t)return!1;let e=this.isProcessAlive(t.pid);return e||this.removePidFile(),e}static getPortFromSettings(){try{let t=h(g,"settings.json"),e=p.loadFromFile(t);return parseInt(e.CLAUDE_MEM_WORKER_PORT,10)}catch{return parseInt(p.get("CLAUDE_MEM_WORKER_PORT"),10)}}static async tryHttpShutdown(t){try{return(await fetch(`http://127.0.0.1:${t}/api/admin/shutdown`,{method:"POST",signal:AbortSignal.timeout(2e3)})).ok?await this.waitForWorkerDown(t,5e3):!1}catch{return!1}}static async waitForWorkerDown(t,e){let r=Date.now();for(;Date.now()-r<e;)try{await fetch(`http://127.0.0.1:${t}/api/health`,{signal:AbortSignal.timeout(500)}),await new Promise(n=>setTimeout(n,100))}catch{return!0}return!1}static getPidInfo(){try{if(!I(S))return null;let t=ut(S,"utf-8"),e=JSON.parse(t);return typeof e.pid!="number"||typeof e.port!="number"?(logger.warn("PROCESS","Malformed PID file: missing or invalid pid/port fields",{},{parsed:e}),null):e}catch(t){return logger.warn("PROCESS","Failed to read PID file",{},{error:t instanceof Error?t.message:String(t),path:S}),null}}static writePidFile(t){j(g,{recursive:!0}),lt(S,JSON.stringify(t,null,2))}static removePidFile(){try{I(S)&&pt(S)}catch{}}static isProcessAlive(t){try{return process.kill(t,0),!0}catch{return!1}}static async waitForHealth(t,e,r=1e4){let n=Date.now(),s=process.platform==="win32",i=s?r*2:r;for(;Date.now()-n<i;){if(!this.isProcessAlive(t))return{success:!1,error:s?`Process died during startup
Troubleshooting:
1. Check Task Manager for zombie 'bun.exe' or 'node.exe' processes
2. Verify port ${e} is not in use: netstat -ano | findstr ${e}
3. Check worker logs in ~/.claude-mem/logs/
4. See GitHub issues: #363, #367, #371, #373
5. Docs: https://docs.claude-mem.ai/troubleshooting/windows-issues`:"Process died during startup"};try{if((await fetch(`http://127.0.0.1:${e}/api/readiness`,{signal:AbortSignal.timeout(1e3)})).ok)return{success:!0,pid:t}}catch{}await new Promise(c=>setTimeout(c,200))}return{success:!1,error:s?`Worker failed to start on Windows (readiness check timed out after ${i}ms)
Troubleshooting:
1. Check Task Manager for zombie 'bun.exe' or 'node.exe' processes
2. Verify port ${e} is not in use: netstat -ano | findstr ${e}
3. Check worker logs in ~/.claude-mem/logs/
4. See GitHub issues: #363, #367, #371, #373
5. Docs: https://docs.claude-mem.ai/troubleshooting/windows-issues`:`Readiness check timed out after ${i}ms`}}static async waitForExit(t,e){let r=Date.now();for(;Date.now()-r<e;){if(!this.isProcessAlive(t))return;await new Promise(n=>setTimeout(n,100))}throw new Error("Process did not exit within timeout")}static getLogFilePath(){let t=new Date().toISOString().slice(0,10);return h(K,`worker-${t}.log`)}static formatUptime(t){let e=new Date(t).getTime(),n=Date.now()-e,s=Math.floor(n/1e3),i=Math.floor(s/60),a=Math.floor(i/60),c=Math.floor(a/24);return c>0?`${c}d ${a%24}h`:a>0?`${a}h ${i%60}m`:i>0?`${i}m ${s%60}s`:`${s}s`}};function y(o={}){let{port:t,includeSkillFallback:e=!1,customPrefix:r,actualError:n}=o,s=r||"Worker service connection failed.",i=t?` (port ${t})`:"",a=`${s}${i}
`;return a+=`To restart the worker:
`,a+=`1. Exit Claude Code completely
`,a+=`2. Run: claude-mem restart
`,a+="3. Restart Claude Code",e&&(a+=`
If that doesn't work, try: /troubleshoot`),n&&(a=`Worker Error: ${n}
${a}`),a}var B=w.join(dt(),".claude","plugins","marketplaces","thedotmack"),V=P(D.HEALTH_CHECK),A=null;function d(){if(A!==null)return A;let o=w.join(p.get("CLAUDE_MEM_DATA_DIR"),"settings.json"),t=p.loadFromFile(o);return A=parseInt(t.CLAUDE_MEM_WORKER_PORT,10),A}async function v(){let o=d();return(await fetch(`http://127.0.0.1:${o}/api/readiness`,{signal:AbortSignal.timeout(V)})).ok}function Dt(){let o=w.join(B,"package.json");return JSON.parse(Tt(o,"utf-8")).version}async function At(){let o=d(),t=await fetch(`http://127.0.0.1:${o}/api/version`,{signal:AbortSignal.timeout(V)});if(!t.ok)throw new Error(`Failed to get worker version: ${t.status}`);return(await t.json()).version}async function G(){let o=Dt(),t=await At();if(o!==t&&(l.info("SYSTEM","Worker version mismatch detected - restarting worker",{pluginVersion:o,workerVersion:t}),await new Promise(e=>setTimeout(e,P(D.PRE_RESTART_SETTLE_DELAY))),await T.restart(d()),await new Promise(e=>setTimeout(e,1e3)),!await v()))throw new Error(`Worker failed to restart after version mismatch. Expected ${o}, was running ${t}`)}async function wt(){let o=p.get("CLAUDE_MEM_DATA_DIR"),t=w.join(o,".pm2-migrated");Ot(o,{recursive:!0}),St(t)||(_t("pm2",["delete","claude-mem-worker"],{stdio:"ignore"}),ht(t,new Date().toISOString(),"utf-8"),l.debug("SYSTEM","PM2 cleanup completed and marked"));let e=d(),r=await T.start(e);return r.success||l.error("SYSTEM","Failed to start worker",{platform:process.platform,port:e,error:r.error,marketplaceRoot:B}),r.success}async function X(){let o=!1;try{o=await v()}catch{o=!1}if(o){await G();return}if(!await wt()){let r=d();throw new Error(y({port:r,customPrefix:`Worker service failed to start on port ${r}.`}))}for(let r=0;r<5;r++){await new Promise(n=>setTimeout(n,500));try{if(await v()){await G();return}}catch{}}let e=d();throw l.error("SYSTEM","Worker started but not responding to health checks"),new Error(y({port:e,customPrefix:`Worker service started but is not responding on port ${e}.`}))}import Mt from"path";function Y(o){if(!o||o.trim()==="")return l.warn("PROJECT_NAME","Empty cwd provided, using fallback",{cwd:o}),"unknown-project";let t=Mt.basename(o);if(t===""){if(process.platform==="win32"){let r=o.match(/^([A-Z]):\\/i);if(r){let s=`drive-${r[1].toUpperCase()}`;return l.info("PROJECT_NAME","Drive root detected",{cwd:o,projectName:s}),s}}return l.warn("PROJECT_NAME","Root directory detected, using fallback",{cwd:o}),"unknown-project"}return t}async function Ct(o){if(await X(),!o)throw new Error("newHook requires input");let{session_id:t,cwd:e,prompt:r}=o,n=Y(e),s=d(),i=await fetch(`http://127.0.0.1:${s}/api/sessions/init`,{method:"POST",headers:{"Content-Type":"application/json"},body:JSON.stringify({claudeSessionId:t,project:n,prompt:r}),signal:AbortSignal.timeout(5e3)});if(!i.ok)throw new Error(`Session initialization failed: ${i.status}`);let a=await i.json(),c=a.sessionDbId,u=a.promptNumber;if(a.skipped&&a.reason==="private"){console.error(`[new-hook] Session ${c}, prompt #${u} (fully private - skipped)`),console.log(M);return}console.error(`[new-hook] Session ${c}, prompt #${u}`);let E=r.startsWith("/")?r.substring(1):r,m=await fetch(`http://127.0.0.1:${s}/sessions/${c}/init`,{method:"POST",headers:{"Content-Type":"application/json"},body:JSON.stringify({userPrompt:E,promptNumber:u}),signal:AbortSignal.timeout(5e3)});if(!m.ok)throw new Error(`SDK agent start failed: ${m.status}`);console.log(M)}var $="";J.on("data",o=>$+=o);J.on("end",async()=>{let o;try{o=$?JSON.parse($):void 0}catch(t){throw new Error(`Failed to parse hook input: ${t instanceof Error?t.message:String(t)}`)}await Ct(o)});
Reference in New Issue View Git Blame Copy Permalink