@actionway/cli-dev 0.0.0-dev.33149579708.3faf5a7ef0f4 → 0.0.0-dev.33150518878.23b075e58bd0

package/README.md

@@ -53,6 +53,8 @@ actionway --agent-host=workbuddy tools search "generate a product image"
   短码与 `{public origin}/cli/activate` 验证 URL，用户在任意设备的浏览器上登录并
   批准后 CLI 轮询取回一次性授权码并在本地完成 PKCE token 交换（远端 / headless /
   WSL 环境可直接使用，`--no-browser` 仅打印 URL 不尝试开浏览器）；
+  fresh `actionway init` 会在 token 交换后的第一条账户请求中携带安装会话和本地
+  客户端上下文，由服务端同时完成 CLI 首次建户、获客归因和安装连接；
   凭据存 `~/.actionway/credentials.json`（POSIX 上为 0600 owner-only 文件；
   Windows 上 chmod 无效，保密性依赖 `%USERPROFILE%` 的继承 ACL——不要把
   `ACTIONWAY_CONFIG_DIR` 指到共享目录）。CLI 从不打印或存储 OAuth client secret。

package/dist/index.js

@@ -12407,6 +12407,35 @@ function runUpdate(options = {}) {
   return { ...status, updated: true, restart_required: true };
 }
 
+// src/lib/client-context.ts
+var ACTIONWAY_AGENT_HOST_HEADER = "x-actionway-agent-host";
+var ACTIONWAY_RUNTIME_OS_HEADER = "x-actionway-runtime-os";
+var ACTIONWAY_AGENT_HOSTS = ["codex", "claude_code", "workbuddy"];
+function isActionwayAgentHost(value) {
+  return typeof value === "string" && ACTIONWAY_AGENT_HOSTS.includes(value);
+}
+function detectRuntimeOs(platform = process.platform, env = process.env) {
+  if (platform === "win32") return "windows";
+  if (platform === "darwin") return "macos";
+  if (platform === "linux") {
+    if ((env.WSL_DISTRO_NAME ?? "").trim() || (env.WSL_INTEROP ?? "").trim()) return "wsl";
+    return "linux";
+  }
+  return "other";
+}
+function localClientContext(agentHost, platform = process.platform, env = process.env) {
+  return {
+    ...isActionwayAgentHost(agentHost) ? { agentHost } : {},
+    runtimeOs: detectRuntimeOs(platform, env)
+  };
+}
+function localClientContextHeaders(context) {
+  return {
+    ...context.agentHost ? { [ACTIONWAY_AGENT_HOST_HEADER]: context.agentHost } : {},
+    [ACTIONWAY_RUNTIME_OS_HEADER]: context.runtimeOs
+  };
+}
+
 // src/auth/clerk.ts
 var DEFAULT_GATEWAY_URL = "https://actionway.ai";
 var SCOPES = "profile email offline_access";
@@ -12680,9 +12709,19 @@ async function loadFreshCredentials(env = process.env, fetchImpl = fetch) {
   saveCredentials(next, env);
   return next;
 }
