@cortexkit/aft-opencode 0.55.1 → 0.56.1

package/dist/tui/aft-rpc.d.ts

@@ -0,0 +1,48 @@
+import { Schema } from "effect";
+export declare const RpcSession: Schema.Struct<{
+    readonly sessionID: Schema.optional<Schema.String>;
+}>;
+export declare const IndexProgress: Schema.Struct<{
+    readonly index: Schema.Literals<readonly ["search", "semantic"]>;
+    readonly status: Schema.String;
+    readonly sessionID: Schema.optional<Schema.String>;
+    readonly stage: Schema.optional<Schema.NullOr<Schema.String>>;
+    readonly completed: Schema.optional<Schema.Number>;
+    readonly total: Schema.optional<Schema.Number>;
+}>;
+export type AftRpcSession = typeof RpcSession.Type;
+export type AftIndexProgress = typeof IndexProgress.Type;
+export declare const AftRpc: {
+    readonly id: "aft";
+    readonly methods: {
+        readonly getStatus: {
+            readonly input: Schema.Struct<{
+                readonly sessionID: Schema.optional<Schema.String>;
+            }>;
+            readonly output: Schema.$Record<Schema.String, Schema.Unknown>;
+        };
+    };
+    readonly events: {
+        readonly statusInvalidated: {
+            readonly schema: Schema.Struct<{
+                readonly sessionID: Schema.optional<Schema.String>;
+            }>;
+        };
+        readonly showStatusDialog: {
+            readonly schema: Schema.Struct<{
+                readonly sessionID: Schema.optional<Schema.String>;
+            }>;
+        };
+        readonly indexProgress: {
+            readonly schema: Schema.Struct<{
+                readonly index: Schema.Literals<readonly ["search", "semantic"]>;
+                readonly status: Schema.String;
+                readonly sessionID: Schema.optional<Schema.String>;
+                readonly stage: Schema.optional<Schema.NullOr<Schema.String>>;
+                readonly completed: Schema.optional<Schema.Number>;
+                readonly total: Schema.optional<Schema.Number>;
+            }>;
+        };
+    };
+};
+//# sourceMappingURL=aft-rpc.d.ts.map

package/dist/tui/aft-rpc.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"aft-rpc.d.ts","sourceRoot":"","sources":["../../src/tui/aft-rpc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAahC,eAAO,MAAM,UAAU;;EAErB,CAAC;AAEH,eAAO,MAAM,aAAa;;;;;;;EAOxB,CAAC;AAEH,MAAM,MAAM,aAAa,GAAG,OAAO,UAAU,CAAC,IAAI,CAAC;AACnD,MAAM,MAAM,gBAAgB,GAAG,OAAO,aAAa,CAAC,IAAI,CAAC;AAEzD,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAajB,CAAC"}

package/dist/tui/v2-status.d.ts

@@ -0,0 +1,11 @@
+import type { AftStatusSnapshot } from "../shared/status";
+export declare function formatAftStatusSegment(status: AftStatusSnapshot | null): string;
+export type AftSidebarSummary = {
+    title: string;
+    version?: string;
+    search: string;
+    semantic: string;
+    health: string;
+};
+export declare function summarizeAftSidebar(status: AftStatusSnapshot | null): AftSidebarSummary;
+//# sourceMappingURL=v2-status.d.ts.map

package/dist/tui/v2-status.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"v2-status.d.ts","sourceRoot":"","sources":["../../src/tui/v2-status.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAa,MAAM,kBAAkB,CAAC;AAMrE,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,iBAAiB,GAAG,IAAI,GAAG,MAAM,CAS/E;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAYF,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,iBAAiB,GAAG,IAAI,GAAG,iBAAiB,CAoBvF"}

package/dist/wakes/runtime-consumer.d.ts

@@ -0,0 +1,19 @@
+import type { BridgeOptions } from "@cortexkit/aft-bridge";
+import type { V2ToolConsumers } from "../tools/definitions/v2.js";
+import { type V2SessionAdmission } from "./session-delivery.js";
+export interface V2WakeHostContext {
+    readonly session: V2SessionAdmission;
+}
+declare const sharedBridgeOptions: Pick<BridgeOptions, "onBashCompletion" | "onBashLongRunning">;
+export interface V2RuntimeConsumer extends V2ToolConsumers {
+    readonly bridgeOptions: typeof sharedBridgeOptions;
+    dispose(): void;
+}
+/**
+ * Creates the V2 execution consumers for one OpenCode Location. The bridge owns
+ * one process-wide `onBashCompletion` callback, so it routes each notification
+ * by session to the delivery object owned by that Location's Effect scope.
+ */
+export declare function createV2RuntimeConsumer(context: V2WakeHostContext): V2RuntimeConsumer;
+export {};
+//# sourceMappingURL=runtime-consumer.d.ts.map

