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

package/dist/v2-entry/index.js

@@ -1,6 +1,70 @@
 // src/v2-entry/create-route33-v2-plugin/create-route33-v2-plugin.ts
 import { Integration as Integration2, Plugin } from "@opencode/plugin";
 
+// src/auth/open-system-browser/open-system-browser.ts
+import { spawn } from "node:child_process";
+var openSystemBrowser = async (url, options = {}) => new Promise((resolve2, reject) => {
+  let command = "xdg-open";
+  let args = [url.href];
+  if (process.platform === "darwin") {
+    command = "open";
+  } else if (process.platform === "win32") {
+    command = "cmd";
+    args = ["/c", "start", "", url.href];
+  }
+  if (options.spawnUrl !== void 0) {
+    options.spawnUrl(command, args, { detached: true, stdio: "ignore" });
+    resolve2();
+    return;
+  }
+  const child = spawn(command, args, {
+    detached: true,
+    stdio: "ignore"
+  });
+  child.once("error", reject);
+  child.once("spawn", () => {
+    child.unref();
+    resolve2();
+  });
+});
+
+// src/auth/authorization-url-stash/authorization-url-stash.ts
+var FALLBACK_URL = "https://route33.ai";
+var SIGN_IN_INSTRUCTIONS = "Open the Route 33 sign-in link \u2014 your browser will finish at a confirmation page.";
+var FINISHING_INSTRUCTIONS = "Finishing Route 33 setup\u2026";
+var URL_WAIT_BUDGET_MS = 3e4;
+var createAuthorizationUrlStash = (options = {}) => {
+  const open = options.open ?? ((url) => openSystemBrowser(url));
+  const waitBudgetMs = options.waitBudgetMs ?? URL_WAIT_BUDGET_MS;
+  let resolveUrl;
+  const nextUrl = new Promise((resolve2) => {
+    resolveUrl = resolve2;
+  });
+  const browserRunner = (url) => {
+    resolveUrl?.(url);
+    return open(url);
+  };
+  const urlForConnect = async (callback) => {
+    let decide;
+    const decided = new Promise((resolve2) => {
+      decide = resolve2;
+    });
+    const timer = setTimeout(() => {
+      decide({ instructions: SIGN_IN_INSTRUCTIONS, url: FALLBACK_URL });
+    }, waitBudgetMs);
+    void nextUrl.then((url) => {
+      clearTimeout(timer);
+      decide({ instructions: SIGN_IN_INSTRUCTIONS, url: url.toString() });
+    });
+    void Promise.resolve(callback).catch(() => void 0).then(() => {
+      clearTimeout(timer);
+      decide({ instructions: FINISHING_INSTRUCTIONS, url: FALLBACK_URL });
+    });
+    return decided;
+  };
+  return { browserRunner, urlForConnect };
+};
+
 // src/cli/read-env-base-url/read-env-base-url.ts
 var readEnvBaseUrl = (env = process.env) => {
   const value = env["ROUTE33_BASE_URL"]?.trim();
@@ -2733,7 +2797,6 @@ var createAuthSession = (options) => {
 };
 
 // src/auth/open-browser-and-capture/open-browser-and-capture.ts
-import { spawn } from "node:child_process";
 import { timingSafeEqual } from "node:crypto";
 
 // src/auth/loopback-callback/loopback-callback.ts
@@ -2852,25 +2915,7 @@ var createAuthLoopbackCallback = async () => {
 var openBrowserAndCapture = async (options) => {
   const callback = await createAuthLoopbackCallback();
   const authorizationUrl = options.authorizationUrl(callback.redirectUri);
-  const browserRunner = options.browserRunner ?? ((url) => new Promise((resolve2, reject) => {
-    let command = "xdg-open";
-    let args = [url.href];
-    if (process.platform === "darwin") {
-      command = "open";
-    } else if (process.platform === "win32") {
-      command = "cmd";
-      args = ["/c", "start", "", url.href];
-    }
-    const child = spawn(command, args, {
-      detached: true,
-      stdio: "ignore"
-    });
-    child.once("error", reject);
-    child.once("spawn", () => {
-      child.unref();
-      resolve2();
-    });
-  }));
+  const browserRunner = options.browserRunner ?? ((url) => openSystemBrowser(url));
   let timer;
   const timeout = new Promise((_resolve, reject) => {
     timer = setTimeout(() => {
@@ -3164,7 +3209,7 @@ var Route33Runtime = class {
     if (typeof client !== "function") {
       return client;
     }
-    this.#managementClient ??= client(() => this.#session.credential());
+    this.#managementClient ??= client();
     return this.#managementClient;
   }
   #subject(credential) {
@@ -3754,20 +3799,20 @@ var HttpManagementKeys = class {
 
 // src/lazy-management-keys/lazy-management-keys.ts
 var lazyManagementKeys = (options) => {
-  const client = async () => new HttpManagementKeys({
+  const client = (accessToken) => new HttpManagementKeys({
     baseUrl: options.apiBaseUrl,
-    credential: await options.obtainCredential(),
+    credential: accessToken,
     ...options.fetchImpl === void 0 ? {} : { fetchImpl: options.fetchImpl }
   });
   return {
-    create: async (accessToken, input) => (await client()).create(accessToken, input),
-    delete: async (accessToken, id) => (await client()).delete(accessToken, id),
-    get: async (accessToken, id) => (await client()).get(accessToken, id),
-    list: async (accessToken) => (await client()).list(accessToken),
-    listOrganizations: async (accessToken) => (await client()).listOrganizations(accessToken),
-    listProjects: async (accessToken, organisationId) => (await client()).listProjects(accessToken, organisationId),
-    regenerate: async (accessToken, id, expiresAt) => (await client()).regenerate(accessToken, id, expiresAt),
-    update: async (accessToken, id, input) => (await client()).update(accessToken, id, input)
+    create: async (accessToken, input) => client(accessToken).create(accessToken, input),
+    delete: async (accessToken, id) => client(accessToken).delete(accessToken, id),
+    get: async (accessToken, id) => client(accessToken).get(accessToken, id),
+    list: async (accessToken) => client(accessToken).list(accessToken),
+    listOrganizations: async (accessToken) => client(accessToken).listOrganizations(accessToken),
+    listProjects: async (accessToken, organisationId) => client(accessToken).listProjects(accessToken, organisationId),
+    regenerate: async (accessToken, id, expiresAt) => client(accessToken).regenerate(accessToken, id, expiresAt),
+    update: async (accessToken, id, input) => client(accessToken).update(accessToken, id, input)
   };
 };
 
@@ -3783,49 +3828,11 @@ var buildProductionRuntimeOptions = (input) => ({
     timeoutMs: LOGIN_BUDGET_MS
   },
   management: {
-    client: (obtainCredential) => lazyManagementKeys({
-      apiBaseUrl: input.apiBaseUrl,
-      obtainCredential
-    })
+    client: () => lazyManagementKeys({ apiBaseUrl: input.apiBaseUrl })
   },
   ...input.tokenStore === void 0 ? {} : { tokenStore: input.tokenStore }
 });
 
-// src/v2-entry/authorization-url-stash/authorization-url-stash.ts
-var FALLBACK_URL = "https://route33.ai";
-var SIGN_IN_INSTRUCTIONS = "Open the Route 33 sign-in link \u2014 your browser will finish at a confirmation page.";
-var FINISHING_INSTRUCTIONS = "Finishing Route 33 setup\u2026";
-var URL_WAIT_BUDGET_MS = 3e4;
-var createAuthorizationUrlStash = () => {
-  let resolveUrl;
-  const nextUrl = new Promise((resolve2) => {
-    resolveUrl = resolve2;
-  });
-  const browserRunner = (url) => {
-    resolveUrl?.(url);
-    return Promise.resolve();
-  };
-  const urlForConnect = async (callback) => {
-    let decide;
-    const decided = new Promise((resolve2) => {
-      decide = resolve2;
-    });
-    const timer = setTimeout(() => {
-      decide({ instructions: SIGN_IN_INSTRUCTIONS, url: FALLBACK_URL });
-    }, URL_WAIT_BUDGET_MS);
-    void nextUrl.then((url) => {
-      clearTimeout(timer);
-      decide({ instructions: SIGN_IN_INSTRUCTIONS, url: url.toString() });
-    });
-    void Promise.resolve(callback).catch(() => void 0).then(() => {
-      clearTimeout(timer);
-      decide({ instructions: FINISHING_INSTRUCTIONS, url: FALLBACK_URL });
-    });
-    return decided;
-  };
-  return { browserRunner, urlForConnect };
-};
-
 // src/v2-entry/connect-copy/connect-copy.ts
 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.",
@@ -4006,12 +4013,10 @@ var hostTokenStore = (options) => ({
 // 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) {
+  const [first = "", ...rest] = promptText.trim().split(/\s+/u).filter(Boolean);
+  const name = first.replace(/^\/+/u, "").split(":")[0] ?? "";
+  const argument = name === "r33" ? rest[0] : first;
+  if (argument === void 0 || argument === "") {
     return "inspect";
   }
   return SUBCOMMANDS.includes(argument) ? argument : "help";
@@ -4041,6 +4046,20 @@ var executeR33Command = async (input) => {
   }
 };
 
+// src/v2-entry/v2-unattributed-model-gate/v2-unattributed-model-gate.ts
+var GATE_COPY = "Route 33 needs a budget for this folder first \u2014 finish the setup dialog in the TUI, or run /connect, choose Route 33, and follow the steps.";
+var createV2UnattributedModelGate = (deps) => async (input) => {
+  if (input.model.providerID !== "route_33") return;
+  const session = await deps.session.get({ sessionID: input.sessionID });
+  const directory = session?.location.directory ?? deps.fallbackDirectory;
+  const state = {
+    directory,
+    outsideWorktree: "return-undefined"
+  };
+  if (readAttribution(state) !== void 0) return;
+  throw new Error(GATE_COPY);
+};
+
 // src/v2-entry/workspace-key-request-hook/workspace-key-request-hook.ts
 var createWorkspaceKeyHook = (deps) => async (input) => {
   const target = new URL(input.request.url);
@@ -4191,6 +4210,14 @@ var createRoute33V2Plugin = (options = {}) => {
           session: context.session
         })
       );
+      const modelGate = await context.session.hook(
+        "model.request",
+        createV2UnattributedModelGate({
+          fallbackDirectory: context.location.directory,
+          session: context.session
+        }),
+        { providerID: "route_33" }
+      );
       const bootstrapFromRefresh = async () => {
         if (runtime === void 0) {
           return;
@@ -4223,7 +4250,8 @@ var createRoute33V2Plugin = (options = {}) => {
           commandTransform.dispose(),
           integrationTransform.dispose(),
           providerTransform.dispose(),
-          sessionHook.dispose()
+          sessionHook.dispose(),
+          modelGate.dispose()
         ]);
       };
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@route_33/opencode",
-  "version": "0.4.7-rc.7",
+  "version": "0.4.7-rc.9",
   "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:-}\\\"",