@route_33/opencode 0.4.7-rc.4 → 0.4.7-rc.6

package/README.md

@@ -5,29 +5,49 @@ usage, and use the route_33 models — no API keys to paste, ever.
 
 ## Install
 
+**OpenCode v2 (recommended):**
+
 ```sh
 opencode plugin add @route_33/opencode
 ```
 
-Restart OpenCode afterwards — plugins load at startup.
+Installs globally — one `plugins` entry in the config's `opencode.json`
+loads every part (the server and TUI parts are auto-discovered from the
+package exports; no `tui.json` exists on v2).
+
+**OpenCode v1:**
 
-Prefer config? Add the package to `opencode.jsonc` instead:
+```sh
+opencode plugin @route_33/opencode           # project scope (default)
+opencode plugin @route_33/opencode --global  # global scope
+```
+
+Installs at the nearest definition and registers the plugin twice: the
+server part in `opencode.json` and the TUI part in `tui.json` — both files
+are load-bearing on v1, which is why the installer writes both.
+
+Either way, restart OpenCode afterwards — plugins load at startup. Prefer
+config? Declare the plugin directly in `opencode.json(c)`:
 
 ```jsonc
-{ "plugins": ["@route_33/opencode"] }
+{ "plugin": ["@route_33/opencode"] }
 ```
 
 ## First run
 
-1. Pick any route_33 model (or run `/connect` and choose **Route 33**).
-2. Open the sign-in link — your browser finishes at a Route 33 confirmation
-   page.
-3. Connect again and assign **which budget covers usage in this folder**: one of your
-   Route 33 projects, or your personal key.
-4. The route_33 models appear. Done.
+With `ROUTE33_API_KEY` unset and `ROUTE33_AUTOCONNECT` not `0`, the wizard
+auto-starts at launch and completes **before the first prompt** on OpenCode
+v2 — the setup awaits the whole chain:
+
+1. The browser sign-in opens; finish it there.
+2. The budget picker follows in OpenCode — one of your Route 33 projects,
+   or your personal key.
+3. The route_33 models appear. Pick one and prompt away.
 
-To change the budget later, connect again and pick another option. `/r33` shows
-the current state at any time.
+On OpenCode v1 the wizard also auto-starts, but the 1.x TUI API has no
+pre-prompt hook, so it runs in parallel with the prompt — the models appear
+after the wizard finishes and OpenCode restarts. Use `/r33` any time to
+re-run connect, change the budget, or inspect the session.
 
 ## Commands
 

package/dist/index.js

@@ -3245,6 +3245,26 @@ var Route33Runtime = class {
   }
 };
 
+// src/v1-entry/unattributed-prompt-gate/unattributed-prompt-gate.ts
+var createUnattributedPromptGate = ({ directory, outsideWorktree }) => (input) => {
+  if (input.model?.providerID !== "route_33") return Promise.resolve();
+  const attribution = readAttribution({ directory, outsideWorktree });
+  if (attribution !== void 0) return Promise.resolve();
+  return Promise.reject(
+    new Error(
+      "Route 33 needs a budget for this folder first \u2014 run /r33 in OpenCode, choose Route 33, and assign a budget."
+    )
+  );
+};
+
+// src/v1-entry/workspace-key-headers/workspace-key-headers.ts
+var createWorkspaceKeyHeaders = ({ resolveKey, session }) => async (input, output) => {
+  const workspace = await session.get({ sessionID: input.sessionID });
+  const key = await resolveKey(workspace.location.directory);
+  if (key === void 0) return;
+  output.headers["Authorization"] = `Bearer ${key.value}`;
+};
+
 // src/create-route33-plugin/create-route33-plugin.ts
 var createRoute33Plugin = (options = {}) => {
   const baseURL = readEnvBaseUrl();
@@ -3285,6 +3305,8 @@ var createRoute33Plugin = (options = {}) => {
       }
     }
     let credentialProvider;
+    let workspaceHeaders;
+    let promptGate;
     if (directKey !== void 0) {
       credentialProvider = () => Promise.resolve(parseGatewayKey(directKey));
     } else if (runtime === void 0) {
@@ -3293,13 +3315,28 @@ var createRoute33Plugin = (options = {}) => {
       );
     } else {
       credentialProvider = () => runtime.resolveCredential();
+      workspaceHeaders = createWorkspaceKeyHeaders({
+        resolveKey: (directory) => runtime.resolveWorkspaceCredential(directory),
+        session: {
+          get: async ({ sessionID }) => {
+            const session = await options.readSession?.(sessionID);
+            return session ?? { location: { directory: input.worktree } };
+          }
+        }
+      });
+      promptGate = createUnattributedPromptGate({
+        directory: input.worktree,
+        outsideWorktree: "return-undefined"
+      });
     }
     return Promise.resolve({
       config: createConfigHook({
         ...resolvedConfig,
         credentialProvider,
         cwd: input.worktree
-      })
+      }),
+      ...workspaceHeaders === void 0 ? {} : { "chat.headers": workspaceHeaders },
+      ...promptGate === void 0 ? {} : { "chat.message": promptGate }
     });
   };
 };