package/dist/wakes/runtime-consumer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"runtime-consumer.d.ts","sourceRoot":"","sources":["../../src/wakes/runtime-consumer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAIV,aAAa,EACd,MAAM,uBAAuB,CAAC;AAK/B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,EAAE,KAAK,kBAAkB,EAAqB,MAAM,uBAAuB,CAAC;AAEnF,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,OAAO,EAAE,kBAAkB,CAAC;CACtC;AA0DD,QAAA,MAAM,mBAAmB,EAAE,IAAI,CAAC,aAAa,EAAE,kBAAkB,GAAG,mBAAmB,CAGtF,CAAC;AAEF,MAAM,WAAW,iBAAkB,SAAQ,eAAe;IACxD,QAAQ,CAAC,aAAa,EAAE,OAAO,mBAAmB,CAAC;IACnD,OAAO,IAAI,IAAI,CAAC;CACjB;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,iBAAiB,GAAG,iBAAiB,CAwBrF"}

package/dist/wakes/session-delivery.d.ts

@@ -0,0 +1,45 @@
+import { Effect } from "effect";
+export interface V2SessionPromptInput {
+    readonly sessionID: string;
+    readonly text: string;
+    readonly delivery: "steer";
+    readonly metadata?: Readonly<Record<string, unknown>>;
+    readonly resume?: boolean;
+}
+export interface V2SessionSyntheticInput {
+    readonly sessionID: string;
+    readonly text: string;
+    readonly description?: string;
+    readonly metadata?: Readonly<Record<string, unknown>>;
+    readonly resume: false;
+}
+export interface V2SessionAdmission {
+    prompt(input: V2SessionPromptInput): Effect.Effect<unknown, unknown>;
+    synthetic(input: V2SessionSyntheticInput): Effect.Effect<unknown, unknown>;
+}
+export interface CompletionWake {
+    readonly sessionID: string;
+    readonly taskIDs: readonly string[];
+    readonly text: string;
+    readonly metadata?: Readonly<Record<string, unknown>>;
+}
+export interface StatusOnlyUpdate {
+    readonly sessionID: string;
+    readonly text: string;
+    readonly description?: string;
+    readonly metadata?: Readonly<Record<string, unknown>>;
+}
+/**
+ * Admit V2 session updates through the host's native inbox. Completion text is
+ * model-directed, while status records are synthetic and never resume a turn.
+ */
+export declare class V2SessionDelivery {
+    private readonly session;
+    private readonly admittedCompletions;
+    private disposed;
+    constructor(session: V2SessionAdmission);
+    completion(input: CompletionWake): Effect.Effect<boolean, unknown>;
+    status(input: StatusOnlyUpdate): Effect.Effect<void, unknown>;
+    dispose(): void;
+}
+//# sourceMappingURL=session-delivery.d.ts.map

package/dist/wakes/session-delivery.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"session-delivery.d.ts","sourceRoot":"","sources":["../../src/wakes/session-delivery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IACtD,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;CAC3B;AAED,MAAM,WAAW,uBAAuB;IACtC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IACtD,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAC;CACxB;AAED,MAAM,WAAW,kBAAkB;IACjC,MAAM,CAAC,KAAK,EAAE,oBAAoB,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACrE,SAAS,CAAC,KAAK,EAAE,uBAAuB,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;CAC5E;AAED,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IACpC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;CACvD;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;CACvD;AAED;;;GAGG;AACH,qBAAa,iBAAiB;IAIhB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAHpC,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAqB;IACzD,OAAO,CAAC,QAAQ,CAAS;gBAEI,OAAO,EAAE,kBAAkB;IAExD,UAAU,CAAC,KAAK,EAAE,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC;IAuBlE,MAAM,CAAC,KAAK,EAAE,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC;IAe7D,OAAO,IAAI,IAAI;CAKhB"}

