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

package/README.md

@@ -1,6 +1,6 @@
 # @route_33/opencode
 
-The Route 33 plugin for OpenCode: sign in with your browser, pick who pays for
+The Route 33 plugin for OpenCode: sign in with your browser, assign the budget for
 usage, and use the route_33 models — no API keys to paste, ever.
 
 ## Install
@@ -22,20 +22,20 @@ Prefer config? Add the package to `opencode.jsonc` instead:
 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 pick **who pays for usage in this folder**: one of your
+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.
 
-To change who pays later, connect again and pick another option. `/r33` shows
+To change the budget later, connect again and pick another option. `/r33` shows
 the current state at any time.
 
 ## Commands
 
-| Command       | Effect                                                    |
-| ------------- | --------------------------------------------------------- |
-| `/r33`        | Show who pays, the active key, and its rotation state     |
-| `/r33 rotate` | Rotate the key immediately                                |
-| `/r33 reset`  | Clear who pays — connect again to pick a different option |
+| Command       | Effect                                                               |
+| ------------- | -------------------------------------------------------------------- |
+| `/r33`        | Show the assigned budget, the active key, and its rotation state     |
+| `/r33 rotate` | Rotate the key immediately                                           |
+| `/r33 reset`  | Clear the assigned budget — connect again to pick a different option |
 
 A browser is required for every sign-in; restarts afterwards sign in silently.
 

package/dist/cli/production-smoke/production-smoke.js

