@route_33/opencode 0.4.7-rc.3 → 0.4.7-rc.5

package/README.md

@@ -1,20 +1,31 @@
 # @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
 
+**OpenCode v2 (recommended)** uses the `add` subcommand and installs into
+the global configuration (`~/.config/opencode/opencode.json` + `tui.json`):
+
 ```sh
 opencode plugin add @route_33/opencode
 ```
 
-Restart OpenCode afterwards — plugins load at startup.
+**OpenCode v1** installs the package and registers the plugin at the nearest
+definition — the project's `.opencode/opencode.json` (plus the TUI part in
+`tui.json`) when run inside a project, the global config with `--global`:
+
+```sh
+opencode plugin @route_33/opencode           # project scope
+opencode plugin @route_33/opencode --global  # global scope
+```
 
-Prefer config? Add the package to `opencode.jsonc` instead:
+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
@@ -22,20 +33,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>` : "";

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>` : "";

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>` : "";
@@ -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 {
@@ -6793,12 +6793,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 +6806,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 +6820,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 +6895,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
     }),
     () => {
@@ -6870,7 +6928,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) {
@@ -6925,6 +6983,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,46 +7038,123 @@ 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 pick who pays for this folder",
-      value: "route33.connect"
+      title: "Route 33: status, budget, and key management",
+      value: "route33.menu"
     }
   ]);
   return Promise.resolve();
 };
 
-// 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;
-  }
-  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"
+// src/tui-entry/show-r33-menu/show-r33-menu.ts
+var menuOptions2 = [
+  {
+    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: menuOptions2
   });
-  if (attribution !== void 0) {
+  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 is not connected \u2014 signing in now. Follow the browser prompt, then run /connect to pick who pays.",
+    message: `Route 33 ${selection} runs through /r33 ${selection} \u2014 type it in the prompt and send.`,
     variant: "info"
   });
-  await oauth.connect({
-    integrationID: "route33",
-    methodID: "browser"
-  }).catch(() => void 0);
 };
 
-// src/tui-entry/index.ts
-var route33V2Tui = {
-  id: "route33",
-  setup: (context) => v2Autoconnect(context)
+// src/tui-entry/v2-autoconnect/v2-autoconnect.ts
+init_attribution();
+init_cli();
+
+// src/tui-entry/v2-connect-runner/v2-connect-runner.ts
+var createV2ConnectRunner = ({
+  context,
+  unattributed
+}) => {
+  const oauth = context.client?.api?.integration?.oauth;
+  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"
+  }) === 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
+var createV2Tui = () => ({
+  id: "route33",
+  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>` : "";
@@ -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.3",
+  "version": "0.4.7-rc.5",
   "type": "module",
   "repository": {
     "type": "git",