bb0508d639
- Updated multiple hooks (context-hook, new-hook, save-hook, summary-hook, user-message-hook) to throw errors using `getWorkerRestartInstructions` for improved user guidance on worker connection issues. - Enhanced `handleWorkerError` function to utilize the new error message generator for consistent error reporting. - Modified `ensureWorkerRunning` function to provide detailed instructions based on the worker's state, including port information. - Introduced `getWorkerRestartInstructions` utility in `error-messages.ts` to generate platform-aware error messages for worker failures.
15 lines
12 KiB
JavaScript
Executable File
15 lines
12 KiB
JavaScript
Executable File
#!/usr/bin/env bun
|
|
import{stdin as y}from"process";import A from"path";import{homedir as mt}from"os";import{spawnSync as dt}from"child_process";import{existsSync as St,writeFileSync as H,readFileSync as Tt}from"fs";import{readFileSync as J,writeFileSync as q,existsSync as Q}from"fs";import{join as z}from"path";import{homedir as Z}from"os";var X=["bugfix","feature","refactor","discovery","decision","change"],Y=["how-it-works","why-it-exists","what-changed","problem-solution","gotcha","pattern","trade-off"];var v=X.join(","),U=Y.join(",");var l=class{static DEFAULTS={CLAUDE_MEM_MODEL:"claude-haiku-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_DATA_DIR:z(Z(),".claude-mem"),CLAUDE_MEM_LOG_LEVEL:"INFO",CLAUDE_MEM_PYTHON_VERSION:"3.13",CLAUDE_CODE_PATH:"",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:v,CLAUDE_MEM_CONTEXT_OBSERVATION_CONCEPTS:U,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){if(!Q(t))return this.getAllDefaults();let e=J(t,"utf-8"),n=JSON.parse(e),r=n;if(n.env&&typeof n.env=="object"){r=n.env;try{q(t,JSON.stringify(r,null,2),"utf-8"),c.info("SETTINGS","Migrated settings file from nested to flat schema",{settingsPath:t})}catch(i){c.warn("SETTINGS","Failed to auto-migrate settings file",{settingsPath:t},i)}}let s={...this.DEFAULTS};for(let i of Object.keys(this.DEFAULTS))r[i]!==void 0&&(s[i]=r[i]);return s}};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||{}),M=class{level=null;useColor;constructor(){this.useColor=process.stdout.isTTY??!1}getLevel(){if(this.level===null){let t=l.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;try{let n=typeof e=="string"?JSON.parse(e):e;if(t==="Bash"&&n.command){let r=n.command.length>50?n.command.substring(0,50)+"...":n.command;return`${t}(${r})`}if(t==="Read"&&n.file_path){let r=n.file_path.split("/").pop()||n.file_path;return`${t}(${r})`}if(t==="Edit"&&n.file_path){let r=n.file_path.split("/").pop()||n.file_path;return`${t}(${r})`}if(t==="Write"&&n.file_path){let r=n.file_path.split("/").pop()||n.file_path;return`${t}(${r})`}return t}catch{return t}}log(t,e,n,r,s){if(t<this.getLevel())return;let i=new Date().toISOString().replace("T"," ").substring(0,23),u=C[t].padEnd(5),f=e.padEnd(6),a="";r?.correlationId?a=`[${r.correlationId}] `:r?.sessionId&&(a=`[session-${r.sessionId}] `);let g="";s!=null&&(this.getLevel()===0&&typeof s=="object"?g=`
|
|
`+JSON.stringify(s,null,2):g=" "+this.formatData(s));let k="";if(r){let{sessionId:It,sdkSessionId:Rt,correlationId:yt,...w}=r;Object.keys(w).length>0&&(k=` {${Object.entries(w).map(([B,G])=>`${B}=${G}`).join(", ")}}`)}let P=`[${i}] [${u}] [${f}] ${a}${n}${k}${g}`;t===3?console.error(P):console.log(P)}debug(t,e,n,r){this.log(0,t,e,n,r)}info(t,e,n,r){this.log(1,t,e,n,r)}warn(t,e,n,r){this.log(2,t,e,n,r)}error(t,e,n,r){this.log(3,t,e,n,r)}dataIn(t,e,n,r){this.info(t,`\u2192 ${e}`,n,r)}dataOut(t,e,n,r){this.info(t,`\u2190 ${e}`,n,r)}success(t,e,n,r){this.info(t,`\u2713 ${e}`,n,r)}failure(t,e,n,r){this.error(t,`\u2717 ${e}`,n,r)}timing(t,e,n,r){this.info(t,`\u23F1 ${e}`,r,{duration:`${n}ms`})}},c=new M;var d={DEFAULT:5e3,HEALTH_CHECK:1e3,WORKER_STARTUP_WAIT:1e3,WORKER_STARTUP_RETRIES:15,WINDOWS_MULTIPLIER:1.5};function b(o){return process.platform==="win32"?Math.round(o*d.WINDOWS_MULTIPLIER):o}import{existsSync as L,readFileSync as ot,writeFileSync as st,unlinkSync as it,mkdirSync as N}from"fs";import{createWriteStream as at}from"fs";import{join as T}from"path";import{spawn as ct,spawnSync as ut}from"child_process";import{homedir as lt}from"os";import{join as p,dirname as tt,basename as Kt}from"path";import{homedir as et}from"os";import{fileURLToPath as rt}from"url";function nt(){return typeof __dirname<"u"?__dirname:tt(rt(import.meta.url))}var Xt=nt(),E=l.get("CLAUDE_MEM_DATA_DIR"),D=process.env.CLAUDE_CONFIG_DIR||p(et(),".claude"),Yt=p(E,"archives"),Jt=p(E,"logs"),qt=p(E,"trash"),Qt=p(E,"backups"),zt=p(E,"settings.json"),Zt=p(E,"claude-mem.db"),te=p(E,"vector-db"),ee=p(D,"settings.json"),re=p(D,"commands"),ne=p(D,"CLAUDE.md");var S=T(E,"worker.pid"),x=T(E,"logs"),$=T(lt(),".claude","plugins","marketplaces","thedotmack"),pt=5e3,Et=1e4,ft=200,_t=1e3,gt=100,O=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};N(x,{recursive:!0});let e=T($,"plugin","scripts","worker-service.cjs");if(!L(e))return{success:!1,error:`Worker script not found at ${e}`};let n=this.getLogFilePath();return this.startWithBun(e,n,t)}static isBunAvailable(){try{return ut("bun",["--version"],{stdio:"pipe",timeout:5e3}).status===0}catch{return!1}}static async startWithBun(t,e,n){if(!this.isBunAvailable())return{success:!1,error:"Bun is required but not found in PATH. Install from https://bun.sh"};try{let r=process.platform==="win32",s=ct("bun",[t],{detached:!0,stdio:["ignore","pipe","pipe"],env:{...process.env,CLAUDE_MEM_WORKER_PORT:String(n)},cwd:$,...r&&{windowsHide:!0}}),i=at(e,{flags:"a"});return s.stdout?.pipe(i),s.stderr?.pipe(i),s.unref(),s.pid?(this.writePidFile({pid:s.pid,port:n,startedAt:new Date().toISOString(),version:process.env.npm_package_version||"unknown"}),this.waitForHealth(s.pid,n)):{success:!1,error:"Failed to get PID from spawned process"}}catch(r){return{success:!1,error:r instanceof Error?r.message:String(r)}}}static async stop(t=pt){let e=this.getPidInfo();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 getPidInfo(){try{if(!L(S))return null;let t=ot(S,"utf-8"),e=JSON.parse(t);return typeof e.pid!="number"||typeof e.port!="number"?null:e}catch{return null}}static writePidFile(t){N(E,{recursive:!0}),st(S,JSON.stringify(t,null,2))}static removePidFile(){try{L(S)&&it(S)}catch{}}static isProcessAlive(t){try{return process.kill(t,0),!0}catch{return!1}}static async waitForHealth(t,e,n=Et){let r=Date.now();for(;Date.now()-r<n;){if(!this.isProcessAlive(t))return{success:!1,error:"Process died during startup"};try{if((await fetch(`http://127.0.0.1:${e}/health`,{signal:AbortSignal.timeout(_t)})).ok)return{success:!0,pid:t}}catch{}await new Promise(s=>setTimeout(s,ft))}return{success:!1,error:"Health check timed out"}}static async waitForExit(t,e){let n=Date.now();for(;Date.now()-n<e;){if(!this.isProcessAlive(t))return;await new Promise(r=>setTimeout(r,gt))}throw new Error("Process did not exit within timeout")}static getLogFilePath(){let t=new Date().toISOString().slice(0,10);return T(x,`worker-${t}.log`)}static formatUptime(t){let e=new Date(t).getTime(),r=Date.now()-e,s=Math.floor(r/1e3),i=Math.floor(s/60),u=Math.floor(i/60),f=Math.floor(u/24);return f>0?`${f}d ${u%24}h`:u>0?`${u}h ${i%60}m`:i>0?`${i}m ${s%60}s`:`${s}s`}};function I(o={}){let{port:t,includeSkillFallback:e=!1,customPrefix:n}=o,r=process.platform==="win32",s=r?"%USERPROFILE%\\.claude\\plugins\\marketplaces\\thedotmack":"~/.claude/plugins/marketplaces/thedotmack",i=r?"Command Prompt or PowerShell":"Terminal",u=n||"Worker service connection failed.",f=t?` (port ${t})`:"",a=`${u}${f}
|
|
|
|
`;return a+=`To restart the worker:
|
|
`,a+=`1. Exit Claude Code completely
|
|
`,a+=`2. Open ${i}
|
|
`,a+=`3. Navigate to: ${s}
|
|
`,a+="4. Run: npm run worker:restart",e&&(a+=`
|
|
|
|
If that doesn't work, try: /troubleshoot`),a}var W=A.join(mt(),".claude","plugins","marketplaces","thedotmack"),K=b(d.HEALTH_CHECK),m=null;function _(){if(m!==null)return m;try{let o=A.join(l.get("CLAUDE_MEM_DATA_DIR"),"settings.json"),t=l.loadFromFile(o);return m=parseInt(t.CLAUDE_MEM_WORKER_PORT,10),m}catch(o){return c.debug("SYSTEM","Failed to load port from settings, using default",{error:o}),m=parseInt(l.get("CLAUDE_MEM_WORKER_PORT"),10),m}}async function R(){try{let o=_();return(await fetch(`http://127.0.0.1:${o}/health`,{signal:AbortSignal.timeout(K)})).ok}catch(o){return c.debug("SYSTEM","Worker health check failed",{error:o instanceof Error?o.message:String(o),errorType:o?.constructor?.name}),!1}}function Ot(){try{let o=A.join(W,"package.json");return JSON.parse(Tt(o,"utf-8")).version}catch(o){return c.debug("SYSTEM","Failed to read plugin version",{error:o instanceof Error?o.message:String(o)}),null}}async function ht(){try{let o=_(),t=await fetch(`http://127.0.0.1:${o}/api/version`,{signal:AbortSignal.timeout(K)});return t.ok?(await t.json()).version:null}catch(o){return c.debug("SYSTEM","Failed to get worker version",{error:o instanceof Error?o.message:String(o)}),null}}async function F(){let o=Ot(),t=await ht();!o||!t||o!==t&&(c.info("SYSTEM","Worker version mismatch detected - restarting worker",{pluginVersion:o,workerVersion:t}),await O.restart(_()),await new Promise(e=>setTimeout(e,1e3)),await R()||c.error("SYSTEM","Worker failed to restart after version mismatch"))}async function At(){let o=A.join(l.get("CLAUDE_MEM_DATA_DIR"),".pm2-migrated");if(!St(o))try{dt("pm2",["delete","claude-mem-worker"],{stdio:"ignore"}),H(o,new Date().toISOString(),"utf-8"),c.debug("SYSTEM","PM2 cleanup completed and marked")}catch{H(o,new Date().toISOString(),"utf-8")}let t=_(),e=await O.start(t);return e.success||c.error("SYSTEM","Failed to start worker",{platform:process.platform,port:t,error:e.error,marketplaceRoot:W}),e.success}async function V(){if(await R()){await F();return}if(!await At()){let e=_();throw new Error(I({port:e,customPrefix:`Worker service failed to start on port ${e}.`}))}for(let e=0;e<5;e++)if(await new Promise(n=>setTimeout(n,500)),await R()){await F();return}let t=_();throw c.error("SYSTEM","Worker started but not responding to health checks"),new Error(I({port:t,customPrefix:`Worker service started but is not responding on port ${t}.`}))}import{appendFileSync as Ct}from"fs";import{homedir as Mt}from"os";import{join as Dt}from"path";var Lt=Dt(Mt(),".claude-mem","silent.log");function h(o,t,e=""){let n=new Date().toISOString(),u=((new Error().stack||"").split(`
|
|
`)[2]||"").match(/at\s+(?:.*\s+)?\(?([^:]+):(\d+):(\d+)\)?/),f=u?`${u[1].split("/").pop()}:${u[2]}`:"unknown",a=`[${n}] [HAPPY-PATH-ERROR] [${f}] ${o}`;if(t!==void 0)try{a+=` ${JSON.stringify(t)}`}catch(g){a+=` [stringify error: ${g}]`}a+=`
|
|
`;try{Ct(Lt,a)}catch(g){console.error("[silent-debug] Failed to write to log:",g)}return e}async function j(o){if(await V(),h("[cleanup-hook] Hook fired",{session_id:o?.session_id,reason:o?.reason}),!o)throw new Error("cleanup-hook requires input from Claude Code");let{session_id:t,reason:e}=o,n=_();try{let r=await fetch(`http://127.0.0.1:${n}/api/sessions/complete`,{method:"POST",headers:{"Content-Type":"application/json"},body:JSON.stringify({claudeSessionId:t,reason:e}),signal:AbortSignal.timeout(d.DEFAULT)});if(r.ok){let s=await r.json();h("[cleanup-hook] Session cleanup completed",s)}else h("[cleanup-hook] Session not found or already cleaned up")}catch(r){h("[cleanup-hook] Worker not reachable (non-critical)",{error:r.message})}console.log('{"continue": true, "suppressOutput": true}'),process.exit(0)}if(y.isTTY)j(void 0);else{let o="";y.on("data",t=>o+=t),y.on("end",async()=>{let t=o?JSON.parse(o):void 0;await j(t)})}
|