dsh-grok-subscription 1.0.6 → 1.0.8

package/README.en.md

@@ -25,7 +25,7 @@ Models, reasoning effort, and weekly quota all stay inside DSH.
 
 ## Three-step start
 
-1. **Install the plugin.** Run the command below; to select a candidate version, enter the full `package@version`, for example `dsh-grok-subscription@1.0.6`.
+1. **Install the plugin.** Run the command below; to select a candidate version, enter the full `package@version`, for example `dsh-grok-subscription@1.0.8`.
 
    ```sh
    dsh plugin --profile web add BaronCyrus/dsh-grok-subscription
@@ -91,7 +91,7 @@ dsh plugin --profile web add BaronCyrus/dsh-grok-subscription
 You can also install the version published on npm:
 
 ```sh
-dsh plugin --profile web add dsh-grok-subscription@1.0.6
+dsh plugin --profile web add dsh-grok-subscription@1.0.8
 ```
 
 DSH handles target selection, the profile lock, dependency resolution, and bundle activation.
@@ -160,6 +160,10 @@ The badge appears only when the current session's provider is `grok-build` and t
 
 `grok-4.7`, `grok-4.7-fast` and `grok-4.6` accept image input: paste or attach an image in the composer and ask about it. Images are normalized to the host's pixel and byte budget by its attachment service before they are sent, and an over-budget image degrades to a text description rather than being dropped silently.
 
+**Both paths support it**: when the host's official `pi-ai` adapter is available it handles images, and otherwise the bundled fallback adapter reads the attachment bytes itself and inlines them as `input_image`. Image support therefore does not depend on resolving the host's packages. The **Active path** row in Settings shows which one is live and whether image input is available — check it first when a model rejects an image.
+
+> If it says "bundled fallback" and images are rejected, `dsh web` most likely was not restarted after updating: the client UI refreshes from disk, but the host adapter is loaded at process start.
+
 `grok-4.5` is **deliberately excluded**. Given a solid red image and asked its colour it answered "green", and it described a yellow square as a "circle with a black outline" — it confabulates instead of looking. The plugin therefore does not advertise image input for it, so it cannot return confident nonsense.
 
 ### Reasoning effort

package/README.md

@@ -25,7 +25,7 @@
 
 ## 三步开始
 
-1. **安装插件**：在终端运行下面的命令；指定候选版本时填写完整的 `包名@版本`，例如 `dsh-grok-subscription@1.0.6`。
+1. **安装插件**：在终端运行下面的命令；指定候选版本时填写完整的 `包名@版本`，例如 `dsh-grok-subscription@1.0.8`。
 
    ```sh
    dsh plugin --profile web add BaronCyrus/dsh-grok-subscription
@@ -91,7 +91,7 @@ dsh plugin --profile web add BaronCyrus/dsh-grok-subscription
 也可以按 npm 上的已发布版本安装：
 
 ```sh
-dsh plugin --profile web add dsh-grok-subscription@1.0.6
+dsh plugin --profile web add dsh-grok-subscription@1.0.8
 ```
 
 目标选择、profile 锁、依赖解析和 bundle 激活均由 DSH 负责。
@@ -160,6 +160,10 @@ dsh --profile web --dump-config
 
 `grok-4.7`、`grok-4.7-fast` 与 `grok-4.6` 支持图片输入：在输入框粘贴或附加图片即可提问。图片由宿主的附件服务按像素与体积预算归一化后发送，超预算时降级为文本说明，而不是静默丢弃。
 
+**两条通路都支持**：宿主官方 `pi-ai` 适配器可用时走官方实现，否则内置回退适配器自己读取附件字节并内联成 `input_image`。因此贴图能力不依赖宿主包的解析结果。设置页的「运行通路」会显示当前生效的是哪一条，以及图片输入是否可用 —— 遇到「当前模型不支持图片」时先看这一行。
+
+> 若显示「内置回退」且贴图被拒，通常是 `dsh web` 更新后没有重启：客户端界面会随刷新更新，但主机端适配器是进程启动时加载的。
+
 `grok-4.5` **不在支持列表内**。实测给它一张纯红图片并询问颜色，它回答 "green"，还把黄色方块描述成「带黑边的圆」——它在编造而不是看图。插件因此不为它声明图片能力，避免输出看起来自信却完全错误的答案。
 
 ### 推理档位

