@ycodium-ai/agent-grok 0.2.3272 → 0.2.3277

package/dist/index.js

@@ -160,7 +160,7 @@ var GROK_CARD = {
 // src/grokInstance.ts
 import * as NodeCrypto3 from "node:crypto";
 import {
-  raceAbort as raceAbort2
+  raceAbort as raceAbort3
 } from "@ycodium-ai/plugin-api/executor";
 import { nodeStreamsFromHandle as nodeStreamsFromHandle2 } from "@ycodium-ai/plugin-api/process-stdin";
 
@@ -27914,6 +27914,11 @@ function tokenizeLaunchArgs(value) {
   return tokens;
 }
 
+// src/grokSignIn.ts
+import {
+  raceAbort
+} from "@ycodium-ai/plugin-api/executor";
+
 // src/deviceCodeOutput.ts
 var OUTPUT_QUIET_MS = 3e3;
 var SILENT_CAP_MS = 3e4;
@@ -27974,6 +27979,12 @@ function readDeviceCodeOutput(stdout, onText) {
   return { text: text3, code };
 }
 
+// src/grokHome.ts
+import * as NodeCrypto2 from "node:crypto";
+import * as NodeOS2 from "node:os";
+import * as NodePath4 from "node:path";
+import { mergeLaunchEnv } from "@ycodium-ai/plugin-api/executor";
+
 // src/grokAccount.ts
 import * as NodeFS2 from "node:fs";
 import * as NodePath3 from "node:path";
@@ -28059,9 +28070,142 @@ var readGrokAccount = (homePath) => {
   };
 };
 
