@ycodium-ai/agent-grok 0.2.2888 → 0.2.2896

package/dist/index.js

@@ -160,7 +160,7 @@ var GROK_CARD = {
 // src/grokInstance.ts
 import * as NodeCrypto2 from "node:crypto";
 import * as NodeOS2 from "node:os";
-import * as NodePath4 from "node:path";
+import * as NodePath5 from "node:path";
 import { mergeLaunchEnv } from "@ycodium-ai/plugin-api/executor";
 import { nodeStreamsFromHandle as nodeStreamsFromHandle2 } from "@ycodium-ai/plugin-api/process-stdin";
 
@@ -24194,6 +24194,60 @@ function approvalOutcomeForDecision(decision, optionId) {
   return decision !== "cancel" && optionId !== void 0 ? { outcome: "selected", optionId } : { outcome: "cancelled" };
 }
 
+// ../../packages/ycodium-acp-executor/src/artifacts.ts
+import * as NodePath from "node:path";
+import * as NodeURL from "node:url";
+function resourceLinkArtifacts(content) {
+  if (content["type"] !== "resource_link" || typeof content["uri"] !== "string") return [];
+  const uri = content["uri"].trim();
+  let path;
+  try {
+    path = uri.toLowerCase().startsWith("file:") ? NodeURL.fileURLToPath(uri) : uri;
+  } catch {
+    return [];
+  }
+  if (!NodePath.isAbsolute(path)) return [];
+  const name = typeof content["name"] === "string" ? content["name"].trim() : "";
+  const mimeType = typeof content["mimeType"] === "string" ? content["mimeType"].trim() : "";
+  return [
+    {
+      path,
+      ...name.length > 0 ? { name } : {},
+      ...mimeType.length > 0 ? { mimeType } : {}
+    }
+  ];
+}
+function acpArtifactEvent(input2) {
+  if (input2.artifacts.length === 0) return void 0;
+  const { toolCallId } = input2;
+  return {
+    ...input2.base,
+    type: "assistant.artifact.produced",
+    payload: {
+      artifacts: input2.artifacts.map((artifact) => ({
+        ...artifact,
+        ...toolCallId !== void 0 ? { toolCallId } : {}
+      }))
+    }
+  };
+}
+function makeArtifactEmitter(input2) {
+  return (artifacts, toolCallId) => {
+    const turnId = input2.turnId();
+    const event = acpArtifactEvent({
+      artifacts,
+      toolCallId,
+      base: {
+        ...input2.stamp(),
+        provider: input2.options.provider,
+        threadId: input2.options.threadId,
+        ...turnId === void 0 ? {} : { turnId }
+      }
+    });
+    if (event !== void 0) input2.emit(event);
+  };
+}
+
 // ../../packages/ycodium-acp-executor/src/event-stream.ts
 var UnboundedEventStream = class {
   subscribers = /* @__PURE__ */ new Set();
@@ -25599,9 +25653,8 @@ function createAcpExecutor(options) {
       options.originBindingGeneration === void 0 ? event : { ...event, originBindingGeneration: options.originBindingGeneration }
     );
   };
-  const emit = (event) => {
-    publish(event);
-  };
+  const emit = publish;
+  const emitArtifacts = makeArtifactEmitter({ emit, stamp, options, turnId: () => activeTurnId });
   const failIfDisposed = () => {
     if (disposed) {
       throw new AcpExecutorDisposedError();
@@ -25704,6 +25757,8 @@ function createAcpExecutor(options) {
             payload: taskEvent.payload
           });
         }
+        if (nextToolCall.status === "completed" && hookResult && "artifacts" in hookResult)
+          emitArtifacts(hookResult.artifacts ?? [], nextToolCall.toolCallId);
         if (handledByHook || !decision.emit) {
           continue;
         }
@@ -25723,6 +25778,10 @@ function createAcpExecutor(options) {
         );
         continue;
       }
