@quolu/lattice 0.63.10 → 0.64.1

package/sensor/dist/mcp/server-instructions.js

@@ -18,79 +18,79 @@ exports.SERVER_INSTRUCTIONS_NO_ROOT_INDEX = exports.SERVER_INSTRUCTIONS = void 0
  * burn tokens. ADR 0049 / 0059 require the eight compatibility tools to remain
  * visible by default; provider identity is Lattice regardless of their names.
  */
-exports.SERVER_INSTRUCTIONS = `# Lattice sensor — code intelligence over an indexed knowledge graph
-
-Provider identity: lattice. The lattice_sensor_* names below are compatibility tool names served by Lattice's own bundled sensor; they do not call or require the independent Lattice sensor product.
-
-Lattice sensor is a SQLite knowledge graph of every symbol, edge, and file in
-the workspace — pre-computed structure you would otherwise re-derive by
-reading files (cached intelligence: thousands of parse/trace decisions you
-don't pay to re-reason each run). Reads are sub-millisecond; the index lags
-writes by ~1s through the file watcher. Reach for it BEFORE *and* while
-writing or editing code — not just for questions: one call returns the
-verbatim source PLUS who calls it and what it affects, so you edit with the
-blast radius in view. More accurate context, in far fewer tokens and
-round-trips than reading files yourself.
-
-## One tool: lattice_sensor_explore — use it instead of reading files
-
-There is a single tool, \`lattice_sensor_explore\`, and it is Read-equivalent. It
-takes either a natural-language question or a bag of symbol/file names and
-returns the **verbatim, line-numbered source** of the relevant symbols
-grouped by file — the same \`<n>\\t<line>\` shape \`Read\` gives you, safe to
-\`Edit\` from — PLUS the call path among them (including dynamic-dispatch hops
-like callbacks, React re-render, and JSX children that grep can't follow) and
-a blast-radius summary of what depends on them.
-
-Whether you're answering "how does X work" or implementing a change (fixing a
-bug, adding a feature), call \`lattice_sensor_explore\` before you Read. ONE call
-usually answers the whole question. Lattice sensor IS the pre-built search index —
-so running your own grep + read loop, or delegating the lookup to a separate
-file-reading sub-task/agent, repeats work lattice sensor already did and costs more
-for the same answer. A direct lattice sensor answer is typically one to a few
-calls; a grep/read exploration is dozens.
-
-## How to query
-
-- **Almost any question — "how does X work", architecture, a bug, "what/where is X", or surveying an area** → \`lattice_sensor_explore\` with a natural-language question or the relevant names. ONE capped call returns the verbatim source grouped by file; most often the ONLY call you need.
-- **"How does X reach/become Y? / the flow / the path from X to Y"** → \`lattice_sensor_explore\`, naming the symbols that span the flow (e.g. \`mutateElement renderScene\`) — it surfaces the call path among them, riding dynamic-dispatch hops, and returns their source.
-- **Reading or editing a file/symbol you can name** → put its name or file path in the \`lattice_sensor_explore\` query — it returns that current line-numbered source (safe to \`Edit\` from) with the call path and blast radius attached, so you don't Read it separately. For an overloaded name it returns every matching definition's body in one call.
-- **Need more?** Call \`lattice_sensor_explore\` again with more specific names — treat the source it returns as already Read.
-
-## Anti-patterns
-
-- **Trust lattice sensor's results — don't re-verify them with grep.** They come from a full AST parse; re-checking with grep is slower, less accurate, and wastes context.
-- **Don't grep or Read first** to find or understand indexed code — ONE \`lattice_sensor_explore\` returns the relevant symbols' source together in a single round-trip. Reach for raw \`Read\`/\`Grep\` only to confirm a specific detail lattice sensor didn't cover, or for what lattice sensor doesn't index (configs, docs).
-- **Don't reconstruct a flow by hand** — name the endpoints in one \`lattice_sensor_explore\` and it surfaces the path between them, dynamic-dispatch hops included.
-- **After editing, check the staleness banner.** When a tool response starts with "⚠️ Some files referenced below were edited since the last index sync…", the listed files are pending re-index — Read those specific files for accurate content. Every file NOT in that banner is fresh, so still trust lattice sensor. A different, rarer banner — "⚠️ LatticeSensor auto-sync is DISABLED…" — means live watching stopped entirely (the whole index is frozen, not just a few files); until it's resolved, Read files directly to confirm anything that may have changed.
-- **A file flagged "⚠ changed on disk after the last index sync" drifted from its index** (most common on projects queried via \`projectPath\`, which have no live watcher). LatticeSensor never serves a possibly-mis-sliced body from such a file — it either shows the file's full CURRENT source (trust it as a Read) or omits the source with this flag. When the source was omitted, Read that specific file; line numbers referencing it elsewhere in the response may be shifted until that project's next sync. All unflagged files remain trustworthy.
-
-## Limitations
-
-- If a project isn't indexed (no \`.lattice/sensor/\`), decide whether building the index will reduce total investigation time and model tokens for the current or expected work. When workspace writes and shell execution are allowed, you may run \`lattice sensor init <projectPath> --json\` yourself, then retry the sensor call; scope it to the intended project and account for the one-time indexing cost. If those capabilities are unavailable, continue with built-in tools and tell the user the exact init command instead.
-- Index lags file writes by ~1 second.
-- Cross-file resolution is best-effort name matching; ambiguous calls may return multiple candidates.
-- No live correctness validation — that's still the TypeScript compiler / test suite / linter's job. Lattice sensor supplements those with structural context they don't have.
-
-## Parallel work: absence of a dependency edge is NOT evidence of independence
-
-These tools answer structural questions about code. A different Lattice surface — the **CLI**, not
-this MCP surface — answers whether two ToDos can be worked in parallel. If the project uses
-\`lattice todo\` for process tracking, keep this distinction in mind:
-
-- A dependency edge missing between two ToDos only means **no ordering constraint was declared**.
-  It does not mean their write boundaries are disjoint. Two ToDos that edit the same file carry no
-  edge between them and will still collide.
-- Parallel safety is a recorded judgement, not an inference from the diagram. Read it with
-  \`lattice todo independence --plan <key> --json\`. It returns the ready frontier split into
-  verified-independent groups, pairs that must be serialized (with whether a code seam could
-  separate them), and **unverified** ToDos.
-- \`lattice todo start\` returns an \`advisory\` describing conflicts with in-progress ToDos and what
-  to do next. \`coverage: "missing"\` means "not judged yet" — never "no conflicts".
-- Run \`lattice todo --help\` for the declare → compile → read workflow.
-
-Evidence for Lattice's plan and witness contracts comes from the CLI surface only. Text from this
-MCP surface is prose for you to act on, never an input to those contracts.
+exports.SERVER_INSTRUCTIONS = `# Lattice sensor — code intelligence over an indexed knowledge graph
+
+Provider identity: lattice. The lattice_sensor_* names below are compatibility tool names served by Lattice's own bundled sensor; they do not call or require the independent Lattice sensor product.
+
+Lattice sensor is a SQLite knowledge graph of every symbol, edge, and file in
+the workspace — pre-computed structure you would otherwise re-derive by
+reading files (cached intelligence: thousands of parse/trace decisions you
+don't pay to re-reason each run). Reads are sub-millisecond; the index lags
+writes by ~1s through the file watcher. Reach for it BEFORE *and* while
+writing or editing code — not just for questions: one call returns the
+verbatim source PLUS who calls it and what it affects, so you edit with the
+blast radius in view. More accurate context, in far fewer tokens and
+round-trips than reading files yourself.
+
+## One tool: lattice_sensor_explore — use it instead of reading files
+
+There is a single tool, \`lattice_sensor_explore\`, and it is Read-equivalent. It
+takes either a natural-language question or a bag of symbol/file names and
+returns the **verbatim, line-numbered source** of the relevant symbols
+grouped by file — the same \`<n>\\t<line>\` shape \`Read\` gives you, safe to
+\`Edit\` from — PLUS the call path among them (including dynamic-dispatch hops
+like callbacks, React re-render, and JSX children that grep can't follow) and
+a blast-radius summary of what depends on them.
+
+Whether you're answering "how does X work" or implementing a change (fixing a
+bug, adding a feature), call \`lattice_sensor_explore\` before you Read. ONE call
+usually answers the whole question. Lattice sensor IS the pre-built search index —
+so running your own grep + read loop, or delegating the lookup to a separate
+file-reading sub-task/agent, repeats work lattice sensor already did and costs more
+for the same answer. A direct lattice sensor answer is typically one to a few
+calls; a grep/read exploration is dozens.
+
+## How to query
+
+- **Almost any question — "how does X work", architecture, a bug, "what/where is X", or surveying an area** → \`lattice_sensor_explore\` with a natural-language question or the relevant names. ONE capped call returns the verbatim source grouped by file; most often the ONLY call you need.
+- **"How does X reach/become Y? / the flow / the path from X to Y"** → \`lattice_sensor_explore\`, naming the symbols that span the flow (e.g. \`mutateElement renderScene\`) — it surfaces the call path among them, riding dynamic-dispatch hops, and returns their source.
+- **Reading or editing a file/symbol you can name** → put its name or file path in the \`lattice_sensor_explore\` query — it returns that current line-numbered source (safe to \`Edit\` from) with the call path and blast radius attached, so you don't Read it separately. For an overloaded name it returns every matching definition's body in one call.
+- **Need more?** Call \`lattice_sensor_explore\` again with more specific names — treat the source it returns as already Read.
+
+## Anti-patterns
+
+- **Trust lattice sensor's results — don't re-verify them with grep.** They come from a full AST parse; re-checking with grep is slower, less accurate, and wastes context.
+- **Don't grep or Read first** to find or understand indexed code — ONE \`lattice_sensor_explore\` returns the relevant symbols' source together in a single round-trip. Reach for raw \`Read\`/\`Grep\` only to confirm a specific detail lattice sensor didn't cover, or for what lattice sensor doesn't index (configs, docs).
+- **Don't reconstruct a flow by hand** — name the endpoints in one \`lattice_sensor_explore\` and it surfaces the path between them, dynamic-dispatch hops included.
+- **After editing, check the staleness banner.** When a tool response starts with "⚠️ Some files referenced below were edited since the last index sync…", the listed files are pending re-index — Read those specific files for accurate content. Every file NOT in that banner is fresh, so still trust lattice sensor. A different, rarer banner — "⚠️ LatticeSensor auto-sync is DISABLED…" — means live watching stopped entirely (the whole index is frozen, not just a few files); until it's resolved, Read files directly to confirm anything that may have changed.
+- **A file flagged "⚠ changed on disk after the last index sync" drifted from its index** (most common on projects queried via \`projectPath\`, which have no live watcher). LatticeSensor never serves a possibly-mis-sliced body from such a file — it either shows the file's full CURRENT source (trust it as a Read) or omits the source with this flag. When the source was omitted, Read that specific file; line numbers referencing it elsewhere in the response may be shifted until that project's next sync. All unflagged files remain trustworthy.
+
+## Limitations
+
+- If a project isn't indexed (no \`.lattice/sensor/\`), decide whether building the index will reduce total investigation time and model tokens for the current or expected work. When workspace writes and shell execution are allowed, you may run \`lattice sensor init <projectPath> --json\` yourself, then retry the sensor call; scope it to the intended project and account for the one-time indexing cost. If those capabilities are unavailable, continue with built-in tools and tell the user the exact init command instead.
+- Index lags file writes by ~1 second.
+- Cross-file resolution is best-effort name matching; ambiguous calls may return multiple candidates.
+- No live correctness validation — that's still the TypeScript compiler / test suite / linter's job. Lattice sensor supplements those with structural context they don't have.
+
+## Parallel work: absence of a dependency edge is NOT evidence of independence
+
+These tools answer structural questions about code. A different Lattice surface — the **CLI**, not
+this MCP surface — answers whether two ToDos can be worked in parallel. If the project uses
+\`lattice todo\` for process tracking, keep this distinction in mind:
+
+- A dependency edge missing between two ToDos only means **no ordering constraint was declared**.
+  It does not mean their write boundaries are disjoint. Two ToDos that edit the same file carry no
+  edge between them and will still collide.
+- Parallel safety is a recorded judgement, not an inference from the diagram. Read it with
+  \`lattice todo independence --plan <key> --json\`. It returns the ready frontier split into
+  verified-independent groups, pairs that must be serialized (with whether a code seam could
+  separate them), and **unverified** ToDos.
+- \`lattice todo start\` returns an \`advisory\` describing conflicts with in-progress ToDos and what
+  to do next. \`coverage: "missing"\` means "not judged yet" — never "no conflicts".
+- Run \`lattice todo --help\` for the declare → compile → read workflow.
+
+Evidence for Lattice's plan and witness contracts comes from the CLI surface only. Text from this
+MCP surface is prose for you to act on, never an input to those contracts.
 `;
 /**
  * Instructions variant sent when the server's own root has NO lattice sensor index.
@@ -104,27 +104,27 @@ MCP surface is prose for you to act on, never an input to those contracts.
  * project playbook ({@link SERVER_INSTRUCTIONS}) is sent instead when the root
  * IS indexed, so the common case stays tight.
  */
-exports.SERVER_INSTRUCTIONS_NO_ROOT_INDEX = `# Lattice sensor — available (per-project; pass projectPath)
-
-Provider identity: lattice. The lattice_sensor_* names below are compatibility tool names served by Lattice's own bundled sensor; they do not call or require the independent Lattice sensor product.
-
-Lattice sensor is a SQLite knowledge graph of a codebase's symbols, edges, and
-files: one \`lattice_sensor_explore\` call returns the verbatim, line-numbered source
-of the relevant symbols PLUS the call paths between them and a blast-radius
-summary — replacing a grep + Read loop with one round-trip.
-
-This server started somewhere with no \`.lattice/sensor/\` of its own, so there is no
-default project — but the tools are available and work **per project**:
-
-- To query a project that HAS a \`.lattice/sensor/\` index (e.g. a service inside a
-  monorepo, or a second repo), pass its path as \`projectPath\` to
-  \`lattice_sensor_explore\` (and any other lattice sensor tool). Lattice sensor resolves the
-  nearest \`.lattice/sensor/\` at or above that path and answers from it — for as many
-  projects as you like in one session.
-- For a project with no \`.lattice/sensor/\`, decide whether the expected reduction in
-  repeated Read/Grep work justifies the one-time indexing cost. When workspace writes
-  and shell execution are allowed, you may run \`lattice sensor init <projectPath> --json\`
-  yourself and then retry with that \`projectPath\`; otherwise use built-in tools and
-  tell the user the exact init command. A new index is picked up live, with no restart.
+exports.SERVER_INSTRUCTIONS_NO_ROOT_INDEX = `# Lattice sensor — available (per-project; pass projectPath)
+
+Provider identity: lattice. The lattice_sensor_* names below are compatibility tool names served by Lattice's own bundled sensor; they do not call or require the independent Lattice sensor product.
+
+Lattice sensor is a SQLite knowledge graph of a codebase's symbols, edges, and
+files: one \`lattice_sensor_explore\` call returns the verbatim, line-numbered source
+of the relevant symbols PLUS the call paths between them and a blast-radius
+summary — replacing a grep + Read loop with one round-trip.
+
+This server started somewhere with no \`.lattice/sensor/\` of its own, so there is no
+default project — but the tools are available and work **per project**:
+
+- To query a project that HAS a \`.lattice/sensor/\` index (e.g. a service inside a
+  monorepo, or a second repo), pass its path as \`projectPath\` to
+  \`lattice_sensor_explore\` (and any other lattice sensor tool). Lattice sensor resolves the
+  nearest \`.lattice/sensor/\` at or above that path and answers from it — for as many
+  projects as you like in one session.
+- For a project with no \`.lattice/sensor/\`, decide whether the expected reduction in
+  repeated Read/Grep work justifies the one-time indexing cost. When workspace writes
+  and shell execution are allowed, you may run \`lattice sensor init <projectPath> --json\`
+  yourself and then retry with that \`projectPath\`; otherwise use built-in tools and
+  tell the user the exact init command. A new index is picked up live, with no restart.
 `;
 //# sourceMappingURL=server-instructions.js.map

package/sensor/package.json

@@ -1,56 +1,56 @@
-{
-  "name": "@quolu/lattice-sensor",
-  "version": "0.7.3-lattice.1",
-  "private": true,
-  "description": "Lattice-owned local structural sensor.",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/kitepon/Lattice.git"
-  },
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
-  "files": [
-    "dist",
-    "README.md"
-  ],
-  "scripts": {
-    "build": "npm run clean && tsc && npm run copy-assets",
-    "copy-assets": "node -e \"const fs=require('fs');fs.mkdirSync('dist/db',{recursive:true});fs.copyFileSync('src/db/schema.sql','dist/db/schema.sql');fs.mkdirSync('dist/extraction/wasm',{recursive:true});fs.readdirSync('src/extraction/wasm').filter(f=>f.endsWith('.wasm')).forEach(f=>fs.copyFileSync('src/extraction/wasm/'+f,'dist/extraction/wasm/'+f))\"",
-    "dev": "tsc --watch",
-    "build:kernel": "bash scripts/build-kernel.sh",
-    "test": "vitest run --maxWorkers=4 --minWorkers=1",
-    "test:watch": "vitest",
-    "test:eval": "vitest run __tests__/evaluation/",
-    "eval": "npm run build && npx tsx __tests__/evaluation/runner.ts",
-    "clean": "node -e \"const fs=require('fs');fs.rmSync('dist',{recursive:true,force:true})\""
-  },
-  "keywords": [
-    "code-intelligence",
-    "knowledge-graph",
-    "static-analysis"
-  ],
-  "author": "",
-  "license": "MIT",
-  "dependencies": {
-    "@clack/prompts": "^1.3.0",
-    "commander": "^14.0.2",
-    "fast-string-width": "^3.0.2",
-    "fast-wrap-ansi": "^0.2.0",
-    "ignore": "^7.0.5",
-    "jsonc-parser": "^3.3.1",
-    "picomatch": "^4.0.4",
-    "sisteransi": "^1.0.5",
-    "tree-sitter-wasms": "^0.1.11",
-    "web-tree-sitter": "^0.25.3"
-  },
-  "devDependencies": {
-    "@types/better-sqlite3": "^7.6.0",
-    "@types/node": "^20.19.30",
-    "@types/picomatch": "^4.0.2",
-    "typescript": "^5.0.0",
-    "vitest": "^2.1.9"
-  },
-  "engines": {
-    "node": ">=20.0.0 <25.0.0 || >=26.0.0"
-  }
-}
+{
+  "name": "@quolu/lattice-sensor",
+  "version": "0.7.3-lattice.1",
+  "private": true,
+  "description": "Lattice-owned local structural sensor.",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/kitepon/Lattice.git"
+  },
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "files": [
+    "dist",
+    "README.md"
+  ],
+  "scripts": {
+    "build": "npm run clean && tsc && npm run copy-assets",
+    "copy-assets": "node -e \"const fs=require('fs');fs.mkdirSync('dist/db',{recursive:true});fs.copyFileSync('src/db/schema.sql','dist/db/schema.sql');fs.mkdirSync('dist/extraction/wasm',{recursive:true});fs.readdirSync('src/extraction/wasm').filter(f=>f.endsWith('.wasm')).forEach(f=>fs.copyFileSync('src/extraction/wasm/'+f,'dist/extraction/wasm/'+f))\"",
+    "dev": "tsc --watch",
+    "build:kernel": "bash scripts/build-kernel.sh",
+    "test": "vitest run --maxWorkers=4 --minWorkers=1",
+    "test:watch": "vitest",
+    "test:eval": "vitest run __tests__/evaluation/",
+    "eval": "npm run build && npx tsx __tests__/evaluation/runner.ts",
+    "clean": "node -e \"const fs=require('fs');fs.rmSync('dist',{recursive:true,force:true})\""
+  },
+  "keywords": [
+    "code-intelligence",
+    "knowledge-graph",
+    "static-analysis"
+  ],
+  "author": "",
+  "license": "MIT",
+  "dependencies": {
+    "@clack/prompts": "^1.3.0",
+    "commander": "^14.0.2",
+    "fast-string-width": "^3.0.2",
+    "fast-wrap-ansi": "^0.2.0",
+    "ignore": "^7.0.5",
+    "jsonc-parser": "^3.3.1",
+    "picomatch": "^4.0.4",
+    "sisteransi": "^1.0.5",
+    "tree-sitter-wasms": "^0.1.11",
+    "web-tree-sitter": "^0.25.3"
+  },
+  "devDependencies": {
+    "@types/better-sqlite3": "^7.6.0",
+    "@types/node": "^20.19.30",
+    "@types/picomatch": "^4.0.2",
+    "typescript": "^5.0.0",
+    "vitest": "^2.1.9"
+  },
+  "engines": {
+    "node": ">=20.0.0 <25.0.0 || >=26.0.0"
+  }
+}