package/lib/client.js

@@ -20,6 +20,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/client.jsx
 var client_exports = {};
 __export(client_exports, {
+  DiagnosticsRows: () => DiagnosticsRows,
   GrokSubscriptionPanel: () => GrokSubscriptionPanel,
   GrokSubscriptionSection: () => GrokSubscriptionSection,
   RPC_CALL_TIMEOUT_MS: () => RPC_CALL_TIMEOUT_MS,
@@ -37,7 +38,7 @@ var import_react2 = require("react");
 var zh = {
   nav: "Grok \u8BA2\u9605",
   title: "Grok \u8BA2\u9605",
-  subtitle: "\u7528 SuperGrok / X Premium\uFF08Grok Build\uFF09\u4F1A\u8BDD\uFF0C\u800C\u4E0D\u662F XAI_API_KEY\u3002\xB7 1.0.6",
+  subtitle: "\u7528 SuperGrok / X Premium\uFF08Grok Build\uFF09\u4F1A\u8BDD\uFF0C\u800C\u4E0D\u662F XAI_API_KEY\u3002\xB7 1.0.8",
   signedIn: "\u5DF2\u767B\u5F55",
   signedOut: "\u672A\u767B\u5F55",
   account: "\u8D26\u6237",
@@ -58,6 +59,13 @@ var zh = {
   loginHelp: "\u767B\u5F55\u65B9\u5F0F\u8BF4\u660E",
   refreshCatalog: "\u5237\u65B0\u6A21\u578B\u76EE\u5F55",
   renderError: "\u754C\u9762\u6E32\u67D3\u5931\u8D25",
+  diagnostics: "\u8FD0\u884C\u901A\u8DEF",
+  adapterPiAi: "\u5B98\u65B9 pi-ai",
+  adapterFallback: "\u5185\u7F6E\u56DE\u9000",
+  imageInput: "\u56FE\u7247\u8F93\u5165",
+  imageInputOn: "\u53EF\u7528",
+  imageInputOff: "\u4E0D\u53EF\u7528\uFF08\u672A\u89E3\u6790\u5230\u5BBF\u4E3B\u9644\u4EF6\u670D\u52A1\uFF09",
+  adapterHint: "\u82E5\u663E\u793A\u300C\u5185\u7F6E\u56DE\u9000\u300D\u4E14\u8D34\u56FE\u88AB\u62D2\uFF0C\u8BF7\u91CD\u542F dsh web \u8BA9\u65B0\u7248\u4E3B\u673A\u7AEF\u751F\u6548\u3002",
   busy: "\u5904\u7406\u4E2D\u2026",
   busyCatalog: "\u6B63\u5728\u5237\u65B0\u6A21\u578B\u76EE\u5F55\u2026",
   busyUsage: "\u6B63\u5728\u5237\u65B0\u7528\u91CF\u2026",
@@ -87,7 +95,7 @@ var zh = {
 var en = {
   nav: "Grok Subscription",
   title: "Grok Subscription",
-  subtitle: "Use a SuperGrok / X Premium (Grok Build) session, not XAI_API_KEY. \xB7 1.0.6",
+  subtitle: "Use a SuperGrok / X Premium (Grok Build) session, not XAI_API_KEY. \xB7 1.0.8",
   signedIn: "Signed in",
   signedOut: "Signed out",
   account: "Account",
@@ -108,6 +116,13 @@ var en = {
   loginHelp: "How signing in works",
   refreshCatalog: "Refresh model catalog",
   renderError: "Failed to render this panel",
+  diagnostics: "Active path",
+  adapterPiAi: "official pi-ai",
+  adapterFallback: "bundled fallback",
+  imageInput: "Image input",
+  imageInputOn: "available",
+  imageInputOff: "unavailable (host attachment service not resolved)",
+  adapterHint: 'If this says "bundled fallback" and images are rejected, restart dsh web so the new host bundle loads.',
   busy: "Working\u2026",
   busyCatalog: "Refreshing model catalog\u2026",
   busyUsage: "Refreshing usage\u2026",
@@ -659,6 +674,19 @@ function Chip({ tone = "off", children }) {
     children
   ] });
 }
+function DiagnosticsRows({ diagnostics, t }) {
+  if (!diagnostics) return null;
+  return /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("div", { className: "gsRows", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("div", { className: "gsRow", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("span", { children: t("diagnostics") }),
+      /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("span", { className: "gsRowValue", children: diagnostics.adapter === "pi-ai" ? t("adapterPiAi") : t("adapterFallback") })
+    ] }),
+    /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("div", { className: "gsRow", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("span", { children: t("imageInput") }),
+      /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("span", { className: "gsRowValue", children: diagnostics.imageInput ? t("imageInputOn") : t("imageInputOff") })
+    ] })
+  ] });
+}
 function UsagePanel({ usage, t, usageBusy, onRefresh, signedIn }) {
   const ok = usage?.status === "ok";
   const usedNumber = ok && Number.isFinite(usage.usedPercent) ? usage.usedPercent : void 0;
@@ -835,6 +863,8 @@ function GrokSubscriptionSection({ rpc, t }) {
         error
       ] }) : null,
       status?.cliAvailable === false ? /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("p", { className: "gsStatus gsStatus--warn", children: t("cliMissing") }) : null,