-async function fetchCliSession(gateway, accessToken, fetchImpl = fetch) {
-  const response = await fetchImpl(`${stripSlash(gateway)}/api/auth/cli-session`, {
-    headers: { Accept: "application/json", Authorization: `Bearer ${accessToken}` },
+async function fetchCliSession(gateway, accessToken, fetchImpl = fetch, context = {}) {
+  const url = new URL(`${stripSlash(gateway)}/api/auth/cli-session`);
+  if (context.installAttribution) {
+    url.searchParams.set("install_session_id", context.installAttribution.installSessionId);
+    url.searchParams.set("install_source", context.installAttribution.installSource);
+  }
+  const response = await fetchImpl(url, {
+    headers: {
+      Accept: "application/json",
+      Authorization: `Bearer ${accessToken}`,
+      "x-actionway-cli-version": getCliVersion(),
+      ...context.clientContext ? localClientContextHeaders(context.clientContext) : {}
+    },
     signal: AbortSignal.timeout(SESSION_TIMEOUT_MS)
   });
   if (response.status === 401) return null;
@@ -12808,7 +12847,10 @@ ${pairing.verificationUrlComplete}`);
       }),
       fetchImpl
     );
-    const account = await fetchCliSession(gateway, tokens.accessToken, fetchImpl);
+    const account = await fetchCliSession(gateway, tokens.accessToken, fetchImpl, {
+      ...options.installAttribution ? { installAttribution: options.installAttribution } : {},
+      ...options.clientContext ? { clientContext: options.clientContext } : {}
+    });
     if (!account) {
       throw new CliError("E_BACKEND", "Actionway did not accept the OAuth token", "run `actionway login` again");
     }
@@ -12882,7 +12924,7 @@ function failFromError2(err, fallbackHint) {
     ...fallbackHint ? { hint: fallbackHint } : {}
   });
 }
-function registerAuthCommands(program2) {
+function registerAuthCommands(program2, getClientContext = () => ({ runtimeOs: "other" })) {
   program2.command("login").description("Authenticate with Actionway by approving a one-time code in any browser (Clerk OAuth with PKCE).").option("--gateway <url>", "Actionway public origin").option("--client-id <id>", "Actionway OAuth client id (must be paired with --issuer; default: both discovered from the public origin)").option("--issuer <url>", "Actionway OAuth issuer (must be paired with --client-id; default: both discovered from the public origin)").option("--timeout-seconds <n>", "how long to wait for the sign-in to be approved").option("--no-browser", "print the verification URL instead of opening a browser (use on remote/headless machines)").action(async (opts) => {
     try {
       const { credentials, account } = await login({
@@ -12891,6 +12933,7 @@ function registerAuthCommands(program2) {
         ...opts.issuer ? { issuer: opts.issuer } : {},
         ...opts.timeoutSeconds ? { timeoutSeconds: Number(opts.timeoutSeconds) } : {},
         ...opts.browser === false ? { noBrowser: true } : {},
+        clientContext: getClientContext(),
         // 授权 URL / 浏览器提示走 stderr NDJSON 事件（stdout 保持结果协议）。
         onNotice: (message) => emitEvent({ event: "auth", message })
       });
@@ -13266,35 +13309,6 @@ function materializeSkill(options = {}) {
   };
 }
 
-// src/lib/client-context.ts
-var ACTIONWAY_AGENT_HOST_HEADER = "x-actionway-agent-host";
-var ACTIONWAY_RUNTIME_OS_HEADER = "x-actionway-runtime-os";
-var ACTIONWAY_AGENT_HOSTS = ["codex", "claude_code", "workbuddy"];
-function isActionwayAgentHost(value) {
-  return typeof value === "string" && ACTIONWAY_AGENT_HOSTS.includes(value);
-}
-function detectRuntimeOs(platform = process.platform, env = process.env) {
-  if (platform === "win32") return "windows";
-  if (platform === "darwin") return "macos";
-  if (platform === "linux") {
-    if ((env.WSL_DISTRO_NAME ?? "").trim() || (env.WSL_INTEROP ?? "").trim()) return "wsl";
-    return "linux";
-  }
-  return "other";
-}
-function localClientContext(agentHost, platform = process.platform, env = process.env) {
-  return {
-    ...isActionwayAgentHost(agentHost) ? { agentHost } : {},
-    runtimeOs: detectRuntimeOs(platform, env)
-  };
-}
-function localClientContextHeaders(context) {
-  return {
-    ...context.agentHost ? { [ACTIONWAY_AGENT_HOST_HEADER]: context.agentHost } : {},
-    [ACTIONWAY_RUNTIME_OS_HEADER]: context.runtimeOs
-  };
-}
-
 // src/lib/install-session.ts
 var UUID_PATTERN = /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
 var ANALYTICS_TIMEOUT_MS = 3e3;
@@ -13445,23 +13459,32 @@ function registerInitCommand(program2, getClientContext = () => ({ runtimeOs: "o
         clientContext
       });
       let loginStarted = false;
+      let account;
       if (!whoamiSnapshot()) {
         loginStarted = true;
-        await login({
+        const loginResult = await login({
           ...opts.gateway ? { gateway: opts.gateway } : {},
           ...opts.clientId ? { clientId: opts.clientId } : {},
           ...opts.issuer ? { issuer: opts.issuer } : {},
           ...opts.timeoutSeconds ? { timeoutSeconds: Number(opts.timeoutSeconds) } : {},
           ...opts.browser === false ? { noBrowser: true } : {},
+          installAttribution: { installSessionId, installSource },
+          clientContext,
           onNotice: (message) => emitEvent({ event: "auth", message })
         });
+        account = {
+          userId: loginResult.account.userId,
+          workspaceId: loginResult.account.workspaceId,
+          walletId: loginResult.account.walletId
+        };
+      } else {
+        account = await connectInstallSession({
+          ...opts.gateway ? { explicitGateway: opts.gateway } : {},
+          installSessionId,
+          installSource,
+          clientContext
+        });
       }
-      const account = await connectInstallSession({
-        ...opts.gateway ? { explicitGateway: opts.gateway } : {},
-        installSessionId,
-        installSource,
-        clientContext
-      });
       const snapshot = whoamiSnapshot();
       ok({
         initialized: true,
@@ -13797,7 +13820,7 @@ function buildProgram() {
   registerDoctorCommand(program2);
   registerUpdateCommand(program2);
   registerDevelopmentStatusCommand(program2);
-  registerAuthCommands(program2);
+  registerAuthCommands(program2, getClientContext);
   registerAccountCommands(program2, getTransport2);
   registerToolsCommands(program2, getTransport2);
   registerActionCommand(program2, generate_video_default, actionDeps);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@actionway/cli-dev",
-  "version": "0.0.0-dev.33149579708.3faf5a7ef0f4",
+  "version": "0.0.0-dev.33150518878.23b075e58bd0",
   "description": "Actionway development CLI for dev.actionway.ai",
   "type": "module",
   "bin": {
@@ -19,8 +19,8 @@
     "tsx": "^4.20.0",
     "typescript": "7.0.2",
     "vitest": "^3.2.7",
-    "@actionway/cli-core": "0.1.0",
-    "@actionway/contracts": "0.1.0"
+    "@actionway/contracts": "0.1.0",
+    "@actionway/cli-core": "0.1.0"
   },
   "engines": {
     "node": ">=20"
@@ -36,9 +36,9 @@
   },
   "actionway": {
     "channel": "development",
-    "source_sha": "3faf5a7ef0f4a67fc6a17ee4f57741b938e0a0e2",
-    "run_id": 33149579708,
-    "run_url": "https://github.com/PawLogic/actionway/actions/runs/33149579708",
+    "source_sha": "23b075e58bd0e275ab8d8667869b75bfdd8a656d",
+    "run_id": 33150518878,
+    "run_url": "https://github.com/PawLogic/actionway/actions/runs/33150518878",
     "gateway_url": "https://dev.actionway.ai"
   }
 }