package/dist/workflow-hints.d.ts

@@ -12,7 +12,18 @@ export interface WorkflowHintsOpts {
     bashCompressionEnabled: boolean;
     /** Set of disabled tool names (after surface filtering). */
     disabledTools: Set<string>;
+    /** Whether the hashline `edit` arm is the one actually registered. */
+    hashlineEffective?: boolean;
 }
+/**
+ * Routing rule for hashline sessions.
+ *
+ * Navigation tools return source that looks edit-ready but never publishes a
+ * snapshot, so an agent that inspects a symbol and then patches it is refused
+ * for a tag it believes it already has. Naming the tag-minting tools is the
+ * only way to distinguish "I have seen this code" from "I can address it".
+ */
+export declare const HASHLINE_TAG_SOURCE_HINT = "**Hashline edit tags**: Only `read` (and accepted AFT `cat`/`head`/`tail` rewrites) mint hashline tags. `aft_zoom`, `aft_outline`, `grep`, `aft_search`, and conflict snippets do not. After navigation, call `read` on every file and range the patch addresses.";
 /**
  * Build the workflow hints block. Returns `null` when no hints are
  * applicable for the configured surface (e.g. `tool_surface: "minimal"`
@@ -26,7 +37,7 @@ export declare function buildWorkflowHints(opts: WorkflowHintsOpts): string | nu
  * Background-bash gating reads the resolved bash config so the graduated
  * `bash.background` setting controls whether the hint appears.
  */
