@cortexkit/aft-opencode 0.45.1 → 0.46.0

package/dist/shared/ignored-message.d.ts

@@ -7,13 +7,15 @@
  * it shows in the right place in the OpenCode UI, and carries `noReply: true`
  * so no LLM call is made.
  *
- * IMPORTANT (cache + crash safety): this path deliberately passes ONLY `agent`
- * (never model/variant). OpenCode crashes if model/variant are supplied on a
- * `noReply: true` prompt, and omitting them keeps the synthetic message from
- * busting the provider prefix cache the previous assistant turn warmed.
- *
- * Lives in `shared/` (not `index.ts`) because `index.ts` must export only the
- * plugin default; both the plugin entry and `tools/permissions.ts` call this.
+ * Model/variant ARE passed when resolvable, mirroring the session's newest
+ * context: OpenCode's `createUserMessage` resolves an omitted model as
+ * `agent.model ?? session-current ?? default` and PERSISTS the result via
+ * `setAgentModel` — so omitting the model on a session whose user picked a
+ * non-default model silently resets the session's model/variant (observed on
+ * OpenCode Desktop via /aft-status). Passing the resolved current context
+ * makes that persistence a no-op. Older OpenCode builds crashed when model
+ * was supplied on a `noReply: true` prompt, so on any failure we retry once
+ * without model/variant rather than dropping the message.
  */
 export declare function sendIgnoredMessage(client: unknown, sessionID: string, text: string): Promise<void>;
 //# sourceMappingURL=ignored-message.d.ts.map

