@cortexkit/aft-opencode 0.36.1 → 0.37.0

package/dist/shared/rpc-client.d.ts

@@ -1,5 +1,16 @@
 export interface AftRpcCallOptions {
     signal?: AbortSignal;
+    /**
+     * Optional gate over WARM (non-placeholder) responses. With multiple RPC
+     * servers alive for one project hash (multi-project hosts, stale long-lived
+     * processes), a warm response can describe ANOTHER project's bridge
+     * (cross-project contamination). Return false to skip that response and
+     * keep trying other ports instead of returning it — so a stray server can't
+     * mask the right one. Skipped responses are never cached as the good port
+     * and never returned; if only strays and placeholders answer, the
+     * placeholder wins.
+     */
+    accept?: (result: unknown) => boolean;
 }
 export declare class AftRpcClient {
     private port;

package/dist/shared/rpc-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rpc-client.d.ts","sourceRoot":"","sources":["../../src/shared/rpc-client.ts"],"names":[],"mappings":"AAYA,MAAM,WAAW,iBAAiB;IAChC,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AA4BD,qBAAa,YAAY;IACvB,OAAO,CAAC,IAAI,CAAuB;IACnC,OAAO,CAAC,KAAK,CAAuB;IACpC,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,iBAAiB,CAA6B;gBAE1C,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAKjD,iFAAiF;IAC3E,IAAI,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACpC,MAAM,EAAE,MAAM,EACd,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,EACpC,OAAO,GAAE,iBAAsB,GAC9B,OAAO,CAAC,CAAC,CAAC;YAyCC,OAAO;IAsBrB;;;;OAIG;IACH,OAAO,CAAC,oBAAoB;IAM5B,4CAA4C;IACtC,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IASrC;;;;OAIG;YACW,gBAAgB;IAwB9B,OAAO,CAAC,gBAAgB;IAwDxB,8EAA8E;IAC9E,OAAO,CAAC,mBAAmB;IAQ3B,OAAO,CAAC,aAAa;IASrB,OAAO,CAAC,cAAc;IAKtB,OAAO,CAAC,gBAAgB;IAKxB,OAAO,CAAC,iBAAiB;YAsBX,WAAW;YAkCX,gBAAgB;IAmB9B,KAAK,IAAI,IAAI;CAKd"}
+{"version":3,"file":"rpc-client.d.ts","sourceRoot":"","sources":["../../src/shared/rpc-client.ts"],"names":[],"mappings":"AAYA,MAAM,WAAW,iBAAiB;IAChC,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB;;;;;;;;;OASG;IACH,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,OAAO,CAAC;CACvC;AA4BD,qBAAa,YAAY;IACvB,OAAO,CAAC,IAAI,CAAuB;IACnC,OAAO,CAAC,KAAK,CAAuB;IACpC,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,iBAAiB,CAA6B;gBAE1C,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAKjD,iFAAiF;IAC3E,IAAI,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACpC,MAAM,EAAE,MAAM,EACd,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,EACpC,OAAO,GAAE,iBAAsB,GAC9B,OAAO,CAAC,CAAC,CAAC;YA8CC,OAAO;IAsBrB;;;;OAIG;IACH,OAAO,CAAC,oBAAoB;IAM5B,4CAA4C;IACtC,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IASrC;;;;OAIG;YACW,gBAAgB;IAwB9B,OAAO,CAAC,gBAAgB;IAwDxB,8EAA8E;IAC9E,OAAO,CAAC,mBAAmB;IAQ3B,OAAO,CAAC,aAAa;IASrB,OAAO,CAAC,cAAc;IAKtB,OAAO,CAAC,gBAAgB;IAKxB,OAAO,CAAC,iBAAiB;YAsBX,WAAW;YAkCX,gBAAgB;IAmB9B,KAAK,IAAI,IAAI;CAKd"}

package/dist/shared/rpc-server.d.ts

@@ -13,6 +13,13 @@ export declare class AftRpcServer {
     handle(method: string, handler: RpcHandler): void;
     /** Start the server on a random port, write port to disk. */
     start(): Promise<number>;
+    /**
+     * Remove sibling port files whose owning process is provably dead.
+     * Only files with a recorded pid that no longer maps to a live process are
+     * removed; pid-less (legacy) files and live entries are left untouched.
+     * Never touches our own freshly written file.
+     */
+    private sweepDeadPortFiles;
     /** Stop the server and clean up port file. */
     stop(): void;
     private dispatch;

package/dist/shared/rpc-server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rpc-server.d.ts","sourceRoot":"","sources":["../../src/shared/rpc-server.ts"],"names":[],"mappings":"AAOA,KAAK,UAAU,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;AAExF,qBAAa,YAAY;IACvB,OAAO,CAAC,MAAM,CAAuB;IACrC,OAAO,CAAC,IAAI,CAAK;IACjB,OAAO,CAAC,KAAK,CAAuB;IACpC,OAAO,CAAC,QAAQ,CAAiC;IACjD,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,QAAQ,CAAS;IACzB,oFAAoF;IACpF,OAAO,CAAC,UAAU,CAAS;gBAEf,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAMjD,sCAAsC;IACtC,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,GAAG,IAAI;IAIjD,6DAA6D;IACvD,KAAK,IAAI,OAAO,CAAC,MAAM,CAAC;IAmD9B,8CAA8C;IAC9C,IAAI,IAAI,IAAI;IAaZ,OAAO,CAAC,QAAQ;CAoEjB"}
+{"version":3,"file":"rpc-server.d.ts","sourceRoot":"","sources":["../../src/shared/rpc-server.ts"],"names":[],"mappings":"AAcA,KAAK,UAAU,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;AAExF,qBAAa,YAAY;IACvB,OAAO,CAAC,MAAM,CAAuB;IACrC,OAAO,CAAC,IAAI,CAAK;IACjB,OAAO,CAAC,KAAK,CAAuB;IACpC,OAAO,CAAC,QAAQ,CAAiC;IACjD,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,QAAQ,CAAS;IACzB,oFAAoF;IACpF,OAAO,CAAC,UAAU,CAAS;gBAEf,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAMjD,sCAAsC;IACtC,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,GAAG,IAAI;IAIjD,6DAA6D;IACvD,KAAK,IAAI,OAAO,CAAC,MAAM,CAAC;IA0D9B;;;;;OAKG;IACH,OAAO,CAAC,kBAAkB;IA6B1B,8CAA8C;IAC9C,IAAI,IAAI,IAAI;IAaZ,OAAO,CAAC,QAAQ;CAoEjB"}

package/dist/shared/session-directory.d.ts

@@ -28,6 +28,7 @@ export declare function getSessionDirectoryCached(sessionId: string | undefined)
  * will return the resolved directory once the lookup completes.
  */
 export declare function warmSessionDirectory(client: unknown, sessionId: string | undefined, fallbackDirectory: string): void;
+export declare function verifySessionDirectory(client: unknown, sessionId: string): Promise<string | null>;
 /** Test-only: clear the cache between unit tests. */
 export declare function _resetSessionDirectoryCacheForTest(): void;
 //# sourceMappingURL=session-directory.d.ts.map

package/dist/shared/session-directory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session-directory.d.ts","sourceRoot":"","sources":["../../src/shared/session-directory.ts"],"names":[],"mappings":"AA+CA;;;;;;;;;;GAUG;AACH,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,OAAO,EACf,SAAS,EAAE,MAAM,EACjB,iBAAiB,EAAE,MAAM,GACxB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CA8CxB;AAWD;;;;;;;;;;GAUG;AACH,wBAAgB,yBAAyB,CACvC,SAAS,EAAE,MAAM,GAAG,SAAS,GAC5B,MAAM,GAAG,IAAI,GAAG,SAAS,CAK3B;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,OAAO,EACf,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,iBAAiB,EAAE,MAAM,GACxB,IAAI,CAIN;AAED,qDAAqD;AACrD,wBAAgB,kCAAkC,IAAI,IAAI,CAEzD"}
+{"version":3,"file":"session-directory.d.ts","sourceRoot":"","sources":["../../src/shared/session-directory.ts"],"names":[],"mappings":"AA+CA;;;;;;;;;;GAUG;AACH,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,OAAO,EACf,SAAS,EAAE,MAAM,EACjB,iBAAiB,EAAE,MAAM,GACxB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CA8CxB;AAWD;;;;;;;;;;GAUG;AACH,wBAAgB,yBAAyB,CACvC,SAAS,EAAE,MAAM,GAAG,SAAS,GAC5B,MAAM,GAAG,IAAI,GAAG,SAAS,CAK3B;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,OAAO,EACf,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,iBAAiB,EAAE,MAAM,GACxB,IAAI,CAIN;AAoBD,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,OAAO,EACf,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAgCxB;AAED,qDAAqD;AACrD,wBAAgB,kCAAkC,IAAI,IAAI,CAGzD"}

package/dist/tools/_shared.d.ts

@@ -69,18 +69,8 @@ export declare function coerceOptionalInt(v: unknown, paramName: string, min: nu
  * collection sentinels qualify.
  */
 export declare function isEmptyParam(value: unknown): boolean;
-/**
- * Per-command timeout overrides (milliseconds).
- *
- * Commands not listed fall back to the bridge-wide default (30s). Only
- * extend budgets for operations that legitimately walk the project
- * file tree or wait on external I/O (embedding API, index build). The
- * goal is to absorb slow first-call spikes without masking real hangs.
- */
 export declare const BASH_TRANSPORT_TIMEOUT_MS = 30000;
-export declare const LONG_RUNNING_COMMAND_TIMEOUT_MS: Record<string, number>;
-/** Returns the per-command timeout override, or undefined to use the bridge default. */
-export declare function timeoutForCommand(command: string): number | undefined;
+export { LONG_RUNNING_COMMAND_TIMEOUT_MS, timeoutForCommand } from "@cortexkit/aft-bridge";
 /** Format bridge failure envelopes without dropping structured error data. */
 export declare function formatBridgeErrorMessage(command: string, response: Record<string, unknown>, params?: Record<string, unknown>): string;
 /**

package/dist/tools/_shared.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"_shared.d.ts","sourceRoot":"","sources":["../../src/tools/_shared.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"_shared.d.ts","sourceRoot":"","sources":["../../src/tools/_shared.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAKH,OAAO,KAAK,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAUhF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAIjD;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,eAAO,MAAM,WAAW,GAAI,KAAK,MAAM,EAAE,KAAK,MAAM,KAAG,GACR,CAAC;AAEhD;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,iBAAiB,CAC/B,CAAC,EAAE,OAAO,EACV,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,MAAM,GACV,MAAM,GAAG,SAAS,CAWpB;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAMpD;AAMD,eAAO,MAAM,yBAAyB,QAAS,CAAC;AAIhD,OAAO,EAAE,+BAA+B,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AA2B3F,8EAA8E;AAC9E,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACjC,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GACnC,MAAM,CAsDR;AAsBD;;;;;;GAMG;AACH,MAAM,WAAW,WAAW;IAC1B,wEAAwE;IACxE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,oDAAoD;IACpD,SAAS,EAAE,MAAM,CAAC;IAClB,6EAA6E;IAC7E,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAkBD;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,WAAW,GAAG,MAAM,CAW3D;AAED;;;;;GAKG;AACH,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,aAAa,EAClB,OAAO,EAAE,WAAW,GACnB,OAAO,CAAC,MAAM,CAAC,CAKjB;AAED;;;;;;GAMG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAQjD;AAED;;2BAE2B;AAC3B,wBAAgB,0BAA0B,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAGtF;AAED,wBAAsB,cAAc,CAClC,GAAG,EAAE,aAAa,EAClB,OAAO,EAAE,WAAW,EACpB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,CAEjB;AAED;;;;;;;;;GASG;AACH,wBAAgB,SAAS,CAAC,GAAG,EAAE,aAAa,EAAE,OAAO,EAAE,WAAW,GAAG,YAAY,CAEhF;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,UAAU,CAC9B,GAAG,EAAE,aAAa,EAClB,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,MAAM,EACf,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,EACpC,OAAO,CAAC,EAAE,oBAAoB,GAC7B,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAgClC;AAED;;;;;GAKG;AACH,wBAAsB,cAAc,CAClC,GAAG,EAAE,aAAa,EAClB,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,MAAM,EACf,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,EACpC,OAAO,CAAC,EAAE,oBAAoB,GAC7B,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAMlC;AAED;;;;;GAKG;AACH,wBAAgB,+BAA+B,CAAC,GAAG,EAAE,aAAa,EAAE,OAAO,EAAE,WAAW,GAAG,IAAI,CAE9F"}

package/dist/tools/bash.d.ts

@@ -1,6 +1,26 @@
 import type { ToolDefinition } from "@opencode-ai/plugin";
 import type { PluginContext } from "../types.js";
-export declare function createBashTool(ctx: PluginContext): ToolDefinition;
+/**
+ * Agent-facing tool description, selected from the live configuration so it
+ * never advertises behavior this project doesn't have:
+ * - code-search prohibition steers to `aft_search` when registered, else the
+ *   `grep` tool (same surface logic as the Rust grep-rewrite footer); the
+ *   registration variant is selected late in index.ts once the final tool map
+ *   is known.
+ * - the compression sentence only appears when output compression is on —
+ *   advertising `compressed: false` otherwise would describe a no-op.
+ * - the background/PTY sentences only appear when `bash.background` is on —
+ *   with it off, explicit `background: true`/`pty: true` is a guaranteed
+ *   `feature_disabled` error from Rust. Foreground promotion still happens
+ *   regardless (the flag gates explicit spawning only), so the no-background
+ *   variant still explains promoted tasks and bash_status/bash_kill.
+ *
+ * Wording rules: this is read by AGENTS choosing a tool, not by users reading
+ * docs. No internal vocabulary ("hoisted", "command rewriting", "unified bash
+ * schema") — describe what the tool does and what NOT to use it for.
+ */
+export declare function bashToolDescription(aftSearchRegistered: boolean, compressionOn: boolean, backgroundOn: boolean): string;
+export declare function createBashTool(ctx: PluginContext, aftSearchRegisteredOverride?: boolean): ToolDefinition;
 export declare function createBashStatusTool(ctx: PluginContext): ToolDefinition;
 export declare function createBashKillTool(ctx: PluginContext): ToolDefinition;
 //# sourceMappingURL=bash.d.ts.map

package/dist/tools/bash.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bash.d.ts","sourceRoot":"","sources":["../../src/tools/bash.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAe,cAAc,EAAc,MAAM,qBAAqB,CAAC;AAYnF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAiFjD,wBAAgB,cAAc,CAAC,GAAG,EAAE,aAAa,GAAG,cAAc,CAsQjE;AAMD,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,aAAa,GAAG,cAAc,CAyBvE;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,aAAa,GAAG,cAAc,CAuBrE"}
+{"version":3,"file":"bash.d.ts","sourceRoot":"","sources":["../../src/tools/bash.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAe,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAYvE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAiCjD;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,mBAAmB,CACjC,mBAAmB,EAAE,OAAO,EAC5B,aAAa,EAAE,OAAO,EACtB,YAAY,EAAE,OAAO,GACpB,MAAM,CAaR;AAgDD,wBAAgB,cAAc,CAC5B,GAAG,EAAE,aAAa,EAClB,2BAA2B,CAAC,EAAE,OAAO,GACpC,cAAc,CAgRhB;AAMD,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,aAAa,GAAG,cAAc,CAyBvE;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,aAAa,GAAG,cAAc,CAuBrE"}

package/dist/tools/conflicts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conflicts.d.ts","sourceRoot":"","sources":["../../src/tools/conflicts.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAE1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAKjD;;GAEG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAwBhF"}
+{"version":3,"file":"conflicts.d.ts","sourceRoot":"","sources":["../../src/tools/conflicts.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAE1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAYjD;;GAEG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAwChF"}

package/dist/tools/hoisted.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hoisted.d.ts","sourceRoot":"","sources":["../../src/tools/hoisted.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAKH,OAAO,KAAK,EAAE,cAAc,EAAc,MAAM,qBAAqB,CAAC;AAItE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAwEjD,wEAAwE;AACxE,eAAO,MAAM,wBAAwB,GAAI,IAAI,MAAM,EAAE,QAAQ,MAAM,EAAE,OAAO,MAAM,KAAG,MAChD,CAAC;AA0RtC;;GAEG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,aAAa,GAAG,cAAc,CAwJjE;AA2mCD;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CA0B/E;AAMD;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CA+FnF"}
+{"version":3,"file":"hoisted.d.ts","sourceRoot":"","sources":["../../src/tools/hoisted.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAKH,OAAO,KAAK,EAAE,cAAc,EAAc,MAAM,qBAAqB,CAAC;AAItE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAwEjD,wEAAwE;AACxE,eAAO,MAAM,wBAAwB,GAAI,IAAI,MAAM,EAAE,QAAQ,MAAM,EAAE,OAAO,MAAM,KAAG,MAChD,CAAC;AA4RtC;;GAEG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,aAAa,GAAG,cAAc,CAwJjE;AA+mCD;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CA0B/E;AAMD;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CA+FnF"}

package/dist/tools/refactoring.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"refactoring.d.ts","sourceRoot":"","sources":["../../src/tools/refactoring.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAG1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAajD;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CA8InF"}
+{"version":3,"file":"refactoring.d.ts","sourceRoot":"","sources":["../../src/tools/refactoring.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAG1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAajD;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CA6InF"}

package/dist/tools/safety.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"safety.d.ts","sourceRoot":"","sources":["../../src/tools/safety.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAe,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAEvE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAwCjD;;;GAGG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAkJ9E"}
+{"version":3,"file":"safety.d.ts","sourceRoot":"","sources":["../../src/tools/safety.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAe,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAEvE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAwCjD;;;GAGG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CA2J9E"}

package/dist/tools/semantic.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"semantic.d.ts","sourceRoot":"","sources":["../../src/tools/semantic.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAE1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAiCjD,wBAAgB,aAAa,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAyFhF"}
+{"version":3,"file":"semantic.d.ts","sourceRoot":"","sources":["../../src/tools/semantic.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAE1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAiCjD,wBAAgB,aAAa,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAkFhF"}

package/dist/tui.js

@@ -1,7 +1,7 @@
 // src/tui/index.tsx
 import { createMemo as createMemo2, createSignal as createSignal2, onCleanup as onCleanup2 } from "solid-js";
 // package.json
-var version = "0.36.1";
+var version = "0.37.0";
 
 // src/shared/rpc-client.ts
 import { existsSync, readdirSync, readFileSync, unlinkSync } from "node:fs";
@@ -115,6 +115,9 @@ class AftRpcClient {
           placeholder = result;
           continue;
         }
+        if (options.accept && !options.accept(result)) {
+          continue;
+        }
         this.port = info.port;
         this.token = info.token;
         return result;
@@ -622,6 +625,20 @@ function scopedSidebarSnapshot(scoped, directory, sessionID) {
 function shouldSuppressUninitializedDowngrade(incomingCacheRole, haveInitializedForContext) {
   return incomingCacheRole === "not_initialized" && haveInitializedForContext;
 }
+function isSnapshotForContext(snapshot, directory, servedDirectory) {
+  const stripSlash = (p) => p.replace(/\/+$/, "");
+  const roots = [snapshot.project_root, snapshot.canonical_root].filter((r) => typeof r === "string" && r.length > 0);
+  if (roots.length === 0)
+    return true;
+  const dir = stripSlash(directory);
+  if (roots.some((r) => stripSlash(r) === dir))
+    return true;
+  if (typeof servedDirectory === "string" && servedDirectory.length > 0) {
+    const served = stripSlash(servedDirectory);
+    return roots.some((r) => stripSlash(r) === served);
+  }
+  return false;
+}
 var SidebarContent = (props) => {
   const [status, setStatus] = createSignal(null);
   const [collapsed, setCollapsed] = createSignal(false);
@@ -674,13 +691,24 @@ var SidebarContent = (props) => {
     inflight = { controller, generation: requestGeneration, directory, sessionID: sid };
     try {
       const client = getClient(directory);
-      const response = await client.call("status", { sessionID: sid }, { signal: controller.signal });
+      const response = await client.call("status", { sessionID: sid }, {
+        signal: controller.signal,
+        accept: (result) => {
+          const rec = result;
+          if (rec?.success === false)
+            return true;
+          return isSnapshotForContext(coerceAftStatus(rec), directory, rec?.served_directory);
+        }
+      });
       if (controller.signal.aborted || requestGeneration !== generation)
         return;
       if (currentDirectory() !== directory || props.sessionID() !== sid)
         return;
       if (response && response.success !== false) {
         const snapshot = coerceAftStatus(response);
+        const servedDirectory = response.served_directory;
+        if (!isSnapshotForContext(snapshot, directory, servedDirectory))
+          return;
         const current = status();
         const haveGoodForContext = current !== null && current.directory === directory && current.sessionID === sid && current.snapshot.cache_role !== "not_initialized";
         if (shouldSuppressUninitializedDowngrade(snapshot.cache_role, haveGoodForContext))
@@ -1142,6 +1170,14 @@ var R = (props) => {
     ]
   }, undefined, true, undefined, this);
 };
+function statusAcceptGate(directory) {
+  return (result) => {
+    const rec = result;
+    if (rec?.success === false)
+      return true;
+    return isSnapshotForContext(coerceAftStatus(rec), directory, rec?.served_directory);
+  };
+}
 var StatusDialog = (props) => {
   const theme = createMemo2(() => props.api.theme.current);
   const t = () => theme();
@@ -1156,7 +1192,7 @@ var StatusDialog = (props) => {
     const requestGeneration = ++pollGeneration;
     pollController = controller;
     try {
-      const response = await props.client.call("status", { sessionID: props.sessionID }, { signal: controller.signal });
+      const response = await props.client.call("status", { sessionID: props.sessionID }, { signal: controller.signal, accept: statusAcceptGate(props.directory) });
       if (controller.signal.aborted || requestGeneration !== pollGeneration)
         return;
       if (response.success !== false) {
@@ -1561,7 +1597,7 @@ async function showStatusDialog(api) {
   let initial = null;
   let initialError = null;
   try {
-    const response = await client.call("status", { sessionID });
+    const response = await client.call("status", { sessionID }, { accept: statusAcceptGate(directory) });
     if (response.success !== false) {
       initial = coerceAftStatus(response);
     } else {
@@ -1574,6 +1610,7 @@ async function showStatusDialog(api) {
   api.ui.dialog.replace(() => /* @__PURE__ */ jsxDEV2(StatusDialog, {
     api,
     client,
+    directory,
     sessionID,
     initial,
     initialError,

package/dist/workflow-hints.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workflow-hints.d.ts","sourceRoot":"","sources":["../src/workflow-hints.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,KAAK,SAAS,EAAqB,MAAM,aAAa,CAAC;AAEhE,MAAM,WAAW,iBAAiB;IAChC,oEAAoE;IACpE,WAAW,EAAE,SAAS,GAAG,aAAa,GAAG,KAAK,CAAC;IAC/C,4EAA4E;IAC5E,aAAa,EAAE,OAAO,CAAC;IACvB,mEAAmE;IACnE,eAAe,EAAE,OAAO,CAAC;IACzB,wEAAwE;IACxE,qBAAqB,EAAE,OAAO,CAAC;IAC/B,sCAAsC;IACtC,sBAAsB,EAAE,OAAO,CAAC;IAChC,4DAA4D;IAC5D,aAAa,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CAC5B;AAID;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI,CA8GzE;AAED;;;;;;;GAOG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,SAAS,EAAE,aAAa,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,MAAM,GAAG,IAAI,CASjG"}
+{"version":3,"file":"workflow-hints.d.ts","sourceRoot":"","sources":["../src/workflow-hints.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,KAAK,SAAS,EAAqB,MAAM,aAAa,CAAC;AAEhE,MAAM,WAAW,iBAAiB;IAChC,oEAAoE;IACpE,WAAW,EAAE,SAAS,GAAG,aAAa,GAAG,KAAK,CAAC;IAC/C,4EAA4E;IAC5E,aAAa,EAAE,OAAO,CAAC;IACvB,mEAAmE;IACnE,eAAe,EAAE,OAAO,CAAC;IACzB,wEAAwE;IACxE,qBAAqB,EAAE,OAAO,CAAC;IAC/B,sCAAsC;IACtC,sBAAsB,EAAE,OAAO,CAAC;IAChC,4DAA4D;IAC5D,aAAa,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CAC5B;AAID;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI,CAuIzE;AAED;;;;;;;GAOG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,SAAS,EAAE,aAAa,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,MAAM,GAAG,IAAI,CASjG"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cortexkit/aft-opencode",
-  "version": "0.36.1",
+  "version": "0.37.0",
   "type": "module",
   "description": "OpenCode plugin for Agent File Tools (AFT) — tree-sitter and lsp powered code analysis",
   "main": "dist/index.js",
@@ -30,19 +30,19 @@
   },
   "dependencies": {
     "@clack/prompts": "^1.2.0",
-    "@cortexkit/aft-bridge": "0.36.1",
+    "@cortexkit/aft-bridge": "0.37.0",
     "@xterm/headless": "^5.5.0",
     "comment-json": "^4.6.2",
     "undici": "^7.25.0",
     "zod": "^4.1.8"
   },
   "optionalDependencies": {
-    "@cortexkit/aft-darwin-arm64": "0.36.1",
-    "@cortexkit/aft-darwin-x64": "0.36.1",
-    "@cortexkit/aft-linux-arm64": "0.36.1",
-    "@cortexkit/aft-linux-x64": "0.36.1",
-    "@cortexkit/aft-win32-arm64": "0.36.1",
-    "@cortexkit/aft-win32-x64": "0.36.1"
+    "@cortexkit/aft-darwin-arm64": "0.37.0",
+    "@cortexkit/aft-darwin-x64": "0.37.0",
+    "@cortexkit/aft-linux-arm64": "0.37.0",
+    "@cortexkit/aft-linux-x64": "0.37.0",
+    "@cortexkit/aft-win32-arm64": "0.37.0",
+    "@cortexkit/aft-win32-x64": "0.37.0"
   },
   "devDependencies": {
     "@opencode-ai/plugin": "^1.15.11",

package/src/shared/rpc-client.ts

@@ -12,6 +12,17 @@ type PortInfo = ParsedPortInfo & { source: PortInfoSource; path?: string };
 
 export interface AftRpcCallOptions {
   signal?: AbortSignal;
+  /**
+   * Optional gate over WARM (non-placeholder) responses. With multiple RPC
+   * servers alive for one project hash (multi-project hosts, stale long-lived
+   * processes), a warm response can describe ANOTHER project's bridge
+   * (cross-project contamination). Return false to skip that response and
+   * keep trying other ports instead of returning it — so a stray server can't
+   * mask the right one. Skipped responses are never cached as the good port
+   * and never returned; if only strays and placeholders answer, the
+   * placeholder wins.
+   */
+  accept?: (result: unknown) => boolean;
 }
 
 function abortError(signal: AbortSignal): Error {
@@ -82,6 +93,11 @@ export class AftRpcClient {
           placeholder = result; // remember but keep trying
           continue;
         }
+        if (options.accept && !options.accept(result)) {
+          // Stray warm response (e.g. another project's data) — skip it and
+          // keep scanning so it can't mask the right server.
+          continue;
+        }
         // Warm response — cache this port for subsequent calls.
         this.port = info.port;
         this.token = info.token;

package/src/shared/rpc-server.ts

@@ -1,9 +1,16 @@
 import { randomBytes } from "node:crypto";
-import { mkdirSync, renameSync, unlinkSync, writeFileSync } from "node:fs";
+import {
+  mkdirSync,
+  readdirSync,
+  readFileSync,
+  renameSync,
+  unlinkSync,
+  writeFileSync,
+} from "node:fs";
 import { createServer, type IncomingMessage, type Server, type ServerResponse } from "node:http";
 import { dirname, join } from "node:path";
 import { log, warn } from "../logger";
-import { rpcPortFileDir } from "./rpc-utils";
+import { isPidAlive, parseRpcPortRecord, rpcPortFileDir } from "./rpc-utils";
 
 type RpcHandler = (params: Record<string, unknown>) => Promise<Record<string, unknown>>;
 
@@ -68,6 +75,13 @@ export class AftRpcServer {
           );
           renameSync(tmpPath, this.portFilePath);
           log(`RPC server listening on 127.0.0.1:${this.port}`);
+          // Hygiene: sweep dead siblings while we're here. The client only
+          // reclaims dead-pid files on a cold port scan, and it caches the
+          // first warm port afterwards — so crash/restart leftovers piled up
+          // (dozens of dead files per project hash were observed). Server
+          // startup is the natural sweep point: it runs once per instance and
+          // already owns this directory.
+          this.sweepDeadPortFiles();
         } catch (err) {
           warn(`Failed to write RPC port file: ${err}`);
         }
@@ -80,6 +94,41 @@ export class AftRpcServer {
     });
   }
 
+  /**
+   * Remove sibling port files whose owning process is provably dead.
+   * Only files with a recorded pid that no longer maps to a live process are
+   * removed; pid-less (legacy) files and live entries are left untouched.
+   * Never touches our own freshly written file.
+   */
+  private sweepDeadPortFiles(): void {
+    let entries: string[];
+    try {
+      entries = readdirSync(this.portsDir);
+    } catch {
+      return;
+    }
+    for (const entry of entries) {
+      if (!entry.endsWith(".json")) continue;
+      const filePath = join(this.portsDir, entry);
+      if (filePath === this.portFilePath) continue;
+      try {
+        const record = parseRpcPortRecord(readFileSync(filePath, "utf-8"));
+        // Unparsable file: stale tmp/corrupt leftover — remove. Parsable but
+        // pid-less (legacy): keep, we cannot prove the owner is dead.
+        if (record === null) {
+          unlinkSync(filePath);
+          continue;
+        }
+        if (record.pid !== undefined && !isPidAlive(record.pid)) {
+          unlinkSync(filePath);
+        }
+      } catch {
+        // Racing another instance's sweep or hitting a permission issue is
+        // fine — the file will be retried on the next server start.
+      }
+    }
+  }
+
   /** Stop the server and clean up port file. */
   stop(): void {
     if (this.server) {

package/src/shared/session-directory.ts

@@ -152,7 +152,63 @@ export function warmSessionDirectory(
   void getSessionDirectory(client, sessionId, fallbackDirectory);
 }
 
+/**
+ * Serve-time verification for cross-project bridge resolution.
+ *
+ * The RPC status handler may serve a bridge for a DIFFERENT project root than
+ * the requesting instance's own directory (the `opencode -s` resume case).
+ * That cross-directory path must never trust a possibly-stale cache entry:
+ * a wrong mapping makes the sidebar render another project's data (RPC
+ * contamination). This helper re-resolves the session's directory via a
+ * fresh SDK lookup and only returns a directory the SDK confirms RIGHT NOW.
+ *
+ * Results are memoized briefly (VERIFY_TTL_MS) so a 1.5s sidebar poll doesn't
+ * hammer the SDK; the TTL is short enough that stale mappings die quickly.
+ * Returns `null` when the lookup fails or the SDK reports no directory —
+ * callers must treat that as "do not serve cross-project data".
+ */
+const VERIFY_TTL_MS = 15_000;
+const verifyCache = new Map<string, { directory: string | null; verifiedAt: number }>();
+
+export async function verifySessionDirectory(
+  client: unknown,
+  sessionId: string,
+): Promise<string | null> {
+  if (!sessionId) return null;
+  const hit = verifyCache.get(sessionId);
+  if (hit && Date.now() - hit.verifiedAt < VERIFY_TTL_MS) return hit.directory;
+
+  const c = client as OpenCodeClientShape;
+  const sessionApi = c?.session;
+  if (!sessionApi || typeof sessionApi.get !== "function") return null;
+
+  let dir: string | null = null;
+  try {
+    const result = await sessionApi.get({ path: { id: sessionId } });
+    const session: SessionInfo | undefined =
+      (result as { data?: SessionInfo } | undefined)?.data ?? (result as SessionInfo | undefined);
+    if (session && typeof session.directory === "string" && session.directory.length > 0) {
+      dir = session.directory;
+    }
+  } catch {
+    // Verification failure = do not serve cross-project data. Do NOT memoize
+    // failures: the next poll should retry (transient SDK errors must not
+    // stick the sidebar on placeholder for the TTL window).
+    return null;
+  }
+
+  verifyCache.set(sessionId, { directory: dir, verifiedAt: Date.now() });
+  if (verifyCache.size > CACHE_MAX_ENTRIES) {
+    const oldest = verifyCache.keys().next().value;
+    if (oldest !== undefined) verifyCache.delete(oldest);
+  }
+  // Keep the long-lived cache coherent with what the SDK just said.
+  if (dir !== null) setCache(sessionId, dir);
+  return dir;
+}
+
 /** Test-only: clear the cache between unit tests. */
 export function _resetSessionDirectoryCacheForTest(): void {
   cache.clear();
+  verifyCache.clear();
 }

package/src/tui/index.tsx

@@ -16,6 +16,7 @@ import {
 import {
   createAftSidebarSlot,
   formatCompressionSidebarRows,
+  isSnapshotForContext,
   resolveTuiStorageDir,
   shouldSuppressUninitializedDowngrade,
 } from "./sidebar";
@@ -128,12 +129,30 @@ const R = (props: {
 interface StatusDialogProps {
   api: TuiPluginApi;
   client: AftRpcClient;
+  directory: string;
   sessionID: string;
   initial: AftStatusSnapshot | null;
   initialError: string | null;
   onClose: () => void;
 }
 
+/**
+ * Shared accept-gate for status RPC calls: skip warm responses that describe
+ * another project (cross-project contamination from multi-project hosts —
+ * see isSnapshotForContext) so they can't beat the right server's response.
+ */
+function statusAcceptGate(directory: string): (result: unknown) => boolean {
+  return (result) => {
+    const rec = result as Record<string, unknown>;
+    if (rec?.success === false) return true; // error envelopes handled by callers
+    return isSnapshotForContext(
+      coerceAftStatus(rec),
+      directory,
+      rec?.served_directory as string | undefined,
+    );
+  };
+}
+
 const StatusDialog = (props: StatusDialogProps) => {
   const theme = createMemo(() => (props.api as any).theme.current as TuiThemeCurrent);
   const t = () => theme();
@@ -157,7 +176,7 @@ const StatusDialog = (props: StatusDialogProps) => {
       const response = await props.client.call(
         "status",
         { sessionID: props.sessionID },
-        { signal: controller.signal },
+        { signal: controller.signal, accept: statusAcceptGate(props.directory) },
       );
       if (controller.signal.aborted || requestGeneration !== pollGeneration) return;
       if ((response as Record<string, unknown>).success !== false) {
@@ -545,7 +564,11 @@ async function showStatusDialog(api: TuiPluginApi): Promise<void> {
   let initial: AftStatusSnapshot | null = null;
   let initialError: string | null = null;
   try {
-    const response = await client.call("status", { sessionID });
+    const response = await client.call(
+      "status",
+      { sessionID },
+      { accept: statusAcceptGate(directory) },
+    );
     if ((response as Record<string, unknown>).success !== false) {
       initial = coerceAftStatus(response as Record<string, unknown>);
     } else {
@@ -561,6 +584,7 @@ async function showStatusDialog(api: TuiPluginApi): Promise<void> {
       <StatusDialog
         api={api}
         client={client}
+        directory={directory}
         sessionID={sessionID}
         initial={initial}
         initialError={initialError}

package/src/tui/sidebar.tsx

@@ -259,6 +259,49 @@ export function shouldSuppressUninitializedDowngrade(
   return incomingCacheRole === "not_initialized" && haveInitializedForContext;
 }
 
+/**
+ * Cross-project contamination belt. The RPC layer can hand back a snapshot
+ * describing a DIFFERENT project than the one this sidebar asked about — a
+ * multi-project host (Desktop / `opencode serve`) whose status handler
+ * resolved another project's warm bridge, including long-lived processes
+ * still running pre-fix plugin code. Rendering it shows another repo's
+ * indexes/health in this window.
+ *
+ * A mismatched project_root is acceptable ONLY when the serving handler says
+ * it resolved that directory DELIBERATELY: new servers attach
+ * `served_directory` (their own cwd, or the SDK-verified `opencode -s` resume
+ * directory) to every status response. That marker is handler-attached
+ * provenance — it cannot be faked by snapshot contents. We explicitly do NOT
+ * use `snapshot.session.id` here: Rust echoes the REQUESTED session id into
+ * the snapshot, so it matches even when the data came from another project's
+ * bridge (the hole that let contamination through this belt's first version).
+ *
+ * Rules:
+ *  - placeholder/synthetic snapshots (no project_root) → accept (not data)
+ *  - project_root (or canonical_root) matches the sidebar directory → accept
+ *  - mismatched root AND served_directory matches a snapshot root → accept
+ *    (deliberate, SDK-verified resume serve from a new server)
+ *  - otherwise → reject (stray; includes everything old servers cross-serve)
+ */
+export function isSnapshotForContext(
+  snapshot: AftStatusSnapshot,
+  directory: string,
+  servedDirectory: string | undefined,
+): boolean {
+  const stripSlash = (p: string) => p.replace(/\/+$/, "");
+  const roots = [snapshot.project_root, snapshot.canonical_root].filter(
+    (r): r is string => typeof r === "string" && r.length > 0,
+  );
+  if (roots.length === 0) return true; // placeholder / synthetic
+  const dir = stripSlash(directory);
+  if (roots.some((r) => stripSlash(r) === dir)) return true;
+  if (typeof servedDirectory === "string" && servedDirectory.length > 0) {
+    const served = stripSlash(servedDirectory);
+    return roots.some((r) => stripSlash(r) === served);
+  }
+  return false;
+}
+
 const SidebarContent = (props: {
   api: TuiPluginApi;
   sessionID: () => string;
@@ -330,12 +373,32 @@ const SidebarContent = (props: {
       const response = await client.call(
         "status",
         { sessionID: sid },
-        { signal: controller.signal },
+        {
+          signal: controller.signal,
+          // With several RPC servers alive for this project hash, a stray
+          // warm response (another project's bridge) must not beat the right
+          // server or the placeholder — skip it at the port-scan level.
+          accept: (result) => {
+            const rec = result as Record<string, unknown>;
+            if (rec?.success === false) return true; // errors handled below
+            return isSnapshotForContext(
+              coerceAftStatus(rec),
+              directory,
+              rec?.served_directory as string | undefined,
+            );
+          },
+        },
       );
       if (controller.signal.aborted || requestGeneration !== generation) return;
       if (currentDirectory() !== directory || props.sessionID() !== sid) return;
       if (response && (response as Record<string, unknown>).success !== false) {
         const snapshot = coerceAftStatus(response as Record<string, unknown>);
+        // Belt: never render a snapshot describing another project (see
+        // isSnapshotForContext). Keep whatever we currently show instead.
+        const servedDirectory = (response as Record<string, unknown>).served_directory as
+          | string
+          | undefined;
+        if (!isSnapshotForContext(snapshot, directory, servedDirectory)) return;
         // Stale-while-revalidate: keep the last-good snapshot instead of
         // flickering to the lazy-bridge placeholder on a transient
         // not_initialized. See shouldSuppressUninitializedDowngrade.

package/dist/tools/structure.d.ts

@@ -1,8 +0,0 @@
-import type { ToolDefinition } from "@opencode-ai/plugin";
-import type { PluginContext } from "../types.js";
-/**
- * Tool definitions for scope-aware structure commands:
- * add_member, add_derive, wrap_try_catch, add_decorator, add_struct_tags.
- */
-export declare function structureTools(ctx: PluginContext): Record<string, ToolDefinition>;
-//# sourceMappingURL=structure.d.ts.map

package/dist/tools/structure.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"structure.d.ts","sourceRoot":"","sources":["../../src/tools/structure.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAE1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAWjD;;;GAGG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAyJjF"}