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

package/dist/tui-entry/index.js

@@ -13,449 +13,6 @@ var __export = (target, all) => {
     __defProp(target, name, { get: all[name], enumerable: true });
 };
 
-// src/attribution/detect-worktree-root/detect-worktree-root.ts
-import * as fs from "node:fs";
-import * as path from "node:path";
-var detectWorktreeRoot;
-var init_detect_worktree_root = __esm({
-  "src/attribution/detect-worktree-root/detect-worktree-root.ts"() {
-    "use strict";
-    detectWorktreeRoot = (startDirectory) => {
-      let directory = fs.realpathSync(startDirectory);
-      for (; ; ) {
-        const gitEntry = path.join(directory, ".git");
-        if (fs.existsSync(gitEntry)) {
-          const entry = fs.statSync(gitEntry);
-          if (entry.isDirectory() || entry.isFile()) {
-            return directory;
-          }
-        }
-        const parent = path.dirname(directory);
-        if (parent === directory) {
-          return void 0;
-        }
-        directory = parent;
-      }
-    };
-  }
-});
-
-// src/attribution/detect-worktree-root/index.ts
-var init_detect_worktree_root2 = __esm({
-  "src/attribution/detect-worktree-root/index.ts"() {
-    "use strict";
-    init_detect_worktree_root();
-  }
-});
-
-// src/attribution/resolve-attribution-file/resolve-attribution-file.ts
-import * as fs2 from "node:fs";
-import * as path2 from "node:path";
-var resolveAttributionFile;
-var init_resolve_attribution_file = __esm({
-  "src/attribution/resolve-attribution-file/resolve-attribution-file.ts"() {
-    "use strict";
-    init_detect_worktree_root2();
-    resolveAttributionFile = (options) => {
-      const worktreeRoot = detectWorktreeRoot(options.directory);
-      if (worktreeRoot !== void 0) {
-        return path2.join(worktreeRoot, ".opencode", "route33.attribution.json");
-      }
-      const fallbackRoots = {
-        "return-undefined": void 0,
-        "use-directory": fs2.realpathSync(options.directory)
-      };
-      const fallbackRoot = fallbackRoots[options.outsideWorktree];
-      return fallbackRoot === void 0 ? void 0 : path2.join(fallbackRoot, ".opencode", "route33.attribution.json");
-    };
-  }
-});
-
-// src/attribution/resolve-attribution-file/index.ts
-var init_resolve_attribution_file2 = __esm({
-  "src/attribution/resolve-attribution-file/index.ts"() {
-    "use strict";
-    init_resolve_attribution_file();
-  }
-});
-
-// src/attribution/clear-attribution/clear-attribution.ts
-import * as fs3 from "node:fs";
-var clearAttribution;
-var init_clear_attribution = __esm({
-  "src/attribution/clear-attribution/clear-attribution.ts"() {
-    "use strict";
-    init_resolve_attribution_file2();
-    clearAttribution = (options) => {
-      const file = resolveAttributionFile(options);
-      if (file === void 0) {
-        return false;
-      }
-      fs3.rmSync(file, { force: true });
-      return true;
-    };
-  }
-});
-
-// src/attribution/clear-attribution/index.ts
-var init_clear_attribution2 = __esm({
-  "src/attribution/clear-attribution/index.ts"() {
-    "use strict";
-    init_clear_attribution();
-  }
-});
-
-// src/contract/adapters/contract-parse-error/contract-parse-error.ts
-var ContractParseError;
-var init_contract_parse_error = __esm({
-  "src/contract/adapters/contract-parse-error/contract-parse-error.ts"() {
-    "use strict";
-    ContractParseError = class extends Error {
-    };
-  }
-});
-
-// src/contract/adapters/contract-parse-error/index.ts
-var init_contract_parse_error2 = __esm({
-  "src/contract/adapters/contract-parse-error/index.ts"() {
-    "use strict";
-    init_contract_parse_error();
-  }
-});
-
-// src/contract/adapters/gateway-api-key/gateway-api-key.ts
-var GatewayApiKey;
-var init_gateway_api_key = __esm({
-  "src/contract/adapters/gateway-api-key/gateway-api-key.ts"() {
-    "use strict";
-    GatewayApiKey = class {
-      value;
-      constructor(value) {
-        this.value = value;
-      }
-    };
-  }
-});
-
-// src/contract/adapters/gateway-api-key/index.ts
-var init_gateway_api_key2 = __esm({
-  "src/contract/adapters/gateway-api-key/index.ts"() {
-    "use strict";
-    init_gateway_api_key();
-  }
-});
-
-// src/contract/adapters/management-jwt/management-jwt.ts
-var ManagementJwt;
-var init_management_jwt = __esm({
-  "src/contract/adapters/management-jwt/management-jwt.ts"() {
-    "use strict";
-    ManagementJwt = class {
-      value;
-      constructor(value) {
-        this.value = value;
-      }
-    };
-  }
-});
-
-// src/contract/adapters/management-jwt/index.ts
-var init_management_jwt2 = __esm({
-  "src/contract/adapters/management-jwt/index.ts"() {
-    "use strict";
-    init_management_jwt();
-  }
-});
-
-// src/contract/adapters/parse-gateway-key/parse-gateway-key.ts
-var parseGatewayKey;
-var init_parse_gateway_key = __esm({
-  "src/contract/adapters/parse-gateway-key/parse-gateway-key.ts"() {
-    "use strict";
-    init_gateway_api_key2();
-    parseGatewayKey = (value) => {
-      if (typeof value !== "string" || value.length === 0) {
-        throw new Error("gateway key must be non-empty");
-      }
-      return new GatewayApiKey(value);
-    };
-  }
-});
-
-// src/contract/adapters/parse-gateway-key/index.ts
-var init_parse_gateway_key2 = __esm({
-  "src/contract/adapters/parse-gateway-key/index.ts"() {
-    "use strict";
-    init_parse_gateway_key();
-  }
-});
-
-// src/contract/adapters/parse-management-jwt/parse-management-jwt.ts
-var parseManagementJwt;
-var init_parse_management_jwt = __esm({
-  "src/contract/adapters/parse-management-jwt/parse-management-jwt.ts"() {
-    "use strict";
-    init_management_jwt2();
-    parseManagementJwt = (value) => {
-      if (typeof value !== "string" || value.length === 0) {
-        throw new Error("management token must be non-empty");
-      }
-      return new ManagementJwt(value);
-    };
-  }
-});
-
-// src/contract/adapters/parse-management-jwt/index.ts
-var init_parse_management_jwt2 = __esm({
-  "src/contract/adapters/parse-management-jwt/index.ts"() {
-    "use strict";
-    init_parse_management_jwt();
-  }
-});
-
-// src/contract/predicates/has-string-fields/has-string-fields.ts
-var hasStringFields;
-var init_has_string_fields = __esm({
-  "src/contract/predicates/has-string-fields/has-string-fields.ts"() {
-    "use strict";
-    hasStringFields = (record, fields) => fields.every((field) => typeof record[field] === "string");
-  }
-});
-
-// src/contract/predicates/has-string-fields/index.ts
-var init_has_string_fields2 = __esm({
-  "src/contract/predicates/has-string-fields/index.ts"() {
-    "use strict";
-    init_has_string_fields();
-  }
-});
-
-// src/contract/predicates/is-nullable-string/is-nullable-string.ts
-var isNullableString;
-var init_is_nullable_string = __esm({
-  "src/contract/predicates/is-nullable-string/is-nullable-string.ts"() {
-    "use strict";
-    isNullableString = (value) => typeof value === "string" || value === null;
-  }
-});
-
-// src/contract/predicates/is-nullable-string/index.ts
-var init_is_nullable_string2 = __esm({
-  "src/contract/predicates/is-nullable-string/index.ts"() {
-    "use strict";
-    init_is_nullable_string();
-  }
-});
-
-// src/contract/predicates/is-owner-type/is-owner-type.ts
-var isOwnerType;
-var init_is_owner_type = __esm({
-  "src/contract/predicates/is-owner-type/is-owner-type.ts"() {
-    "use strict";
-    isOwnerType = (value) => value === "project" || value === "user_personal" || value === "user_project";
-  }
-});
-
-// src/contract/predicates/is-owner-type/index.ts
-var init_is_owner_type2 = __esm({
-  "src/contract/predicates/is-owner-type/index.ts"() {
-    "use strict";
-    init_is_owner_type();
-  }
-});
-
-// src/contract/predicates/is-record/is-record.ts
-var isRecord;
-var init_is_record = __esm({
-  "src/contract/predicates/is-record/is-record.ts"() {
-    "use strict";
-    isRecord = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
-  }
-});
-
-// src/contract/predicates/is-record/index.ts
-var init_is_record2 = __esm({
-  "src/contract/predicates/is-record/index.ts"() {
-    "use strict";
-    init_is_record();
-  }
-});
-
-// src/contract/predicates/index.ts
-var init_predicates = __esm({
-  "src/contract/predicates/index.ts"() {
-    "use strict";
-    init_has_string_fields2();
-    init_is_nullable_string2();
-    init_is_owner_type2();
-    init_is_record2();
-  }
-});
-
-// src/contract/adapters/parse-management-subject/parse-management-subject.ts
-var parseManagementSubject;
-var init_parse_management_subject = __esm({
-  "src/contract/adapters/parse-management-subject/parse-management-subject.ts"() {
-    "use strict";
-    init_predicates();
-    init_contract_parse_error2();
-    parseManagementSubject = (credential) => {
-      const encodedPayload = credential.value.split(".")[1];
-      if (encodedPayload === void 0 || encodedPayload.length === 0) {
-        throw new ContractParseError("management token carries no usable subject");
-      }
-      let payload;
-      try {
-        payload = JSON.parse(
-          Buffer.from(encodedPayload, "base64url").toString("utf8")
-        );
-      } catch {
-        throw new ContractParseError("management token payload is not JSON");
-      }
-      if (!isRecord(payload)) {
-        throw new ContractParseError("management token payload is not an object");
-      }
-      const subject = payload["sub"];
-      if (typeof subject !== "string" || subject.length === 0) {
-        throw new ContractParseError("management token carries no usable subject");
-      }
-      return subject;
-    };
-  }
-});
-
-// src/contract/adapters/parse-management-subject/index.ts
-var init_parse_management_subject2 = __esm({
-  "src/contract/adapters/parse-management-subject/index.ts"() {
-    "use strict";
-    init_parse_management_subject();
-  }
-});
-
-// src/contract/adapters/index.ts
-var init_adapters = __esm({
-  "src/contract/adapters/index.ts"() {
-    "use strict";
-    init_contract_parse_error2();
-    init_gateway_api_key2();
-    init_management_jwt2();
-    init_parse_gateway_key2();
-    init_parse_management_jwt2();
-    init_parse_management_subject2();
-  }
-});
-
-// src/attribution/parse-attribution/parse-attribution.ts
-var parseAttribution;
-var init_parse_attribution = __esm({
-  "src/attribution/parse-attribution/parse-attribution.ts"() {
-    "use strict";
-    init_adapters();
-    init_predicates();
-    parseAttribution = (value) => {
-      if (!isRecord(value)) {
-        throw new ContractParseError("invalid attribution");
-      }
-      if (value["kind"] === "personal") {
-        return { kind: "personal" };
-      }
-      if (value["kind"] === "project" && typeof value["projectId"] === "string") {
-        return { kind: "project", projectId: value["projectId"] };
-      }
-      throw new ContractParseError("invalid attribution");
-    };
-  }
-});
-
-// src/attribution/parse-attribution/index.ts
-var init_parse_attribution2 = __esm({
-  "src/attribution/parse-attribution/index.ts"() {
-    "use strict";
-    init_parse_attribution();
-  }
-});
-
-// src/attribution/read-attribution/read-attribution.ts
-import * as fs4 from "node:fs";
-var readAttribution;
-var init_read_attribution = __esm({
-  "src/attribution/read-attribution/read-attribution.ts"() {
-    "use strict";
-    init_parse_attribution2();
-    init_resolve_attribution_file2();
-    readAttribution = (options) => {
-      const file = resolveAttributionFile(options);
-      if (file === void 0) {
-        return void 0;
-      }
-      try {
-        const parsed = JSON.parse(fs4.readFileSync(file, "utf8"));
-        return parseAttribution(parsed);
-      } catch {
-        return void 0;
-      }
-    };
-  }
-});
-
-// src/attribution/read-attribution/index.ts
-var init_read_attribution2 = __esm({
-  "src/attribution/read-attribution/index.ts"() {
-    "use strict";
-    init_read_attribution();
-  }
-});
-
-// src/attribution/write-attribution/write-attribution.ts
-import { randomUUID } from "node:crypto";
-import * as fs5 from "node:fs";
-import * as path3 from "node:path";
-var writeAttribution;
-var init_write_attribution = __esm({
-  "src/attribution/write-attribution/write-attribution.ts"() {
-    "use strict";
-    init_resolve_attribution_file2();
-    writeAttribution = (options, attribution) => {
-      const file = resolveAttributionFile(options);
-      if (file === void 0) {
-        return false;
-      }
-      fs5.mkdirSync(path3.dirname(file), { recursive: true });
-      const temporaryFile = `${file}.${String(process.pid)}.${randomUUID()}.tmp`;
-      try {
-        fs5.writeFileSync(temporaryFile, `${JSON.stringify(attribution)}
-`, "utf8");
-        fs5.renameSync(temporaryFile, file);
-      } catch (error) {
-        fs5.rmSync(temporaryFile, { force: true });
-        throw error;
-      }
-      return true;
-    };
-  }
-});
-
-// src/attribution/write-attribution/index.ts
-var init_write_attribution2 = __esm({
-  "src/attribution/write-attribution/index.ts"() {
-    "use strict";
-    init_write_attribution();
-  }
-});
-
-// src/attribution/index.ts
-var init_attribution = __esm({
-  "src/attribution/index.ts"() {
-    "use strict";
-    init_clear_attribution2();
-    init_detect_worktree_root2();
-    init_parse_attribution2();
-    init_read_attribution2();
-    init_resolve_attribution_file2();
-    init_write_attribution2();
-  }
-});
-
 // src/cli/read-env-base-url/read-env-base-url.ts
 var readEnvBaseUrl;
 var init_read_env_base_url = __esm({
@@ -723,7 +280,7 @@ var init_r33_catalog_model = __esm({
 
 // src/shared/resolve-cache-dir/resolve-cache-dir.ts
 import * as os from "node:os";
-import * as path4 from "node:path";
+import * as path from "node:path";
 var resolveCacheDir;
 var init_resolve_cache_dir = __esm({
   "src/shared/resolve-cache-dir/resolve-cache-dir.ts"() {
@@ -733,8 +290,8 @@ var init_resolve_cache_dir = __esm({
       if (override !== void 0 && override !== "") {
         return override;
       }
-      return path4.join(
-        env["XDG_CACHE_HOME"] ?? path4.join(os.homedir(), ".cache"),
+      return path.join(
+        env["XDG_CACHE_HOME"] ?? path.join(os.homedir(), ".cache"),
         "opencode-route33"
       );
     };
@@ -904,7 +461,7 @@ var init_read_env_strict2 = __esm({
 
 // src/cli/resolve-v1-secret-store-directory/resolve-v1-secret-store-directory.ts
 import * as os2 from "node:os";
-import * as path5 from "node:path";
+import * as path2 from "node:path";
 var resolveV1SecretStoreDirectory;
 var init_resolve_v1_secret_store_directory = __esm({
   "src/cli/resolve-v1-secret-store-directory/resolve-v1-secret-store-directory.ts"() {
@@ -912,13 +469,13 @@ var init_resolve_v1_secret_store_directory = __esm({
     resolveV1SecretStoreDirectory = (options = {}) => {
       const explicit = options.directory?.trim();
       if (explicit !== void 0 && explicit.length > 0) {
-        return path5.resolve(explicit);
+        return path2.resolve(explicit);
       }
       const hostConfig = (options.env ?? process.env)["OPENCODE_CONFIG_DIR"]?.trim();
       if (hostConfig !== void 0 && hostConfig.length > 0) {
-        return path5.join(path5.resolve(hostConfig), "route33");
+        return path2.join(path2.resolve(hostConfig), "route33");
       }
-      return path5.join(
+      return path2.join(
         options.homeDirectory ?? os2.homedir(),
         ".config",
         "opencode",
@@ -1005,11 +562,251 @@ var init_build_authorize_url = __esm({
   }
 });
 
-// src/auth/build-authorize-url/index.ts
-var init_build_authorize_url2 = __esm({
-  "src/auth/build-authorize-url/index.ts"() {
+// src/auth/build-authorize-url/index.ts
+var init_build_authorize_url2 = __esm({
+  "src/auth/build-authorize-url/index.ts"() {
+    "use strict";
+    init_build_authorize_url();
+  }
+});
+
+// src/contract/adapters/contract-parse-error/contract-parse-error.ts
+var ContractParseError;
+var init_contract_parse_error = __esm({
+  "src/contract/adapters/contract-parse-error/contract-parse-error.ts"() {
+    "use strict";
+    ContractParseError = class extends Error {
+    };
+  }
+});
+
+// src/contract/adapters/contract-parse-error/index.ts
+var init_contract_parse_error2 = __esm({
+  "src/contract/adapters/contract-parse-error/index.ts"() {
+    "use strict";
+    init_contract_parse_error();
+  }
+});
+
+// src/contract/adapters/gateway-api-key/gateway-api-key.ts
+var GatewayApiKey;
+var init_gateway_api_key = __esm({
+  "src/contract/adapters/gateway-api-key/gateway-api-key.ts"() {
+    "use strict";
+    GatewayApiKey = class {
+      value;
+      constructor(value) {
+        this.value = value;
+      }
+    };
+  }
+});
+
+// src/contract/adapters/gateway-api-key/index.ts
+var init_gateway_api_key2 = __esm({
+  "src/contract/adapters/gateway-api-key/index.ts"() {
+    "use strict";
+    init_gateway_api_key();
+  }
+});
+
+// src/contract/adapters/management-jwt/management-jwt.ts
+var ManagementJwt;
+var init_management_jwt = __esm({
+  "src/contract/adapters/management-jwt/management-jwt.ts"() {
+    "use strict";
+    ManagementJwt = class {
+      value;
+      constructor(value) {
+        this.value = value;
+      }
+    };
+  }
+});
+
+// src/contract/adapters/management-jwt/index.ts
+var init_management_jwt2 = __esm({
+  "src/contract/adapters/management-jwt/index.ts"() {
+    "use strict";
+    init_management_jwt();
+  }
+});
+
+// src/contract/adapters/parse-gateway-key/parse-gateway-key.ts
+var parseGatewayKey;
+var init_parse_gateway_key = __esm({
+  "src/contract/adapters/parse-gateway-key/parse-gateway-key.ts"() {
+    "use strict";
+    init_gateway_api_key2();
+    parseGatewayKey = (value) => {
+      if (typeof value !== "string" || value.length === 0) {
+        throw new Error("gateway key must be non-empty");
+      }
+      return new GatewayApiKey(value);
+    };
+  }
+});
+
+// src/contract/adapters/parse-gateway-key/index.ts
+var init_parse_gateway_key2 = __esm({
+  "src/contract/adapters/parse-gateway-key/index.ts"() {
+    "use strict";
+    init_parse_gateway_key();
+  }
+});
+
+// src/contract/adapters/parse-management-jwt/parse-management-jwt.ts
+var parseManagementJwt;
+var init_parse_management_jwt = __esm({
+  "src/contract/adapters/parse-management-jwt/parse-management-jwt.ts"() {
+    "use strict";
+    init_management_jwt2();
+    parseManagementJwt = (value) => {
+      if (typeof value !== "string" || value.length === 0) {
+        throw new Error("management token must be non-empty");
+      }
+      return new ManagementJwt(value);
+    };
+  }
+});
+
+// src/contract/adapters/parse-management-jwt/index.ts
+var init_parse_management_jwt2 = __esm({
+  "src/contract/adapters/parse-management-jwt/index.ts"() {
+    "use strict";
+    init_parse_management_jwt();
+  }
+});
+
+// src/contract/predicates/has-string-fields/has-string-fields.ts
+var hasStringFields;
+var init_has_string_fields = __esm({
+  "src/contract/predicates/has-string-fields/has-string-fields.ts"() {
+    "use strict";
+    hasStringFields = (record, fields) => fields.every((field) => typeof record[field] === "string");
+  }
+});
+
+// src/contract/predicates/has-string-fields/index.ts
+var init_has_string_fields2 = __esm({
+  "src/contract/predicates/has-string-fields/index.ts"() {
+    "use strict";
+    init_has_string_fields();
+  }
+});
+
+// src/contract/predicates/is-nullable-string/is-nullable-string.ts
+var isNullableString;
+var init_is_nullable_string = __esm({
+  "src/contract/predicates/is-nullable-string/is-nullable-string.ts"() {
+    "use strict";
+    isNullableString = (value) => typeof value === "string" || value === null;
+  }
+});
+
+// src/contract/predicates/is-nullable-string/index.ts
+var init_is_nullable_string2 = __esm({
+  "src/contract/predicates/is-nullable-string/index.ts"() {
+    "use strict";
+    init_is_nullable_string();
+  }
+});
+
+// src/contract/predicates/is-owner-type/is-owner-type.ts
+var isOwnerType;
+var init_is_owner_type = __esm({
+  "src/contract/predicates/is-owner-type/is-owner-type.ts"() {
+    "use strict";
+    isOwnerType = (value) => value === "project" || value === "user_personal" || value === "user_project";
+  }
+});
+
+// src/contract/predicates/is-owner-type/index.ts
+var init_is_owner_type2 = __esm({
+  "src/contract/predicates/is-owner-type/index.ts"() {
+    "use strict";
+    init_is_owner_type();
+  }
+});
+
+// src/contract/predicates/is-record/is-record.ts
+var isRecord;
+var init_is_record = __esm({
+  "src/contract/predicates/is-record/is-record.ts"() {
+    "use strict";
+    isRecord = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+  }
+});
+
+// src/contract/predicates/is-record/index.ts
+var init_is_record2 = __esm({
+  "src/contract/predicates/is-record/index.ts"() {
+    "use strict";
+    init_is_record();
+  }
+});
+
+// src/contract/predicates/index.ts
+var init_predicates = __esm({
+  "src/contract/predicates/index.ts"() {
+    "use strict";
+    init_has_string_fields2();
+    init_is_nullable_string2();
+    init_is_owner_type2();
+    init_is_record2();
+  }
+});
+
+// src/contract/adapters/parse-management-subject/parse-management-subject.ts
+var parseManagementSubject;
+var init_parse_management_subject = __esm({
+  "src/contract/adapters/parse-management-subject/parse-management-subject.ts"() {
+    "use strict";
+    init_predicates();
+    init_contract_parse_error2();
+    parseManagementSubject = (credential) => {
+      const encodedPayload = credential.value.split(".")[1];
+      if (encodedPayload === void 0 || encodedPayload.length === 0) {
+        throw new ContractParseError("management token carries no usable subject");
+      }
+      let payload;
+      try {
+        payload = JSON.parse(
+          Buffer.from(encodedPayload, "base64url").toString("utf8")
+        );
+      } catch {
+        throw new ContractParseError("management token payload is not JSON");
+      }
+      if (!isRecord(payload)) {
+        throw new ContractParseError("management token payload is not an object");
+      }
+      const subject = payload["sub"];
+      if (typeof subject !== "string" || subject.length === 0) {
+        throw new ContractParseError("management token carries no usable subject");
+      }
+      return subject;
+    };
+  }
+});
+
+// src/contract/adapters/parse-management-subject/index.ts
+var init_parse_management_subject2 = __esm({
+  "src/contract/adapters/parse-management-subject/index.ts"() {
+    "use strict";
+    init_parse_management_subject();
+  }
+});
+
+// src/contract/adapters/index.ts
+var init_adapters = __esm({
+  "src/contract/adapters/index.ts"() {
     "use strict";
-    init_build_authorize_url();
+    init_contract_parse_error2();
+    init_gateway_api_key2();
+    init_management_jwt2();
+    init_parse_gateway_key2();
+    init_parse_management_jwt2();
+    init_parse_management_subject2();
   }
 });
 
@@ -1352,8 +1149,48 @@ var init_loopback_callback2 = __esm({
   }
 });
 
-// src/auth/open-browser-and-capture/open-browser-and-capture.ts
+// src/auth/open-system-browser/open-system-browser.ts
 import { spawn } from "node:child_process";
+var openSystemBrowser;
+var init_open_system_browser = __esm({
+  "src/auth/open-system-browser/open-system-browser.ts"() {
+    "use strict";
+    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/open-system-browser/index.ts
+var init_open_system_browser2 = __esm({
+  "src/auth/open-system-browser/index.ts"() {
+    "use strict";
+    init_open_system_browser();
+  }
+});
+
+// src/auth/open-browser-and-capture/open-browser-and-capture.ts
 import { timingSafeEqual } from "node:crypto";
 var openBrowserAndCapture;
 var init_open_browser_and_capture = __esm({
@@ -1361,28 +1198,11 @@ var init_open_browser_and_capture = __esm({
     "use strict";
     init_auth_error2();
     init_loopback_callback2();
+    init_open_system_browser2();
     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(() => {
@@ -2115,12 +1935,12 @@ var init_catalog_fetch_error2 = __esm({
 });
 
 // src/catalog/catalog-cache/cache-file-path/cache-file-path.ts
-import * as path6 from "node:path";
+import * as path3 from "node:path";
 var cacheFilePath;
 var init_cache_file_path = __esm({
   "src/catalog/catalog-cache/cache-file-path/cache-file-path.ts"() {
     "use strict";
-    cacheFilePath = (keyHash, cacheDir) => path6.join(cacheDir, `catalog-${keyHash}.json`);
+    cacheFilePath = (keyHash, cacheDir) => path3.join(cacheDir, `catalog-${keyHash}.json`);
   }
 });
 
@@ -2229,7 +2049,7 @@ var init_is_catalog_model_record2 = __esm({
 });
 
 // src/catalog/catalog-cache/read-disk/read-disk.ts
-import * as fs6 from "node:fs";
+import * as fs from "node:fs";
 var readDisk;
 var init_read_disk = __esm({
   "src/catalog/catalog-cache/read-disk/read-disk.ts"() {
@@ -2241,7 +2061,7 @@ var init_read_disk = __esm({
     readDisk = (keyHash, cacheDir) => {
       try {
         const parsed = JSON.parse(
-          fs6.readFileSync(cacheFilePath(keyHash, cacheDir), "utf8")
+          fs.readFileSync(cacheFilePath(keyHash, cacheDir), "utf8")
         );
         if (!isRecord(parsed) || parsed["version"] !== CATALOG_CACHE_VERSION || typeof parsed["fetchedAt"] !== "number" || !isCatalogModelRecord(parsed["models"])) {
           return void 0;
@@ -2326,7 +2146,7 @@ var init_read_stale_catalog2 = __esm({
 });
 
 // src/catalog/catalog-cache/write-catalog/write-catalog.ts
-import * as fs7 from "node:fs";
+import * as fs2 from "node:fs";
 var writeCatalog;
 var init_write_catalog = __esm({
   "src/catalog/catalog-cache/write-catalog/write-catalog.ts"() {
@@ -2345,8 +2165,8 @@ var init_write_catalog = __esm({
       };
       catalogMemory.set(keyHash, record);
       try {
-        fs7.mkdirSync(options.cacheDir, { recursive: true });
-        fs7.writeFileSync(
+        fs2.mkdirSync(options.cacheDir, { recursive: true });
+        fs2.writeFileSync(
           cacheFilePath(keyHash, options.cacheDir),
           JSON.stringify({ version: CATALOG_CACHE_VERSION, ...record })
         );
@@ -3841,7 +3661,7 @@ var init_fetch_live2 = __esm({
 });
 
 // src/enrich/models-dev/read-models-dev-cache/read-models-dev-cache.ts
-import * as fs8 from "node:fs";
+import * as fs3 from "node:fs";
 var readModelsDevCache;
 var init_read_models_dev_cache = __esm({
   "src/enrich/models-dev/read-models-dev-cache/read-models-dev-cache.ts"() {
@@ -3850,7 +3670,7 @@ var init_read_models_dev_cache = __esm({
     init_num2();
     readModelsDevCache = (cachePath) => {
       try {
-        const parsed = JSON.parse(fs8.readFileSync(cachePath, "utf8"));
+        const parsed = JSON.parse(fs3.readFileSync(cachePath, "utf8"));
         if (!isRecord(parsed)) {
           return void 0;
         }
@@ -3876,8 +3696,8 @@ var init_read_models_dev_cache2 = __esm({
 });
 
 // src/enrich/models-dev/write-models-dev-cache/write-models-dev-cache.ts
-import * as fs9 from "node:fs";
-import * as path7 from "node:path";
+import * as fs4 from "node:fs";
+import * as path4 from "node:path";
 var writeModelsDevCache;
 var init_write_models_dev_cache = __esm({
   "src/enrich/models-dev/write-models-dev-cache/write-models-dev-cache.ts"() {
@@ -3885,8 +3705,8 @@ var init_write_models_dev_cache = __esm({
     init_shared();
     writeModelsDevCache = (cachePath, envelope) => {
       try {
-        fs9.mkdirSync(path7.dirname(cachePath), { recursive: true });
-        fs9.writeFileSync(cachePath, JSON.stringify(envelope), "utf8");
+        fs4.mkdirSync(path4.dirname(cachePath), { recursive: true });
+        fs4.writeFileSync(cachePath, JSON.stringify(envelope), "utf8");
       } catch (error) {
         logger.warn(
           "failed to write models.dev cache:",
@@ -3906,7 +3726,7 @@ var init_write_models_dev_cache2 = __esm({
 });
 
 // src/enrich/models-dev/load-models-dev/load-models-dev.ts
-import * as path8 from "node:path";
+import * as path5 from "node:path";
 var CACHE_FILE, loadModelsDev;
 var init_load_models_dev = __esm({
   "src/enrich/models-dev/load-models-dev/load-models-dev.ts"() {
@@ -3922,7 +3742,7 @@ var init_load_models_dev = __esm({
       const cacheDir = options.cacheDir ?? resolveCacheDir({});
       const ttlMs = options.ttlMs ?? MODELS_DEV_TTL_MS;
       const now = options.now ?? Date.now;
-      const cachePath = path8.join(cacheDir, CACHE_FILE);
+      const cachePath = path5.join(cacheDir, CACHE_FILE);
       const cached = readModelsDevCache(cachePath);
       if (cached !== void 0 && now() - cached.fetchedAt < ttlMs) {
         return createModelsDevSource("cache", cached.data);
@@ -4087,20 +3907,20 @@ var init_regenerate_models2 = __esm({
 });
 
 // src/config/remove-legacy-manifest/remove-legacy-manifest.ts
-import * as fs10 from "node:fs";
-import * as path9 from "node:path";
+import * as fs5 from "node:fs";
+import * as path6 from "node:path";
 var removeLegacyManifest;
 var init_remove_legacy_manifest = __esm({
   "src/config/remove-legacy-manifest/remove-legacy-manifest.ts"() {
     "use strict";
     init_shared();
     removeLegacyManifest = (root) => {
-      const file = path9.join(root, ".opencode", "route33-generated.json");
+      const file = path6.join(root, ".opencode", "route33-generated.json");
       try {
-        if (!fs10.existsSync(file)) {
+        if (!fs5.existsSync(file)) {
           return;
         }
-        fs10.rmSync(file);
+        fs5.rmSync(file);
         logger.info(
           "route_33: removed obsolete route33-generated.json (regeneration is stateless since 0.4.4)"
         );
@@ -4745,9 +4565,9 @@ var init_default_gateway_key_ttl_ms2 = __esm({
 });
 
 // src/key-lease/file-secret-store/file-secret-store.ts
-import { randomUUID as randomUUID2 } from "node:crypto";
-import * as fs11 from "node:fs/promises";
-import * as path10 from "node:path";
+import { randomUUID } from "node:crypto";
+import * as fs6 from "node:fs/promises";
+import * as path7 from "node:path";
 var FileSecretStore;
 var init_file_secret_store = __esm({
   "src/key-lease/file-secret-store/file-secret-store.ts"() {
@@ -4764,7 +4584,7 @@ var init_file_secret_store = __esm({
           throw new TypeError("File secret store scope is not portable");
         }
         this.#directory = options.directory;
-        this.#file = path10.join(options.directory, `lease-${options.scopeId}.json`);
+        this.#file = path7.join(options.directory, `lease-${options.scopeId}.json`);
       }
       /** Reads and parses the scoped gateway credential.
        * @returns The persisted credential, when present.
@@ -4772,7 +4592,7 @@ var init_file_secret_store = __esm({
       async get() {
         let contents;
         try {
-          contents = await fs11.readFile(this.#file, "utf8");
+          contents = await fs6.readFile(this.#file, "utf8");
         } catch (cause) {
           if (cause instanceof Error && "code" in cause && cause.code === "ENOENT") {
             return void 0;
@@ -4788,22 +4608,22 @@ var init_file_secret_store = __esm({
        */
       async set(key) {
         if (key === void 0) {
-          await fs11.rm(this.#file, { force: true });
+          await fs6.rm(this.#file, { force: true });
           return;
         }
-        await fs11.mkdir(this.#directory, { mode: 448, recursive: true });
-        await fs11.chmod(this.#directory, 448);
-        const temporary = path10.join(this.#directory, `.lease-${randomUUID2()}.tmp`);
+        await fs6.mkdir(this.#directory, { mode: 448, recursive: true });
+        await fs6.chmod(this.#directory, 448);
+        const temporary = path7.join(this.#directory, `.lease-${randomUUID()}.tmp`);
         try {
-          await fs11.writeFile(temporary, `${JSON.stringify(key.value)}
+          await fs6.writeFile(temporary, `${JSON.stringify(key.value)}
 `, {
             encoding: "utf8",
             flag: "wx",
             mode: 384
           });
-          await fs11.rename(temporary, this.#file);
+          await fs6.rename(temporary, this.#file);
         } finally {
-          await fs11.rm(temporary, { force: true });
+          await fs6.rm(temporary, { force: true });
         }
       }
     };
@@ -5423,49 +5243,252 @@ var init_lease_for_attribution = __esm({
         return reusable;
       }
       try {
-        const renewed = await renewKey({
-          leaseState: options.installation.state,
-          mint: {
-            attribution: options.attribution,
-            clock,
-            identity: {
-              credential: await resolveSeamValue(options.management.credential),
-              subject: await resolveSeamValue(options.management.subject)
-            },
-            installation: {
-              keyName: options.installation.keyName,
-              ttlMs: policy.ttlMs
-            },
-            managementClient: options.management.client
-          },
-          secretStore: options.installation.secretStore
-        });
-        if (policy.orphanRetentionCycles !== void 0) {
-          await controlOrphans({
-            clock,
-            currentKeyId: renewed.lease.keyId,
-            keyName: options.installation.keyName,
-            managementClient: options.management.client,
-            managementCredential: await resolveSeamValue(
-              options.management.credential
-            ),
-            retentionCycles: policy.orphanRetentionCycles,
-            ttlMs: policy.ttlMs
-          });
-        }
-        return renewed;
-      } catch (cause) {
-        return mapRenewalFailure({ cause, current, now });
+        const renewed = await renewKey({
+          leaseState: options.installation.state,
+          mint: {
+            attribution: options.attribution,
+            clock,
+            identity: {
+              credential: await resolveSeamValue(options.management.credential),
+              subject: await resolveSeamValue(options.management.subject)
+            },
+            installation: {
+              keyName: options.installation.keyName,
+              ttlMs: policy.ttlMs
+            },
+            managementClient: options.management.client
+          },
+          secretStore: options.installation.secretStore
+        });
+        if (policy.orphanRetentionCycles !== void 0) {
+          await controlOrphans({
+            clock,
+            currentKeyId: renewed.lease.keyId,
+            keyName: options.installation.keyName,
+            managementClient: options.management.client,
+            managementCredential: await resolveSeamValue(
+              options.management.credential
+            ),
+            retentionCycles: policy.orphanRetentionCycles,
+            ttlMs: policy.ttlMs
+          });
+        }
+        return renewed;
+      } catch (cause) {
+        return mapRenewalFailure({ cause, current, now });
+      }
+    };
+  }
+});
+
+// src/key-lease/lease-for-attribution/index.ts
+var init_lease_for_attribution2 = __esm({
+  "src/key-lease/lease-for-attribution/index.ts"() {
+    "use strict";
+    init_lease_for_attribution();
+  }
+});
+
+// src/attribution/detect-worktree-root/detect-worktree-root.ts
+import * as fs7 from "node:fs";
+import * as path8 from "node:path";
+var detectWorktreeRoot;
+var init_detect_worktree_root = __esm({
+  "src/attribution/detect-worktree-root/detect-worktree-root.ts"() {
+    "use strict";
+    detectWorktreeRoot = (startDirectory) => {
+      let directory = fs7.realpathSync(startDirectory);
+      for (; ; ) {
+        const gitEntry = path8.join(directory, ".git");
+        if (fs7.existsSync(gitEntry)) {
+          const entry = fs7.statSync(gitEntry);
+          if (entry.isDirectory() || entry.isFile()) {
+            return directory;
+          }
+        }
+        const parent = path8.dirname(directory);
+        if (parent === directory) {
+          return void 0;
+        }
+        directory = parent;
+      }
+    };
+  }
+});
+
+// src/attribution/detect-worktree-root/index.ts
+var init_detect_worktree_root2 = __esm({
+  "src/attribution/detect-worktree-root/index.ts"() {
+    "use strict";
+    init_detect_worktree_root();
+  }
+});
+
+// src/attribution/resolve-attribution-file/resolve-attribution-file.ts
+import * as fs8 from "node:fs";
+import * as path9 from "node:path";
+var resolveAttributionFile;
+var init_resolve_attribution_file = __esm({
+  "src/attribution/resolve-attribution-file/resolve-attribution-file.ts"() {
+    "use strict";
+    init_detect_worktree_root2();
+    resolveAttributionFile = (options) => {
+      const worktreeRoot = detectWorktreeRoot(options.directory);
+      if (worktreeRoot !== void 0) {
+        return path9.join(worktreeRoot, ".opencode", "route33.attribution.json");
+      }
+      const fallbackRoots = {
+        "return-undefined": void 0,
+        "use-directory": fs8.realpathSync(options.directory)
+      };
+      const fallbackRoot = fallbackRoots[options.outsideWorktree];
+      return fallbackRoot === void 0 ? void 0 : path9.join(fallbackRoot, ".opencode", "route33.attribution.json");
+    };
+  }
+});
+
+// src/attribution/resolve-attribution-file/index.ts
+var init_resolve_attribution_file2 = __esm({
+  "src/attribution/resolve-attribution-file/index.ts"() {
+    "use strict";
+    init_resolve_attribution_file();
+  }
+});
+
+// src/attribution/clear-attribution/clear-attribution.ts
+import * as fs9 from "node:fs";
+var clearAttribution;
+var init_clear_attribution = __esm({
+  "src/attribution/clear-attribution/clear-attribution.ts"() {
+    "use strict";
+    init_resolve_attribution_file2();
+    clearAttribution = (options) => {
+      const file = resolveAttributionFile(options);
+      if (file === void 0) {
+        return false;
+      }
+      fs9.rmSync(file, { force: true });
+      return true;
+    };
+  }
+});
+
+// src/attribution/clear-attribution/index.ts
+var init_clear_attribution2 = __esm({
+  "src/attribution/clear-attribution/index.ts"() {
+    "use strict";
+    init_clear_attribution();
+  }
+});
+
+// src/attribution/parse-attribution/parse-attribution.ts
+var parseAttribution;
+var init_parse_attribution = __esm({
+  "src/attribution/parse-attribution/parse-attribution.ts"() {
+    "use strict";
+    init_adapters();
+    init_predicates();
+    parseAttribution = (value) => {
+      if (!isRecord(value)) {
+        throw new ContractParseError("invalid attribution");
+      }
+      if (value["kind"] === "personal") {
+        return { kind: "personal" };
+      }
+      if (value["kind"] === "project" && typeof value["projectId"] === "string") {
+        return { kind: "project", projectId: value["projectId"] };
+      }
+      throw new ContractParseError("invalid attribution");
+    };
+  }
+});
+
+// src/attribution/parse-attribution/index.ts
+var init_parse_attribution2 = __esm({
+  "src/attribution/parse-attribution/index.ts"() {
+    "use strict";
+    init_parse_attribution();
+  }
+});
+
+// src/attribution/read-attribution/read-attribution.ts
+import * as fs10 from "node:fs";
+var readAttribution;
+var init_read_attribution = __esm({
+  "src/attribution/read-attribution/read-attribution.ts"() {
+    "use strict";
+    init_parse_attribution2();
+    init_resolve_attribution_file2();
+    readAttribution = (options) => {
+      const file = resolveAttributionFile(options);
+      if (file === void 0) {
+        return void 0;
+      }
+      try {
+        const parsed = JSON.parse(fs10.readFileSync(file, "utf8"));
+        return parseAttribution(parsed);
+      } catch {
+        return void 0;
+      }
+    };
+  }
+});
+
+// src/attribution/read-attribution/index.ts
+var init_read_attribution2 = __esm({
+  "src/attribution/read-attribution/index.ts"() {
+    "use strict";
+    init_read_attribution();
+  }
+});
+
+// src/attribution/write-attribution/write-attribution.ts
+import { randomUUID as randomUUID2 } from "node:crypto";
+import * as fs11 from "node:fs";
+import * as path10 from "node:path";
+var writeAttribution;
+var init_write_attribution = __esm({
+  "src/attribution/write-attribution/write-attribution.ts"() {
+    "use strict";
+    init_resolve_attribution_file2();
+    writeAttribution = (options, attribution) => {
+      const file = resolveAttributionFile(options);
+      if (file === void 0) {
+        return false;
+      }
+      fs11.mkdirSync(path10.dirname(file), { recursive: true });
+      const temporaryFile = `${file}.${String(process.pid)}.${randomUUID2()}.tmp`;
+      try {
+        fs11.writeFileSync(temporaryFile, `${JSON.stringify(attribution)}
+`, "utf8");
+        fs11.renameSync(temporaryFile, file);
+      } catch (error) {
+        fs11.rmSync(temporaryFile, { force: true });
+        throw error;
       }
+      return true;
     };
   }
 });
 
-// src/key-lease/lease-for-attribution/index.ts
-var init_lease_for_attribution2 = __esm({
-  "src/key-lease/lease-for-attribution/index.ts"() {
+// src/attribution/write-attribution/index.ts
+var init_write_attribution2 = __esm({
+  "src/attribution/write-attribution/index.ts"() {
     "use strict";
-    init_lease_for_attribution();
+    init_write_attribution();
+  }
+});
+
+// src/attribution/index.ts
+var init_attribution = __esm({
+  "src/attribution/index.ts"() {
+    "use strict";
+    init_clear_attribution2();
+    init_detect_worktree_root2();
+    init_parse_attribution2();
+    init_read_attribution2();
+    init_resolve_attribution_file2();
+    init_write_attribution2();
   }
 });
 
@@ -6132,7 +6155,7 @@ var init_route33_runtime = __esm({
         if (typeof client !== "function") {
           return client;
         }
-        this.#managementClient ??= client(() => this.#session.credential());
+        this.#managementClient ??= client();
         return this.#managementClient;
       }
       #subject(credential) {
@@ -6387,7 +6410,6 @@ var init_create_route33_plugin2 = __esm({
 });
 
 // src/tui-entry/v1-connect-wizard/v1-connect-wizard.ts
-init_attribution();
 init_cli();
 
 // src/tui-entry/production-options/production-options.ts
@@ -6817,20 +6839,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)
   };
 };
 
@@ -6846,10 +6868,7 @@ 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 }
 });
@@ -6902,12 +6921,10 @@ 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) {
+  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";
@@ -7098,19 +7115,82 @@ var r33Menu = async (api, composeOptions) => {
   await r33MenuActions({ api, composeOptions })(selection);
 };
 
+// src/tui-entry/v2-setup-directory/v2-setup-directory.ts
+init_attribution();
+init_cli();
+var v2SetupDirectory = (context) => {
+  if (readEnvDirectApiKey() !== void 0) return void 0;
+  if (readEnvAutoconnectDisabled()) return void 0;
+  const location = context.location;
+  if (location === void 0) return void 0;
+  if (detectWorktreeRoot(location.directory) === void 0) {
+    return void 0;
+  }
+  const attributed = readAttribution({
+    directory: location.directory,
+    outsideWorktree: "return-undefined"
+  }) !== void 0;
+  return attributed ? void 0 : location.directory;
+};
+
+// src/tui-entry/v1-setup-lock/v1-setup-lock.ts
+var SETUP_MODE = "route33-setup";
+var RESUME_BIND = "enter";
+var v1SetupLock = (deps) => {
+  const setupPending = () => v2SetupDirectory({ location: { directory: deps.directory() } }) !== void 0;
+  const pop = setupPending() ? deps.mode?.push(SETUP_MODE) : void 0;
+  if (pop !== void 0) {
+    deps.keymap?.registerLayer({
+      bindings: ["route33.setup"],
+      commands: [
+        {
+          bind: RESUME_BIND,
+          id: "route33.setup",
+          run: () => {
+            void settle();
+          },
+          suggested: true,
+          title: "Route 33: pick the budget for this folder"
+        }
+      ],
+      mode: SETUP_MODE,
+      priority: 10
+    });
+  }
+  let running = false;
+  const settle = async () => {
+    if (running) return;
+    running = true;
+    try {
+      if (setupPending()) {
+        await deps.run();
+      }
+    } finally {
+      running = false;
+    }
+    if (setupPending()) return;
+    pop?.();
+  };
+  return { start: settle };
+};
+
 // src/tui-entry/v1-connect-wizard/v1-connect-wizard.ts
 var createV1ConnectWizard = (composeOptions = productionOptions) => (api) => {
   if (readEnvDirectApiKey() !== void 0 || readEnvAutoconnectDisabled()) {
     return Promise.resolve();
   }
-  const directory = api.state.path.directory;
-  const unconnected = readAttribution({
-    directory,
-    outsideWorktree: "return-undefined"
-  }) === void 0;
-  if (unconnected) {
-    void runConnect(api, composeOptions);
-  }
+  const surfaces = api;
+  const lock = v1SetupLock({
+    directory: () => api.state.path.directory,
+    ...surfaces.keymap === void 0 ? {} : {
+      keymap: {
+        registerLayer: (layer) => surfaces.keymap?.registerLayer(layer)
+      }
+    },
+    ...surfaces.mode === void 0 ? {} : { mode: surfaces.mode },
+    run: () => runConnect(api, composeOptions)
+  });
+  void lock.start();
   const legacyCommands = api.command;
   legacyCommands?.register(() => [
     {
@@ -7123,6 +7203,367 @@ var createV1ConnectWizard = (composeOptions = productionOptions) => (api) => {
   return Promise.resolve();
 };
 
+// src/tui-entry/show-r33-menu/show-r33-menu.ts
+init_attribution();
+
+// src/tui-entry/v2-autoconnect/v2-autoconnect.ts
+init_attribution();
+
+// src/tui-entry/v2-attribution-field/v2-attribution-field.ts
+var v2AttributionField = (methods) => {
+  const browserMethods = methods?.filter(
+    (entry) => entry.type === "oauth" && entry.id === "browser"
+  );
+  const fields = browserMethods?.flatMap((entry) => entry.form ?? []);
+  const field = fields?.find((entry) => entry.key === "attribution");
+  if (field?.options === void 0 || field.options.length === 0) {
+    return void 0;
+  }
+  return field;
+};
+
+// src/tui-entry/v2-integration-surface/v2-integration-surface.ts
+var v2IntegrationSurface = (context) => context.client?.integration ?? context.client?.api?.integration;
+
+// src/tui-entry/v2-attribution-form/v2-attribution-form.ts
+var v2AttributionForm = async (context) => {
+  const get = v2IntegrationSurface(context)?.get;
+  if (get === void 0) return void 0;
+  const integration = await get({
+    integrationID: "route33",
+    ...context.location === void 0 ? {} : { location: { directory: context.location.directory } }
+  }).catch(() => void 0);
+  return v2AttributionField(integration?.data.methods);
+};
+
+// src/tui-entry/v2-connect-copy/v2-connect-copy.ts
+var V2_CONNECT_COPY = {
+  dismissed: "Route 33 is not set up for this folder yet. Press Enter to pick the budget, or run /connect and choose Route 33.",
+  expired: "The Route 33 sign-in link expired. Press Enter to retry, or run /connect and choose Route 33.",
+  manualFallback: "Route 33 is not connected in this folder. Run /connect, choose Route 33, and follow the steps.",
+  manualPath: "Press Enter to retry, or run /connect, choose Route 33, and follow the steps.",
+  pickerTitle: "Which budget covers Route 33 usage in this folder?",
+  setupIncomplete: "Route 33 setup did not complete. Press Enter to retry, or run /connect and choose Route 33.",
+  signInFailed: "Route 33 sign-in did not complete. Press Enter to retry, or run /connect and choose Route 33.",
+  signInTitle: "Route 33 \u2014 sign in",
+  statusUnavailable: "Route 33 sign-in did not settle. Press Enter to retry, or run /connect and choose Route 33.",
+  stale: "That Route 33 option is no longer available. Press Enter to retry, or run /connect and choose Route 33.",
+  success: "Route 33 connected \u2713 \u2014 pick a route_33 model and start.",
+  timedOut: "Route 33 sign-in timed out. Press Enter to retry, or run /connect and choose Route 33."
+};
+
+// src/tui-entry/v2-outcome-copy/v2-outcome-copy.ts
+var v2OutcomeCopy = (outcome, failedFallback) => {
+  if (outcome.kind === "failed") {
+    return {
+      message: `${outcome.message ?? failedFallback} ${V2_CONNECT_COPY.manualPath}`,
+      variant: "error"
+    };
+  }
+  const byKind = {
+    complete: V2_CONNECT_COPY.manualFallback,
+    expired: V2_CONNECT_COPY.expired,
+    failed: failedFallback,
+    timeout: V2_CONNECT_COPY.timedOut,
+    unavailable: V2_CONNECT_COPY.statusUnavailable
+  };
+  return { message: byKind[outcome.kind], variant: "error" };
+};
+
+// src/tui-entry/v2-budget-picker/v2-budget-picker.ts
+var v2BudgetPicker = async (deps) => {
+  if (!deps.unattributed()) {
+    deps.toast({ message: V2_CONNECT_COPY.success, variant: "success" });
+    return;
+  }
+  const options = deps.form.options ?? [];
+  const selection = await deps.dialog.select({
+    options: options.map((option) => ({
+      description: option.description,
+      title: option.label,
+      value: option.value
+    })),
+    title: deps.form.title ?? V2_CONNECT_COPY.pickerTitle
+  });
+  if (selection === void 0) {
+    deps.toast({ message: V2_CONNECT_COPY.dismissed });
+    return;
+  }
+  if (!options.some((option) => option.value === selection)) {
+    deps.toast({ message: V2_CONNECT_COPY.stale, variant: "error" });
+    return;
+  }
+  if (!deps.unattributed()) {
+    deps.toast({ message: V2_CONNECT_COPY.success, variant: "success" });
+    return;
+  }
+  let second;
+  try {
+    second = await deps.connect({
+      answer: { [deps.form.key]: selection },
+      integrationID: "route33",
+      location: deps.locationInput,
+      methodID: "browser"
+    });
+  } catch (error) {
+    deps.toast({
+      message: `${error instanceof Error ? error.message : String(error)} ${V2_CONNECT_COPY.manualPath}`,
+      variant: "error"
+    });
+    return;
+  }
+  const settled = await deps.pollTerminal(second.data.attemptID);
+  if (settled.kind === "complete") {
+    deps.toast({ message: V2_CONNECT_COPY.success, variant: "success" });
+    return;
+  }
+  const copy = v2OutcomeCopy(settled, V2_CONNECT_COPY.setupIncomplete);
+  deps.toast(copy);
+};
+
+// src/tui-entry/v2-connect-surface/v2-connect-surface.ts
+var v2ConnectSurface = (context) => v2IntegrationSurface(context)?.oauth?.connect;
+
+// src/tui-entry/v2-form-reader/v2-form-reader.ts
+init_abortable_sleep2();
+var createV2FormReader = ({ attempts = 5, context, retryDelayMs = 500 }) => async () => {
+  for (let attempt = 1; attempt <= attempts; attempt += 1) {
+    const form = await v2AttributionForm(context);
+    if (form !== void 0) return form;
+    if (attempt < attempts) {
+      await abortableSleep(retryDelayMs);
+    }
+  }
+  return void 0;
+};
+
+// src/tui-entry/v2-poll-terminal/v2-poll-terminal.ts
+init_abortable_sleep2();
+var createV2PollTerminal = ({
+  locationInput,
+  maxPolls = 600,
+  pollDelayMs = 1e3,
+  status,
+  statusErrorLimit = 5
+}) => async (attemptID) => {
+  let errors = 0;
+  for (let poll = 0; poll < maxPolls; poll += 1) {
+    await abortableSleep(pollDelayMs);
+    try {
+      const result = await status({
+        attemptID,
+        integrationID: "route33",
+        location: locationInput
+      });
+      errors = 0;
+      const state = result.data.status;
+      if (state === "pending") continue;
+      if (state === "failed") {
+        return { kind: "failed", message: result.data.message };
+      }
+      return { kind: state };
+    } catch {
+      errors += 1;
+      if (errors >= statusErrorLimit) return { kind: "unavailable" };
+    }
+  }
+  return { kind: "timeout" };
+};
+
+// src/tui-entry/v2-connect-retry/v2-connect-retry.ts
+init_abortable_sleep2();
+
+// 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-retry/v2-connect-retry.ts
+var v2ConnectRetry = async ({
+  connect,
+  input,
+  maxAttempts = 20,
+  retryDelayMs = 500
+}) => {
+  for (let attempt = 1; attempt <= maxAttempts; attempt += 1) {
+    try {
+      return await connect(input);
+    } catch (error) {
+      if (!isMethodNotRegistered(error)) {
+        throw error;
+      }
+      if (attempt < maxAttempts) {
+        await abortableSleep(retryDelayMs);
+      }
+    }
+  }
+  return void 0;
+};
+
+// src/tui-entry/v2-sign-in-wait/v2-sign-in-wait.ts
+var v2SignInWait = async (deps) => {
+  const state = { dismissed: false };
+  void deps.alert().then(() => {
+    state.dismissed = true;
+  }).catch(() => {
+    state.dismissed = true;
+  });
+  const outcome = await deps.pollTerminal(deps.attemptID);
+  return { dismissed: state.dismissed, outcome };
+};
+
+// src/tui-entry/v2-sign-in-pass/v2-sign-in-pass.ts
+var v2SignInPass = async ({
+  connect,
+  dialog,
+  formReader,
+  locationInput,
+  maxAttempts,
+  pollTerminal,
+  retryDelayMs,
+  toast,
+  unattributed
+}) => {
+  let attempt;
+  try {
+    attempt = await v2ConnectRetry({
+      connect,
+      input: {
+        integrationID: "route33",
+        location: locationInput,
+        methodID: "browser"
+      },
+      maxAttempts,
+      retryDelayMs
+    });
+  } catch (error) {
+    toast({
+      message: `${error instanceof Error ? error.message : String(error)} ${V2_CONNECT_COPY.manualPath}`,
+      variant: "error"
+    });
+    return { aborted: true };
+  }
+  if (attempt === void 0) {
+    toast({ message: V2_CONNECT_COPY.manualFallback, variant: "error" });
+    return { aborted: true };
+  }
+  const waited = await v2SignInWait({
+    alert: () => dialog.alert({
+      message: `${attempt.data.instructions}
+
+${attempt.data.url}`,
+      title: V2_CONNECT_COPY.signInTitle
+    }),
+    attemptID: attempt.data.attemptID,
+    pollTerminal
+  });
+  if (waited.dismissed) {
+    if (waited.outcome.kind === "complete") {
+      return { connected: true };
+    }
+    toast({ message: V2_CONNECT_COPY.dismissed });
+    return { aborted: true };
+  }
+  dialog.clear();
+  const outcome = waited.outcome;
+  if (outcome.kind === "complete") {
+    return { connected: true };
+  }
+  if (outcome.kind === "failed") {
+    if (!unattributed()) {
+      return { connected: true };
+    }
+    const form = await formReader();
+    if (form === void 0) {
+      toast(v2OutcomeCopy(outcome, V2_CONNECT_COPY.signInFailed));
+      return { aborted: true };
+    }
+    return { form };
+  }
+  toast(v2OutcomeCopy(outcome, V2_CONNECT_COPY.signInFailed));
+  return { aborted: true };
+};
+
+// src/tui-entry/v2-status-surface/v2-status-surface.ts
+var v2StatusSurface = (context) => v2IntegrationSurface(context)?.oauth?.status;
+
+// src/tui-entry/v2-connect-runner/v2-connect-runner.ts
+var v2GuidedConnect = async (deps) => {
+  const { context, unattributed } = deps;
+  const connect = v2ConnectSurface(context);
+  const status = v2StatusSurface(context);
+  const dialog = context.ui.dialog;
+  const toast = (input) => {
+    context.ui.toast.show(input);
+  };
+  const location = context.location;
+  if (connect === void 0 || location === void 0) return;
+  if (!unattributed()) return;
+  if (status === void 0 || dialog === void 0) {
+    toast({ message: V2_CONNECT_COPY.manualFallback });
+    return;
+  }
+  const locationInput = { directory: location.directory };
+  const pollTerminal = createV2PollTerminal({
+    locationInput,
+    maxPolls: deps.maxPolls,
+    pollDelayMs: deps.pollDelayMs,
+    status,
+    statusErrorLimit: deps.statusErrorLimit
+  });
+  const earlyForm = await v2AttributionForm(context);
+  if (earlyForm !== void 0) {
+    await v2BudgetPicker({
+      connect,
+      dialog,
+      form: earlyForm,
+      locationInput,
+      pollTerminal,
+      toast,
+      unattributed
+    });
+    return;
+  }
+  const result = await v2SignInPass({
+    connect,
+    dialog,
+    formReader: createV2FormReader({
+      attempts: deps.formReadAttempts,
+      context,
+      retryDelayMs: deps.retryDelayMs
+    }),
+    locationInput,
+    maxAttempts: deps.maxAttempts,
+    pollTerminal,
+    retryDelayMs: deps.retryDelayMs,
+    toast,
+    unattributed
+  });
+  if ("aborted" in result) return;
+  if ("connected" in result) {
+    toast({ message: V2_CONNECT_COPY.success, variant: "success" });
+    return;
+  }
+  await v2BudgetPicker({
+    connect,
+    dialog,
+    form: result.form,
+    locationInput,
+    pollTerminal,
+    toast,
+    unattributed
+  });
+};
+
+// src/tui-entry/v2-autoconnect/v2-autoconnect.ts
+var v2Autoconnect = async (context) => {
+  const directory = v2SetupDirectory(context);
+  if (directory === void 0) return;
+  const unattributed = () => readAttribution({
+    directory,
+    outsideWorktree: "return-undefined"
+  }) === void 0;
+  await v2GuidedConnect({ context, unattributed });
+};
+
 // src/tui-entry/show-r33-menu/show-r33-menu.ts
 var menuOptions2 = [
   {
@@ -7152,11 +7593,15 @@ var showR33Menu = async (context) => {
     options: menuOptions2
   });
   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"
-    });
+  if (selection === "connect" || selection === "change") {
+    const location = context.location ?? context.data?.location.default();
+    if (selection === "change" && location !== void 0) {
+      clearAttribution({
+        directory: location.directory,
+        outsideWorktree: "return-undefined"
+      });
+    }
+    await v2Autoconnect({ ...context, location });
     return;
   }
   context.ui.toast.show({
@@ -7165,72 +7610,49 @@ var showR33Menu = async (context) => {
   });
 };
 
-// src/tui-entry/v2-autoconnect/v2-autoconnect.ts
-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 connect = v2ConnectSurface(context);
-  const sleep = (ms) => new Promise((resolve2) => {
-    setTimeout(resolve2, ms);
-  });
-  return async (message) => {
-    if (connect === void 0) return;
-    if (!unattributed()) return;
-    context.ui.toast.show({ message, variant: "info" });
-    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);
-      }
+// src/tui-entry/v2-setup-lock/v2-setup-lock.ts
+var SETUP_MODE2 = "route33-setup";
+var RESUME_BIND2 = "enter";
+var v2SetupLock = (context) => {
+  const required = v2SetupDirectory(context) !== void 0;
+  const release = required ? context.keymap?.mode.push(SETUP_MODE2) : void 0;
+  if (required) {
+    context.keymap?.layer(() => ({
+      bindings: ["route33.setup"],
+      commands: [
+        {
+          bind: RESUME_BIND2,
+          id: "route33.setup",
+          run: () => {
+            void settle();
+          },
+          suggested: true,
+          title: "Route 33: pick the budget for this folder"
+        }
+      ],
+      mode: SETUP_MODE2,
+      priority: 10
+    }));
+  }
+  let running = false;
+  const settle = async () => {
+    if (running) return;
+    running = true;
+    try {
+      await v2Autoconnect(context);
+    } finally {
+      running = false;
     }
+    if (v2SetupDirectory(context) !== void 0) return;
+    release?.();
   };
-};
-
-// 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.");
+  return { start: settle };
 };
 
 // src/tui-entry/v2-tui/v2-tui.ts
 var createV2Tui = () => ({
   id: "route33",
-  setup: async (context) => {
-    await v2Autoconnect(context);
+  setup: (context) => {
     context.keymap?.layer(() => ({
       mode: "global",
       priority: 10,
@@ -7248,6 +7670,8 @@ var createV2Tui = () => ({
       ],
       bindings: ["route33.menu"]
     }));
+    const location = context.location ?? context.data?.location.default();
+    void v2SetupLock({ ...context, location }).start().catch(() => void 0);
   }
 });