-export declare function buildHintsFromConfig(config: AftConfig, disabledTools: Set<string>): string | null;
+export declare function buildHintsFromConfig(config: AftConfig, disabledTools: Set<string>, hashlineEffective?: boolean): string | null;
 /**
  * Fold the hints block into a host `system[]` array in place.
  *

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,2DAA2D;IAC3D,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,CAgIzE;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,SAAS,EAAE,aAAa,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,MAAM,GAAG,IAAI,CASjG;AAED;;;;;;;;GAQG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI,CAQ9E"}
+{"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,2DAA2D;IAC3D,qBAAqB,EAAE,OAAO,CAAC;IAC/B,sCAAsC;IACtC,sBAAsB,EAAE,OAAO,CAAC;IAChC,4DAA4D;IAC5D,aAAa,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC3B,sEAAsE;IACtE,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B;AAID;;;;;;;GAOG;AACH,eAAO,MAAM,wBAAwB,sQACgO,CAAC;AAEtQ;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI,CA8IzE;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,SAAS,EACjB,aAAa,EAAE,GAAG,CAAC,MAAM,CAAC,EAC1B,iBAAiB,UAAQ,GACxB,MAAM,GAAG,IAAI,CAUf;AAED;;;;;;;;GAQG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI,CAQ9E"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cortexkit/aft-opencode",
-  "version": "0.55.1",
+  "version": "0.56.1",
   "type": "module",
   "description": "OpenCode plugin for Agent File Tools (AFT) — tree-sitter and lsp powered code analysis",
   "main": "dist/index.js",
@@ -12,6 +12,7 @@
   },
   "files": [
     "dist",
+    "src/entry",
     "src/tui",
     "src/tui-compiled",
     "src/shared",
@@ -19,11 +20,12 @@
     "README.md"
   ],
   "scripts": {
-    "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",
+    "build": "bun build src/index.ts src/entry/server.mjs --outdir dist --target node --format esm --external effect && 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/",
+    "test:load-matrix": "bun test ./test/load-matrix/load-matrix.ts",
     "lint": "biome check src",
     "schema": "bun scripts/build-schema.ts",
     "build:tool-schemas": "bun run scripts/build-tool-schemas.ts",
@@ -34,25 +36,27 @@
   },
   "dependencies": {
     "@clack/prompts": "^1.6.0",
-    "@cortexkit/aft-bridge": "0.55.1",
+    "@cortexkit/aft-bridge": "0.56.1",
     "@opentui/core": "0.4.3",
     "@opentui/solid": "0.4.3",
     "comment-json": "^4.6.2",
+    "effect": "4.0.0-rc.112",
     "solid-js": "1.9.12",
     "undici": "^7.25.0",
     "zod": "^4.4.3"
   },
   "optionalDependencies": {
-    "@cortexkit/aft-darwin-arm64": "0.55.1",
-    "@cortexkit/aft-darwin-x64": "0.55.1",
-    "@cortexkit/aft-linux-arm64": "0.55.1",
-    "@cortexkit/aft-linux-x64": "0.55.1",
-    "@cortexkit/aft-win32-arm64": "0.55.1",
-    "@cortexkit/aft-win32-x64": "0.55.1"
+    "@cortexkit/aft-darwin-arm64": "0.56.1",
+    "@cortexkit/aft-darwin-x64": "0.56.1",
+    "@cortexkit/aft-linux-arm64": "0.56.1",
+    "@cortexkit/aft-linux-x64": "0.56.1",
+    "@cortexkit/aft-win32-arm64": "0.56.1",
+    "@cortexkit/aft-win32-x64": "0.56.1"
   },
   "devDependencies": {
     "@opencode-ai/plugin": "^1.17.11",
     "@opencode-ai/sdk": "^1.17.11",
+    "@opencode/plugin": "2.0.3",
     "@types/node": "^22.0.0",
     "typescript": "^5.8.0"
   },
@@ -61,16 +65,17 @@
       "types": "./dist/index.d.ts",
       "import": "./dist/index.js"
     },
+    "./server": {
+      "types": "./src/entry/server.d.ts",
+      "import": "./dist/entry/server.js"
+    },
     "./tui": {
-      "types": "./src/tui/index.tsx",
-      "import": "./src/tui/entry.mjs"
+      "types": "./src/entry/tui.d.ts",
+      "import": "./src/entry/tui.mjs"
     }
   },
-  "oc-plugin": [
-    "server",
-    "tui"
-  ],
   "peerDependencies": {
-    "@opencode-ai/plugin": ">=1.17.0"
+    "@opencode-ai/plugin": ">=0.0.0-beta-0",
+    "@opencode/plugin": "2.0.3"
   }
 }

package/src/entry/server-runtime.mjs

@@ -0,0 +1,109 @@
+import {
+  acquireBridge,
+  findBinary,
+  releaseBridge,
+  resolveCortexKitStorageRoot,
+} from "@cortexkit/aft-bridge";
+import { Effect } from "effect";
+
+import {
+  buildConfigTierConfigureParams,
+  loadAftConfig,
+  resolveBridgePoolTransportOptions,
+} from "../config.js";
+import { resolvePluginVersion } from "../plugin-version.js";
+import { registerAftRpc } from "../rpc/register.js";
+import { hoistedV2ToolConsumers } from "../tools/hoisted/v2.js";
+import { createV2RuntimeConsumer } from "../wakes/runtime-consumer.js";
+import {
+  buildAftToolDefinitions,
+  openCodeHashlineEffective,
+  registerAftTools,
+} from "../tool-registration.js";
+
+const defaults = {
+  buildConfigureParams: buildConfigTierConfigureParams,
+  buildToolMap: buildAftToolDefinitions,
+  registerTools: registerAftTools,
+  registerRpc: registerAftRpc,
+  toolConsumers: (context) => ({
+    ...hoistedV2ToolConsumers(context),
+    ...createV2RuntimeConsumer(context),
+  }),
+  acquireBridge,
+  loadConfig: loadAftConfig,
+  releaseBridge,
+  resolveBinary: findBinary,
+  resolvePoolOptions: resolveBridgePoolTransportOptions,
+  resolveStorageRoot: resolveCortexKitStorageRoot,
+  resolveVersion: () => resolvePluginVersion(import.meta.url),
+};
+
+async function bootLocation(context, location, dependencies) {
+  const directory = location.directory;
+  const config = dependencies.loadConfig(directory);
+  if (config.enabled === false) return undefined;
+
+  const storageDir = dependencies.resolveStorageRoot();
+  const configOverrides = dependencies.buildConfigureParams(directory, {
+    bash_permissions: true,
+    harness: "opencode",
+    storage_dir: storageDir,
+  });
+  const binaryPath = await dependencies.resolveBinary(dependencies.resolveVersion());
+  const canonicalDirectory = location.project?.canonical ?? directory;
+  const consumers = dependencies.toolConsumers(context);
+  const pool = await dependencies.acquireBridge(canonicalDirectory, {
+    harness: "opencode",
+    binaryPath,
+    poolOptions: {
+      ...dependencies.resolvePoolOptions(config),
+      ...consumers.bridgeOptions,
+    },
+    configOverrides,
+    subcConnectionFile: config.subc?.connection_file,
+  });
+  const toolContext = {
+    pool,
+    client: context,
+    config,
+    hashlineEffective: openCodeHashlineEffective(config),
+    storageDir,
+    isProjectEnabled: (projectRoot) =>
+      projectRoot === directory ? true : dependencies.loadConfig(projectRoot).enabled !== false,
+  };
+  const tools = dependencies.buildToolMap(toolContext, config);
+  return { consumers, pool, tools };
+}
+
+export function makeServerEffect(overrides = {}) {
+  const dependencies = { ...defaults, ...overrides };
+
+  return (context) => {
+    // The V2 host already resolved the Location before invoking the plugin. Capture
+    // it now so every registration and transport route belongs to that exact scope.
+    const location = context.location;
+
+    return Effect.gen(function* () {
+      const runtime = yield* Effect.promise(() => bootLocation(context, location, dependencies));
+      if (!runtime) return;
+
+      yield* Effect.addFinalizer(() =>
+        Effect.promise(async () => {
+          runtime.consumers.dispose?.();
+          await dependencies.releaseBridge(runtime.pool);
+        }),
+      );
+      const rpc = yield* dependencies.registerRpc(context, location, runtime.pool);
+      yield* Effect.addFinalizer(() => Effect.promise(() => rpc.dispose()));
+      yield* dependencies.registerTools(
+        context,
+        location,
+        runtime.tools,
+        runtime.consumers,
+      );
+    });
+  };
+}
+
+export const serverEffect = makeServerEffect();

package/src/entry/server.d.ts

@@ -0,0 +1,10 @@
+import type { Plugin as V1Plugin } from "@opencode-ai/plugin";
+
+interface ServerEntry {
+  readonly id: string;
+  readonly server: V1Plugin;
+  readonly effect: (context: unknown) => unknown;
+}
+
+declare const entry: ServerEntry;
+export default entry;

package/src/entry/server.mjs

@@ -0,0 +1,10 @@
+import server from "../index.js";
+import { serverEffect as effect } from "./server-runtime.mjs";
+
+const id = "aft-opencode";
+
+export default {
+  id,
+  server,
+  effect,
+};

package/src/entry/tui.d.ts

@@ -0,0 +1,8 @@
+interface TuiEntry {
+  readonly id: string;
+  readonly tui: (api: unknown, options?: unknown, meta?: unknown) => Promise<void>;
+  readonly setup: (context: unknown) => Promise<void>;
+}
+
+declare const entry: TuiEntry;
+export default entry;

package/src/entry/tui.mjs

@@ -0,0 +1,9 @@
+import legacy from "../tui/entry.mjs";
+
+const setup = (...args) => legacy.setup(...args);
+
+export default {
+  id: legacy.id,
+  tui: legacy.tui,
+  setup,
+};

package/src/tui/aft-rpc.ts

@@ -0,0 +1,43 @@
+import { Schema } from "effect";
+
+/**
+ * The V2 host's Rpc.define returns its input after checking reserved custom
+ * error names. AFT defines no custom RPC errors, so this local identity has the
+ * same result and also loads on V1, where @opencode-ai/schema is unavailable.
+ */
+const Rpc = {
+  define<const Definition>(definition: Definition): Definition {
+    return definition;
+  },
+};
+
+export const RpcSession = Schema.Struct({
+  sessionID: Schema.optional(Schema.String),
+});
+
+export const IndexProgress = Schema.Struct({
+  index: Schema.Literals(["search", "semantic"]),
+  status: Schema.String,
+  sessionID: Schema.optional(Schema.String),
+  stage: Schema.optional(Schema.NullOr(Schema.String)),
+  completed: Schema.optional(Schema.Number),
+  total: Schema.optional(Schema.Number),
+});
+
+export type AftRpcSession = typeof RpcSession.Type;
+export type AftIndexProgress = typeof IndexProgress.Type;
+
+export const AftRpc = Rpc.define({
+  id: "aft",
+  methods: {
+    getStatus: {
+      input: RpcSession,
+      output: Schema.Record(Schema.String, Schema.Unknown),
+    },
+  },
+  events: {
+    statusInvalidated: { schema: RpcSession },
+    showStatusDialog: { schema: RpcSession },
+    indexProgress: { schema: IndexProgress },
+  },
+});

