context-mode 1.0.88 → 1.0.89

package/hooks/pretooluse.mjs

@@ -96,24 +96,46 @@ try {
       const allHooks = settings.hooks || {};
       let changed = false;
 
-      for (const hookType of Object.keys(allHooks)) {
-        const entries = allHooks[hookType];
-        if (!Array.isArray(entries)) continue;
-
-        for (const entry of entries) {
-          // Fix deprecated Task-only matcher (PreToolUse only)
-          if (hookType === "PreToolUse" && entry.matcher?.includes("Task") && !entry.matcher.includes("Agent")) {
-            entry.matcher = entry.matcher.replace("Task", "Agent|Task");
+      // If hooks.json is present, the plugin system owns hook registration.
+      // Remove any settings.json context-mode entries to prevent duplicate concurrent
+      // hook processes that cause "non-blocking hook error" on every tool call.
+      const hooksJsonPath = resolve(myRoot, "hooks", "hooks.json");
+      if (existsSync(hooksJsonPath)) {
+        for (const hookType of Object.keys(allHooks)) {
+          const entries = allHooks[hookType];
+          if (!Array.isArray(entries)) continue;
+          const filtered = entries.filter(
+            (entry) =>
+              !entry.hooks?.some(
+                (h) => h.command?.includes(".mjs") && h.command?.includes("context-mode"),
+              ),
+          );
+          if (filtered.length !== entries.length) {
+            allHooks[hookType] = filtered;
             changed = true;
           }
-          // Rewrite stale context-mode hook paths to point to current version
-          for (const h of (entry.hooks || [])) {
-            if (h.command && h.command.includes(".mjs") && h.command.includes("context-mode") && !h.command.includes(targetDir)) {
-              // Extract the script filename (e.g., sessionstart.mjs, pretooluse.mjs)
-              const scriptMatch = h.command.match(/([a-z]+\.mjs)\s*"?\s*$/);
-              if (scriptMatch) {
-                h.command = "node " + resolve(targetDir, "hooks", scriptMatch[1]);
-                changed = true;
+        }
+      } else {
+        // Legacy: hooks.json absent — rewrite stale paths to current version dir.
+        for (const hookType of Object.keys(allHooks)) {
+          const entries = allHooks[hookType];
+          if (!Array.isArray(entries)) continue;
+
+          for (const entry of entries) {
+            // Fix deprecated Task-only matcher (PreToolUse only)
+            if (hookType === "PreToolUse" && entry.matcher?.includes("Task") && !entry.matcher.includes("Agent")) {
+              entry.matcher = entry.matcher.replace("Task", "Agent|Task");
+              changed = true;
+            }
+            // Rewrite stale context-mode hook paths to point to current version
+            for (const h of (entry.hooks || [])) {
+              if (h.command && h.command.includes(".mjs") && h.command.includes("context-mode") && !h.command.includes(targetDir)) {
+                // Extract the script filename (e.g., sessionstart.mjs, pretooluse.mjs)
+                const scriptMatch = h.command.match(/([a-z]+\.mjs)\s*"?\s*$/);
+                if (scriptMatch) {
+                  h.command = "node " + resolve(targetDir, "hooks", scriptMatch[1]);
+                  changed = true;
+                }
               }
             }
           }

package/hooks/session-snapshot.bundle.mjs

@@ -1,29 +1,29 @@
-function a(t){return t.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;").replace(/'/g,"&apos;")}var N=10;function h(t,r=4){return[...new Set(t.filter(o=>o.length>0))].slice(0,r).map(o=>o.length>80?o.slice(0,80):o)}function m(t,r){if(r.length===0)return"";let s=r.map(n=>`"${a(n)}"`).join(", ");return`
+function a(t){return t.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;").replace(/'/g,"&apos;")}var M=10;function h(t,r=4){return[...new Set(t.filter(o=>o.length>0))].slice(0,r).map(o=>o.length>80?o.slice(0,80):o)}function m(t,r){if(r.length===0)return"";let s=r.map(n=>`"${a(n)}"`).join(", ");return`
     For full details:
     ${a(t)}(
       queries: [${s}],
       source: "session-events"
-    )`}function x(t,r){if(t.length===0)return"";let s=new Map;for(let l of t){let b=l.data,p=s.get(b);p||(p={ops:new Map},s.set(b,p));let g;l.type==="file_write"?g="write":l.type==="file_read"?g="read":l.type==="file_edit"?g="edit":g=l.type,p.ops.set(g,(p.ops.get(g)??0)+1)}let o=Array.from(s.entries()).slice(-N),u=[],i=[];for(let[l,{ops:b}]of o){let p=Array.from(b.entries()).map(([S,y])=>`${S}\xD7${y}`).join(", "),g=l.split("/").pop()??l;u.push(`    ${a(g)} (${a(p)})`),i.push(`${g} ${Array.from(b.keys()).join(" ")}`)}let e=h(i);return[`  <files count="${s.size}">`,...u,m(r,e),"  </files>"].join(`
-`)}function M(t,r){if(t.length===0)return"";let s=[],n=[];for(let i of t)s.push(`    ${a(i.data)}`),n.push(i.data);let o=h(n);return[`  <errors count="${t.length}">`,...s,m(r,o),"  </errors>"].join(`
-`)}function A(t,r){if(t.length===0)return"";let s=new Set,n=[],o=[];for(let e of t)s.has(e.data)||(s.add(e.data),n.push(`    ${a(e.data)}`),o.push(e.data));if(n.length===0)return"";let u=h(o);return[`  <decisions count="${n.length}">`,...n,m(r,u),"  </decisions>"].join(`
-`)}function D(t,r){if(t.length===0)return"";let s=new Set,n=[],o=[];for(let e of t)s.has(e.data)||(s.add(e.data),e.type==="rule_content"?n.push(`    ${a(e.data)}`):n.push(`    ${a(e.data)}`),o.push(e.data));if(n.length===0)return"";let u=h(o);return[`  <rules count="${n.length}">`,...n,m(r,u),"  </rules>"].join(`
-`)}function F(t,r){if(t.length===0)return"";let s=[],n=[];for(let i of t)s.push(`    ${a(i.data)}`),n.push(i.data);let o=h(n);return[`  <git count="${t.length}">`,...s,m(r,o),"  </git>"].join(`
-`)}function R(t){if(t.length===0)return"";let r=[],s={};for(let e of t)try{let c=JSON.parse(e.data);typeof c.subject=="string"?r.push(c.subject):typeof c.taskId=="string"&&typeof c.status=="string"&&(s[c.taskId]=c.status)}catch{}if(r.length===0)return"";let n=new Set(["completed","deleted","failed"]),o=Object.keys(s).sort((e,c)=>Number(e)-Number(c)),u=[];for(let e=0;e<r.length;e++){let c=o[e],l=c?s[c]??"pending":"pending";n.has(l)||u.push(r[e])}if(u.length===0)return"";let i=[];for(let e of u)i.push(`    [pending] ${a(e)}`);return i.join(`
-`)}function J(t,r){let s=R(t);if(!s)return"";let n=[];for(let e of t)try{let c=JSON.parse(e.data);typeof c.subject=="string"&&n.push(c.subject)}catch{}let o=h(n);return[`  <task_state count="${s.split(`
+    )`}function A(t,r){if(t.length===0)return"";let s=new Map;for(let l of t){let b=l.data,p=s.get(b);p||(p={ops:new Map},s.set(b,p));let g;l.type==="file_write"?g="write":l.type==="file_read"?g="read":l.type==="file_edit"?g="edit":g=l.type,p.ops.set(g,(p.ops.get(g)??0)+1)}let o=Array.from(s.entries()).slice(-M),u=[],i=[];for(let[l,{ops:b}]of o){let p=Array.from(b.entries()).map(([S,y])=>`${S}\xD7${y}`).join(", "),g=l.split("/").pop()??l;u.push(`    ${a(g)} (${a(p)})`),i.push(`${g} ${Array.from(b.keys()).join(" ")}`)}let e=h(i);return[`  <files count="${s.size}">`,...u,m(r,e),"  </files>"].join(`
+`)}function x(t,r){if(t.length===0)return"";let s=[],n=[];for(let i of t)s.push(`    ${a(i.data)}`),n.push(i.data);let o=h(n);return[`  <errors count="${t.length}">`,...s,m(r,o),"  </errors>"].join(`
+`)}function D(t,r){if(t.length===0)return"";let s=new Set,n=[],o=[];for(let e of t)s.has(e.data)||(s.add(e.data),n.push(`    ${a(e.data)}`),o.push(e.data));if(n.length===0)return"";let u=h(o);return[`  <decisions count="${n.length}">`,...n,m(r,u),"  </decisions>"].join(`
+`)}function F(t,r){if(t.length===0)return"";let s=new Set,n=[],o=[];for(let e of t)s.has(e.data)||(s.add(e.data),e.type==="rule_content"?n.push(`    ${a(e.data)}`):n.push(`    ${a(e.data)}`),o.push(e.data));if(n.length===0)return"";let u=h(o);return[`  <rules count="${n.length}">`,...n,m(r,u),"  </rules>"].join(`
+`)}function R(t,r){if(t.length===0)return"";let s=[],n=[];for(let i of t)s.push(`    ${a(i.data)}`),n.push(i.data);let o=h(n);return[`  <git count="${t.length}">`,...s,m(r,o),"  </git>"].join(`
+`)}function B(t){if(t.length===0)return"";let r=[],s={};for(let e of t)try{let c=JSON.parse(e.data);typeof c.subject=="string"?r.push(c.subject):typeof c.taskId=="string"&&typeof c.status=="string"&&(s[c.taskId]=c.status)}catch{}if(r.length===0)return"";let n=new Set(["completed","deleted","failed"]),o=Object.keys(s).sort((e,c)=>Number(e)-Number(c)),u=[];for(let e=0;e<r.length;e++){let c=o[e],l=c?s[c]??"pending":"pending";n.has(l)||u.push(r[e])}if(u.length===0)return"";let i=[];for(let e of u)i.push(`    [pending] ${a(e)}`);return i.join(`
+`)}function J(t,r){let s=B(t);if(!s)return"";let n=[];for(let e of t)try{let c=JSON.parse(e.data);typeof c.subject=="string"&&n.push(c.subject)}catch{}let o=h(n);return[`  <task_state count="${s.split(`
 `).length}">`,s,m(r,o),"  </task_state>"].join(`
 `)}function X(t,r,s){if(t.length===0&&r.length===0)return"";let n=[],o=[];if(t.length>0){let e=t[t.length-1];n.push(`    cwd: ${a(e.data)}`),o.push("working directory")}for(let e of r)n.push(`    ${a(e.data)}`),o.push(e.data);let u=h(o);return["  <environment>",...n,m(s,u),"  </environment>"].join(`
 `)}function z(t,r){if(t.length===0)return"";let s=[],n=[];for(let i of t){let e=i.type==="subagent_completed"?"completed":i.type==="subagent_launched"?"launched":"unknown";s.push(`    [${e}] ${a(i.data)}`),n.push(`subagent ${i.data}`)}let o=h(n);return[`  <subagents count="${t.length}">`,...s,m(r,o),"  </subagents>"].join(`
 `)}function G(t,r){if(t.length===0)return"";let s=new Map;for(let e of t){let c=e.data.split(":")[0].trim();s.set(c,(s.get(c)??0)+1)}let n=[],o=[];for(let[e,c]of s)n.push(`    ${a(e)} (${c}\xD7)`),o.push(`skill ${e} invocation`);let u=h(o);return[`  <skills count="${t.length}">`,...n,m(r,u),"  </skills>"].join(`
-`)}function Q(t){if(t.length===0)return"";let r=t[t.length-1];return`  <intent mode="${a(r.data)}"/>`}function H(t,r){let s=r?.compactCount??1,n=r?.searchTool??"ctx_search",o=new Date().toISOString(),u=[],i=[],e=[],c=[],l=[],b=[],p=[],g=[],S=[],y=[],k=[];for(let d of t)switch(d.category){case"file":u.push(d);break;case"task":i.push(d);break;case"rule":e.push(d);break;case"decision":c.push(d);break;case"cwd":l.push(d);break;case"error":b.push(d);break;case"env":p.push(d);break;case"git":g.push(d);break;case"subagent":S.push(d);break;case"intent":y.push(d);break;case"skill":k.push(d);break}let f=[];f.push(`  <how_to_search>
+`)}function P(t){if(t.length===0)return"";let r=t[t.length-1];return`  <intent mode="${a(r.data)}"/>`}function V(t,r){let s=r?.compactCount??1,n=r?.searchTool??"ctx_search",o=new Date().toISOString(),u=[],i=[],e=[],c=[],l=[],b=[],p=[],g=[],S=[],y=[],k=[];for(let d of t)switch(d.category){case"file":u.push(d);break;case"task":i.push(d);break;case"rule":e.push(d);break;case"decision":c.push(d);break;case"cwd":l.push(d);break;case"error":b.push(d);break;case"env":p.push(d);break;case"git":g.push(d);break;case"subagent":S.push(d);break;case"intent":y.push(d);break;case"skill":k.push(d);break}let f=[];f.push(`  <how_to_search>
   Each section below contains a summary of prior work.
   For FULL DETAILS, run the exact tool call shown under each section.
   Do NOT ask the user to re-explain prior work. Search first.
   Do NOT invent your own queries \u2014 use the ones provided.
-  </how_to_search>`);let $=x(u,n);$&&f.push($);let v=M(b,n);v&&f.push(v);let w=A(c,n);w&&f.push(w);let E=D(e,n);E&&f.push(E);let q=F(g,n);q&&f.push(q);let L=J(i,n);L&&f.push(L);let _=X(l,p,n);_&&f.push(_);let j=z(S,n);j&&f.push(j);let T=G(k,n);T&&f.push(T);let O=Q(y);O&&f.push(O);let B=`<session_resume events="${t.length}" compact_count="${s}" generated_at="${o}">`,C="</session_resume>",I=f.join(`
+  </how_to_search>`);let $=A(u,n);$&&f.push($);let v=x(b,n);v&&f.push(v);let w=D(c,n);w&&f.push(w);let E=F(e,n);E&&f.push(E);let q=R(g,n);q&&f.push(q);let L=J(i,n);L&&f.push(L);let _=X(l,p,n);_&&f.push(_);let j=z(S,n);j&&f.push(j);let T=G(k,n);T&&f.push(T);let C=P(y);C&&f.push(C);let O=`<session_resume events="${t.length}" compact_count="${s}" generated_at="${o}">`,I="</session_resume>",N=f.join(`
 
-`);return I?`${B}
+`);return N?`${O}
 
-${I}
+${N}
 
-${C}`:`${B}
-${C}`}export{H as buildResumeSnapshot,R as renderTaskState};
+${I}`:`${O}
+${I}`}export{V as buildResumeSnapshot,B as renderTaskState};

package/insight/server.mjs

@@ -28,18 +28,28 @@ if (isBun) {
 } else {
   try {
     Database = (await import("better-sqlite3")).default;
-  } catch {
-    console.error("\n  Error: better-sqlite3 not found.");
-    console.error("  Install it: npm install better-sqlite3");
-    console.error("  Or use Bun: bun insight/server.mjs\n");
+    // Verify native addon loads correctly (catches arch mismatch: x86_64 vs arm64)
+    const testDb = new Database(":memory:");
+    testDb.close();
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
+    console.error("\n  Error: better-sqlite3 failed to load.");
+    console.error(`  ${msg}`);
+    if (msg.includes("incompatible architecture") || msg.includes("dlopen")) {
+      const cacheHint = process.env.INSIGHT_SESSION_DIR
+        ? join(dirname(process.env.INSIGHT_SESSION_DIR), "insight-cache", "node_modules")
+        : join("~", ".claude", "context-mode", "insight-cache", "node_modules");
+      console.error(`\n  Fix: rm -rf ${cacheHint} && context-mode insight`);
+    } else {
+      console.error("  Install it: npm install better-sqlite3");
+    }
     process.exit(1);
   }
 }
 
 // ── Paths ────────────────────────────────────────────────
-const BASE = join(homedir(), ".claude", "context-mode");
-const CONTENT_DIR = join(BASE, "content");
-const SESSION_DIR = join(BASE, "sessions");
+const SESSION_DIR = process.env.INSIGHT_SESSION_DIR || join(homedir(), ".claude", "context-mode", "sessions");
+const CONTENT_DIR = process.env.INSIGHT_CONTENT_DIR || join(homedir(), ".claude", "context-mode", "content");
 const DIST_DIR = join(__dirname, "dist");
 
 // ── SQLite helpers ───────────────────────────────────────
@@ -103,6 +113,11 @@ function mergeByKey(arr, key, mergeFn) {
   return [...map.values()];
 }
 
+// ── Input validation ────────────────────────────────────
+function isValidHash(hash) {
+  return /^[a-f0-9_]+$/.test(hash);
+}
+
 // ── API Handlers ─────────────────────────────────────────
 
 function apiOverview() {
@@ -530,6 +545,7 @@ function route(method, pathname, params) {
 
   if (pathname.startsWith("/api/content/") && pathname.includes("/chunks/")) {
     const parts = pathname.split("/");
+    if (!isValidHash(parts[3])) return { error: "invalid hash" };
     return apiSourceChunks(parts[3], Number(parts[5]));
   }
   if (pathname === "/api/search") {
@@ -539,10 +555,12 @@ function route(method, pathname, params) {
   }
   if (pathname.startsWith("/api/sessions/") && pathname.includes("/events/")) {
     const parts = pathname.split("/");
+    if (!isValidHash(parts[3])) return { error: "invalid hash" };
     return apiSessionEvents(parts[3], decodeURIComponent(parts[5]));
   }
   if (method === "DELETE" && pathname.startsWith("/api/content/")) {
     const parts = pathname.split("/");
+    if (!isValidHash(parts[3])) return { error: "invalid hash" };
     return apiDeleteSource(parts[3], Number(parts[5]));
   }
   return null;

package/openclaw.plugin.json

@@ -3,7 +3,7 @@
   "name": "Context Mode",
   "kind": "tool",
   "description": "OpenClaw plugin that saves 98% of your context window. Sandboxed code execution in 11 languages, FTS5 knowledge base with BM25 ranking, and intent-driven search.",
-  "version": "1.0.88",
+  "version": "1.0.89",
   "sandbox": {
     "mode": "permissive",
     "filesystem_access": "full",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "context-mode",
-  "version": "1.0.88",
+  "version": "1.0.89",
   "type": "module",
   "description": "MCP plugin that saves 98% of your context window. Works with Claude Code, Gemini CLI, VS Code Copilot, OpenCode, and Codex CLI. Sandboxed code execution, FTS5 knowledge base, and intent-driven search.",
   "author": "Mert Koseoğlu",