+// src/grokHome.ts
+function expandHomePath(value) {
+  if (value === "~") return NodeOS2.homedir();
+  if (value.startsWith("~/") || value.startsWith("~\\")) {
+    return NodePath4.join(NodeOS2.homedir(), value.slice(2));
+  }
+  return value;
+}
+function resolveGrokHomePath(value) {
+  const trimmed3 = value.trim();
+  if (trimmed3.length === 0) return NodePath4.join(NodeOS2.homedir(), ".grok");
+  return NodePath4.resolve(expandHomePath(trimmed3));
+}
+function probeGrokAccount(accountPath) {
+  const resolved = resolveGrokHomePath(accountPath);
+  const account = readGrokAccount(resolved);
+  return {
+    accountPath: resolved,
+    state: account.state,
+    ...account.email === void 0 ? {} : { email: account.email },
+    ...account.name === void 0 ? {} : { name: account.name },
+    ...account.expiresAt === void 0 ? {} : { expiresAt: account.expiresAt }
+  };
+}
+function grokContinuationKey(recipe) {
+  return `grok:home:${resolveGrokHomePath(recipe.homePath)}`;
+}
+function resolveAccountHomePath(recipe, configuredHome) {
+  const fromEnvironment = recipe.environment["GROK_HOME"]?.trim();
+  if (fromEnvironment !== void 0 && fromEnvironment.length > 0) {
+    return NodePath4.resolve(expandHomePath(fromEnvironment));
+  }
+  return resolveGrokHomePath(configuredHome);
+}
+function absentPath() {
+  return NodePath4.join(
+    NodeOS2.tmpdir(),
+    `ycodium-grok-no-auth-${NodeCrypto2.randomUUID()}`,
+    "auth.json"
+  );
+}
+function ownEndpointAuthGuard(recipe) {
+  const connectivity = GROK_CARD.modelConnectivity;
+  const baseUrlKey = connectivity.baseUrlEnvKey;
+  if (baseUrlKey === void 0 || (recipe.environment[baseUrlKey]?.trim() ?? "") === "") return {};
+  const guard = {};
+  for (const entry of connectivity.extraEnv ?? []) {
+    if (entry.value === "$absentPath") guard[entry.name] = absentPath();
+  }
+  return guard;
+}
+function buildSignInEnv(recipe) {
+  const configuredHome = recipe.homePath;
+  const homeInjection = configuredHome.trim().length > 0 ? { [GROK_CARD.homeEnvVar]: resolveGrokHomePath(configuredHome) } : {};
+  return mergeLaunchEnv({
+    accountHome: homeInjection,
+    instanceTable: recipe.environment,
+    handOverrides: { GROK_OAUTH2_REFERRER: "ycodium" }
+  });
+}
+function buildSpawnEnv(recipe, resolvedHomePath, homeConfigured) {
+  const homeInjection = homeConfigured ? { [GROK_CARD.homeEnvVar]: resolvedHomePath } : {};
+  return mergeLaunchEnv({
+    accountHome: { ...homeInjection, ...ownEndpointAuthGuard(recipe) },
+    instanceTable: recipe.environment,
+    handOverrides: { GROK_OAUTH2_REFERRER: "ycodium" }
+  });
+}
+
+// src/grokSignIn.ts
+function makeGrokSignIn(input2) {
+  const { host, recipe } = input2;
+  const operations = /* @__PURE__ */ new Map();
+  const signIn = {
+    start: async (signal) => {
+      if (recipe.binaryPath.length === 0) throw new Error("Grok program path is not configured");
+      const env = buildSignInEnv(recipe);
+      const handle = await host.process.spawn({
+        program: recipe.binaryPath,
+        args: [...GROK_CARD.deviceCodeSignInArgs],
+        owner: { bindingId: host.bindingId },
+        ...Object.keys(env).length > 0 ? { env } : {},
+        ...signal === void 0 ? {} : { signal }
+      });
+      const output2 = readDeviceCodeOutput(
+        handle.stdout,
+        (text3) => host.log.info("sign-in output", { text: text3 })
+      );
+      const operationId = `grok-sign-in-${Date.now().toString(36)}-${operations.size}`;
+      let closing;
+      const operation = {
+        handle,
+        close: () => closing ??= Promise.resolve().then(async () => {
+          await handle.kill("SIGTERM").catch(() => void 0);
+          await Promise.allSettled([handle.exited, output2.text]);
+        }).finally(() => {
+          if (operations.get(operationId) === operation) operations.delete(operationId);
+        })
+      };
+      operations.set(operationId, operation);
+      try {
+        const code = await raceAbort(output2.code, signal);
+        if (signal?.aborted || input2.isDisposed()) throw new Error("Grok sign-in cancelled");
+        return { operationId, ...code };
+      } catch (error62) {
+        await operation.close();
+        throw error62;
+      }
+    },
+    cancel: async (operationId) => {
+      await operations.get(operationId)?.close();
+    },
+    verify: async (signal) => {
+      const active = [...operations.values()];
+      try {
+        for (const operation of active) {
+          const code = await raceAbort(operation.handle.exited, signal);
+          if (code !== 0) throw new Error(`Grok sign-in exited with code ${String(code)}`);
+        }
+        return await input2.probe(signal);
+      } finally {
+        await Promise.all(active.map((operation) => operation.close()));
+      }
+    }
+  };
+  return {
+    signIn,
+    close: async () => {
+      await Promise.all([...operations.values()].map((operation) => operation.close()));
+    }
+  };
+}
+
 // src/grokQuota.ts
 import * as NodeFS3 from "node:fs";
-import * as NodePath4 from "node:path";
+import * as NodePath5 from "node:path";
 import {
   parseRetryAfterMs
 } from "@ycodium-ai/plugin-api/usage";
