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

package/README.md

@@ -5,22 +5,27 @@ 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`):
+**OpenCode v2 (recommended):**
 
 ```sh
 opencode plugin add @route_33/opencode
 ```
 
-**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`:
+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:**
 
 ```sh
-opencode plugin @route_33/opencode           # project scope
+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)`:
 
@@ -30,15 +35,19 @@ config? Declare the plugin directly in `opencode.json(c)`:
 
 ## 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 }
         });
       };
     };
@@ -7093,21 +7169,43 @@ var showR33Menu = async (context) => {
 init_attribution();
 init_cli();
 
+// src/tui-entry/is-method-not-registered/is-method-not-registered.ts
+var isMethodNotRegistered = (error) => error instanceof Error && error.message.includes("OAuth method not found");
+
+// src/tui-entry/v2-connect-surface/v2-connect-surface.ts
+var v2ConnectSurface = (context) => {
+  const oauth = context.client?.integration?.oauth ?? context.client?.api?.integration?.oauth;
+  return oauth?.connect;
+};
+
 // src/tui-entry/v2-connect-runner/v2-connect-runner.ts
 var createV2ConnectRunner = ({
   context,
+  maxAttempts = 20,
+  retryDelayMs = 500,
   unattributed
 }) => {
-  const oauth = context.client?.api?.integration?.oauth;
+  const connect = v2ConnectSurface(context);
+  const sleep = (ms) => new Promise((resolve2) => {
+    setTimeout(resolve2, ms);
+  });
   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);
+    for (let attempt = 1; ; attempt += 1) {
+      if (!unattributed()) return;
+      try {
+        await connect({
+          integrationID: "route33",
+          methodID: "browser"
+        });
+        return;
+      } catch (error) {
+        if (attempt >= maxAttempts || !isMethodNotRegistered(error)) return;
+        await sleep(retryDelayMs);
+      }
+    }
   };
 };
 

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.5",
+  "version": "0.4.7-rc.7",
   "type": "module",
   "repository": {
     "type": "git",