package/dist/tui-entry/index.js

@@ -6226,6 +6226,64 @@ var init_route33_runtime2 = __esm({
   }
 });
 
+// src/v1-entry/unattributed-prompt-gate/unattributed-prompt-gate.ts
+var createUnattributedPromptGate;
+var init_unattributed_prompt_gate = __esm({
+  "src/v1-entry/unattributed-prompt-gate/unattributed-prompt-gate.ts"() {
+    "use strict";
+    init_attribution();
+    createUnattributedPromptGate = ({ directory, outsideWorktree }) => (input) => {
+      if (input.model?.providerID !== "route_33") return Promise.resolve();
+      const attribution = readAttribution({ directory, outsideWorktree });
+      if (attribution !== void 0) return Promise.resolve();
+      return Promise.reject(
+        new Error(
+          "Route 33 needs a budget for this folder first \u2014 run /r33 in OpenCode, choose Route 33, and assign a budget."
+        )
+      );
+    };
+  }
+});
+
+// src/v1-entry/unattributed-prompt-gate/index.ts
+var init_unattributed_prompt_gate2 = __esm({
+  "src/v1-entry/unattributed-prompt-gate/index.ts"() {
+    "use strict";
+    init_unattributed_prompt_gate();
+  }
+});
+
+// src/v1-entry/workspace-key-headers/workspace-key-headers.ts
+var createWorkspaceKeyHeaders;
+var init_workspace_key_headers = __esm({
+  "src/v1-entry/workspace-key-headers/workspace-key-headers.ts"() {
+    "use strict";
+    createWorkspaceKeyHeaders = ({ resolveKey, session }) => async (input, output) => {
+      const workspace = await session.get({ sessionID: input.sessionID });
+      const key = await resolveKey(workspace.location.directory);
+      if (key === void 0) return;
+      output.headers["Authorization"] = `Bearer ${key.value}`;
+    };
+  }
+});
+
+// src/v1-entry/workspace-key-headers/index.ts
+var init_workspace_key_headers2 = __esm({
+  "src/v1-entry/workspace-key-headers/index.ts"() {
+    "use strict";
+    init_workspace_key_headers();
+  }
+});
+
+// src/v1-entry/index.ts
+var init_v1_entry = __esm({
+  "src/v1-entry/index.ts"() {
+    "use strict";
+    init_unattributed_prompt_gate2();
+    init_workspace_key_headers2();
+  }
+});
+
 // src/create-route33-plugin/create-route33-plugin.ts
 var createRoute33Plugin;
 var init_create_route33_plugin = __esm({
@@ -6238,6 +6296,7 @@ var init_create_route33_plugin = __esm({
     init_requested_client_id2();
     init_route33_runtime2();
     init_ux();
+    init_v1_entry();
     createRoute33Plugin = (options = {}) => {
       const baseURL = readEnvBaseUrl();
       const clientId = options.clientId ?? readEnvClientId() ?? DEFAULT_ROUTE33_CLIENT_ID;
@@ -6277,6 +6336,8 @@ var init_create_route33_plugin = __esm({
           }
         }
         let credentialProvider;
+        let workspaceHeaders;
+        let promptGate;
         if (directKey !== void 0) {
           credentialProvider = () => Promise.resolve(parseGatewayKey(directKey));
         } else if (runtime === void 0) {
@@ -6285,13 +6346,28 @@ var init_create_route33_plugin = __esm({
           );
         } else {
           credentialProvider = () => runtime.resolveCredential();
+          workspaceHeaders = createWorkspaceKeyHeaders({
+            resolveKey: (directory) => runtime.resolveWorkspaceCredential(directory),
+            session: {
+              get: async ({ sessionID }) => {
+                const session = await options.readSession?.(sessionID);
+                return session ?? { location: { directory: input.worktree } };
+              }
+            }
+          });
+          promptGate = createUnattributedPromptGate({
+            directory: input.worktree,
+            outsideWorktree: "return-undefined"
+          });
         }
         return Promise.resolve({
           config: createConfigHook({
             ...resolvedConfig,
             credentialProvider,
             cwd: input.worktree
-          })
+          }),
+          ...workspaceHeaders === void 0 ? {} : { "chat.headers": workspaceHeaders },
+          ...promptGate === void 0 ? {} : { "chat.message": promptGate }
         });
       };
     };
@@ -6793,12 +6869,8 @@ var productionOptions = () => {
   };
 };
 
-// src/tui-entry/run-connect/run-connect.ts
-init_attribution();
-init_config();
-
-// src/tui-entry/dialog-confirm/dialog-confirm.ts
-var confirmFromDialog = (api, input) => new Promise((resolve2) => {
+// src/tui-entry/dialog-select/dialog-select.ts
+var selectFromDialog = async (api, input) => new Promise((resolve2) => {
   let settled = false;
   const settle = (value) => {
     if (settled) {
@@ -6810,14 +6882,12 @@ var confirmFromDialog = (api, input) => new Promise((resolve2) => {
   };
   const dialog = api.ui.dialog;
   dialog.replace(
-    () => api.ui.DialogConfirm({
-      message: input.message,
-      onCancel: () => {
-        settle(false);
-      },
-      onConfirm: () => {
-        settle(true);
+    () => api.ui.DialogSelect({
+      current: input.current,
+      onSelect: (option) => {
+        settle(option.value);
       },
+      options: input.options,
       title: input.title
     }),
     () => {
@@ -6826,8 +6896,70 @@ var confirmFromDialog = (api, input) => new Promise((resolve2) => {
   );
 });
 
-// src/tui-entry/dialog-select/dialog-select.ts
-var selectFromDialog = async (api, input) => new Promise((resolve2) => {
+// src/tui-entry/r33-command-reply/r33-command-reply.ts
+init_create_route33_plugin2();
+
+// src/v2-entry/parse-r33-subcommand/parse-r33-subcommand.ts
+var SUBCOMMANDS = ["inspect", "rotate", "reset"];
+var parseR33Subcommand = (promptText) => {
+  const [invocation, argument] = promptText.trim().split(/\s+/u);
+  const name = invocation?.replace(/^\/+/u, "").split(":")[0] ?? "";
+  if (name !== "r33") {
+    return "help";
+  }
+  if (argument === void 0) {
+    return "inspect";
+  }
+  return SUBCOMMANDS.includes(argument) ? argument : "help";
+};
+
+// src/v2-entry/r33-command/r33-command.ts
+var executeR33Command = async (input) => {
+  const subcommand = parseR33Subcommand(input.promptText);
+  if (input.handlers === void 0) {
+    return "Route 33 is not connected in this folder. Run /connect, choose Route 33, and follow the steps.";
+  }
+  if (subcommand === "help") {
+    return "Route 33 usage: /r33 [inspect|rotate|reset] \u2014 inspect shows attribution and key rotation, rotate rotates the key now, reset clears the assigned budget (assign again with /connect).";
+  }
+  switch (subcommand) {
+    case "rotate": {
+      const lease = await input.handlers["rotate-now"]();
+      return `Route 33 key rotated. Key ${lease.keyId} is valid until ${lease.expiresAt}.`;
+    }
+    case "reset": {
+      await input.handlers["reset-attribution"]();
+      return "Route 33 attribution cleared. Run /connect, choose Route 33, and assign a budget again.";
+    }
+    default: {
+      return JSON.stringify(input.handlers["inspect-session"](), null, 2);
+    }
+  }
+};
+
+// src/tui-entry/r33-command-reply/r33-command-reply.ts
+var r33CommandReply = (deps) => async (subcommand) => {
+  let runtime;
+  const entry = createRoute33Plugin({
+    ...deps.composeOptions(),
+    bindRuntime: (instance) => {
+      runtime = instance;
+    }
+  });
+  await entry({ worktree: deps.api.state.path.directory });
+  const handlers = runtime?.commandHandlers();
+  return executeR33Command({
+    handlers,
+    promptText: `/r33 ${subcommand}`
+  });
+};
+
+// src/tui-entry/run-connect/run-connect.ts
+init_attribution();
+init_config();
+
+// src/tui-entry/dialog-confirm/dialog-confirm.ts
+var confirmFromDialog = (api, input) => new Promise((resolve2) => {
   let settled = false;
   const settle = (value) => {
     if (settled) {
@@ -6839,12 +6971,14 @@ var selectFromDialog = async (api, input) => new Promise((resolve2) => {
   };
   const dialog = api.ui.dialog;
   dialog.replace(
-    () => api.ui.DialogSelect({
-      current: input.current,
-      onSelect: (option) => {
-        settle(option.value);
+    () => api.ui.DialogConfirm({
+      message: input.message,
+      onCancel: () => {
+        settle(false);
+      },
+      onConfirm: () => {
+        settle(true);
       },
-      options: input.options,
       title: input.title
     }),
     () => {
@@ -6925,6 +7059,45 @@ var runConnect = async (api, composeOptions) => {
   }
 };
 
+// src/tui-entry/r33-menu-actions/r33-menu-actions.ts
+var r33MenuActions = (deps) => async (selection) => {
+  if (selection === "connect" || selection === "change") {
+    await runConnect(deps.api, deps.composeOptions);
+    return;
+  }
+  try {
+    const reply = await r33CommandReply(deps)(selection);
+    deps.api.ui.toast({
+      message: reply,
+      title: "Route 33",
+      variant: "info"
+    });
+  } catch (error) {
+    deps.api.ui.toast({
+      message: error instanceof Error ? error.message : String(error),
+      title: "Route 33",
+      variant: "error"
+    });
+  }
+};
+
+// src/tui-entry/r33-menu/r33-menu.ts
+var menuOptions = [
+  { title: "Connect \u2014 sign in and assign a budget", value: "connect" },
+  { title: "Inspect session \u2014 attribution and key metadata", value: "inspect" },
+  { title: "Rotate key now", value: "rotate" },
+  { title: "Change budget \u2014 reassign this folder", value: "change" },
+  { title: "Reset attribution \u2014 clear the assigned budget", value: "reset" }
+];
+var r33Menu = async (api, composeOptions) => {
+  const selection = await selectFromDialog(api, {
+    options: menuOptions,
+    title: "Route 33 \u2014 choose an action"
+  });
+  if (selection === void 0) return;
+  await r33MenuActions({ api, composeOptions })(selection);
+};
+
 // src/tui-entry/v1-connect-wizard/v1-connect-wizard.ts
 var createV1ConnectWizard = (composeOptions = productionOptions) => (api) => {
   if (readEnvDirectApiKey() !== void 0 || readEnvAutoconnectDisabled()) {
@@ -6941,17 +7114,17 @@ var createV1ConnectWizard = (composeOptions = productionOptions) => (api) => {
   const legacyCommands = api.command;
   legacyCommands?.register(() => [
     {
-      onSelect: () => runConnect(api, composeOptions),
+      onSelect: () => void r33Menu(api, composeOptions),
       slash: { name: "r33" },
-      title: "Route 33: sign in and assign a budget for this folder",
-      value: "route33.connect"
+      title: "Route 33: status, budget, and key management",
+      value: "route33.menu"
     }
   ]);
   return Promise.resolve();
 };
 
 // src/tui-entry/show-r33-menu/show-r33-menu.ts
-var menuOptions = [
+var menuOptions2 = [
   {
     title: "Connect \u2014 sign in and assign a budget",
     value: "connect"
@@ -6976,7 +7149,7 @@ var menuOptions = [
 var showR33Menu = async (context) => {
   const selection = await context.ui.dialog.select({
     title: "Route 33 \u2014 choose an action",
-    options: menuOptions
+    options: menuOptions2
   });
   if (selection === void 0) return;
   if (selection === "connect") {
@@ -6995,27 +7168,40 @@ var showR33Menu = async (context) => {
 // src/tui-entry/v2-autoconnect/v2-autoconnect.ts
 init_attribution();
 init_cli();
-var v2Autoconnect = async (context) => {
-  if (readEnvDirectApiKey() !== void 0 || readEnvAutoconnectDisabled() || context.location === void 0) {
-    return;
-  }
+
+// src/tui-entry/v2-connect-runner/v2-connect-runner.ts
+var createV2ConnectRunner = ({
+  context,
+  unattributed
+}) => {
   const oauth = context.client?.api?.integration?.oauth;
-  if (oauth === void 0 || oauth.connect === void 0) return;
-  const attribution = readAttribution({
-    directory: context.location.directory,
+  return async (message) => {
+    const connect = oauth?.connect;
+    if (connect === void 0) return;
+    if (!unattributed()) return;
+    context.ui.toast.show({ message, variant: "info" });
+    await connect({
+      integrationID: "route33",
+      methodID: "browser"
+    }).catch(() => void 0);
+  };
+};
+
+// src/tui-entry/v2-autoconnect/v2-autoconnect.ts
+var v2Autoconnect = async (context) => {
+  if (readEnvDirectApiKey() !== void 0) return;
+  if (readEnvAutoconnectDisabled()) return;
+  const location = context.location;
+  if (location === void 0) return;
+  const unattributed = () => readAttribution({
+    directory: location.directory,
     outsideWorktree: "return-undefined"
-  });
-  if (attribution !== void 0) {
-    return;
-  }
-  context.ui.toast.show({
-    message: "Route 33 is not connected \u2014 signing in now. Follow the browser prompt, then run /connect to assign a budget.",
-    variant: "info"
-  });
-  await oauth.connect({
-    integrationID: "route33",
-    methodID: "browser"
-  }).catch(() => void 0);
+  }) === void 0;
+  const connectPass = createV2ConnectRunner({ context, unattributed });
+  await connectPass(
+    "Route 33 is not connected \u2014 signing in now, then pick the budget for this folder."
+  );
+  await connectPass("Signed in to Route 33 \u2014 opening the budget picker.");
 };
 
 // src/tui-entry/v2-tui/v2-tui.ts

package/dist/v2-entry/index.js

@@ -3248,6 +3248,26 @@ var Route33Runtime = class {
   }
 };
 
+// src/v1-entry/unattributed-prompt-gate/unattributed-prompt-gate.ts
+var createUnattributedPromptGate = ({ directory, outsideWorktree }) => (input) => {
+  if (input.model?.providerID !== "route_33") return Promise.resolve();
+  const attribution = readAttribution({ directory, outsideWorktree });
+  if (attribution !== void 0) return Promise.resolve();
+  return Promise.reject(
+    new Error(
+      "Route 33 needs a budget for this folder first \u2014 run /r33 in OpenCode, choose Route 33, and assign a budget."
+    )
+  );
+};
+
+// src/v1-entry/workspace-key-headers/workspace-key-headers.ts
+var createWorkspaceKeyHeaders = ({ resolveKey, session }) => async (input, output) => {
+  const workspace = await session.get({ sessionID: input.sessionID });
+  const key = await resolveKey(workspace.location.directory);
+  if (key === void 0) return;
+  output.headers["Authorization"] = `Bearer ${key.value}`;
+};
+
 // src/create-route33-plugin/create-route33-plugin.ts
 var createRoute33Plugin = (options = {}) => {
   const baseURL = readEnvBaseUrl();
@@ -3288,6 +3308,8 @@ var createRoute33Plugin = (options = {}) => {
       }
     }
     let credentialProvider;
+    let workspaceHeaders;
+    let promptGate;
     if (directKey !== void 0) {
       credentialProvider = () => Promise.resolve(parseGatewayKey(directKey));
     } else if (runtime === void 0) {
@@ -3296,13 +3318,28 @@ var createRoute33Plugin = (options = {}) => {
       );
     } else {
       credentialProvider = () => runtime.resolveCredential();
+      workspaceHeaders = createWorkspaceKeyHeaders({
+        resolveKey: (directory) => runtime.resolveWorkspaceCredential(directory),
+        session: {
+          get: async ({ sessionID }) => {
+            const session = await options.readSession?.(sessionID);
+            return session ?? { location: { directory: input.worktree } };
+          }
+        }
+      });
+      promptGate = createUnattributedPromptGate({
+        directory: input.worktree,
+        outsideWorktree: "return-undefined"
+      });
     }
     return Promise.resolve({
       config: createConfigHook({
         ...resolvedConfig,
         credentialProvider,
         cwd: input.worktree
-      })
+      }),
+      ...workspaceHeaders === void 0 ? {} : { "chat.headers": workspaceHeaders },
+      ...promptGate === void 0 ? {} : { "chat.message": promptGate }
     });
   };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@route_33/opencode",
-  "version": "0.4.7-rc.4",
+  "version": "0.4.7-rc.6",
   "type": "module",
   "repository": {
     "type": "git",
@@ -42,8 +42,8 @@
     "eslint": "10.13.0",
     "typescript": "6.0.3",
     "vitest": "5.0.5",
-    "@cronos-ai-lab/eslint-config": "0.1.2",
-    "@cronos-ai-lab/typescript-config": "0.1.2"
+    "@cronos-ai-lab/typescript-config": "0.1.2",
+    "@cronos-ai-lab/eslint-config": "0.1.2"
   },
   "scripts": {
     "build": "esbuild src/index.ts src/v2-entry/index.ts src/tui-entry/index.ts src/cli/production-smoke/production-smoke.ts --bundle --format=esm --platform=node --packages=external --outbase=src --outdir=dist --alias:@opencode-ai/plugin-v2=@opencode/plugin --define:__ROUTE33_DEFAULT_CLIENT_ID__=\\\"${ROUTE33_DEFAULT_CLIENT_ID:-}\\\"",