@@ -28108,7 +28252,7 @@ var grokQuotaWindows = (body) => {
 };
 var createGrokUsage = (input2) => {
   const now = input2.now ?? Date.now;
-  const authPath = NodePath4.join(input2.homePath, AUTH_FILE_NAME2);
+  const authPath = NodePath5.join(input2.homePath, AUTH_FILE_NAME2);
   const readQuota = async (request) => {
     const baseUrlKey = GROK_CARD.modelConnectivity.baseUrlEnvKey;
     if (baseUrlKey !== void 0 && (input2.environment[baseUrlKey]?.trim() ?? "") !== "") {
@@ -28824,8 +28968,8 @@ var grokPromptSettlement = {
 };
 
 // src/grokSkills.ts
-import * as NodeOS2 from "node:os";
-import * as NodePath5 from "node:path";
+import * as NodeOS3 from "node:os";
+import * as NodePath6 from "node:path";
 var INSPECT_TIMEOUT_MS = 15e3;
 var MAX_INSPECT_OUTPUT_BYTES = 4 * 1024 * 1024;
 var GROK_INSPECT_ARGS = ["inspect", "--json"];
@@ -28885,7 +29029,7 @@ var runGrokInspect = async (input2) => {
 };
 async function probeGrokSkills(input2) {
   try {
-    return await runGrokInspect({ ...input2, cwd: NodeOS2.homedir() });
+    return await runGrokInspect({ ...input2, cwd: NodeOS3.homedir() });
   } catch {
     return [];
   }
@@ -28894,14 +29038,14 @@ async function inspectGrokWorkspace(input2) {
   const skills = await runGrokInspect(input2);
   const watched = /* @__PURE__ */ new Set([
     // 项目技能目录的位置没有实测，这两处只是触发重查的提示，不影响答案本身。
-    NodePath5.join(input2.cwd, ".grok", "skills"),
-    NodePath5.join(input2.cwd, ".agents", "skills")
+    NodePath6.join(input2.cwd, ".grok", "skills"),
+    NodePath6.join(input2.cwd, ".agents", "skills")
   ]);
   for (const skill of skills) {
     watched.add(skill.path);
-    const skillDirectory = NodePath5.dirname(skill.path);
+    const skillDirectory = NodePath6.dirname(skill.path);
     watched.add(skillDirectory);
-    watched.add(NodePath5.dirname(skillDirectory));
+    watched.add(NodePath6.dirname(skillDirectory));
   }
   return { skills, watchPaths: [...watched] };
 }
@@ -28955,7 +29099,7 @@ function grokOpenCommands(session) {
 
 // src/modelCacheRefresh.ts
 import * as NodeFS4 from "node:fs";
-import * as NodePath6 from "node:path";
+import * as NodePath7 from "node:path";
 import {
   ExecutorSpawnAbortedError as ExecutorSpawnAbortedError2,
   ExecutorSpawnRefusedError as ExecutorSpawnRefusedError2,
@@ -28967,7 +29111,7 @@ import {
   describeExecutorSpawnFailure,
   ExecutorSpawnAbortedError,
   ExecutorSpawnRefusedError,
-  raceAbort
+  raceAbort as raceAbort2
 } from "@ycodium-ai/plugin-api/executor";
 import { nodeStreamsFromHandle } from "@ycodium-ai/plugin-api/process-stdin";
 var PROBE_REQUEST_TIMEOUT_MS = 2e4;
@@ -29003,7 +29147,7 @@ async function probeGrokModels(input2) {
   let handshake;
   try {
     const { readable, writable } = nodeStreamsFromHandle(handle);
-    handshake = await raceAbort(
+    handshake = await raceAbort2(
       openAcpProbeHandshake({
         readable,
         writable,
@@ -29039,7 +29183,7 @@ var GROK_MODEL_CACHE_FILE = "models_cache.json";
 var GROK_MODEL_CACHE_MAX_AGE_MS = 24 * 60 * 60 * 1e3;
 var GROK_MODELS_COMMAND_TIMEOUT_MS = 6e4;
 function grokModelCachePath(accountHome) {
-  return NodePath6.join(accountHome, GROK_MODEL_CACHE_FILE);
+  return NodePath7.join(accountHome, GROK_MODEL_CACHE_FILE);
 }
 function readGrokModelCacheMtimeMs(accountHome) {
   try {
@@ -29194,79 +29338,6 @@ function createGrokModelCatalog(input2) {
   return { readCliVersion, refreshModelCatalog, refreshForSend };
 }
 
-// src/grokHome.ts
-import * as NodeCrypto2 from "node:crypto";
-import * as NodeOS3 from "node:os";
-import * as NodePath7 from "node:path";
-import { mergeLaunchEnv } from "@ycodium-ai/plugin-api/executor";
-function expandHomePath(value) {
-  if (value === "~") return NodeOS3.homedir();
-  if (value.startsWith("~/") || value.startsWith("~\\")) {
-    return NodePath7.join(NodeOS3.homedir(), value.slice(2));
-  }
-  return value;
-}
-function resolveGrokHomePath(value) {
-  const trimmed3 = value.trim();
-  if (trimmed3.length === 0) return NodePath7.join(NodeOS3.homedir(), ".grok");
-  return NodePath7.resolve(expandHomePath(trimmed3));
-}
-function probeGrokAccount(accountPath) {
-  const resolved = resolveGrokHomePath(accountPath);
-  const account = readGrokAccount(resolved);
-  return {
-    accountPath: resolved,
-    state: account.state,
-    ...account.email === void 0 ? {} : { email: account.email },
-    ...account.name === void 0 ? {} : { name: account.name },
-    ...account.expiresAt === void 0 ? {} : { expiresAt: account.expiresAt }
-  };
-}
-function grokContinuationKey(recipe) {
-  return `grok:home:${resolveGrokHomePath(recipe.homePath)}`;
-}
-function resolveAccountHomePath(recipe, configuredHome) {
-  const fromEnvironment = recipe.environment["GROK_HOME"]?.trim();
-  if (fromEnvironment !== void 0 && fromEnvironment.length > 0) {
-    return NodePath7.resolve(expandHomePath(fromEnvironment));
-  }
-  return resolveGrokHomePath(configuredHome);
-}
-function absentPath() {
-  return NodePath7.join(
-    NodeOS3.tmpdir(),
-    `ycodium-grok-no-auth-${NodeCrypto2.randomUUID()}`,
-    "auth.json"
-  );
-}
-function ownEndpointAuthGuard(recipe) {
-  const connectivity = GROK_CARD.modelConnectivity;
-  const baseUrlKey = connectivity.baseUrlEnvKey;
-  if (baseUrlKey === void 0 || (recipe.environment[baseUrlKey]?.trim() ?? "") === "") return {};
-  const guard = {};
-  for (const entry of connectivity.extraEnv ?? []) {
-    if (entry.value === "$absentPath") guard[entry.name] = absentPath();
-  }
-  return guard;
-}
-function buildSignInEnv(recipe) {
-  const configuredHome = recipe.homePath;
-  const homeInjection = configuredHome.trim().length > 0 ? { [GROK_CARD.homeEnvVar]: resolveGrokHomePath(configuredHome) } : {};
-  return mergeLaunchEnv({
-    accountHome: homeInjection,
-    instanceTable: recipe.environment,
-    handOverrides: { GROK_OAUTH2_REFERRER: "ycodium" }
-  });
-}
-function buildSpawnEnv(recipe, resolvedHomePath, homeConfigured) {
-  const homeInjection = homeConfigured ? { [GROK_CARD.homeEnvVar]: resolvedHomePath } : {};
-  return mergeLaunchEnv({
-    accountHome: { ...homeInjection, ...ownEndpointAuthGuard(recipe) },
-    instanceTable: recipe.environment,
-    handOverrides: { GROK_OAUTH2_REFERRER: "ycodium" }
-  });
-}
-
 // src/grokInstance.ts
 var RESUME_SCHEMA_VERSION = 1;
 var yieldTick = () => new Promise((resolve2) => {
@@ -29326,7 +29397,6 @@ var createGrokInstance = (config2, host) => {
   const recipe = parseGrokInstanceConfig(config2);
   const events = new EventBus();
   const threads = /* @__PURE__ */ new Map();
-  const signInOperations = /* @__PURE__ */ new Map();
   let disposed = false;
   const { requireThread, registerSession, stopSession, stopAll } = createAcpSessionRegistry(
     threads,
@@ -29334,11 +29404,7 @@ var createGrokInstance = (config2, host) => {
     host.log
   );
   const disposeOnce = createRetryableClose(async () => {
-    const operations = [...signInOperations.values()];
-    signInOperations.clear();
-    for (const operation of operations) {
-      await operation.handle.kill("SIGTERM").catch(() => void 0);
-    }
+    await signIn.close();
     await stopAll();
     events.close();
   });
@@ -29387,9 +29453,9 @@ var createGrokInstance = (config2, host) => {
       };
     }
     const env = spawnEnv();
-    const version2 = await raceAbort2(modelCatalog.readCliVersion(signal), signal);
+    const version2 = await raceAbort3(modelCatalog.readCliVersion(signal), signal);
     if (signal?.aborted) throw new Error("aborted");
-    await raceAbort2(
+    await raceAbort3(
       modelCatalog.refreshModelCatalog({
         force: false,
         cliVersion: version2,
@@ -29398,7 +29464,7 @@ var createGrokInstance = (config2, host) => {
       signal
     );
     if (signal?.aborted) throw new Error("aborted");
-    const [outcome, skills] = await raceAbort2(
+    const [outcome, skills] = await raceAbort3(
       Promise.all([
         probeGrokModels({
           recipe,
@@ -29437,6 +29503,7 @@ var createGrokInstance = (config2, host) => {
       ...GROK_NATIVE_MODE_REPORT
     };
   };
+  const signIn = makeGrokSignIn({ host, recipe, probe, isDisposed: () => disposed });
   const instance = {
     probe,
     readCliVersion: () => modelCatalog.readCliVersion(),
@@ -29721,44 +29788,7 @@ var createGrokInstance = (config2, host) => {
       disposed = true;
       return disposeOnce();
     },
-    /**
-     * 设备码登录：`grok login --device-auth` 是 RFC 8628 流程，CLI 自己打印网址和
-     * 验证码、轮询到批准，不开浏览器，所以服务器没有图形界面也跑得起来。怎么从
-     * stdout 捞网址与验证码见 deviceCodeOutput.ts，流程本身不假造。
-     */
-    signIn: {
-      start: async () => {
-        if (recipe.binaryPath.length === 0) {
-          throw new Error("Grok program path is not configured");
-        }
-        const env = buildSignInEnv(recipe);
-        const handle = await host.process.spawn({
-          program: recipe.binaryPath,
-          args: [...GROK_CARD.deviceCodeSignInArgs],
-          owner: { bindingId: host.bindingId },
-          ...Object.keys(env).length > 0 ? { env } : {}
-        });
-        const output2 = readDeviceCodeOutput(
-          handle.stdout,
-          (text3) => host.log.info("sign-in output", { text: text3 })
-        );
-        const stdoutText = output2.text;
-        const operationId = `grok-sign-in-${Date.now().toString(36)}-${signInOperations.size}`;
-        signInOperations.set(operationId, { handle, stdoutText });
-        void stdoutText.finally(() => {
-          signInOperations.delete(operationId);
-        });
-        return { operationId, ...await output2.code };
-      },
-      cancel: async (operationId) => {
-        const operation = signInOperations.get(operationId);
-        if (operation === void 0) return;
-        signInOperations.delete(operationId);
-        await operation.handle.kill("SIGTERM").catch(() => void 0);
-        await operation.stdoutText.catch(() => void 0);
-      },
-      verify: () => probe()
-    }
+    signIn: signIn.signIn
   };
   return instance;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ycodium-ai/agent-grok",
-  "version": "0.2.3272",
+  "version": "0.2.3277",
   "description": "Grok executor: grok CLI over Agent Client Protocol stdio.",
   "keywords": [
     "ycodium",
@@ -21,9 +21,9 @@
     "@types/node": "24.12.4",
     "esbuild": "0.28.1",
     "vite-plus": "0.2.2",
+    "@ycodium-ai/plugin-api": "0.2.0",
     "ycodium-executor-testing": "0.0.0",
-    "ycodium-acp-executor": "0.2.0",
-    "@ycodium-ai/plugin-api": "0.2.3272"
+    "ycodium-acp-executor": "0.2.0"
   },
   "ycodium": {
     "plugin": "./dist/index.js",