oh-my-opencode 5.0.0-beta.5 → 5.0.0-beta.7

package/dist/skills/coding-agent-sessions/SKILL.md

@@ -1,6 +1,6 @@
 ---
 name: coding-agent-sessions
-description: "MUST USE when asked to find, read, list, search, inspect, fetch, export, or reconstruct coding-agent sessions across Codex, Claude Code/Desktop, OpenCode, Senpi/pi, oh-my-pi (omp), gajae-code (gjc), OpenClaw, Factory Droid, Amp, Gemini/Kimi/Qwen CLIs, Codebuff, Roo/Kilo/Cline, Kodu, Cursor CLI, Aider, Aside browser-agent sessions, or unknown local agent logs. Covers transcripts, session IDs, rollout JSONL, state SQLite, Claude projects/pre-compact histories, OpenCode messages/parts, child/subagent linkage, cwd/model/time/token filters, archives, and cost clues. Expands fuzzy recall into parallel query lanes and first probes known stores so absent platforms are skipped cheaply. Triggers: coding agent sessions, Codex/Claude/OpenCode/Senpi/pi/oh-my-pi/omp/gajae-code/gjc/OpenClaw/Droid/Amp/Kodu/Cursor/Aider/Aside sessions, transcript search, session history, session ID, read transcript, token usage, subagent sessions, what did I do yesterday, did we already do this."
+description: "MUST USE when asked to find, read, list, search, inspect, fetch, export, or reconstruct coding-agent sessions across Codex, Claude Code/Desktop, OpenCode, OMO/Senpi/pi, oh-my-pi (omp), gajae-code (gjc), OpenClaw, Factory Droid, Amp, Gemini/Kimi/Qwen CLIs, Codebuff, Roo/Kilo/Cline, Kodu, Cursor CLI, Aider, Aside browser-agent sessions, or unknown local agent logs. Covers transcripts, session IDs, rollout JSONL, state SQLite, Claude projects/pre-compact histories, OpenCode messages/parts, child/subagent linkage, cwd/model/time/token filters, archives, and cost clues. Expands fuzzy recall into parallel query lanes and first probes known stores so absent platforms are skipped cheaply. Triggers: coding agent sessions, Codex/Claude/OpenCode/OMO/Senpi/pi/oh-my-pi/omp/gajae-code/gjc/OpenClaw/Droid/Amp/Kodu/Cursor/Aider/Aside sessions, transcript search, session history, session ID, read transcript, token usage, subagent sessions, what did I do yesterday, did we already do this."
 ---
 
 # Coding Agent Sessions
@@ -15,7 +15,7 @@ Find local coding-agent sessions across agent products before answering from mem
    |---|---|
    | Codex / OpenAI Codex CLI | `references/codex.md` |
    | Claude Code / Claude Desktop histories | `references/claude.md` |
-   | Senpi / pi coding-agent logs | `references/senpi.md` |
+   | OMO / Senpi / pi coding-agent logs | `references/senpi.md` |
    | oh-my-pi (`omp`, `~/.omp`) and gajae-code (`gjc`, `~/.gjc`) logs | `references/senpi.md` |
    | OpenCode / oh-my-openagent (formerly oh-my-opencode) storage | `references/opencode.md` |
    | OpenClaw, Droid, Amp, Gemini, Kimi, Qwen, Codebuff, Roo/Kilo/Cline, Kodu, Cursor CLI, Aider, Kiro, Goose, Hermes, Crush, Zed, Aside | `references/all-platforms.md` |
@@ -120,6 +120,7 @@ Use `references/codex.md` for Codex storage details.
 |---|---|
 | Missing Codex sessions | Set `CODEX_HOME` or pass `--root /path/to/.codex`. |
 | Missing oh-my-pi / gajae-code sessions | Those stores live in `~/.omp/agent/sessions` and `~/.gjc/agent/sessions`. For a custom `PI_CONFIG_DIR` / `PI_CODING_AGENT_DIR`, pass that agent dir with `--root`. |
+| Missing OMO / Senpi sessions | The `senpi` platform searches `~/.omo/agent/sessions`, `~/.senpi/agent/sessions`, and `~/.pi/agent/sessions` (plus matching profile roots). Pass a nonstandard agent directory with `--root`. |
 | Missing OpenCode sessions | Pass the data dir that contains `messages/` and `parts/`, often `~/.opencode` or `~/.local/share/opencode`. |
 | Missing Claude sessions | Search `~/.claude/projects`, `~/.claude/transcripts`, and `~/.claude/pre-compact-session-histories`; use `--root` for nonstandard config dirs. |
 | Missing Aside sessions | The Aside browser agent stores per-user data under `~/.aside/u/<n>/` (`sessions/<date>_<id>/messages.jsonl` transcripts + a `state.db` index; `agents/*/sessions/` is just a hardlink mirror). Pass `--root` for a nonstandard `.aside` dir or an exported user dir. |

package/dist/skills/coding-agent-sessions/references/all-platforms.md