+      if (event._tag === "AssistantContentBlock") {
+        emitArtifacts(resourceLinkArtifacts(event.content));
+        continue;
+      }
       if (event._tag === "CompactionUpdated") {
         applyCompactionUpdate(event);
         continue;
@@ -26931,9 +26990,69 @@ function tokenizeLaunchArgs(value) {
   return tokens;
 }
 
+// src/deviceCodeOutput.ts
+var OUTPUT_QUIET_MS = 3e3;
+var SILENT_CAP_MS = 3e4;
+var DEVICE_CODE_URL = /https?:\/\/\S+/;
+var DEVICE_CODE_VALUE = /\b([A-Z0-9]{4,}(?:-[A-Z0-9]{4,})+)\b/;
+var deviceCodeUrl = (output2) => DEVICE_CODE_URL.exec(output2)?.[0];
+var deviceCodeValue = (output2) => DEVICE_CODE_VALUE.exec(output2)?.[1];
+var hasDeviceCode = (output2) => deviceCodeUrl(output2) !== void 0 && deviceCodeValue(output2) !== void 0;
+function readDeviceCodeOutput(stdout, onText) {
+  const collected = [];
+  let onCodeFound;
+  const codeFound = new Promise((resolve2) => {
+    onCodeFound = resolve2;
+  });
+  let quietTimer;
+  let onQuiet;
+  const outputWentQuiet = new Promise((resolve2) => {
+    onQuiet = resolve2;
+  });
+  const text3 = (async () => {
+    const decoder = new TextDecoder();
+    for await (const chunk of stdout) {
+      const piece = decoder.decode(chunk, { stream: true });
+      collected.push(piece);
+      onText(piece);
+      if (onCodeFound !== void 0 && hasDeviceCode(collected.join(""))) {
+        onCodeFound();
+        onCodeFound = void 0;
+      }
+      if (onQuiet !== void 0) {
+        clearTimeout(quietTimer);
+        quietTimer = setTimeout(() => onQuiet?.(), OUTPUT_QUIET_MS);
+      }
+    }
+    return collected.join("");
+  })();
+  const code = (async () => {
+    let silentCap;
+    await Promise.race([
+      codeFound,
+      text3.then(() => void 0),
+      outputWentQuiet,
+      new Promise((resolve2) => {
+        silentCap = setTimeout(resolve2, SILENT_CAP_MS);
+      })
+    ]);
+    clearTimeout(silentCap);
+    clearTimeout(quietTimer);
+    onQuiet = void 0;
+    const output2 = collected.join("");
+    const verificationUrl = deviceCodeUrl(output2);
+    const userCode = deviceCodeValue(output2);
+    return {
+      ...userCode === void 0 ? {} : { userCode },
+      ...verificationUrl === void 0 ? {} : { verificationUrl }
+    };
+  })();
+  return { text: text3, code };
+}
+
 // src/grokAccount.ts
 import * as NodeFS from "node:fs";
-import * as NodePath from "node:path";
+import * as NodePath2 from "node:path";
 var AUTH_FILE_NAME = "auth.json";
 var isRecord7 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
 var readString2 = (record3, key) => {
@@ -27001,7 +27120,7 @@ var isExpired = (expiresAt, nowMs) => {
 };
 var readGrokAccount = (homePath) => {
   const exists = directoryExists(homePath);
-  const raw = readCredentialFile(NodePath.join(homePath, AUTH_FILE_NAME));
+  const raw = readCredentialFile(NodePath2.join(homePath, AUTH_FILE_NAME));
   if (raw === void 0) return signedOutProbe(exists);
   const parsed = parseJsonRecord(raw);
   const identity = parsed === void 0 ? void 0 : findIdentityEntry(parsed);
@@ -27018,7 +27137,7 @@ var readGrokAccount = (homePath) => {
 
 // src/grokQuota.ts
 import * as NodeFS2 from "node:fs";
-import * as NodePath2 from "node:path";
+import * as NodePath3 from "node:path";
 import {
   parseRetryAfterMs
 } from "@ycodium-ai/plugin-api/usage";
@@ -27065,7 +27184,7 @@ var grokQuotaWindows = (body) => {
 };
 var createGrokUsage = (input2) => {
   const now = input2.now ?? Date.now;
-  const authPath = NodePath2.join(input2.homePath, AUTH_FILE_NAME2);
+  const authPath = NodePath3.join(input2.homePath, AUTH_FILE_NAME2);
   const readQuota = async (request) => {
     const baseUrlKey = GROK_CARD.modelConnectivity.baseUrlEnvKey;
     if (baseUrlKey !== void 0 && (input2.environment[baseUrlKey]?.trim() ?? "") !== "") {
@@ -27453,6 +27572,39 @@ function buildGrokBackgroundTaskEvents(input2) {
   return events;
 }
 
+// src/grokImageArtifacts.ts
+function imageGenResult(rawOutput) {
+  let value = rawOutput;
+  if (typeof value === "string") {
+    try {
+      value = JSON.parse(value);
+    } catch {
+      return void 0;
+    }
+  }
+  return value !== null && typeof value === "object" && value["type"] === "ImageGen" ? value : void 0;
+}
+function sessionDirectory(path, sessionFolder, filename) {
+  if (typeof sessionFolder !== "string" || sessionFolder.trim().length === 0) return void 0;
+  const tail = [...sessionFolder.split(/[\\/]/).filter((part) => part.length > 0), filename];
+  const parts = path.split(/([\\/])/);
+  const segments = parts.filter((_, index) => index % 2 === 0);
+  if (segments.length <= tail.length) return void 0;
+  const matches = tail.every(
+    (part, index) => segments[segments.length - tail.length + index] === part
+  );
+  if (!matches) return void 0;
+  return parts.slice(0, parts.length - tail.length * 2).join("");
+}
+function grokImageArtifacts(rawOutput) {
+  const result = imageGenResult(rawOutput);
+  const path = typeof result?.["path"] === "string" ? result["path"].trim() : "";
+  if (result === void 0 || path.length === 0) return [];
+  const filename = typeof result["filename"] === "string" && result["filename"].trim().length > 0 ? result["filename"].trim() : path.split(/[\\/]/).at(-1) ?? path;
+  const linkBase = sessionDirectory(path, result["session_folder"], filename);
+  return [{ path, name: filename, ...linkBase !== void 0 ? { linkBase } : {} }];
+}
+
 // src/grokSupport.ts
 import { modelSelectionStringOption } from "@ycodium-ai/plugin-api/executor";
 var GROK_NATIVE_MODE_BY_RUNTIME_MODE = {
@@ -27746,7 +27898,7 @@ var grokPromptSettlement = {
 
 // src/grokSkills.ts
 import * as NodeOS from "node:os";
-import * as NodePath3 from "node:path";
+import * as NodePath4 from "node:path";
 var INSPECT_TIMEOUT_MS = 15e3;
 var MAX_INSPECT_OUTPUT_BYTES = 4 * 1024 * 1024;
 var GROK_INSPECT_ARGS = ["inspect", "--json"];
@@ -27814,14 +27966,14 @@ async function inspectGrokWorkspace(input2) {
   const skills = await runGrokInspect(input2);
   const watched = /* @__PURE__ */ new Set([
     // 项目技能目录的位置没有实测，这两处只是触发重查的提示，不影响答案本身。
-    NodePath3.join(input2.cwd, ".grok", "skills"),
-    NodePath3.join(input2.cwd, ".agents", "skills")
+    NodePath4.join(input2.cwd, ".grok", "skills"),
+    NodePath4.join(input2.cwd, ".agents", "skills")
   ]);
   for (const skill of skills) {
     watched.add(skill.path);
-    const skillDirectory = NodePath3.dirname(skill.path);
+    const skillDirectory = NodePath4.dirname(skill.path);
     watched.add(skillDirectory);
-    watched.add(NodePath3.dirname(skillDirectory));
+    watched.add(NodePath4.dirname(skillDirectory));
   }
   return { skills, watchPaths: [...watched] };
 }
@@ -27929,22 +28081,17 @@ var EventBus = class {
     };
   }
 };
-var DEVICE_CODE_URL = /https?:\/\/\S+/;
-var DEVICE_CODE_VALUE = /\b([A-Z0-9]{4,}(?:-[A-Z0-9]{4,})+)\b/;
-var deviceCodeUrl = (output2) => DEVICE_CODE_URL.exec(output2)?.[0];
-var deviceCodeValue = (output2) => DEVICE_CODE_VALUE.exec(output2)?.[1];
-var hasDeviceCode = (output2) => deviceCodeUrl(output2) !== void 0 && deviceCodeValue(output2) !== void 0;
 function expandHomePath(value) {
   if (value === "~") return NodeOS2.homedir();
   if (value.startsWith("~/") || value.startsWith("~\\")) {
-    return NodePath4.join(NodeOS2.homedir(), value.slice(2));
+    return NodePath5.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));
+  if (trimmed3.length === 0) return NodePath5.join(NodeOS2.homedir(), ".grok");
+  return NodePath5.resolve(expandHomePath(trimmed3));
 }
 function probeGrokAccount(accountPath) {
   const resolved = resolveGrokHomePath(accountPath);
@@ -27963,12 +28110,12 @@ function grokContinuationKey(recipe) {
 function resolveAccountHomePath(recipe, configuredHome) {
   const fromEnvironment = recipe.environment["GROK_HOME"]?.trim();
   if (fromEnvironment !== void 0 && fromEnvironment.length > 0) {
-    return NodePath4.resolve(expandHomePath(fromEnvironment));
+    return NodePath5.resolve(expandHomePath(fromEnvironment));
   }
   return resolveGrokHomePath(configuredHome);
 }
 function absentPath() {
-  return NodePath4.join(
+  return NodePath5.join(
     NodeOS2.tmpdir(),
     `ycodium-grok-no-auth-${NodeCrypto2.randomUUID()}`,
     "auth.json"
@@ -28075,8 +28222,7 @@ var createGrokInstance = (config2, host) => {
         readiness: outcome.kind === "not-started" ? outcome.readiness : "error",
         auth: probeAuth(),
         ...outcome.detail === void 0 ? {} : { detail: outcome.detail },
-        // 装着但握不上手时，界面照样画权限格。不报档就退回宿主四档，而那四档对这双手
-        // 是撒谎的——这台开发机的 grok 就长期停在这个出口上。
+        // 装着但握不上手时，界面照样画权限格。不报档就退回宿主四档，而那四档对这双手是撒谎的——这台开发机的 grok 就长期停在这个出口上。
         ...outcome.kind === "failed" ? GROK_NATIVE_MODE_REPORT : {}
       };
     }
@@ -28174,13 +28320,16 @@ var createGrokInstance = (config2, host) => {
         authMethodId: resolveGrokAuthMethodId,
         hooks: {
           promptSettlement: turnUsage.settlement,
-          onToolCallUpdated: (update) => buildGrokBackgroundTaskEvents({
-            tasks: backgroundTasks,
-            toolCallId: update.toolCallId,
-            rawInput: update.rawInput,
-            rawOutput: update.rawOutput,
-            toolCallStatus: update.status,
-            turnId: update.turnId
+          onToolCallUpdated: (update) => ({
+            events: buildGrokBackgroundTaskEvents({
+              tasks: backgroundTasks,
+              toolCallId: update.toolCallId,
+              rawInput: update.rawInput,
+              rawOutput: update.rawOutput,
+              toolCallStatus: update.status,
+              turnId: update.turnId
+            }),
+            artifacts: grokImageArtifacts(update.rawOutput)
           }),
           onExtensionRequest: async (method, params, ctx) => {
             if (XAI_EXIT_PLAN_MODE_METHODS.includes(method)) {
@@ -28377,9 +28526,8 @@ var createGrokInstance = (config2, host) => {
     },
     /**
      * 设备码登录：`grok login --device-auth` 是 RFC 8628 流程，CLI 自己打印网址和
-     * 验证码、轮询到批准，不开浏览器，所以服务器没有图形界面也跑得起来。输出
-     * 格式没在这台机器上实测过（auth.x.ai 到不了），网址与验证码按宽松模式从
-     * stdout 里捞；捞不到就把原始输出留给用户看，流程本身不假造。
+     * 验证码、轮询到批准，不开浏览器，所以服务器没有图形界面也跑得起来。怎么从
+     * stdout 捞网址与验证码见 deviceCodeOutput.ts，流程本身不假造。
      */
     signIn: {
       start: async () => {
@@ -28393,46 +28541,17 @@ var createGrokInstance = (config2, host) => {
           owner: { bindingId: host.bindingId },
           ...Object.keys(env).length > 0 ? { env } : {}
         });
-        const collected = [];
-        let onCodeFound;
-        const codeFound = new Promise((resolve2) => {
-          onCodeFound = resolve2;
-        });
-        const stdoutText = (async () => {
-          const decoder = new TextDecoder();
-          for await (const chunk of handle.stdout) {
-            const text3 = decoder.decode(chunk, { stream: true });
-            collected.push(text3);
-            host.log.info("sign-in output", { text: text3 });
-            if (onCodeFound !== void 0 && hasDeviceCode(collected.join(""))) {
-              onCodeFound();
-              onCodeFound = void 0;
-            }
-          }
-          return collected.join("");
-        })();
+        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);
         });
-        let timer;
-        await Promise.race([
-          codeFound,
-          stdoutText.then(() => void 0),
-          new Promise((resolve2) => {
-            timer = setTimeout(resolve2, 3e3);
-          })
-        ]);
-        if (timer !== void 0) clearTimeout(timer);
-        const output2 = collected.join("");
-        const verificationUrl = deviceCodeUrl(output2);
-        const userCode = deviceCodeValue(output2);
-        return {
-          operationId,
-          ...userCode === void 0 ? {} : { userCode },
-          ...verificationUrl === void 0 ? {} : { verificationUrl }
-        };
+        return { operationId, ...await output2.code };
       },
       cancel: async (operationId) => {
         const operation = signInOperations.get(operationId);

package/package.json

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