+      /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(DiagnosticsRows, { diagnostics: status?.diagnostics, t }),
+      status?.diagnostics && !status.diagnostics.imageInput ? /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("p", { className: "gsHint", children: t("adapterHint") }) : null,
       /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("details", { className: "gsDisclosure", children: [
         /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("summary", { children: [
           /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(Chevron, {}),

package/lib/index.js

@@ -389,7 +389,9 @@ function toLlmModels(models) {
       provider: PROVIDER_ID,
       id: model.id,
       name: model.name,
-      inputModalities: ["text"]
+      // The bundled adapter inlines images through the host attachment store,
+      // so it advertises the same modality map as the official pi-ai path.
+      inputModalities: supportsImageInput(model.id) ? ["text", "image"] : ["text"]
     };
     const reasoning = reasoningInfoOf(model);
     if (reasoning) info.reasoning = reasoning;
@@ -751,6 +753,17 @@ function hostModuleRoots(env = process.env, argv1 = process.argv[1]) {
   }
   const prefix = env.NPM_CONFIG_PREFIX;
   if (typeof prefix === "string" && prefix.trim()) push(join2(prefix.trim(), "lib", "node_modules"));
+  if (typeof process.execPath === "string" && process.execPath) {
+    push(join2(dirname(process.execPath), "..", "lib", "node_modules"));
+  }
+  push(join2("/opt/homebrew", "lib", "node_modules"));
+  push(join2("/usr/local", "lib", "node_modules"));
+  for (const segment of ["Library/pnpm", ".local/share/pnpm", ".pnpm-global"]) {
+    push(join2(homedir2(), segment, "node_modules"));
+  }
+  if (typeof env.DSH_PORTABLE_HOME === "string" && env.DSH_PORTABLE_HOME.trim()) {
+    push(join2(env.DSH_PORTABLE_HOME.trim(), "node_modules"));
+  }
   push(join2(homedir2(), ".local", "lib", "node_modules"));
   const dshHome = typeof env.DSH_HOME === "string" && env.DSH_HOME.trim() ? env.DSH_HOME.trim() : join2(homedir2(), ".dsh");
   push(join2(dshHome, "profiles", "node_modules"));
@@ -796,7 +809,13 @@ function resolveExportsTarget(exportsField, subpath) {
 }
 function resolveHostSpecifierManually(root, specifier) {
   const { name: name2, subpath } = splitSpecifier(specifier);
-  for (const pkgDir of [join2(root, name2), join2(root, "node_modules", name2)]) {
+  const candidates = [
+    join2(root, name2),
+    join2(root, "node_modules", name2),
+    join2(root, "@deepseek-ai", "dsh", "node_modules", name2),
+    join2(root, "node_modules", "@deepseek-ai", "dsh", "node_modules", name2)
+  ];
+  for (const pkgDir of candidates) {
     const manifest = join2(pkgDir, "package.json");
     if (!existsSync2(manifest)) continue;
     let pkg;
@@ -858,7 +877,66 @@ function textOf(content) {
     return "";
   }).join("");
 }
-function responsesInput(options) {
+function imagePlaceholderText(ref) {
+  const name2 = typeof ref?.name === "string" && ref.name.trim() ? ` ${JSON.stringify(ref.name.trim())}` : "";
+  return `[attached image${name2} could not be included in this request]`;
+}
+async function collectImageParts(options, resolveAttachments, policy = {}) {
+  const parts = /* @__PURE__ */ new Map();
+  const refs = [];
+  for (const message of options.messages ?? []) {
+    for (const block of message?.content ?? []) {
+      if (block?.type !== "image" || !block.attachment) continue;
+      const id = block.attachment.attachmentId;
+      if (typeof id !== "string" || !id || parts.has(id)) continue;
+      parts.set(id, void 0);
+      refs.push(block.attachment);
+    }
+  }
+  if (refs.length === 0) return parts;
+  let store;
+  try {
+    store = resolveAttachments?.();
+  } catch {
+    store = void 0;
+  }
+  if (!store?.readImageRequest) return parts;
+  const request = {
+    maxPixels: policy.maxPixels ?? REQUEST_IMAGE_PIXEL_BUDGET,
+    maxBytes: policy.maxBytes ?? REQUEST_IMAGE_MAX_BYTES
+  };
+  await Promise.all(refs.map(async (ref) => {
+    try {
+      const version = await store.readImageRequest(ref, request);
+      if (!version?.data || typeof version.mediaType !== "string" || !version.mediaType) return;
+      parts.set(ref.attachmentId, {
+        mediaType: version.mediaType,
+        base64: Buffer.from(version.data).toString("base64")
+      });
+    } catch {
+    }
+  }));
+  return parts;
+}
+function imageContentParts(blocks, imageParts) {
+  const parts = [];
+  const text = textOf(blocks);
+  if (text) parts.push({ type: "input_text", text });
+  for (const block of blocks ?? []) {
+    if (block?.type !== "image" || !block.attachment) continue;
+    const resolved = imageParts?.get(block.attachment.attachmentId);
+    if (resolved) {
+      parts.push({
+        type: "input_image",
+        image_url: `data:${resolved.mediaType};base64,${resolved.base64}`
+      });
+    } else {
+      parts.push({ type: "input_text", text: imagePlaceholderText(block.attachment) });
+    }
+  }
+  return parts;
+}
+function responsesInput(options, imageParts) {
   const input = [];
   const system = typeof options.system === "string" && options.system ? options.system : void 0;
   if (system) input.push({ role: "system", content: system });
@@ -889,6 +967,12 @@ function responsesInput(options) {
       if (text2) input.push({ role: "assistant", content: text2 });
       continue;
     }
+    const hasImage = (message.content ?? []).some((block) => block?.type === "image");
+    if (role === "user" && hasImage) {
+      const parts = imageContentParts(message.content, imageParts);
+      if (parts.length > 0) input.push({ role, content: parts });
+      continue;
+    }
     const text = textOf(message.content);
     if (!text) continue;
     input.push({ role, content: text });
@@ -937,7 +1021,7 @@ async function* streamResponsesUnsafe(options, token) {
   }
   const body = {
     model: options.model,
-    input: responsesInput(options),
+    input: responsesInput(options, await collectImageParts(options, options.resolveAttachments)),
     stream: true
   };
   if (typeof options.maxTokens === "number") body.max_output_tokens = options.maxTokens;
@@ -1138,7 +1222,7 @@ function visiblePiModels(session) {
   if (session.publicAccount()?.signedIn !== true) return [];
   return toPiModels(session.models()).map((model) => model.provider === PROVIDER_ID ? model : { ...model, provider: PROVIDER_ID });
 }
-function createDuckAdapter(session) {
+function createDuckAdapter(session, adapterOptions = {}) {
   const providerInfo = () => ({ id: PROVIDER_ID, name: DISPLAY_NAME });
   const list = () => {
     const signedIn = session.publicAccount()?.signedIn === true;
@@ -1160,7 +1244,9 @@ function createDuckAdapter(session) {
         provider,
         id: model,
         name: found?.name ?? model,
-        inputModalities: ["text"],
+        // The host gates prompt attachment admission on resolveModelInfo, NOT on
+        // listModels, so this must match the catalog's modality map exactly.
+        inputModalities: supportsImageInput(model) ? ["text", "image"] : ["text"],
         context: { contextWindow: raw?.contextWindow ?? 5e5 }
       };
       const reasoning = reasoningInfoOf(raw);
@@ -1180,6 +1266,7 @@ function createDuckAdapter(session) {
         yield { type: "finish", reason: { kind: "error", failure: { message: "Unknown provider", code: "NO_ADAPTER" } } };
         return;
       }
+      const callOptions = typeof adapterOptions.resolveAttachments === "function" ? { ...options, resolveAttachments: adapterOptions.resolveAttachments } : options;
       let token = await session.currentToken();
       if (!token) {
         yield { type: "finish", reason: { kind: "error", failure: { message: "Grok subscription is not signed in", code: "MISSING_CREDENTIAL" } } };
@@ -1188,7 +1275,7 @@ function createDuckAdapter(session) {
       for (let attempt = 0; ; attempt++) {
         let emitted = false;
         try {
-          for await (const chunk of streamResponses(options, token)) {
+          for await (const chunk of streamResponses(callOptions, token, callOptions.resolveAttachments)) {
             emitted = true;
             yield chunk;
           }
@@ -1287,7 +1374,7 @@ function wrapAsHostAdapter(candidate, dshLlm) {
   return new GrokBuildAdapter();
 }
 function createGrokBuildAdapterSync(session, options = {}) {
-  const duck = createDuckAdapter(session);
+  const duck = createDuckAdapter(session, { resolveAttachments: options.resolveAttachments });
   const dshLlm = options.dshLlm;
   return {
     adapter: wrapAsHostAdapter(duck, dshLlm),
@@ -1302,7 +1389,7 @@ async function createGrokBuildAdapter(session, options = {}) {
     optionalImport("@deepseek-ai/dsh-llm-pi-ai", importOpts),
     optionalImport("@deepseek-ai/dsh-llm", importOpts)
   ]);
-  const duck = createDuckAdapter(session);
+  const duck = createDuckAdapter(session, { resolveAttachments: options.resolveAttachments });
   const asHostAdapter = (candidate) => wrapAsHostAdapter(candidate, dshLlm);
   if (!piAi?.createProvider || !dshPi?.PiAiAdapter) {
     return {
@@ -1878,8 +1965,17 @@ function sanitizeUsage(usage) {
   }
   return out;
 }
-async function dispatch(session, endpoint) {
-  if (endpoint === "status") return publicResult(stripSecrets(await session.status()));
+async function dispatch(session, endpoint, diagnostics) {
+  if (endpoint === "status") {
+    const status = await session.status();
+    return publicResult(stripSecrets({
+      ...status,
+      // Which adapter is actually serving this route: the host's official
+      // pi-ai implementation or the bundled fallback. Diagnosing "model does
+      // not support images" starts here.
+      diagnostics: typeof diagnostics === "function" ? diagnostics() : diagnostics
+    }));
+  }
   if (endpoint === "pull") return publicResult(stripSecrets(await session.pull()));
   if (endpoint === "logout") return publicResult(stripSecrets(await session.logout()));
   if (endpoint === "catalog/refresh") {
@@ -1902,7 +1998,7 @@ function createRpcHandler(session, options = {}) {
   return async function handle(endpoint, _payload, _signal) {
     try {
       return await withTimeout(
-        dispatch(session, endpoint),
+        dispatch(session, endpoint, options.diagnostics),
         timeoutMs,
         `Grok subscription RPC "${endpoint}" timed out after ${timeoutMs}ms`,
         { unref: false }
@@ -2011,6 +2107,15 @@ function softService(ctx, key) {
   }
   return void 0;
 }
+function attachmentResolver(ctx) {
+  return () => {
+    try {
+      return typeof ctx.get === "function" ? ctx.get("attachments") : void 0;
+    } catch {
+      return void 0;
+    }
+  };
+}
 function apply(ctx, options = {}) {
   let active = true;
   if (typeof ctx.effect === "function") {
@@ -2038,11 +2143,21 @@ function apply(ctx, options = {}) {
     logger: ctx.logger,
     onCatalogChange: notifyCatalogChange
   });
-  const handler = createRpcHandler(session);
+  const adapterState = { kind: "custom-mvp", upgraded: false };
+  const handler = createRpcHandler(session, {
+    diagnostics: () => ({
+      adapter: adapterState.upgraded ? "pi-ai" : "fallback",
+      adapterKind: adapterState.kind,
+      imageInput: typeof resolveAttachments()?.readImageRequest === "function",
+      hostPeersResolved: adapterState.upgraded
+    })
+  });
+  const resolveAttachments = attachmentResolver(ctx);
   const createSync = options.createSync ?? createGrokBuildAdapterSync;
   try {
-    const created = createSync(session);
+    const created = createSync(session, { resolveAttachments });
     if (created.note) ctx.logger?.debug?.(created.note);
+    adapterState.kind = created.kind;
     ctx.llm.registerAdapter([PROVIDER_ID], created.adapter);
     notifyCatalogChange();
   } catch (error) {
@@ -2053,14 +2168,14 @@ function apply(ctx, options = {}) {
   }
   const defer = options.defer ?? scheduleDeferred2;
   defer(() => {
-    void deferredBoot(ctx, session, notifyCatalogChange, options);
+    void deferredBoot(ctx, session, notifyCatalogChange, options, adapterState);
   });
   ctx.inject(["connection"], (connectionContext) => connectionContext.effect(
     () => registerSubscriptionTransport(connectionContext.connection, handler),
     "grok-subscription: host-only account RPC"
   ));
 }
-async function deferredBoot(ctx, session, notifyCatalogChange, options = {}) {
+async function deferredBoot(ctx, session, notifyCatalogChange, options = {}, adapterState) {
   if (!options.skipSettings) {
     await tryRegisterSettings(ctx);
   }
@@ -2087,18 +2202,15 @@ async function deferredBoot(ctx, session, notifyCatalogChange, options = {}) {
   }
   if (options.skipUpgrade) return;
   const createAsync = options.createAsync ?? createGrokBuildAdapter;
-  const resolveAttachments = () => {
-    try {
-      return typeof ctx.get === "function" ? ctx.get("attachments") : void 0;
-    } catch {
-      return void 0;
-    }
-  };
   try {
-    const created = await createAsync(session, { ...options.adapterOptions, resolveAttachments });
+    const created = await createAsync(session, { ...options.adapterOptions, resolveAttachments: attachmentResolver(ctx) });
     if (created.kind === "pi-ai") {
       if (created.note) ctx.logger?.warn?.(created.note);
       ctx.llm.registerAdapter([PROVIDER_ID], created.adapter);
+      if (adapterState) {
+        adapterState.kind = created.kind;
+        adapterState.upgraded = true;
+      }
       notifyCatalogChange?.();
     } else if (created.note) {
       ctx.logger?.debug?.(created.note);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-grok-subscription",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "description": "Use a SuperGrok or X Premium Grok Build subscription in DeepSeek Harness",
   "type": "module",
   "main": "./lib/index.js",