@@ -10,7 +10,7 @@ Registered platform keys: `codex`, `claude`, `senpi`, `oh-my-pi`, `gajae-code`,
 |---|---|---|
 | Codex | `$CODEX_HOME`, `~/.codex` | `%CODEX_HOME%`, `%USERPROFILE%\.codex` |
 | Claude | `~/.claude` | `%USERPROFILE%\.claude`, `%APPDATA%\Claude` |
-| Senpi / pi | `~/.senpi/agent`, `~/.pi/agent` | `%USERPROFILE%\.senpi\agent`, `%USERPROFILE%\.pi\agent` |
+| OMO / Senpi / pi | `~/.omo/agent`, `~/.senpi/agent`, `~/.pi/agent` | `%USERPROFILE%\.omo\agent`, `%USERPROFILE%\.senpi\agent`, `%USERPROFILE%\.pi\agent` |
 | oh-my-pi (`omp`) | `~/.omp/agent`, `~/.omp/profiles/*/agent`, `$XDG_DATA_HOME/omp` | `%USERPROFILE%\.omp\agent` |
 | gajae-code (`gjc`) | `~/.gjc/agent`, `~/.gjc/profiles/*/agent`, `$XDG_DATA_HOME/gjc` | `%USERPROFILE%\.gjc\agent` |
 | OpenCode | `$OPENCODE_HOME`, `~/.opencode`, `~/.local/share/opencode` | `%OPENCODE_HOME%`, `%APPDATA%\opencode`, `%USERPROFILE%\.opencode` |

package/dist/skills/coding-agent-sessions/references/senpi.md

@@ -1,10 +1,10 @@
-# Senpi / pi Family Coding-Agent Sessions
+# OMO / Senpi / pi Family Coding-Agent Sessions
 
-The pi family (Senpi, oh-my-pi, gajae-code) shares one session format, so one scanner serves all three under separate platform keys.
+The pi family (OMO/Senpi, oh-my-pi, gajae-code) shares one session format, so one scanner serves all three under separate platform keys.
 
 | Platform key | Aliases | Config root | Sessions |
 |---|---|---|---|
-| `senpi` | - | `~/.senpi`, `~/.pi` | `<root>/agent/sessions/<encoded-cwd>/<timestamp>_<uuid>.jsonl` |
+| `senpi` | - | `~/.omo`, `~/.senpi`, `~/.pi` | `<root>/agent/sessions/<encoded-cwd>/<timestamp>_<uuid>.jsonl` |
 | `oh-my-pi` | `omp`, `ohmypi` | `~/.omp` | `~/.omp/agent/sessions/<encoded-cwd>/<timestamp>_<uuid>.jsonl` |
 | `gajae-code` | `gjc`, `gajae` | `~/.gjc` | `~/.gjc/agent/sessions/<encoded-cwd>/<timestamp>_<uuid>.jsonl` |
 
@@ -14,7 +14,7 @@ Extra roots scanned for every pi-family platform:
 - XDG stores (macOS/Linux, default profile): `$XDG_DATA_HOME/<app>/sessions/**` and `$XDG_DATA_HOME/<app>/profiles/<profile>/sessions/**`, where `<app>` is `senpi`, `omp`, or `gjc`. XDG flattens the `agent/` path segment.
 - A custom `PI_CONFIG_DIR` / `PI_CODING_AGENT_DIR` / `GJC_CONFIG_DIR` store: pass that agent directory with `--root`.
 
-`~/.senpi/agent/settings.json`, `models.json`, and `auth.json` provide environment context; oh-my-pi and gajae-code keep the same files plus `config.yml` and `models.yml` next to their sessions directory.
+`~/.omo/agent` and `~/.senpi/agent` are the current and legacy OMO/Senpi stores. Their `settings.json`, `models.json`, and `auth.json` files provide environment context; oh-my-pi and gajae-code keep the same files plus `config.yml` and `models.yml` next to their sessions directory.
 
 Common event types:
 

package/dist/skills/coding-agent-sessions/scripts/agent_sessions/pi_family.py

@@ -5,7 +5,7 @@ from pathlib import Path
 from .transcript import env_path, existing, jsonl_parallel, recent, stem_id
 from .types import Session
 
-SENPI_CONFIG_DIRS = (".senpi", ".pi")
+SENPI_CONFIG_DIRS = (".omo", ".senpi", ".pi")
 OH_MY_PI_CONFIG_DIRS = (".omp",)
 GAJAE_CODE_CONFIG_DIRS = (".gjc",)
 

package/dist/tui.js

@@ -18837,15 +18837,16 @@ var init_codegraph = __esm(() => {
 });
 
 // packages/omo-config-core/src/schema/memory.ts