package/src/cli-help.mjs

@@ -201,7 +201,7 @@ Commands:
 registerはLATTICE_BRIDGE_REGISTRAR_SSH_HOSTとLATTICE_BRIDGE_REGISTRAR_SCRIPTが
 両方設定されている時だけ動く。アドレスは送らず、remote側がssh送信元から決める。
 `,
-  hooks: `Usage: lattice hooks <install|status|uninstall|emit> --host <claude|codex>
+  hooks: `Usage: lattice hooks <install|status|uninstall|emit> --host <claude|codex|cursor>
 `,
 });
 
@@ -297,10 +297,10 @@ const SUBCOMMAND_USAGE = Object.freeze({
   'bridge status': 'bridge status --json',
   'bridge disable': 'bridge disable --json',
   'bridge register': 'bridge register --json',
-  'hooks install': 'hooks install --host <claude|codex>',
-  'hooks status': 'hooks status --host <claude|codex>',
-  'hooks uninstall': 'hooks uninstall --host <claude|codex>',
-  'hooks emit': 'hooks emit --host <claude|codex>',
+  'hooks install': 'hooks install --host <claude|codex|cursor>',
+  'hooks status': 'hooks status --host <claude|codex|cursor>',
+  'hooks uninstall': 'hooks uninstall --host <claude|codex|cursor>',
+  'hooks emit': 'hooks emit --host <claude|codex|cursor>',
 });
 
 function requestedNamespace(argv) {

package/src/hooks-cli.mjs

@@ -10,7 +10,8 @@ import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 
 const INFO = 'INFO: このrepoにはLattice sensor index（.lattice/sensor/）があります。コード構造の調査はsensor入口（MCP: lattice_sensor_explore 等／CLI: lattice sensor）を優先できます。';
-const HOSTS = new Set(['claude', 'codex']);
+const HOSTS = new Set(['claude', 'codex', 'cursor']);
+const HOST_USAGE = 'usage: lattice hooks <install|status|uninstall|emit> --host <claude|codex|cursor>';
 const MAX_STDIN_BYTES = 64 * 1024;
 const SHOWN_MAX_AGE_MS = 7 * 24 * 60 * 60 * 1000;
 const CLAIM_MAX_AGE_MS = 60 * 60 * 1000;
@@ -32,7 +33,22 @@ function failure(stdout, code, message, exit = 1, detail) {
 }
 
 function configPath(home, host) {
-  return path.join(home, host === 'claude' ? '.claude/settings.json' : '.codex/hooks.json');
+  if (host === 'claude') return path.join(home, '.claude/settings.json');
+  if (host === 'cursor') return path.join(home, '.cursor/hooks.json');
+  return path.join(home, '.codex/hooks.json');
+}
+
+function eventName(host) {
+  return host === 'cursor' ? 'beforeSubmitPrompt' : 'UserPromptSubmit';
+}
+
+function isFlatHost(host) {
+  return host === 'cursor';
+}
+
+function isCommandHandler(item, host) {
+  if (item === null || typeof item !== 'object' || typeof item.command !== 'string') return false;
+  return isFlatHost(host) || item.type === 'command';
 }
 
 function stateBase(env) {
@@ -314,15 +330,16 @@ async function withReceiptLock(env, host, operation) {
   }
 }
 
-function allHandlers(value) {
-  const list = value?.hooks?.UserPromptSubmit;
+function allHandlers(value, host) {
+  const list = value?.hooks?.[eventName(host)];
   if (!Array.isArray(list)) return [];
+  if (isFlatHost(host)) return list;
   return list.flatMap((wrapper) => Array.isArray(wrapper?.hooks) ? wrapper.hooks : []);
 }
 
-function configContains(value, argv) {
-  return allHandlers(value).some((item) => item?.type === 'command'
-    && typeof item.command === 'string' && commandIs(item.command, [argv]));
+function configContains(value, argv, host) {
+  return allHandlers(value, host).some((item) => isCommandHandler(item, host)
+    && commandIs(item.command, [argv]));
 }
 
 async function recoverReceipt(env, host, configTarget, testHooks) {
@@ -335,7 +352,7 @@ async function recoverReceipt(env, host, configTarget, testHooks) {
     const config = await readConfig(configTarget);
     const entries = receipt.entries.flatMap((entry) => {
       if (entry.status !== 'pending') return [entry];
-      return configContains(config.value, entry.argv) ? [{ ...entry, status: 'committed' }] : [];
+      return configContains(config.value, entry.argv, host) ? [{ ...entry, status: 'committed' }] : [];
     });
     const recovered = { ...receipt, entries };
     await writeReceiptUnlocked(target, recovered);
@@ -390,26 +407,37 @@ async function readConfig(target) {
     || Array.isArray(value.hooks))) {
     throw Object.assign(new Error('hooks is not an object'), { code: 'CONFIG_INVALID' });
   }
-  if (value.hooks?.UserPromptSubmit !== undefined && !Array.isArray(value.hooks.UserPromptSubmit)) {
-    throw Object.assign(new Error('UserPromptSubmit is not an array'), { code: 'CONFIG_INVALID' });
+  for (const name of ['UserPromptSubmit', 'beforeSubmitPrompt']) {
+    if (value.hooks?.[name] !== undefined && !Array.isArray(value.hooks[name])) {
+      throw Object.assign(new Error(`${name} is not an array`), { code: 'CONFIG_INVALID' });
+    }
   }
   return { existed: true, mode: info.mode & 0o777, bytes, value };
 }
 
-function hooksList(value) {
+function hooksList(value, host) {
+  const name = eventName(host);
   if (value.hooks === undefined) value.hooks = {};
-  if (value.hooks.UserPromptSubmit === undefined) value.hooks.UserPromptSubmit = [];
-  return value.hooks.UserPromptSubmit;
+  if (value.hooks[name] === undefined) value.hooks[name] = [];
+  return value.hooks[name];
 }
 
-function stripIdentity(value, identities) {
+function stripIdentity(value, identities, host) {
   let removed = 0;
-  const list = hooksList(value);
-  value.hooks.UserPromptSubmit = list.flatMap((wrapper) => {
+  const name = eventName(host);
+  const list = hooksList(value, host);
+  if (isFlatHost(host)) {
+    value.hooks[name] = list.filter((item) => {
+      const owned = isCommandHandler(item, host) && commandIs(item.command, identities);
+      if (owned) removed += 1;
+      return !owned;
+    });
+    return removed;
+  }
+  value.hooks[name] = list.flatMap((wrapper) => {
     if (!wrapper || !Array.isArray(wrapper.hooks)) return [wrapper];
     const handlers = wrapper.hooks.filter((item) => {
-      const owned = item?.type === 'command' && typeof item.command === 'string'
-        && commandIs(item.command, identities);
+      const owned = isCommandHandler(item, host) && commandIs(item.command, identities);
       if (owned) removed += 1;
       return !owned;
     });
@@ -419,9 +447,9 @@ function stripIdentity(value, identities) {
 }
 
 function hostHandler(host, command) {
-  return host === 'claude'
-    ? { type: 'command', command, timeout: 5 }
-    : { type: 'command', command, timeout: 5, async: false, statusMessage: null };
+  if (host === 'claude') return { type: 'command', command, timeout: 5 };
+  if (host === 'cursor') return { command, timeout: 5 };
+  return { type: 'command', command, timeout: 5, async: false, statusMessage: null };
 }
 
 export async function resolveStableNodePath(execPath, {
@@ -655,11 +683,17 @@ async function mutate(host, env, stdout, uninstall, source, platform, testHooks)
     }
     const identities = [current, ...committedIdentities(receipt)];
     const next = structuredClone(prestate.value);
-    const removed = stripIdentity(next, identities);
-    if (!uninstall) hooksList(next).push({ hooks: [hostHandler(host, shell(current))] });
+    if (host === 'cursor' && next.version === undefined) next.version = 1;
+    const removed = stripIdentity(next, identities, host);
+    if (!uninstall) {
+      const entry = hostHandler(host, shell(current));
+      if (isFlatHost(host)) hooksList(next, host).push(entry);
+      else hooksList(next, host).push({ hooks: [entry] });
+    }
 
-    const currentHandlers = allHandlers(prestate.value).filter((item) => item?.type === 'command'
-      && typeof item.command === 'string' && commandIs(item.command, identities));
+    const currentHandlers = allHandlers(prestate.value, host).filter((item) => (
+      isCommandHandler(item, host) && commandIs(item.command, identities)
+    ));
     const alreadyWired = !uninstall && currentHandlers.length === 1
       && commandIs(currentHandlers[0].command, [current])
       && exactHandler(currentHandlers[0], hostHandler(host, shell(current)));
@@ -755,8 +789,8 @@ async function status(host, env, stdout, source, platform, testHooks) {
   let canonicalMatches = 0;
   let foreign = 0;
   let canonicalShape = false;
-  for (const item of allHandlers(config.value)) {
-    if (item?.type !== 'command' || typeof item.command !== 'string') continue;
+  for (const item of allHandlers(config.value, host)) {
+    if (!isCommandHandler(item, host)) continue;
     if (commandIs(item.command, identities)) {
       matches += 1;
       if (commandIs(item.command, [argv])) {
@@ -805,6 +839,20 @@ async function diagnose(state, stdout, message, diagnostic) {
   stdout.write(`Lattice hooks: ${diagnostic}\n`);
 }
 
+function sessionIdFromEvent(event) {
+  for (const key of ['session_id', 'conversation_id']) {
+    if (typeof event?.[key] === 'string' && event[key].length > 0) return event[key];
+  }
+  return null;
+}
+
+function cwdFromEvent(event) {
+  if (typeof event?.cwd === 'string' && path.isAbsolute(event.cwd)) return event.cwd;
+  const root = event?.workspace_roots?.[0];
+  if (typeof root === 'string' && path.isAbsolute(root)) return root;
+  return null;
+}
+
 async function readHookInput(stdin) {
   const chunks = [];
   let length = 0;
@@ -820,14 +868,15 @@ async function readHookInput(stdin) {
   try { event = JSON.parse(Buffer.concat(chunks).toString('utf8')); } catch {
     throw new Error('hook stdin is not strict JSON');
   }
-  if (typeof event?.session_id !== 'string' || event.session_id.length === 0
-    || typeof event.cwd !== 'string' || !path.isAbsolute(event.cwd)) {
+  const sessionId = sessionIdFromEvent(event);
+  const cwdValue = cwdFromEvent(event);
+  if (sessionId === null || cwdValue === null) {
     throw new Error('hook stdin requires session_id and absolute cwd');
   }
   try {
-    const cwd = await realpath(event.cwd);
+    const cwd = await realpath(cwdValue);
     if (!(await lstat(cwd)).isDirectory()) throw new Error('cwd is not a directory');
-    return { ...event, cwd };
+    return { ...event, session_id: sessionId, cwd };
   } catch {
     throw new Error('hook cwd is unavailable');
   }
@@ -925,7 +974,9 @@ async function acquireClaim(claim) {
 }
 
 function outputLine(host) {
-  return host === 'claude' ? `${INFO}\n` : `${JSON.stringify({
+  if (host === 'claude') return `${INFO}\n`;
+  if (host === 'cursor') return `${JSON.stringify({ additional_context: INFO })}\n`;
+  return `${JSON.stringify({
     hookSpecificOutput: { hookEventName: 'UserPromptSubmit', additionalContext: INFO },
   })}\n`;
 }
@@ -1035,12 +1086,10 @@ export async function runHooksCli({
 }) {
   if (argv.length !== 3 || !['install', 'status', 'uninstall', 'emit'].includes(argv[0])
     || argv[1] !== '--host' || !HOSTS.has(argv[2])) {
-    return failure(stdout, 'USAGE',
-      'usage: lattice hooks <install|status|uninstall|emit> --host <claude|codex>', 2);
+    return failure(stdout, 'USAGE', HOST_USAGE, 2);
   }
   const [command, , host] = argv;
   if (platform === 'win32') {
-    if (command === 'status') return status(host, env, stdout, source, platform, testHooks);
     return failure(stdout, 'HOST_PLATFORM_UNSUPPORTED', 'native Windows hooks are unsupported');
   }
   if (command === 'install') return mutate(host, env, stdout, false, source, platform, testHooks);