package/src/tui/index.tsx

@@ -1,7 +1,7 @@
 /** @jsxImportSource @opentui/solid */
 // @ts-nocheck
 
-import type { TuiPlugin, TuiPluginApi, TuiThemeCurrent } from "@opencode-ai/plugin/tui";
+import type { TuiPlugin, TuiPluginApi, TuiThemeCurrent } from "@opencode/plugin/tui";
 import { createMemo, createSignal, onCleanup } from "solid-js";
 
 import { version as packageVersion } from "../../package.json";
@@ -29,6 +29,7 @@ import {
   resolveTuiStorageDir,
   shouldSuppressUninitializedDowngrade,
 } from "./sidebar";
+import { setupV2Tui } from "./v2";
 
 // The TUI talks to the server plugin via AftRpcClient. The client reads the
 // JSON port file written by AftRpcServer ({ port, token }) and includes that
@@ -803,4 +804,5 @@ const id = "aft-opencode";
 export default {
   id,
   tui,
+  setup: setupV2Tui,
 };

package/src/tui/sidebar.tsx

@@ -7,7 +7,7 @@
 // current without polling.
 
 import { canonicalizeProjectRoot } from "@cortexkit/aft-bridge";
-import type { TuiPluginApi, TuiSlotPlugin, TuiThemeCurrent } from "@opencode-ai/plugin/tui";
+import type { TuiPluginApi, TuiSlotPlugin, TuiThemeCurrent } from "@opencode/plugin/tui";
 import { createEffect, createMemo, createSignal, on, onCleanup } from "solid-js";
 import { AftRpcClient } from "../shared/rpc-client";
 import {

package/src/tui/types/opencode-plugin-tui.d.ts

@@ -1,7 +1,8 @@
-// Type declarations for @opencode-ai/plugin/tui
-// These types are not yet exported by the installed @opencode-ai/plugin package
+// Compatibility declarations for the GA @opencode/plugin/tui entrypoint.
+// AFT's shared TUI still consumes the legacy callback surface while its V2 setup
+// export uses the GA setup context directly.
 
-declare module "@opencode-ai/plugin/tui" {
+declare module "@opencode/plugin/tui" {
   import type {
     createOpencodeClient as createOpencodeClientV2,
     Event as TuiEvent,

package/src/tui/v2-status.ts

@@ -0,0 +1,56 @@
+import type { AftStatusSnapshot, StatusBar } from "../shared/status";
+
+function count(value: number | undefined): string {
+  return value === undefined ? "?" : String(value);
+}
+
+export function formatAftStatusSegment(status: AftStatusSnapshot | null): string {
+  const bar = status?.status_bar;
+  if (!bar) return "AFT starting…";
+  const stale = bar.tier2_stale ? "~" : "";
+  return (
+    `AFT E${count(bar.errors)} W${count(bar.warnings)} | ` +
+    `${stale}D${count(bar.dead_code)} U${count(bar.unused_exports)} ` +
+    `C${count(bar.duplicates)} | T${count(bar.todos)}`
+  );
+}
+
+export type AftSidebarSummary = {
+  title: string;
+  version?: string;
+  search: string;
+  semantic: string;
+  health: string;
+};
+
+function healthSummary(bar: StatusBar | undefined): string {
+  if (!bar) return "health pending";
+  const stale = bar.tier2_stale ? "~" : "";
+  return (
+    `E${count(bar.errors)} W${count(bar.warnings)} ` +
+    `${stale}D${count(bar.dead_code)} U${count(bar.unused_exports)} ` +
+    `C${count(bar.duplicates)} T${count(bar.todos)}`
+  );
+}
+
+export function summarizeAftSidebar(status: AftStatusSnapshot | null): AftSidebarSummary {
+  if (!status || status.cache_role === "not_initialized") {
+    return {
+      title: "AFT",
+      search: "not initialized",
+      semantic: "not initialized",
+      health: "health pending",
+    };
+  }
+
+  const semantic = status.semantic_index.stage
+    ? `${status.semantic_index.status} (${status.semantic_index.stage})`
+    : status.semantic_index.status;
+  return {
+    title: status.degraded ? "AFT · DEGRADED" : "AFT",
+    version: status.version || undefined,
+    search: status.search_index.status,
+    semantic,
+    health: healthSummary(status.status_bar),
+  };
+}