-var OmoMemoryReflectionTriggerSchema, OmoMemoryReflectionSchema, OmoMemorySyncSchema, OmoMemorySearchSchema, OmoMemoryReflectionTriggerLayerSchema, OmoMemoryReflectionLayerSchema, OmoMemorySyncLayerSchema, OmoMemorySearchLayerSchema, OmoMemoryAgentOverridesSchema, OmoMemorySettingsSchema, OmoMemorySettingsLayerSchema;
+var OmoMemoryReflectionTriggerSchema, OmoMemoryReflectionSchema, OmoMemorySyncSchema, OmoMemorySearchSchema, OmoMemoryNudgeSchema, OmoMemoryFactsSchema, OmoMemoryDreamSchema, OmoMemoryPeopleSchema, OmoMemorySoulSchema, OmoMemoryReflectionTriggerLayerSchema, OmoMemoryReflectionLayerSchema, OmoMemorySyncLayerSchema, OmoMemorySearchLayerSchema, OmoMemoryNudgeLayerSchema, OmoMemoryFactsLayerSchema, OmoMemoryDreamLayerSchema, OmoMemoryPeopleLayerSchema, OmoMemorySoulLayerSchema, OmoMemoryAgentOverridesSchema, OmoMemorySettingsSchema, OmoMemorySettingsLayerSchema;
 var init_memory = __esm(() => {
   init_zod();
   OmoMemoryReflectionTriggerSchema = object({
-    step_count: number2().int().nonnegative().default(0),
+    step_count: number2().int().nonnegative().default(25),
     on_compaction: boolean2().default(true)
   }).strict();
   OmoMemoryReflectionSchema = object({
-    trigger: OmoMemoryReflectionTriggerSchema.default({ step_count: 0, on_compaction: true }),
+    enabled: boolean2().default(true),
+    trigger: OmoMemoryReflectionTriggerSchema.default({ step_count: 25, on_compaction: true }),
     merge: _enum2(["auto", "integration"]).default("auto"),
     category: string2().min(1).default("quick"),
     timeout_minutes: number2().int().positive().default(15),
@@ -18858,11 +18859,36 @@ var init_memory = __esm(() => {
   OmoMemorySearchSchema = object({
     enabled: boolean2().default(true)
   }).strict();
+  OmoMemoryNudgeSchema = object({
+    enabled: boolean2().default(true),
+    every_user_turns: number2().int().min(1).default(10)
+  }).strict();
+  OmoMemoryFactsSchema = object({
+    enabled: boolean2().default(true),
+    debounce_settles: number2().int().min(1).default(4)
+  }).strict();
+  OmoMemoryDreamSchema = object({
+    enabled: boolean2().default(true),
+    idle_minutes: number2().int().min(0).default(30),
+    min_hours_between: number2().int().min(1).default(24),
+    shutdown_launch: boolean2().default(true),
+    auto_select_max: number2().int().min(1).max(10).default(5),
+    auto_select_max_chars: number2().int().min(1e4).default(150000)
+  }).strict();
+  OmoMemoryPeopleSchema = object({
+    enabled: boolean2().default(true),
+    max_entries: number2().int().min(1).max(100).default(40),
+    max_entry_chars: number2().int().min(50).max(500).default(200)
+  }).strict();
+  OmoMemorySoulSchema = object({
+    edit_notice: boolean2().default(true)
+  }).strict();
   OmoMemoryReflectionTriggerLayerSchema = object({
     step_count: number2().int().nonnegative().optional(),
     on_compaction: boolean2().optional()
   }).strict();
   OmoMemoryReflectionLayerSchema = object({
+    enabled: boolean2().optional(),
     trigger: OmoMemoryReflectionTriggerLayerSchema.optional(),
     merge: _enum2(["auto", "integration"]).optional(),
     category: string2().min(1).optional(),
@@ -18876,10 +18902,39 @@ var init_memory = __esm(() => {
   OmoMemorySearchLayerSchema = object({
     enabled: boolean2().optional()
   }).strict();
+  OmoMemoryNudgeLayerSchema = object({
+    enabled: boolean2().optional(),
+    every_user_turns: number2().int().min(1).optional()
+  }).strict();
+  OmoMemoryFactsLayerSchema = object({
+    enabled: boolean2().optional(),
+    debounce_settles: number2().int().min(1).optional()
+  }).strict();
+  OmoMemoryDreamLayerSchema = object({
+    enabled: boolean2().optional(),
+    idle_minutes: number2().int().min(0).optional(),
+    min_hours_between: number2().int().min(1).optional(),
+    shutdown_launch: boolean2().optional(),
+    auto_select_max: number2().int().min(1).max(10).optional(),
+    auto_select_max_chars: number2().int().min(1e4).optional()
+  }).strict();
+  OmoMemoryPeopleLayerSchema = object({
+    enabled: boolean2().optional(),
+    max_entries: number2().int().min(1).max(100).optional(),
+    max_entry_chars: number2().int().min(50).max(500).optional()
+  }).strict();
+  OmoMemorySoulLayerSchema = object({
+    edit_notice: boolean2().optional()
+  }).strict();
   OmoMemoryAgentOverridesSchema = object({
     enabled: boolean2().optional(),
     agent: string2().min(1).optional(),
     reflection: OmoMemoryReflectionLayerSchema.optional(),
+    nudge: OmoMemoryNudgeLayerSchema.optional(),
+    facts: OmoMemoryFactsLayerSchema.optional(),
+    dream: OmoMemoryDreamLayerSchema.optional(),
+    people: OmoMemoryPeopleLayerSchema.optional(),
+    soul: OmoMemorySoulLayerSchema.optional(),
     sync: OmoMemorySyncLayerSchema.optional(),
     search: OmoMemorySearchLayerSchema.optional(),
     compile_warn_tokens: number2().int().positive().optional()
@@ -18889,12 +18944,25 @@ var init_memory = __esm(() => {
     agent: string2().min(1).default("auto"),
     tool_exposure: _enum2(["direct", "search"]).default("direct"),
     reflection: OmoMemoryReflectionSchema.default({
-      trigger: { step_count: 0, on_compaction: true },
+      enabled: true,
+      trigger: { step_count: 25, on_compaction: true },
       merge: "auto",
       category: "quick",
       timeout_minutes: 15,
       sandbox: "auto"
     }),
+    nudge: OmoMemoryNudgeSchema.default({ enabled: true, every_user_turns: 10 }),
+    facts: OmoMemoryFactsSchema.default({ enabled: true, debounce_settles: 4 }),
+    dream: OmoMemoryDreamSchema.default({
+      enabled: true,
+      idle_minutes: 30,
+      min_hours_between: 24,
+      shutdown_launch: true,
+      auto_select_max: 5,
+      auto_select_max_chars: 150000
+    }),
+    people: OmoMemoryPeopleSchema.default({ enabled: true, max_entries: 40, max_entry_chars: 200 }),
+    soul: OmoMemorySoulSchema.default({ edit_notice: true }),
     sync: OmoMemorySyncSchema.default({ enabled: true }),
     search: OmoMemorySearchSchema.default({ enabled: true }),
     compile_warn_tokens: number2().int().positive().default(30000),
@@ -18905,6 +18973,11 @@ var init_memory = __esm(() => {
     agent: string2().min(1).optional(),
     tool_exposure: _enum2(["direct", "search"]).optional(),
     reflection: OmoMemoryReflectionLayerSchema.optional(),
+    nudge: OmoMemoryNudgeLayerSchema.optional(),
+    facts: OmoMemoryFactsLayerSchema.optional(),
+    dream: OmoMemoryDreamLayerSchema.optional(),
+    people: OmoMemoryPeopleLayerSchema.optional(),
+    soul: OmoMemorySoulLayerSchema.optional(),
     sync: OmoMemorySyncLayerSchema.optional(),
     search: OmoMemorySearchLayerSchema.optional(),
     compile_warn_tokens: number2().int().positive().optional(),
@@ -19060,6 +19133,19 @@ var init_team = __esm(() => {
   OmoTeamsConfigLayerSchema = record(string2(), OmoTeamSpecLayerSchema);
 });
 
+// packages/omo-config-core/src/schema/telemetry.ts
+var OmoTelemetrySettingsShape, OmoTelemetrySettingsLayerSchema, OmoTelemetrySettingsSchema;
+var init_telemetry = __esm(() => {
+  init_zod();
+  OmoTelemetrySettingsShape = {
+    enabled: boolean2()
+  };
+  OmoTelemetrySettingsLayerSchema = object(OmoTelemetrySettingsShape).partial().strict();
+  OmoTelemetrySettingsSchema = OmoTelemetrySettingsLayerSchema.extend({
+    enabled: boolean2().default(true)
+  }).strict();
+});
+
 // packages/omo-config-core/src/schema/config.ts
 var OmoOpenCodeHarnessConfigSchema, OmoTypedHarnessConfigSchema, OmoConfigProfileSchema, OmoConfigSchema, OmoConfigLayerSchema;
 var init_config = __esm(() => {
@@ -19071,6 +19157,7 @@ var init_config = __esm(() => {
   init_model_catalog();
   init_task();
   init_team();
+  init_telemetry();
   OmoOpenCodeHarnessConfigSchema = record(string2(), unknown());
   OmoTypedHarnessConfigSchema = object({
     categories: OmoCategoriesConfigSchema.optional(),
@@ -19079,7 +19166,8 @@ var init_config = __esm(() => {
     task: OmoTaskSettingsLayerSchema.optional(),
     teams: OmoTeamsConfigLayerSchema.optional(),
     models: OmoModelCatalogLayerSchema.optional(),
-    memory: OmoMemorySettingsLayerSchema.optional()
+    memory: OmoMemorySettingsLayerSchema.optional(),
+    telemetry: OmoTelemetrySettingsLayerSchema.optional()
   }).strict();
   OmoConfigProfileSchema = object({
     categories: OmoCategoriesConfigSchema.optional(),
@@ -19089,6 +19177,7 @@ var init_config = __esm(() => {
     teams: OmoTeamsConfigLayerSchema.optional(),
     models: OmoModelCatalogLayerSchema.optional(),
     memory: OmoMemorySettingsLayerSchema.optional(),
+    telemetry: OmoTelemetrySettingsLayerSchema.optional(),
     "[opencode]": OmoOpenCodeHarnessConfigSchema.optional(),
     "[senpi]": OmoTypedHarnessConfigSchema.optional(),
     "[codex]": OmoTypedHarnessConfigSchema.optional()
@@ -19102,6 +19191,7 @@ var init_config = __esm(() => {
     teams: OmoTeamsConfigSchema.optional(),
     models: OmoModelCatalogSchema.optional(),
     memory: OmoMemorySettingsSchema.optional(),
+    telemetry: OmoTelemetrySettingsSchema.optional(),
     "[opencode]": OmoOpenCodeHarnessConfigSchema.optional(),
     "[senpi]": OmoTypedHarnessConfigSchema.optional(),
     "[codex]": OmoTypedHarnessConfigSchema.optional(),
@@ -19118,6 +19208,7 @@ var init_config = __esm(() => {
     teams: OmoTeamsConfigLayerSchema.optional(),
     models: OmoModelCatalogLayerSchema.optional(),
     memory: OmoMemorySettingsLayerSchema.optional(),
+    telemetry: OmoTelemetrySettingsLayerSchema.optional(),
     "[opencode]": OmoOpenCodeHarnessConfigSchema.optional(),
     "[senpi]": OmoTypedHarnessConfigSchema.optional(),
     "[codex]": OmoTypedHarnessConfigSchema.optional(),
@@ -19140,6 +19231,7 @@ var init_schema = __esm(() => {
   init_model_ref();
   init_task();
   init_team();
+  init_telemetry();
 });
 
 // packages/omo-config-core/src/loader/merge.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oh-my-opencode",
-  "version": "5.0.0-beta.5",
+  "version": "5.0.0-beta.7",
   "description": "The Best AI Agent Harness - Batteries-Included OpenCode Plugin with Multi-Model Orchestration, Parallel Background Agents, and Crafted LSP/AST Tools",
   "main": "./dist/index.js",
   "types": "dist/index.d.ts",
@@ -180,7 +180,7 @@
     "zod": "^4.4.3"
   },
   "devDependencies": {
-    "@code-yeongyu/senpi": "2026.8.11-2",
+    "@code-yeongyu/senpi": "2026.8.12-4",
     "@oh-my-opencode/agents-md-core": "workspace:*",
     "@oh-my-opencode/ast-grep-mcp": "workspace:*",
     "@oh-my-opencode/boulder-state": "workspace:*",
@@ -196,6 +196,7 @@
     "@oh-my-opencode/model-core": "workspace:*",
     "@oh-my-opencode/omo-codex": "workspace:*",
     "@oh-my-opencode/omo-config-core": "workspace:*",
+    "@oh-my-opencode/omo-opencode": "workspace:*",
     "@oh-my-opencode/omo-senpi": "workspace:*",
     "@oh-my-opencode/openclaw-core": "workspace:*",
     "@oh-my-opencode/pi-goal": "workspace:*",
@@ -220,18 +221,18 @@
     "typescript": "^7.0.2"
   },
   "optionalDependencies": {
-    "oh-my-opencode-darwin-arm64": "5.0.0-beta.5",
-    "oh-my-opencode-darwin-x64": "5.0.0-beta.5",
-    "oh-my-opencode-darwin-x64-baseline": "5.0.0-beta.5",
-    "oh-my-opencode-linux-arm64": "5.0.0-beta.5",
-    "oh-my-opencode-linux-arm64-musl": "5.0.0-beta.5",
-    "oh-my-opencode-linux-x64": "5.0.0-beta.5",
-    "oh-my-opencode-linux-x64-baseline": "5.0.0-beta.5",
-    "oh-my-opencode-linux-x64-musl": "5.0.0-beta.5",
-    "oh-my-opencode-linux-x64-musl-baseline": "5.0.0-beta.5",
-    "oh-my-opencode-windows-arm64": "5.0.0-beta.5",
-    "oh-my-opencode-windows-x64": "5.0.0-beta.5",
-    "oh-my-opencode-windows-x64-baseline": "5.0.0-beta.5"
+    "oh-my-opencode-darwin-arm64": "5.0.0-beta.7",
+    "oh-my-opencode-darwin-x64": "5.0.0-beta.7",
+    "oh-my-opencode-darwin-x64-baseline": "5.0.0-beta.7",
+    "oh-my-opencode-linux-arm64": "5.0.0-beta.7",
+    "oh-my-opencode-linux-arm64-musl": "5.0.0-beta.7",
+    "oh-my-opencode-linux-x64": "5.0.0-beta.7",
+    "oh-my-opencode-linux-x64-baseline": "5.0.0-beta.7",
+    "oh-my-opencode-linux-x64-musl": "5.0.0-beta.7",
+    "oh-my-opencode-linux-x64-musl-baseline": "5.0.0-beta.7",
+    "oh-my-opencode-windows-arm64": "5.0.0-beta.7",
+    "oh-my-opencode-windows-x64": "5.0.0-beta.7",
+    "oh-my-opencode-windows-x64-baseline": "5.0.0-beta.7"
   },
   "overrides": {
     "@earendil-works/pi-agent-core": "0.80.3",

package/packages/lsp-core/src/lsp/client-wrapper.test.ts

@@ -4,8 +4,9 @@ import { join } from "node:path";
 import { afterEach, describe, expect, it } from "bun:test";
 
 import { createStandaloneMcpRequestContext, runWithRequestContext } from "../request-context.js";
-import { findWorkspaceRoot, resolvePathInsideContext } from "./client-wrapper.js";
+import { findWorkspaceRoot, resolveReadablePathInsideContext, withLspClient } from "./client-wrapper.js";
 import { LspInvalidPathError } from "./errors.js";
+import { LspManager } from "./manager.js";
 
 const tempDirectories: string[] = [];
 
@@ -48,16 +49,68 @@ describe("LSP client path confinement", () => {
 		).toThrow(LspInvalidPathError);
 	});
 
-	it("#given a symlink inside cwd that points outside #when resolving #then rejects the escape", () => {
+	it("#given a symlink inside cwd that points outside #when resolving read path #then keeps lexical path and cwd root", () => {
 		const root = tempRoot("lsp-client-wrapper-symlink-root-");
 		const outside = tempRoot("lsp-client-wrapper-symlink-outside-");
+		mkdirSync(join(root, ".git"), { recursive: true });
+		mkdirSync(join(outside, ".git"), { recursive: true });
 		writeFileSync(join(outside, "file.ts"), "export const outside = true;\n");
 		symlinkSync(outside, join(root, "linked"));
 
-		expect(() =>
-			runWithRequestContext(createStandaloneMcpRequestContext({ cwd: root }), () =>
-				resolvePathInsideContext("linked/file.ts"),
-			),
-		).toThrow(LspInvalidPathError);
+		const result = runWithRequestContext(createStandaloneMcpRequestContext({ cwd: root }), () => ({
+			filePath: resolveReadablePathInsideContext("linked/file.ts"),
+			workspaceRoot: findWorkspaceRoot("linked/file.ts"),
+		}));
+
+		expect(result.filePath).toBe(join(realpathSync(root), "linked", "file.ts"));
+		expect(result.workspaceRoot).toBe(realpathSync(root));
+	});
+
+	it("#given an absolute macOS alias path through an outside symlink #when resolving read path #then preserves the lexical suffix", () => {
+		const root = tempRoot("lsp-client-wrapper-alias-root-");
+		const outside = tempRoot("lsp-client-wrapper-alias-outside-");
+		mkdirSync(join(root, ".git"), { recursive: true });
+		writeFileSync(join(outside, "file.ts"), "export const outside = true;\n");
+		symlinkSync(outside, join(root, "linked"));
+
+		const result = runWithRequestContext(createStandaloneMcpRequestContext({ cwd: root }), () =>
+			resolveReadablePathInsideContext(join(root, "linked", "file.ts")),
+		);
+
+		expect(result).toBe(join(realpathSync(root), "linked", "file.ts"));
+	});
+
+	it("#given missing parent directories without markers #when resolving workspace #then uses an existing directory", () => {
+		const root = tempRoot("lsp-client-wrapper-missing-root-");
+		const workspace = runWithRequestContext(createStandaloneMcpRequestContext({ cwd: root }), () =>
+			findWorkspaceRoot("missing/deep/file.ts"),
+		);
+
+		expect(workspace).toBe(realpathSync(root));
+	});
+
+	it("#given a symlink inside cwd that points outside #when starting rename #then rejects before client acquisition", async () => {
+		const root = tempRoot("lsp-client-wrapper-rename-root-");
+		const outside = tempRoot("lsp-client-wrapper-rename-outside-");
+		writeFileSync(join(outside, "file.ts"), "export const outside = true;\n");
+		symlinkSync(outside, join(root, "linked"));
+		let clientFactoryCalls = 0;
+		const manager = new LspManager({
+			clientFactory: () => {
+				clientFactoryCalls += 1;
+				throw new Error("client acquisition must not start");
+			},
+		});
+
+		try {
+			await expect(
+				runWithRequestContext(createStandaloneMcpRequestContext({ cwd: root }), () =>
+					withLspClient("linked/file.ts", async () => undefined, "rename", { manager }),
+				),
+			).rejects.toThrow(LspInvalidPathError);
+			expect(clientFactoryCalls).toBe(0);
+		} finally {
+			await manager.stopAll();
+		}
 	});
 });

package/packages/lsp-core/src/lsp/client-wrapper.ts

@@ -1,5 +1,5 @@
-import { existsSync, statSync } from "node:fs";
-import { dirname, join, resolve } from "node:path";
+import { existsSync, realpathSync, statSync } from "node:fs";
+import { basename, dirname, join, resolve } from "node:path";
 import {
 	canonicalizeExistingOrNearestAncestor,
 	contextCwd,
@@ -31,30 +31,48 @@ export function isDirectoryPath(filePath: string): boolean {
 }
 
 export function findWorkspaceRoot(filePath: string): string {
-	const abs = resolvePathInsideContext(filePath);
+	const cwd = contextCwd();
+	const abs = resolveReadablePathInsideContext(filePath);
 	let dir = abs;
 
 	if (!isDirectoryPath(dir)) {
 		dir = dirname(dir);
 	}
 
-	let prevDir = "";
-	while (dir !== prevDir) {
-		for (const marker of WORKSPACE_MARKERS) {
-			if (existsSync(join(dir, marker))) {
-				return dir;
+	const fallbackRoot = nearestExistingDirectoryInsideContext(dir, cwd) ?? cwd;
+	while (isPathInside(cwd, dir)) {
+		const canonicalDir = existingDirectoryInsideContext(dir, cwd);
+		if (canonicalDir !== undefined) {
+			for (const marker of WORKSPACE_MARKERS) {
+				if (existsSync(join(dir, marker))) {
+					return canonicalDir;
+				}
 			}
 		}
-		prevDir = dir;
+		if (dir === cwd) break;
 		dir = dirname(dir);
 	}
 
-	return dirname(abs);
+	return fallbackRoot;
 }
 
-export function resolvePathInsideContext(filePath: string): string {
+export function resolveReadablePathInsideContext(filePath: string): string {
 	const cwd = contextCwd();
 	const abs = resolve(cwd, filePath);
+	if (isPathInside(cwd, abs)) return abs;
+
+	const rebased = rebaseThroughCanonicalAncestor(abs, cwd);
+	if (rebased !== undefined) return rebased;
+
+	const canonical = canonicalizeExistingOrNearestAncestor(abs);
+	if (isPathInside(cwd, canonical)) return canonical;
+
+	throw new LspInvalidPathError(`LSP file path must be inside request cwd: ${filePath}`);
+}
+
+export function resolvePathInsideContext(filePath: string): string {
+	const cwd = contextCwd();
+	const abs = resolveReadablePathInsideContext(filePath);
 	const canonical = canonicalizeExistingOrNearestAncestor(abs);
 	if (!isPathInside(cwd, canonical)) {
 		throw new LspInvalidPathError(`LSP file path must be inside request cwd: ${filePath}`);
@@ -62,6 +80,39 @@ export function resolvePathInsideContext(filePath: string): string {
 	return canonical;
 }
 
+function rebaseThroughCanonicalAncestor(path: string, cwd: string): string | undefined {
+	let current = path;
+	const suffix: string[] = [];
+	while (true) {
+		if (existsSync(current)) {
+			const canonical = realpathSync(current);
+			if (isPathInside(cwd, canonical)) return suffix.length === 0 ? canonical : join(canonical, ...suffix);
+		}
+		const parent = dirname(current);
+		if (parent === current) return undefined;
+		suffix.unshift(basename(current));
+		current = parent;
+	}
+}
+
+function existingDirectoryInsideContext(directory: string, cwd: string): string | undefined {
+	if (!existsSync(directory)) return undefined;
+	const canonical = realpathSync(directory);
+	if (!statSync(canonical).isDirectory()) return undefined;
+	return isPathInside(cwd, canonical) ? canonical : undefined;
+}
+
+function nearestExistingDirectoryInsideContext(directory: string, cwd: string): string | undefined {
+	let current = directory;
+	while (isPathInside(cwd, current)) {
+		const canonical = existingDirectoryInsideContext(current, cwd);
+		if (canonical !== undefined) return canonical;
+		if (current === cwd) return undefined;
+		current = dirname(current);
+	}
+	return undefined;
+}
+
 export function formatServerLookupError(result: Exclude<ServerLookupResult, { status: "found" }>): string {
 	if (result.status === "not_installed") {
 		return formatNotInstalled(result);
@@ -143,7 +194,7 @@ export interface WithLspClientOptions {
 	manager?: LspManager;
 }
 
-const READ_ONLY_RETRY_TOOLS = new Set([
+const READ_ONLY_TOOLS = new Set([
 	"diagnostics",
 	"definition",
 	"references",
@@ -154,11 +205,13 @@ const READ_ONLY_RETRY_TOOLS = new Set([
 
 export async function withLspClient<T>(
 	filePath: string,
-	fn: (client: LspClient, workspaceRoot: string) => Promise<T>,
+	fn: (client: LspClient, workspaceRoot: string, resolvedFilePath: string) => Promise<T>,
 	toolName: string,
 	options: WithLspClientOptions = {},
 ): Promise<T> {
-	const absPath = resolvePathInsideContext(filePath);
+	const absPath = READ_ONLY_TOOLS.has(toolName)
+		? resolveReadablePathInsideContext(filePath)
+		: resolvePathInsideContext(filePath);
 
 	if (isDirectoryPath(absPath)) {
 		throw new LspInvalidPathError(
@@ -181,9 +234,9 @@ export async function withLspClient<T>(
 		const client = await manager.getClient(root, server, options.signal);
 
 		try {
-			return await fn(client, root);
+			return await fn(client, root, absPath);
 		} catch (err) {
-			if (allowRetry && READ_ONLY_RETRY_TOOLS.has(toolName) && isLspDeadConnectionError(err)) {
+			if (allowRetry && READ_ONLY_TOOLS.has(toolName) && isLspDeadConnectionError(err)) {
 				manager.invalidateClient(root, server.id, client);
 				return acquireAndCall(false);
 			}

package/packages/lsp-core/src/lsp/workspace-edit-adversarial.test.ts

@@ -1,4 +1,4 @@
-import { mkdtempSync, readFileSync, rmSync, writeFileSync } from "node:fs";
+import { mkdtempSync, readFileSync, realpathSync, rmSync, symlinkSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { pathToFileURL } from "node:url";
@@ -87,6 +87,25 @@ describe("workspace edit adversarial inputs", () => {
 		expect(readFileSync(outsideFile, "utf-8")).toBe("outside bytes\n");
 	});
 
+	it("#given an in-workspace symlink to an outside file #when applying an edit #then rejects without modifying target", () => {
+		const workspace = makeTempDirectory("lsp-workspace-");
+		const outside = makeTempDirectory("lsp-outside-");
+		const outsideFile = join(outside, "outside.ts");
+		const canonicalWorkspace = realpathSync(workspace);
+		const linkedDirectory = join(canonicalWorkspace, "linked");
+		writeFileSync(outsideFile, "outside bytes\n", "utf-8");
+		symlinkSync(outside, linkedDirectory);
+
+		const result = applyWorkspaceEdit(
+			{ changes: { [pathToFileURL(join(linkedDirectory, "outside.ts")).href]: [insertion()] } },
+			{ workspaceRoot: canonicalWorkspace },
+		);
+
+		expect(result.success).toBe(false);
+		expect(result.errors.join("\n")).toContain("outside workspace");
+		expect(readFileSync(outsideFile, "utf-8")).toBe("outside bytes\n");
+	});
+
 	it("#given annotations or mixed edit representations #when planned #then unsupported claims are rejected", () => {
 		const workspace = makeTempDirectory("lsp-workspace-");
 		const unsupported = [

package/packages/lsp-core/src/tools/diagnostics.ts

@@ -1,4 +1,4 @@
-import { isDirectoryPath, resolvePathInsideContext, withLspClient } from "../lsp/client-wrapper.js";
+import { isDirectoryPath, resolveReadablePathInsideContext, withLspClient } from "../lsp/client-wrapper.js";
 import { DEFAULT_MAX_DIAGNOSTICS } from "../lsp/constants.js";
 import { aggregateDiagnosticsForDirectory } from "../lsp/directory-diagnostics.js";
 import { filterDiagnosticsBySeverity, formatDiagnostic } from "../lsp/formatters.js";
@@ -23,7 +23,7 @@ export async function executeLspDiagnostics(
 	const severity = severityFilter(params);
 
 	try {
-		const absPath = resolvePathInsideContext(filePath);
+		const absPath = resolveReadablePathInsideContext(filePath);
 		if (isDirectoryPath(absPath)) {
 			const extension = inferExtensionFromDirectory(absPath);
 			if (!extension) {
@@ -62,7 +62,7 @@ export async function executeLspDiagnostics(
 
 		const result = await withLspClient(
 				filePath,
-				async (client) => client.diagnostics(filePath, signal),
+				async (client, _workspaceRoot, resolvedFilePath) => client.diagnostics(resolvedFilePath, signal),
 				"diagnostics",
 				clientOptions(signal),
 			);

package/packages/lsp-core/src/tools/navigation.ts

@@ -17,7 +17,8 @@ export async function executeLspGotoDefinition(
 	try {
 			const result = await withLspClient(
 				filePath,
-				async (client) => client.definition(filePath, line, character, signal),
+				async (client, _workspaceRoot, resolvedFilePath) =>
+					client.definition(resolvedFilePath, line, character, signal),
 				"definition",
 				clientOptions(signal),
 			);
@@ -49,7 +50,8 @@ export async function executeLspFindReferences(
 	try {
 			const result = await withLspClient(
 				filePath,
-				async (client) => client.references(filePath, line, character, includeDeclaration, signal),
+				async (client, _workspaceRoot, resolvedFilePath) =>
+					client.references(resolvedFilePath, line, character, includeDeclaration, signal),
 				"references",
 				clientOptions(signal),
 			);

package/packages/lsp-core/src/tools/rename.ts

@@ -16,7 +16,8 @@ export async function executeLspPrepareRename(
 	try {
 			const result = await withLspClient(
 				filePath,
-				async (client) => client.prepareRename(filePath, line, character, signal),
+				async (client, _workspaceRoot, resolvedFilePath) =>
+					client.prepareRename(resolvedFilePath, line, character, signal),
 				"prepareRename",
 				clientOptions(signal),
 			);
@@ -46,7 +47,8 @@ export async function executeLspRename(
 	try {
 		const result = await withLspClient(
 			filePath,
-			async (client) => client.rename(filePath, line, character, newName, signal),
+			async (client, _workspaceRoot, resolvedFilePath) =>
+				client.rename(resolvedFilePath, line, character, newName, signal),
 			"rename",
 			clientOptions(signal),
 		);