glass-connect 0.1.0 → 0.2.0

package/dist/cli.js

@@ -16592,7 +16592,7 @@ var init_execution_handler = __esm({
 });
 
 // ../../packages/contracts/src/environments.ts
-var environmentCredentialScope, environmentPairingApprovalPath, environmentRotationApprovalPath, maxEnvironmentDisplayNameLength, base64UrlPattern, rejectUnknown2, decodePublicKey, decodePlatform, decodeEnvironmentIdentityChallenge, decodeExecutionEnvironment, decodeApprovalResponse, decodeBeginEnvironmentPairingResponse, decodeEnvironmentPairingStatus, decodeEnvironmentCredential;
+var environmentCredentialScope, environmentPairingApprovalPath, maxEnvironmentDisplayNameLength, base64UrlPattern, rejectUnknown2, decodePublicKey, decodePlatform, decodeEnvironmentIdentityChallenge, decodeExecutionEnvironment, decodeBeginEnvironmentPairingResponse, decodeEnvironmentPairingStatus, decodeEnvironmentCredential;
 var init_environments = __esm({
   "../../packages/contracts/src/environments.ts"() {
     "use strict";
@@ -16600,7 +16600,6 @@ var init_environments = __esm({
     init_validation();
     environmentCredentialScope = "glass-connect";
     environmentPairingApprovalPath = "/#glass-connect-pair";
-    environmentRotationApprovalPath = "/#glass-connect-rotate";
     maxEnvironmentDisplayNameLength = 120;
     base64UrlPattern = /^[A-Za-z0-9_-]+$/u;
     rejectUnknown2 = (value2, keys, path) => {
@@ -16711,12 +16710,12 @@ var init_environments = __esm({
         revokedAt: revokedAt.value
       });
     };
-    decodeApprovalResponse = (input, kind) => {
-      const path = kind === "pairing" ? "$pairingResponse" : "$rotationResponse";
+    decodeBeginEnvironmentPairingResponse = (input) => {
+      const path = "$pairingResponse";
       const record2 = decodeRecord(input, path);
       if (!record2.ok) return record2;
-      const idKey = kind === "pairing" ? "pairingId" : "rotationId";
-      const codeKey = kind === "pairing" ? "pairingCode" : "rotationCode";
+      const idKey = "pairingId";
+      const codeKey = "pairingCode";
       const keys = rejectUnknown2(
         record2.value,
         [idKey, codeKey, "pollingToken", "approvalPath", "expiresAt"],
@@ -16732,8 +16731,7 @@ var init_environments = __esm({
         minLength: 43,
         maxLength: 128
       });
-      const expectedPath = kind === "pairing" ? environmentPairingApprovalPath : environmentRotationApprovalPath;
-      const approvalPath = record2.value.approvalPath === expectedPath ? decodeSuccess(expectedPath) : decodeFailure(`${path}.approvalPath`, "invalid_format", "Unexpected approval path.");
+      const approvalPath = record2.value.approvalPath === environmentPairingApprovalPath ? decodeSuccess(environmentPairingApprovalPath) : decodeFailure(`${path}.approvalPath`, "invalid_format", "Unexpected approval path.");
       const expiresAt = decodeIsoDateTime(record2.value.expiresAt, `${path}.expiresAt`);
       const issues = [id, code, pollingToken, approvalPath, expiresAt].flatMap(
         (result3) => result3.ok ? [] : result3.issues
@@ -16741,23 +16739,14 @@ var init_environments = __esm({
       if (issues.length > 0) return { ok: false, issues };
       if (!id.ok || !code.ok || !pollingToken.ok || !approvalPath.ok || !expiresAt.ok)
         return decodeFailure(path, "invalid_type", "Invalid approval response.");
-      return decodeSuccess(
-        kind === "pairing" ? {
-          pairingId: id.value,
-          pairingCode: code.value,
-          pollingToken: pollingToken.value,
-          approvalPath: approvalPath.value,
-          expiresAt: expiresAt.value
-        } : {
-          rotationId: id.value,
-          rotationCode: code.value,
-          pollingToken: pollingToken.value,
-          approvalPath: approvalPath.value,
-          expiresAt: expiresAt.value
-        }
-      );
+      return decodeSuccess({
+        pairingId: id.value,
+        pairingCode: code.value,
+        pollingToken: pollingToken.value,
+        approvalPath: approvalPath.value,
+        expiresAt: expiresAt.value
+      });
     };
-    decodeBeginEnvironmentPairingResponse = (input) => decodeApprovalResponse(input, "pairing");
     decodeEnvironmentPairingStatus = (input) => {
       const record2 = decodeRecord(input, "$pairingStatusResponse");
       if (!record2.ok) return record2;
@@ -21176,8 +21165,8 @@ var init_main = __esm({
       const index = args2.indexOf(name);
       return index < 0 ? void 0 : args2[index + 1];
     };
-    identityPath2 = option3("--identity") ?? defaultIdentityPath();
-    workspaceRegistryPath = option3("--workspaces") ?? defaultWorkspaceRegistryPath(identityPath2);
+    identityPath2 = defaultIdentityPath();
+    workspaceRegistryPath = defaultWorkspaceRegistryPath(identityPath2);
     publishIdentity = async (origin) => {
       let identity2 = createNodeIdentity(origin);
       const nodePlatform = platform() === "darwin" ? "macos" : platform() === "win32" ? "windows" : "linux";
@@ -21198,15 +21187,7 @@ Waiting for approval\u2026
       return identity2;
     };
     runConnectCommand = async () => {
-      const commandArguments = [
-        ...process.execArgv,
-        process.argv[1] ?? "",
-        "connect",
-        "--identity",
-        identityPath2,
-        "--workspaces",
-        workspaceRegistryPath
-      ];
+      const commandArguments = [...process.execArgv, process.argv[1] ?? "", "connect"];
       const child = spawn2(process.execPath, commandArguments, { stdio: "inherit" });
       const result3 = await new Promise((complete, reject) => {
         child.once("error", reject);
@@ -21216,11 +21197,11 @@ Waiting for approval\u2026
       if (result3.code !== 0) process.exitCode = result3.code ?? 1;
     };
     if (command === "start") {
-      const configuredOrigin = option3("--api") ?? process.env.GLASS_CLOUD_ORIGIN;
+      const configuredOrigin = process.env.GLASS_CLOUD_ORIGIN;
       let identity2 = await loadNodeIdentity(identityPath2);
       if (identity2 !== null && configuredOrigin !== void 0 && new URL(identity2.apiOrigin).origin !== new URL(configuredOrigin).origin) {
         throw new Error(
-          `This Glass Connect identity belongs to ${identity2.apiOrigin}. Use a different --identity path for ${configuredOrigin}.`
+          `This Glass Connect identity belongs to ${identity2.apiOrigin}. Use stage-specific Glass Connect state for ${configuredOrigin}.`
         );
       }
       if (identity2 !== null && identity2.environment !== null) {
@@ -21237,7 +21218,8 @@ Waiting for approval\u2026
         }
       } else {
         const origin = configuredOrigin ?? identity2?.apiOrigin;
-        if (origin === void 0) throw new Error("Set GLASS_CLOUD_ORIGIN or pass --api.");
+        if (origin === void 0)
+          throw new Error("Glass Connect has no configured Glass Cloud origin.");
         identity2 = await publishIdentity(origin);
       }
       const registeredWorkspaces = await loadWorkspaceRegistry(workspaceRegistryPath, {
@@ -21256,9 +21238,7 @@ Waiting for approval\u2026
       }
       await runConnectCommand();
     } else if (command === "help") {
-      process.stdout.write(
-        "Usage: glass-connect [--api URL] [--name NAME] [--identity PATH] [--workspaces PATH]\n"
-      );
+      process.stdout.write("Usage: glass-connect [--name NAME]\n");
     } else if (command === "descriptor") {
       process.stdout.write(`${JSON.stringify(await Effect_exports.runPromise(readExecutionDescriptor))}
 `);
@@ -21408,7 +21388,7 @@ Waiting for approval\u2026
         });
     } else {
       throw new Error(
-        "Usage: glass-connect [--api URL] [--name NAME] | descriptor | workspace-add --id UUID --name NAME --root PATH | workspace-list | workspace-remove --id UUID"
+        "Usage: glass-connect [--name NAME] | descriptor | workspace-add --id UUID --name NAME --root PATH | workspace-list | workspace-remove --id UUID"
       );
     }
   }
@@ -21417,18 +21397,26 @@ Waiting for approval\u2026
 // ../../config/glass-cloud.json
 var glass_cloud_default = {
   origins: {
-    development: "https://glasscloud-api-dev-iqwgnfdineqiceki.naaiyyyy.workers.dev",
     production: "https://glasscloud-api-prod-lcuxsmngpdigrgum.naaiyyyy.workers.dev",
     staging: "https://glasscloud-api-staging-rmhiqpuua7m4g6a3.naaiyyyy.workers.dev"
+  },
+  services: {
+    stagingTunnelControl: "glasscloud-tunnelcontrol-staging-uyzu7wweagwmmwd2"
   }
 };
 
 // npm/cli.ts
 import { chmod as chmod5 } from "node:fs/promises";
 import { createRequire as createRequire2 } from "node:module";
-import { arch, platform as platform2 } from "node:os";
+import { arch, homedir as homedir2, platform as platform2 } from "node:os";
 import { dirname as dirname5, join as join7 } from "node:path";
+var productionStateRoot = join7(homedir2(), ".glass", "production");
 process.env.GLASS_CLOUD_ORIGIN ??= glass_cloud_default.origins.production;
+process.env.GLASS_NODE_IDENTITY_PATH ??= join7(productionStateRoot, "execution-node.json");
+process.env.GLASS_EXECUTION_WORKSPACES_PATH ??= join7(
+  productionStateRoot,
+  "execution-workspaces.json"
+);
 if (platform2() !== "win32") {
   const require3 = createRequire2(import.meta.url);
   const nodePtyRoot = dirname5(require3.resolve("node-pty/package.json"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "glass-connect",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "Publish a computer to Glass with one command.",
   "license": "UNLICENSED",
   "bin": {
@@ -20,4 +20,4 @@
   "engines": {
     "node": ">=24.13.1"
   }
-}
+}