package/dist/shared/ignored-message.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ignored-message.d.ts","sourceRoot":"","sources":["../../src/shared/ignored-message.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,kBAAkB,CACtC,MAAM,EAAE,OAAO,EACf,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,IAAI,CAAC,CAqCf"}
+{"version":3,"file":"ignored-message.d.ts","sourceRoot":"","sources":["../../src/shared/ignored-message.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAsB,kBAAkB,CACtC,MAAM,EAAE,OAAO,EACf,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,IAAI,CAAC,CAsDf"}

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

@@ -15,16 +15,34 @@ export interface AftRpcCallOptions {
      * placeholder wins.
      */
     accept?: (result: unknown) => boolean;
+    /**
+     * Internal one-hop guard for verified-directory redirects. A redirected
+     * call must never redirect again (placeholder chains would otherwise
+     * ping-pong between two bridgeless instances).
+     */
+    noRedirect?: boolean;
 }
+export declare function subscribeRpcRedirects(listener: (from: string, to: string) => void): () => void;
+export declare function __resetRpcRedirectsForTest(): void;
+export declare function __recordRpcRedirectForTest(from: string, to: string): void;
 export declare class AftRpcClient {
     private port;
     private token;
     private portsDir;
     private legacyPortFile;
     private stalePortFailures;
+    private storageDir;
+    private directory;
     constructor(storageDir: string, directory: string);
     /** Call an RPC method. Retries port resolution if the server isn't ready yet. */
     call<T = Record<string, unknown>>(method: string, params?: Record<string, unknown>, options?: AftRpcCallOptions): Promise<T>;
+    /**
+     * One-hop redirect to the instance that owns the session's bridge. Returns
+     * null (caller keeps the placeholder) unless the redirected call produced a
+     * warm response — a placeholder from the target is not an improvement, and
+     * failures must not mask the original placeholder.
+     */
+    private followVerifiedDirectory;
     private callOne;
     /**
      * Heuristic for "this response is the lazy-spawn placeholder, not the real
@@ -34,7 +52,11 @@ export declare class AftRpcClient {
     private looksLikePlaceholder;
     /** Check if any RPC server is reachable. */
     isAvailable(): Promise<boolean>;
-    /** Resolve the freshest live endpoint for the persistent TUI WebSocket. */
+    /** Resolve the freshest live endpoint for the persistent TUI WebSocket.
+     *  Follows a learned verified-directory redirect so the socket subscribes
+     *  to the instance that owns the session's bridge (the one that will
+     *  actually push status-changed frames), not this directory's bridgeless
+     *  placeholder instance. */
     resolveEndpoint(signal?: AbortSignal): Promise<AftRpcEndpoint | null>;
     /**
      * Discover all live RPC port files for this project. Tries the per-instance

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,MAAM,cAAc,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC;AAEpE,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,2EAA2E;IACrE,eAAe,CAAC,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC;IAM3E;;;;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;YA6BX,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,MAAM,cAAc,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC;AAEpE,MAAM,WAAW,iBAAiB;IAChC,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB;;;;;;;;;OASG;IACH,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,OAAO,CAAC;IACtC;;;;OAIG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAuBD,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,KAAK,IAAI,GAAG,MAAM,IAAI,CAK9F;AAcD,wBAAgB,0BAA0B,IAAI,IAAI,CAGjD;AAED,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,IAAI,CAEzE;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;IACtD,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,SAAS,CAAS;gBAEd,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAOjD,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;IA0Db;;;;;OAKG;YACW,uBAAuB;YAwBvB,OAAO;IAsBrB;;;;OAIG;IACH,OAAO,CAAC,oBAAoB;IAM5B,4CAA4C;IACtC,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IASrC;;;;gCAI4B;IACtB,eAAe,CAAC,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC;IAa3E;;;;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;YA6BX,WAAW;YAkCX,gBAAgB;IAmB9B,KAAK,IAAI,IAAI;CAKd"}

package/dist/subc-tool-schemas.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"subc-tool-schemas.d.ts","sourceRoot":"","sources":["../src/subc-tool-schemas.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAkBH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAUhD,QAAA,MAAM,eAAe,sOAsBX,CAAC;AAEX,MAAM,MAAM,gBAAgB,GAAG,CAAC,OAAO,eAAe,CAAC,CAAC,MAAM,CAAC,CAAC;AAEhE,wBAAgB,qBAAqB,IAAI,aAAa,CAYrD;AAQD;;GAEG;AACH,wBAAgB,oBAAoB,IAAI,MAAM,CAAC,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAqFxF;AAED;;GAEG;AACH,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,MAAM,CAajG;AAED,wBAAgB,wBAAwB,IAAI,MAAM,CAEjD;AAED,eAAO,MAAM,oBAAoB,EAAE,SAAS,gBAAgB,EAAoB,CAAC"}
+{"version":3,"file":"subc-tool-schemas.d.ts","sourceRoot":"","sources":["../src/subc-tool-schemas.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAkBH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAYhD,QAAA,MAAM,eAAe,sOAsBX,CAAC;AAEX,MAAM,MAAM,gBAAgB,GAAG,CAAC,OAAO,eAAe,CAAC,CAAC,MAAM,CAAC,CAAC;AAEhE,wBAAgB,qBAAqB,IAAI,aAAa,CAYrD;AAWD;;GAEG;AACH,wBAAgB,oBAAoB,IAAI,MAAM,CAAC,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAqFxF;AAED;;GAEG;AACH,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,MAAM,CAajG;AAED,wBAAgB,wBAAwB,IAAI,MAAM,CAEjD;AAED,eAAO,MAAM,oBAAoB,EAAE,SAAS,gBAAgB,EAAoB,CAAC"}

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;AAGtE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAsCjD,wEAAwE;AACxE,eAAO,MAAM,wBAAwB,GAAI,IAAI,MAAM,EAAE,QAAQ,MAAM,EAAE,OAAO,MAAM,KAAG,MAChD,CAAC;AAwQtC;;GAEG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,aAAa,GAAG,cAAc,CAuHjE;AAwkBD;;;;;;;;;GASG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CA0B/E;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAqGnF"}
+{"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;AAGtE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAsCjD,wEAAwE;AACxE,eAAO,MAAM,wBAAwB,GAAI,IAAI,MAAM,EAAE,QAAQ,MAAM,EAAE,OAAO,MAAM,KAAG,MAChD,CAAC;AAwQtC;;GAEG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,aAAa,GAAG,cAAc,CAuHjE;AA8mBD;;;;;;;;;GASG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CA0B/E;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAqGnF"}

package/dist/tools/permissions.d.ts

@@ -65,6 +65,13 @@ export declare const _permissionsInternalsForTest: {
 export declare function assertExternalDirectoryPermission(ctx: PluginContext, context: ToolContext, target: string, options?: {
     kind?: "file" | "directory";
 }): Promise<string | undefined>;
+/**
+ * Ask OpenCode for permission to expose indexed content from a different git root.
+ * This deliberately uses a tool-specific permission id rather than
+ * `external_directory`: a user may allow ordinary path reads while still wanting
+ * a separate audit point for search results produced from borrowed indexes.
+ */
+export declare function assertAftSearchExternalPermission(ctx: PluginContext, context: ToolContext, target: string): Promise<string | undefined>;
 /**
  * Trigger the host OpenCode permission check for grep.
  *

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

@@ -1 +1 @@
-{"version":3,"file":"permissions.d.ts","sourceRoot":"","sources":["../../src/tools/permissions.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAGvD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAsDjD;;;;;;;;;;;GAWG;AACH,wBAAsB,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAEhE;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAGhF;AAED,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAEnF;AAED,wBAAgB,kCAAkC,CAChD,OAAO,EAAE,WAAW,EACpB,YAAY,EAAE,MAAM,GACnB,MAAM,CAER;AAED,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAazF;AAED,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,WAAW,GAAG,MAAM,CAE9D;AAED,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,WAAW,EACpB,QAAQ,EAAE,MAAM,EAAE,EAClB,QAAQ,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GACrC,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAkB7B;AAED;;;GAGG;AACH,iBAAS,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAI5D;AASD,iBAAS,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAGjD;AA6DD;;;;;;;;;;;;GAYG;AACH,iBAAS,oBAAoB,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAO/C;AAED,eAAO,MAAM,4BAA4B;;;;CAIxC,CAAC;AAEF;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,iCAAiC,CACrD,GAAG,EAAE,aAAa,EAClB,OAAO,EAAE,WAAW,EACpB,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE;IAAE,IAAI,CAAC,EAAE,MAAM,GAAG,WAAW,CAAA;CAAE,GACxC,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAqE7B;AAkCD;;;;;;GAMG;AACH,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,MAAM,EACf,QAAQ,GAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAO,GACjD,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAE7B;AAED;;;;;;GAMG;AACH,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,MAAM,EACf,QAAQ,GAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAO,GACjD,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAE7B;AAED;;;;;;GAMG;AACH,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,MAAM,EACf,QAAQ,GAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAA;CAAO,GAC/B,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAkB7B;AAED,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAOhE"}
+{"version":3,"file":"permissions.d.ts","sourceRoot":"","sources":["../../src/tools/permissions.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAGvD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAwDjD;;;;;;;;;;;GAWG;AACH,wBAAsB,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAEhE;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAGhF;AAED,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAEnF;AAED,wBAAgB,kCAAkC,CAChD,OAAO,EAAE,WAAW,EACpB,YAAY,EAAE,MAAM,GACnB,MAAM,CAER;AAED,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAazF;AAED,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,WAAW,GAAG,MAAM,CAE9D;AAED,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,WAAW,EACpB,QAAQ,EAAE,MAAM,EAAE,EAClB,QAAQ,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GACrC,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAkB7B;AAED;;;GAGG;AACH,iBAAS,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAI5D;AASD,iBAAS,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAGjD;AA6DD;;;;;;;;;;;;GAYG;AACH,iBAAS,oBAAoB,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAO/C;AAED,eAAO,MAAM,4BAA4B;;;;CAIxC,CAAC;AAEF;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,iCAAiC,CACrD,GAAG,EAAE,aAAa,EAClB,OAAO,EAAE,WAAW,EACpB,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE;IAAE,IAAI,CAAC,EAAE,MAAM,GAAG,WAAW,CAAA;CAAE,GACxC,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAqE7B;AAwBD;;;;;GAKG;AACH,wBAAsB,iCAAiC,CACrD,GAAG,EAAE,aAAa,EAClB,OAAO,EAAE,WAAW,EACpB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAsE7B;AAkCD;;;;;;GAMG;AACH,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,MAAM,EACf,QAAQ,GAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAO,GACjD,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAE7B;AAED;;;;;;GAMG;AACH,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,MAAM,EACf,QAAQ,GAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAO,GACjD,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAE7B;AAED;;;;;;GAMG;AACH,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,MAAM,EACf,QAAQ,GAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAA;CAAO,GAC/B,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAkB7B;AAED,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAOhE"}

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;AAYjD,wBAAgB,aAAa,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CA+EhF"}
+{"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;AAgBjD,wBAAgB,aAAa,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CA+FhF"}

package/dist/tui/notification-socket.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"notification-socket.d.ts","sourceRoot":"","sources":["../../src/tui/notification-socket.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAuB,MAAM,sBAAsB,CAAC;AAGzE,MAAM,WAAW,kBAAkB;IACjC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,kBAAkB;IACjC,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,gBAAgB;IAC/B,YAAY,EAAE,MAAM,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IAC9C,YAAY,EAAE,MAAM,MAAM,GAAG,IAAI,CAAC;IAClC,cAAc,EAAE,CAAC,YAAY,EAAE,kBAAkB,KAAK,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CAClF;AAED,UAAU,aAAa;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,gBAAgB,CACd,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,GAAG,OAAO,EAC5C,QAAQ,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,GACjC,IAAI,CAAC;IACR,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,KAAK,IAAI,IAAI,CAAC;CACf;AAED,KAAK,gBAAgB,GAAG,KAAK,GAAG,EAAE,MAAM,KAAK,aAAa,CAAC;AAC3D,KAAK,aAAa,GAAG,IAAI,CAAC,YAAY,EAAE,iBAAiB,GAAG,OAAO,CAAC,CAAC;AAErE,UAAU,UAAU;IAClB,YAAY,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,aAAa,CAAC;IACnD,aAAa,EAAE,gBAAgB,GAAG,IAAI,CAAC;IACvC,UAAU,EAAE,OAAO,UAAU,CAAC;IAC9B,YAAY,EAAE,OAAO,YAAY,CAAC;CACnC;AA8CD,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,gBAAgB,GAAG,IAAI,CAKjE;AAED,wBAAgB,gBAAgB,IAAI,IAAI,CAavC;AAED,wBAAgB,wBAAwB,IAAI,IAAI,CAG/C;AAED,wBAAgB,4BAA4B,CAC1C,QAAQ,EAAE,CAAC,KAAK,EAAE,kBAAkB,KAAK,IAAI,GAC5C,MAAM,IAAI,CAKZ;AAED,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,EACnC,OAAO,EAAE,MAAM,GACd;IAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;IAAC,OAAO,EAAE,MAAM,IAAI,CAAA;CAAE,CAoB/C;AA4PD,wBAAgB,4BAA4B,CAAC,SAAS,EAAE,OAAO,CAAC,UAAU,CAAC,GAAG,MAAM,IAAI,CAMvF;AAED,wBAAgB,0BAA0B,IAAI,IAAI,CAiBjD"}
+{"version":3,"file":"notification-socket.d.ts","sourceRoot":"","sources":["../../src/tui/notification-socket.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAA8C,MAAM,sBAAsB,CAAC;AAGhG,MAAM,WAAW,kBAAkB;IACjC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,kBAAkB;IACjC,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,gBAAgB;IAC/B,YAAY,EAAE,MAAM,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IAC9C,YAAY,EAAE,MAAM,MAAM,GAAG,IAAI,CAAC;IAClC,cAAc,EAAE,CAAC,YAAY,EAAE,kBAAkB,KAAK,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CAClF;AAED,UAAU,aAAa;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,gBAAgB,CACd,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,GAAG,OAAO,EAC5C,QAAQ,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,GACjC,IAAI,CAAC;IACR,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,KAAK,IAAI,IAAI,CAAC;CACf;AAED,KAAK,gBAAgB,GAAG,KAAK,GAAG,EAAE,MAAM,KAAK,aAAa,CAAC;AAC3D,KAAK,aAAa,GAAG,IAAI,CAAC,YAAY,EAAE,iBAAiB,GAAG,OAAO,CAAC,CAAC;AAErE,UAAU,UAAU;IAClB,YAAY,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,aAAa,CAAC;IACnD,aAAa,EAAE,gBAAgB,GAAG,IAAI,CAAC;IACvC,UAAU,EAAE,OAAO,UAAU,CAAC;IAC9B,YAAY,EAAE,OAAO,YAAY,CAAC;CACnC;AA8CD,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,gBAAgB,GAAG,IAAI,CAMjE;AAwBD,wBAAgB,gBAAgB,IAAI,IAAI,CAiBvC;AAED,wBAAgB,wBAAwB,IAAI,IAAI,CAG/C;AAED,wBAAgB,4BAA4B,CAC1C,QAAQ,EAAE,CAAC,KAAK,EAAE,kBAAkB,KAAK,IAAI,GAC5C,MAAM,IAAI,CAKZ;AAED,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,EACnC,OAAO,EAAE,MAAM,GACd;IAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;IAAC,OAAO,EAAE,MAAM,IAAI,CAAA;CAAE,CAoB/C;AA4PD,wBAAgB,4BAA4B,CAAC,SAAS,EAAE,OAAO,CAAC,UAAU,CAAC,GAAG,MAAM,IAAI,CAMvF;AAED,wBAAgB,0BAA0B,IAAI,IAAI,CAiBjD"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cortexkit/aft-opencode",
-  "version": "0.45.1",
+  "version": "0.46.0",
   "type": "module",
   "description": "OpenCode plugin for Agent File Tools (AFT) — tree-sitter and lsp powered code analysis",
   "main": "dist/index.js",
@@ -13,13 +13,14 @@
   "files": [
     "dist",
     "src/tui",
+    "src/tui-compiled",
     "src/shared",
     "src/logger.ts",
     "README.md"
   ],
   "scripts": {
-    "build": "bun build src/index.ts --outdir dist --target node --format esm --external @opencode-ai/plugin --external @opencode-ai/sdk && bun build src/tui/index.tsx --outfile dist/tui.js --target node --format esm --external @opencode-ai/plugin --external @opencode-ai/plugin/tui --external @opencode-ai/sdk --external @opentui/solid --external solid-js && tsc --emitDeclarationOnly",
-    "typecheck": "tsc --noEmit",
+    "build": "bun build src/index.ts --outdir dist --target node --format esm --external @opencode-ai/plugin --external @opencode-ai/sdk && tsc --emitDeclarationOnly && bun run build:tui",
+    "typecheck": "tsc --noEmit && tsc -p tsconfig.scripts.json",
     "pretest": "node -e \"if (process.env.CI !== 'true') { const { spawnSync } = require('node:child_process'); const result = spawnSync('cargo', ['build'], { cwd: '../..', stdio: 'inherit', shell: process.platform === 'win32' }); process.exit(result.status ?? 1); } else { console.log('Skipping cargo build in CI; workflow builds agent-file-tools before tests.'); }\"",
     "test": "bun test",
     "test:e2e": "bun test src/__tests__/e2e/",
@@ -27,25 +28,27 @@
     "schema": "bun scripts/build-schema.ts",
     "build:tool-schemas": "bun run scripts/build-tool-schemas.ts",
     "prepublishOnly": "bun run build",
-    "test:unit": "bun test src/__tests__ --path-ignore-patterns 'src/__tests__/e2e/**'"
+    "test:unit": "bun test src/__tests__ --path-ignore-patterns 'src/__tests__/e2e/**'",
+    "build:tui": "bun scripts/build-tui.ts",
+    "smoke:tui": "bun test ./scripts/smoke-tui-pack-install.ts"
   },
   "dependencies": {
     "@clack/prompts": "^1.6.0",
-    "@cortexkit/aft-bridge": "0.45.1",
-    "@opentui/core": "^0.4.2",
-    "@opentui/solid": "^0.4.2",
+    "@cortexkit/aft-bridge": "0.46.0",
+    "@opentui/core": "0.4.3",
+    "@opentui/solid": "0.4.3",
     "comment-json": "^4.6.2",
     "solid-js": "1.9.12",
     "undici": "^7.25.0",
     "zod": "^4.4.3"
   },
   "optionalDependencies": {
-    "@cortexkit/aft-darwin-arm64": "0.45.1",
-    "@cortexkit/aft-darwin-x64": "0.45.1",
-    "@cortexkit/aft-linux-arm64": "0.45.1",
-    "@cortexkit/aft-linux-x64": "0.45.1",
-    "@cortexkit/aft-win32-arm64": "0.45.1",
-    "@cortexkit/aft-win32-x64": "0.45.1"
+    "@cortexkit/aft-darwin-arm64": "0.46.0",
+    "@cortexkit/aft-darwin-x64": "0.46.0",
+    "@cortexkit/aft-linux-arm64": "0.46.0",
+    "@cortexkit/aft-linux-x64": "0.46.0",
+    "@cortexkit/aft-win32-arm64": "0.46.0",
+    "@cortexkit/aft-win32-x64": "0.46.0"
   },
   "devDependencies": {
     "@opencode-ai/plugin": "^1.17.11",
@@ -60,7 +63,7 @@
     },
     "./tui": {
       "types": "./src/tui/index.tsx",
-      "import": "./src/tui/index.tsx"
+      "import": "./src/tui/entry.mjs"
     }
   },
   "oc-plugin": [

package/src/shared/ignored-message.ts

@@ -9,13 +9,15 @@ import { resolvePromptContext } from "./last-assistant-model.js";
  * it shows in the right place in the OpenCode UI, and carries `noReply: true`
  * so no LLM call is made.
  *
- * IMPORTANT (cache + crash safety): this path deliberately passes ONLY `agent`
- * (never model/variant). OpenCode crashes if model/variant are supplied on a
- * `noReply: true` prompt, and omitting them keeps the synthetic message from
- * busting the provider prefix cache the previous assistant turn warmed.
- *
- * Lives in `shared/` (not `index.ts`) because `index.ts` must export only the
- * plugin default; both the plugin entry and `tools/permissions.ts` call this.
+ * Model/variant ARE passed when resolvable, mirroring the session's newest
+ * context: OpenCode's `createUserMessage` resolves an omitted model as
+ * `agent.model ?? session-current ?? default` and PERSISTS the result via
+ * `setAgentModel` — so omitting the model on a session whose user picked a
+ * non-default model silently resets the session's model/variant (observed on
+ * OpenCode Desktop via /aft-status). Passing the resolved current context
+ * makes that persistence a no-op. Older OpenCode builds crashed when model
+ * was supplied on a `noReply: true` prompt, so on any failure we retry once
+ * without model/variant rather than dropping the message.
  */
 export async function sendIgnoredMessage(
   client: unknown,
@@ -30,32 +32,49 @@ export async function sendIgnoredMessage(
   };
 
   let agent: string | undefined;
+  let model: { providerID: string; modelID: string } | undefined;
+  let variant: string | undefined;
   try {
     const ctx = await resolvePromptContext(
       client as Parameters<typeof resolvePromptContext>[0],
       sessionID,
     );
     agent = ctx?.agent;
+    model = ctx?.model;
+    variant = ctx?.variant;
   } catch {
     agent = undefined;
   }
 
-  const body: Record<string, unknown> = {
+  const send = async (body: Record<string, unknown>): Promise<void> => {
+    const promptInput = { path: { id: sessionID }, body };
+    if (typeof typedClient.session?.prompt === "function") {
+      await Promise.resolve(typedClient.session.prompt(promptInput));
+      return;
+    }
+    if (typeof typedClient.session?.promptAsync === "function") {
+      await typedClient.session.promptAsync(promptInput);
+      return;
+    }
+    throw new Error("[aft-plugin] client.session.prompt is unavailable");
+  };
+
+  const base: Record<string, unknown> = {
     noReply: true,
     parts: [{ type: "text", text, ignored: true }],
   };
-  if (agent) body.agent = agent;
-  const promptInput = { path: { id: sessionID }, body };
-
-  if (typeof typedClient.session?.prompt === "function") {
-    await Promise.resolve(typedClient.session.prompt(promptInput));
-    return;
-  }
+  if (agent) base.agent = agent;
 
-  if (typeof typedClient.session?.promptAsync === "function") {
-    await typedClient.session.promptAsync(promptInput);
-    return;
+  if (model) {
+    const withModel: Record<string, unknown> = { ...base, model };
+    if (variant) withModel.variant = variant;
+    try {
+      await send(withModel);
+      return;
+    } catch {
+      // Retry below without model/variant (legacy-host compatibility).
+    }
   }
 
-  throw new Error("[aft-plugin] client.session.prompt is unavailable");
+  await send(base);
 }

package/src/shared/rpc-client.ts

@@ -25,6 +25,61 @@ export interface AftRpcCallOptions {
    * placeholder wins.
    */
   accept?: (result: unknown) => boolean;
+  /**
+   * Internal one-hop guard for verified-directory redirects. A redirected
+   * call must never redirect again (placeholder chains would otherwise
+   * ping-pong between two bridgeless instances).
+   */
+  noRedirect?: boolean;
+}
+
+/**
+ * Verified-directory redirect registry (module-level, shared by every client
+ * in this process).
+ *
+ * Why it exists: the TUI process can run in a DIFFERENT directory than the
+ * process hosting the session's warm bridge (TUI attached to `opencode
+ * serve` / Desktop, launched from $HOME). Port-file discovery is keyed by
+ * hash(directory), so the TUI's client only ever finds its own bridgeless
+ * instance — which answers the lazy placeholder forever. The placeholder now
+ * carries `verified_directory` (the session's SDK-verified project root);
+ * `call()` follows it once, to the port files of the instance that actually
+ * owns the session's bridge.
+ *
+ * The registry remembers learned redirects so `resolveEndpoint()` (the
+ * persistent notification WebSocket) can aim at the same instance, and
+ * notifies listeners so an already-connected socket re-homes instead of
+ * staying subscribed to the bridgeless instance that will never push.
+ */
+const redirectTargets = new Map<string, string>();
+const redirectListeners = new Set<(from: string, to: string) => void>();
+
+export function subscribeRpcRedirects(listener: (from: string, to: string) => void): () => void {
+  redirectListeners.add(listener);
+  return () => {
+    redirectListeners.delete(listener);
+  };
+}
+
+function recordRedirect(from: string, to: string): void {
+  if (redirectTargets.get(from) === to) return;
+  redirectTargets.set(from, to);
+  for (const listener of redirectListeners) {
+    try {
+      listener(from, to);
+    } catch {
+      // one listener must not block the others
+    }
+  }
+}
+
+export function __resetRpcRedirectsForTest(): void {
+  redirectTargets.clear();
+  redirectListeners.clear();
+}
+
+export function __recordRpcRedirectForTest(from: string, to: string): void {
+  recordRedirect(from, to);
 }
 
 function abortError(signal: AbortSignal): Error {
@@ -59,8 +114,12 @@ export class AftRpcClient {
   private portsDir: string;
   private legacyPortFile: string;
   private stalePortFailures = new Map<string, number>();
+  private storageDir: string;
+  private directory: string;
 
   constructor(storageDir: string, directory: string) {
+    this.storageDir = storageDir;
+    this.directory = directory;
     this.portsDir = rpcPortFileDir(storageDir, directory);
     this.legacyPortFile = rpcPortFilePath(storageDir, directory);
   }
@@ -110,12 +169,54 @@ export class AftRpcClient {
       }
     }
 
-    // All ports returned placeholder OR failed. Use placeholder if we have
-    // one (sidebar then shows the lazy-spawn UI); otherwise rethrow last error.
-    if (placeholder !== null) return placeholder;
+    // All ports returned placeholder OR failed. Before settling for the
+    // placeholder, follow its verified_directory once: the session's warm
+    // bridge may live in another process registered under a different
+    // directory hash (TUI attached to a serve/Desktop host). See the
+    // redirect registry doc above.
+    if (placeholder !== null) {
+      const redirected = await this.followVerifiedDirectory<T>(
+        method,
+        params,
+        options,
+        placeholder,
+      );
+      if (redirected !== null) return redirected;
+      return placeholder;
+    }
     throw lastError instanceof Error ? lastError : new Error(String(lastError));
   }
 
+  /**
+   * One-hop redirect to the instance that owns the session's bridge. Returns
+   * null (caller keeps the placeholder) unless the redirected call produced a
+   * warm response — a placeholder from the target is not an improvement, and
+   * failures must not mask the original placeholder.
+   */
+  private async followVerifiedDirectory<T>(
+    method: string,
+    params: Record<string, unknown>,
+    options: AftRpcCallOptions,
+    placeholder: T,
+  ): Promise<T | null> {
+    if (options.noRedirect) return null;
+    const verified = (placeholder as Record<string, unknown> | null)?.verified_directory;
+    if (typeof verified !== "string" || verified.length === 0 || verified === this.directory) {
+      return null;
+    }
+    const target = new AftRpcClient(this.storageDir, verified);
+    try {
+      const result = await target.call<T>(method, params, { ...options, noRedirect: true });
+      if (this.looksLikePlaceholder(result)) return null;
+      // Only remember (and re-home the notification socket) once the target
+      // actually served warm data — a dead redirect must stay unlearned.
+      recordRedirect(this.directory, verified);
+      return result;
+    } catch {
+      return null;
+    }
+  }
+
   private async callOne<T>(
     method: string,
     params: Record<string, unknown>,
@@ -159,8 +260,19 @@ export class AftRpcClient {
     }
   }
 
-  /** Resolve the freshest live endpoint for the persistent TUI WebSocket. */
+  /** Resolve the freshest live endpoint for the persistent TUI WebSocket.
+   *  Follows a learned verified-directory redirect so the socket subscribes
+   *  to the instance that owns the session's bridge (the one that will
+   *  actually push status-changed frames), not this directory's bridgeless
+   *  placeholder instance. */
   async resolveEndpoint(signal?: AbortSignal): Promise<AftRpcEndpoint | null> {
+    const redirect = redirectTargets.get(this.directory);
+    if (redirect) {
+      const target = new AftRpcClient(this.storageDir, redirect);
+      const [info] = await target.resolvePortInfos(signal);
+      if (info) return { port: info.port, token: info.token };
+      // Redirect target gone (process exited) — fall through to own ports.
+    }
     const [info] = await this.resolvePortInfos(signal);
     if (!info) return null;
     return { port: info.port, token: info.token };

package/src/tui/entry.mjs

@@ -0,0 +1,16 @@
+// Prefer the host OpenTUI runtime registry when it exists. OpenTUI 0.4.x
+// registers these virtual modules process-wide, which lets the precompiled TUI
+// use the host's single Solid/OpenTUI runtime even when this package is loaded
+// from an npm cache under node_modules.
+let mod;
+try {
+  await import("opentui:runtime-module:" + encodeURIComponent("@opentui/solid"));
+  mod = await import("../tui-compiled/index.tsx");
+} catch {
+  // Older hosts and bare Bun do not provide the virtual registry. Falling back
+  // to the raw TSX entry keeps development checkouts and OpenTUI 0.3.x hosts
+  // working where the Solid transform still applies to this source path.
+  mod = await import("./index.tsx");
+}
+
+export default mod.default;

package/src/tui/notification-socket.ts

@@ -1,4 +1,4 @@
-import { AftRpcClient, type AftRpcEndpoint } from "../shared/rpc-client";
+import { AftRpcClient, type AftRpcEndpoint, subscribeRpcRedirects } from "../shared/rpc-client";
 import { resolveCortexKitStorageRoot } from "../shared/storage-paths";
 
 export interface SocketNotification {
@@ -86,14 +86,41 @@ export function startAftTuiSocket(options: TuiSocketOptions): void {
   opts = options;
   closed = false;
   generation += 1;
+  ensureRedirectSubscription();
   void reconcileSocketScope();
 }
 
+/**
+ * Re-home the socket when a status call learns a verified-directory redirect
+ * (see rpc-client). The socket may already be connected to this directory's
+ * bridgeless instance — which authenticates and accepts hello but will never
+ * push a status-changed frame, because the session's bridge lives in another
+ * process. Drop it and reconnect; resolveEndpoint now follows the redirect.
+ */
+let redirectUnsubscribe: (() => void) | null = null;
+function ensureRedirectSubscription(): void {
+  if (redirectUnsubscribe) return;
+  redirectUnsubscribe = subscribeRpcRedirects((from) => {
+    if (closed) return;
+    const scope = currentScope();
+    if (!scope || scope.directory !== from) return;
+    generation += 1;
+    connectingGeneration = null;
+    connectingScope = null;
+    closeCurrentSocket(false);
+    void connect(scope, generation);
+  });
+}
+
 export function stopAftTuiSocket(): void {
   closed = true;
   generation += 1;
   connectingGeneration = null;
   connectingScope = null;
+  if (redirectUnsubscribe) {
+    redirectUnsubscribe();
+    redirectUnsubscribe = null;
+  }
   if (reconnectTimer) {
     deps.clearTimeout(reconnectTimer);
     reconnectTimer = undefined;

package/src/tui-compiled/badge-contrast.ts

@@ -0,0 +1,43 @@
+/**
+ * Pick the text color for a sidebar badge label drawn on a theme accent.
+ * Keep this logic in sync with Magic Context so both sidebars make the same
+ * contrast decision for shared themes.
+ */
+
+type Color = { r: number; g: number; b: number; a?: number };
+
+const MIN_OPAQUE_ALPHA = 0.5;
+const MIN_CHANNEL_DISTANCE = 0.06;
+const LIGHT_ACCENT_LUMINANCE = 0.5;
+
+function srgbChannelToLinear(c: number): number {
+  return c <= 0.03928 ? c / 12.92 : ((c + 0.055) / 1.055) ** 2.4;
+}
+
+function relativeLuminance(bg: Color): number {
+  return (
+    0.2126 * srgbChannelToLinear(bg.r) +
+    0.7152 * srgbChannelToLinear(bg.g) +
+    0.0722 * srgbChannelToLinear(bg.b)
+  );
+}
+
+function nearlyEqual(a: Color, b: Color): boolean {
+  return (
+    Math.abs(a.r - b.r) < MIN_CHANNEL_DISTANCE &&
+    Math.abs(a.g - b.g) < MIN_CHANNEL_DISTANCE &&
+    Math.abs(a.b - b.b) < MIN_CHANNEL_DISTANCE
+  );
+}
+
+export function readableTextColorOn(bg: Color): string {
+  return relativeLuminance(bg) < LIGHT_ACCENT_LUMINANCE ? "#ffffff" : "#000000";
+}
+
+export function badgeTextColor<T extends Color>(accent: T, background: T): T | string {
+  const alpha = background.a ?? 1;
+  if (alpha >= MIN_OPAQUE_ALPHA && !nearlyEqual(accent, background)) {
+    return background;
+  }
+  return readableTextColorOn(accent);
+}