@@ -260,7 +260,7 @@ var buildCallbackPage = (state, errorCode) => {
   const safeCode = (errorCode ?? "").replace(/[^a-z0-9_-]/gi, "");
   const title = isError ? "Sign-in failed" : "Signed in";
   const headline = isError ? "Sign-in failed" : "Signed in to route33";
-  const subline = isError ? "Return to OpenCode and retry." : "Return to OpenCode \u2014 one more step may wait there: if it asks who pays for usage, pick a project. Then this window can be closed.";
+  const subline = isError ? "Return to OpenCode and retry." : "Return to OpenCode \u2014 one more step may wait there: if it asks which budget covers usage, pick a project. Then this window can be closed.";
   const statusLabel = isError ? "Authentication error" : "Authenticated";
   const dotClass = isError ? "r33-status__dot r33-status__dot--error" : "r33-status__dot";
   const codeLine = isError && safeCode.length > 0 ? `<p class="r33-code">Error code: <span class="r33-code__value">${safeCode}</span></p>` : "";
@@ -421,7 +421,7 @@ var createPkceVerifierAndChallenge = () => {
 };
 
 // src/auth/requested-scopes/requested-scopes.ts
-var REQUESTED_OAUTH_SCOPES = "openid offline_access projects:read api-keys:read api-keys:create api-keys:rotate api-keys:delete";
+var REQUESTED_OAUTH_SCOPES = "openid offline_access projects:read keys:read keys:write";
 
 // src/auth/login-flow/login-flow.ts
 var loginFlow = async (options) => {

package/dist/index.js

@@ -2546,7 +2546,7 @@ var createAttributionPrompt = (projects) => {
 
 // src/ux/attribution-prompt-error/attribution-prompt-error.ts
 var MESSAGES = {
-  ATTRIBUTION_PRESENTER_UNAVAILABLE: "Route 33 needs OpenCode v2 to choose who pays for usage in this folder. Update to OpenCode v2, run /connect, choose Route 33, and follow the steps.",
+  ATTRIBUTION_PRESENTER_UNAVAILABLE: "Route 33 needs OpenCode v2 to assign a budget for this folder. Update to OpenCode v2, run /connect, choose Route 33, and follow the steps.",
   ATTRIBUTION_SELECTION_INVALID: "That Route 33 option is no longer available. Connect again and pick another."
 };
 var AttributionPromptError = class extends GatewayCredentialError {
@@ -2762,7 +2762,7 @@ var buildCallbackPage = (state, errorCode) => {
   const safeCode = (errorCode ?? "").replace(/[^a-z0-9_-]/gi, "");
   const title = isError ? "Sign-in failed" : "Signed in";
   const headline = isError ? "Sign-in failed" : "Signed in to route33";
-  const subline = isError ? "Return to OpenCode and retry." : "Return to OpenCode \u2014 one more step may wait there: if it asks who pays for usage, pick a project. Then this window can be closed.";
+  const subline = isError ? "Return to OpenCode and retry." : "Return to OpenCode \u2014 one more step may wait there: if it asks which budget covers usage, pick a project. Then this window can be closed.";
   const statusLabel = isError ? "Authentication error" : "Authenticated";
   const dotClass = isError ? "r33-status__dot r33-status__dot--error" : "r33-status__dot";
   const codeLine = isError && safeCode.length > 0 ? `<p class="r33-code">Error code: <span class="r33-code__value">${safeCode}</span></p>` : "";
@@ -2923,7 +2923,7 @@ var createPkceVerifierAndChallenge = () => {
 };
 
 // src/auth/requested-scopes/requested-scopes.ts
-var REQUESTED_OAUTH_SCOPES = "openid offline_access projects:read api-keys:read api-keys:create api-keys:rotate api-keys:delete";
+var REQUESTED_OAUTH_SCOPES = "openid offline_access projects:read keys:read keys:write";
 
 // src/auth/login-flow/login-flow.ts
 var loginFlow = async (options) => {

package/dist/tui-entry/index.js

@@ -1242,7 +1242,7 @@ html,body{margin:0}
       const safeCode = (errorCode ?? "").replace(/[^a-z0-9_-]/gi, "");
       const title = isError ? "Sign-in failed" : "Signed in";
       const headline = isError ? "Sign-in failed" : "Signed in to route33";
-      const subline = isError ? "Return to OpenCode and retry." : "Return to OpenCode \u2014 one more step may wait there: if it asks who pays for usage, pick a project. Then this window can be closed.";
+      const subline = isError ? "Return to OpenCode and retry." : "Return to OpenCode \u2014 one more step may wait there: if it asks which budget covers usage, pick a project. Then this window can be closed.";
       const statusLabel = isError ? "Authentication error" : "Authenticated";
       const dotClass = isError ? "r33-status__dot r33-status__dot--error" : "r33-status__dot";
       const codeLine = isError && safeCode.length > 0 ? `<p class="r33-code">Error code: <span class="r33-code__value">${safeCode}</span></p>` : "";
@@ -1479,7 +1479,7 @@ var REQUESTED_OAUTH_SCOPES;
 var init_requested_scopes = __esm({
   "src/auth/requested-scopes/requested-scopes.ts"() {
     "use strict";
-    REQUESTED_OAUTH_SCOPES = "openid offline_access projects:read api-keys:read api-keys:create api-keys:rotate api-keys:delete";
+    REQUESTED_OAUTH_SCOPES = "openid offline_access projects:read keys:read keys:write";
   }
 });
 
@@ -5811,7 +5811,7 @@ var init_attribution_prompt_error = __esm({
     "use strict";
     init_config();
     MESSAGES = {
-      ATTRIBUTION_PRESENTER_UNAVAILABLE: "Route 33 needs OpenCode v2 to choose who pays for usage in this folder. Update to OpenCode v2, run /connect, choose Route 33, and follow the steps.",
+      ATTRIBUTION_PRESENTER_UNAVAILABLE: "Route 33 needs OpenCode v2 to assign a budget for this folder. Update to OpenCode v2, run /connect, choose Route 33, and follow the steps.",
       ATTRIBUTION_SELECTION_INVALID: "That Route 33 option is no longer available. Connect again and pick another."
     };
     AttributionPromptError = class extends GatewayCredentialError {
@@ -6870,7 +6870,7 @@ var runConnect = async (api, composeOptions) => {
     }
     if (readAttribution(state) !== void 0) {
       const change = await confirmFromDialog(api, {
-        message: "Change who pays for usage in this folder?",
+        message: "Change the budget assigned to this folder?",
         title: "Route 33"
       });
       if (change !== true) {
@@ -6943,13 +6943,55 @@ var createV1ConnectWizard = (composeOptions = productionOptions) => (api) => {
     {
       onSelect: () => runConnect(api, composeOptions),
       slash: { name: "r33" },
-      title: "Route 33: sign in and pick who pays for this folder",
+      title: "Route 33: sign in and assign a budget for this folder",
       value: "route33.connect"
     }
   ]);
   return Promise.resolve();
 };
 
+// src/tui-entry/show-r33-menu/show-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 showR33Menu = async (context) => {
+  const selection = await context.ui.dialog.select({
+    title: "Route 33 \u2014 choose an action",
+    options: menuOptions
+  });
+  if (selection === void 0) return;
+  if (selection === "connect") {
+    context.ui.toast.show({
+      message: "Route 33 connect \u2014 finish the browser sign-in, then run /connect in OpenCode and choose Route 33 to assign a budget.",
+      variant: "info"
+    });
+    return;
+  }
+  context.ui.toast.show({
+    message: `Route 33 ${selection} runs through /r33 ${selection} \u2014 type it in the prompt and send.`,
+    variant: "info"
+  });
+};
+
 // src/tui-entry/v2-autoconnect/v2-autoconnect.ts
 init_attribution();
 init_cli();
@@ -6957,6 +6999,8 @@ var v2Autoconnect = async (context) => {
   if (readEnvDirectApiKey() !== void 0 || readEnvAutoconnectDisabled() || context.location === void 0) {
     return;
   }
+  const oauth = context.client?.api?.integration?.oauth;
+  if (oauth === void 0 || oauth.connect === void 0) return;
   const attribution = readAttribution({
     directory: context.location.directory,
     outsideWorktree: "return-undefined"
@@ -6965,20 +7009,42 @@ var v2Autoconnect = async (context) => {
     return;
   }
   context.ui.toast.show({
-    message: "Route 33 is not connected \u2014 signing in now. Follow the browser prompt, then run /connect to pick who pays.",
+    message: "Route 33 is not connected \u2014 signing in now. Follow the browser prompt, then run /connect to assign a budget.",
     variant: "info"
   });
-  await context.client.api.integration.oauth.connect({
+  await oauth.connect({
     integrationID: "route33",
     methodID: "browser"
   }).catch(() => void 0);
 };
 
-// src/tui-entry/index.ts
-var route33V2Tui = {
+// src/tui-entry/v2-tui/v2-tui.ts
+var createV2Tui = () => ({
   id: "route33",
-  setup: (context) => v2Autoconnect(context)
-};
+  setup: async (context) => {
+    await v2Autoconnect(context);
+    context.keymap?.layer(() => ({
+      mode: "global",
+      priority: 10,
+      commands: [
+        {
+          id: "route33.menu",
+          title: "Route 33: menu",
+          group: "Route 33",
+          slash: { name: "r33", arguments: true },
+          enabled: () => true,
+          run: async () => {
+            await showR33Menu(context);
+          }
+        }
+      ],
+      bindings: ["route33.menu"]
+    }));
+  }
+});
+
+// src/tui-entry/index.ts
+var route33V2Tui = createV2Tui();
 var tui = createV1ConnectWizard();
 var tui_entry_default = route33V2Tui;
 export {

package/dist/v2-entry/index.js

@@ -2549,7 +2549,7 @@ var createAttributionPrompt = (projects) => {
 
 // src/ux/attribution-prompt-error/attribution-prompt-error.ts
 var MESSAGES = {
-  ATTRIBUTION_PRESENTER_UNAVAILABLE: "Route 33 needs OpenCode v2 to choose who pays for usage in this folder. Update to OpenCode v2, run /connect, choose Route 33, and follow the steps.",
+  ATTRIBUTION_PRESENTER_UNAVAILABLE: "Route 33 needs OpenCode v2 to assign a budget for this folder. Update to OpenCode v2, run /connect, choose Route 33, and follow the steps.",
   ATTRIBUTION_SELECTION_INVALID: "That Route 33 option is no longer available. Connect again and pick another."
 };
 var AttributionPromptError = class extends GatewayCredentialError {
@@ -2765,7 +2765,7 @@ var buildCallbackPage = (state, errorCode) => {
   const safeCode = (errorCode ?? "").replace(/[^a-z0-9_-]/gi, "");
   const title = isError ? "Sign-in failed" : "Signed in";
   const headline = isError ? "Sign-in failed" : "Signed in to route33";
-  const subline = isError ? "Return to OpenCode and retry." : "Return to OpenCode \u2014 one more step may wait there: if it asks who pays for usage, pick a project. Then this window can be closed.";
+  const subline = isError ? "Return to OpenCode and retry." : "Return to OpenCode \u2014 one more step may wait there: if it asks which budget covers usage, pick a project. Then this window can be closed.";
   const statusLabel = isError ? "Authentication error" : "Authenticated";
   const dotClass = isError ? "r33-status__dot r33-status__dot--error" : "r33-status__dot";
   const codeLine = isError && safeCode.length > 0 ? `<p class="r33-code">Error code: <span class="r33-code__value">${safeCode}</span></p>` : "";
@@ -2926,7 +2926,7 @@ var createPkceVerifierAndChallenge = () => {
 };
 
 // src/auth/requested-scopes/requested-scopes.ts
-var REQUESTED_OAUTH_SCOPES = "openid offline_access projects:read api-keys:read api-keys:create api-keys:rotate api-keys:delete";
+var REQUESTED_OAUTH_SCOPES = "openid offline_access projects:read keys:read keys:write";
 
 // src/auth/login-flow/login-flow.ts
 var loginFlow = async (options) => {
@@ -3794,7 +3794,7 @@ var CONNECT_COPY = {
   failFastClientId: "This Route 33 build has no OAuth client id. Reinstall it from the opencode-dist ref, or set ROUTE33_CLIENT_ID and restart OpenCode.",
   failFastWorktree: "Route 33 attributes usage to a project inside a Git worktree. Open a Git repository (or run git init), then connect again.",
   selectionInvalid: "That Route 33 option is no longer available. Connect again and pick another.",
-  signedInNextStep: "Signed in to Route 33 \u2713. One more step: connect again, choose Route 33, and pick who pays for usage in this folder."
+  signedInNextStep: "Signed in to Route 33 \u2713. One more step: connect again, choose Route 33, and assign a budget for this folder."
 };
 
 // src/v2-entry/parse-connect-answer/parse-connect-answer.ts
@@ -3870,7 +3870,7 @@ var buildConnectForm = (plan) => ({
     value: option.selection
   })),
   required: true,
-  title: "Who pays for Route 33 usage in this folder?",
+  title: "Which budget covers Route 33 usage in this folder?",
   type: "string"
 });
 
@@ -3987,7 +3987,7 @@ var executeR33Command = async (input) => {
     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 who pays (pick again with /connect).";
+    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": {
@@ -3996,7 +3996,7 @@ var executeR33Command = async (input) => {
     }
     case "reset": {
       await input.handlers["reset-attribution"]();
-      return "Route 33 attribution cleared. Run /connect, choose Route 33, and pick who pays again.";
+      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);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@route_33/opencode",
-  "version": "0.4.7-rc.2",
+  "version": "0.4.7-rc.4",
   "type": "module",
   "repository": {
     "type": "git",
@@ -42,8 +42,8 @@
     "eslint": "10.13.0",
     "typescript": "6.0.3",
     "vitest": "5.0.5",
-    "@cronos-ai-lab/typescript-config": "0.1.1",
-    "@cronos-ai-lab/eslint-config": "0.1.1"
+    "@cronos-ai-lab/eslint-config": "0.1.2",
+    "@cronos-ai-lab/typescript-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:-}\\\"",