dshmarket 1.61.0 → 1.62.0

package/client/client.js

@@ -436,6 +436,8 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 			sortDownloads: "npm 下载量(近 30 天)",
 			/** Discover/theme card byline tooltip for catalog `version`. */
 			catalogNpmLatest: "npm 当前 latest",
+			catalogVersionDated: "目录数据（{0} 刷新）里记录的 npm 版本；在那之后发布的版本要等下一次目录刷新才会出现",
+			catalogVersionUndated: "目录数据里记录的 npm 版本；目录每日刷新，所以可能滞后于 npm 上的实际 latest",
 			sortStars: "Star 数",
 			sortAdded: "发布时间",
 			sortDesc: "降序",
@@ -1024,6 +1026,8 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 			sortDownloads: "npm downloads (30d)",
 			/** Discover/theme card byline tooltip for catalog `version`. */
 			catalogNpmLatest: "npm latest",
+			catalogVersionDated: "the npm version as of the catalog's last refresh ({0}); a release published since then appears after the next refresh",
+			catalogVersionUndated: "the npm version as of the catalog's last refresh — the catalog updates daily, so this can lag npm's actual latest",
 			sortStars: "Stars",
 			sortAdded: "Release date",
 			sortDesc: "Descending",
@@ -7175,6 +7179,15 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 			* first reply always has to ask which one it was.
 			*/
 			const [version, setVersion] = (0, react.useState)(null);
+			/**
+			* The catalog's own build date (#712). The version on a card is the
+			* catalog's copy, not a live npm lookup, so a plugin published after the
+			* last refresh shows the older number — the tooltip has to say so, or
+			* "npm latest" beside a number that is not npm's latest is a bug report
+			* waiting to be filed. Null until the catalog answers.
+			*/
+			const [catalogUpdated, setCatalogUpdated] = (0, react.useState)(null);
+			const catalogVersionTip = (0, react.useMemo)(() => catalogUpdated === null ? t("catalogVersionUndated") : t("catalogVersionDated").replace("{0}", catalogUpdated), [catalogUpdated, t]);
 			/** Non-live activation results from the last operation, shown as a banner. */
 			const [activationWarnings, setActivationWarnings] = (0, react.useState)([]);
 			const [hostDependencyFindings, setHostDependencyFindings] = (0, react.useState)([]);
@@ -7363,6 +7376,8 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 					}
 					cachedRegistry = body.registry;
 					setData(body.registry);
+					const catalogDate = body.registry.updated;
+					setCatalogUpdated(typeof catalogDate === "string" && catalogDate.trim() !== "" ? catalogDate : null);
 					setHostVersion(typeof body.hostVersion === "string" ? body.hostVersion : null);
 					setLoadError(null);
 				}).catch((error) => {
@@ -9119,7 +9134,7 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 											}),
 											/* @__PURE__ */ (0, react_jsx_runtime.jsx)(CatalogVersionMark, {
 												version: p.version,
-												tip: t("catalogNpmLatest")
+												tip: catalogVersionTip
 											}),
 											typeof p.downloads === "number" && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Tooltip, {
 												label: String(p.downloads),
@@ -9296,7 +9311,7 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 												}),
 												/* @__PURE__ */ (0, react_jsx_runtime.jsx)(CatalogVersionMark, {
 													version: p.version,
-													tip: t("catalogNpmLatest")
+													tip: catalogVersionTip
 												}),
 												typeof p.downloads === "number" && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Tooltip, {
 													label: String(p.downloads),
@@ -11446,7 +11461,7 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 									}),
 									/* @__PURE__ */ (0, react_jsx_runtime.jsx)(CatalogVersionMark, {
 										version: confirming.version,
-										tip: t("catalogNpmLatest")
+										tip: catalogVersionTip
 									}),
 									typeof confirming.downloads === "number" && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Tooltip, {
 										label: String(confirming.downloads),

package/lib/dsh-cli.js

@@ -6,7 +6,7 @@
  * Installs run through node:child_process, not ctx.shell: the shell service is
  * the agent's sandboxed executor and denies writes to the profile directory.
  */
-import { spawn } from 'node:child_process';
+import { spawn, spawnSync } from 'node:child_process';
 import { existsSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { dirname, isAbsolute, join, resolve } from 'node:path';
@@ -215,20 +215,78 @@ export function toolSearchDirs(platform = process.platform, env = process.env, h
  * precisely the branch that cannot work from a spawned child.
  *
  * Scope, stated plainly because it is narrower than the issue title
- * suggests: this is the HTTPS half. pnpm falls back to `git@github.com:`
- * when HTTPS fails, and the ssh side needs `GIT_SSH_COMMAND`, which
- * overrides `core.sshCommand` and `GIT_SSH` — the two ordinary ways to
- * choose an identity — and whose `BatchMode=yes` would disable
- * `SSH_ASKPASS`, breaking key-passphrase installs that work today. That
- * half needs a policy decision, so it is not made here. Note also that on
- * POSIX `runDshPlugin` spawns detached, so the subtree has no controlling
- * terminal and the prompt already dies instantly; the hang the issue
- * reports needs Windows, where the spawn is not detached.
+ * suggests: this is the HTTPS half, and the FIRST attempt HTTPS is. Measured
+ * with a `GIT_SSH_COMMAND` sentinel that always fails: pnpm's clone of a
+ * `github:owner/repo#path:/sub` spec succeeds without ever calling it, so
+ * ssh is the fallback that runs after HTTPS fails — which is the private
+ * repository case, not the common one.
+ *
+ * The ssh half (#596, @JINITAIMI121) is a policy decision, and it is made
+ * here: `BatchMode=yes`, so a passphrase or host-key question fails fast
+ * instead of waiting on a terminal nobody is watching. The cost is real and
+ * is why it is conditional — `BatchMode` also disables `SSH_ASKPASS`, so a
+ * key that NEEDS a passphrase stops prompting even where something could
+ * have answered, and the install fails where it used to work.
+ *
+ * So it is set only when the user has expressed NO ssh preference at all:
+ * `GIT_SSH_COMMAND` and `GIT_SSH` in the environment, and `core.sshCommand`
+ * in git config — the three ordinary ways to choose an identity, and
+ * `GIT_SSH_COMMAND` would silently override all three (measured: with
+ * `core.sshCommand` set, ours wins and theirs is never run). A user who
+ * has an agent or a specific key configured keeps exactly what they have;
+ * the prompt is closed for everyone else, and `classifyPnpmFailure` says
+ * what to do if that turns out to be the passphrase case.
  */
-export function gitEnvForPnpm(env = process.env) {
-    if ((env.GIT_TERMINAL_PROMPT ?? '').trim() !== '')
-        return {};
-    return { GIT_TERMINAL_PROMPT: '0' };
+let coreSshCommandProbe;
+/**
+ * `core.sshCommand` from the user's git configuration, or null.
+ *
+ * The third place an ssh identity hides, and the one the environment cannot
+ * show: `git config --get` answers it. Memoized for the process — a user
+ * does not reconfigure git mid-install, and this runs on every spawn.
+ *
+ * @returns the configured command, or null when git has none (including
+ *   when git is absent — an unreadable answer is not a choice).
+ */
+export function probeCoreSshCommand(env) {
+    // Memoized only for the caller that has no opinion: a test that supplies
+    // its own environment is asking a different question and must get the
+    // fresh answer.
+    if (env === undefined && coreSshCommandProbe !== undefined)
+        return coreSshCommandProbe ?? null;
+    try {
+        const out = spawnSync('git', ['config', '--get', 'core.sshCommand'], {
+            encoding: 'utf8',
+            timeout: 5_000,
+            stdio: ['ignore', 'pipe', 'ignore'],
+            ...(env === undefined ? {} : { env }),
+            // A user's git may be a shim that prints to a console; nothing here
+            // wants a window.
+            windowsHide: true,
+        });
+        const answer = out.status === 0 && typeof out.stdout === 'string' && out.stdout.trim() !== ''
+            ? out.stdout.trim()
+            : null;
+        if (env === undefined)
+            coreSshCommandProbe = answer;
+        return answer;
+    }
+    catch {
+        if (env === undefined)
+            coreSshCommandProbe = null;
+        return null;
+    }
+}
+export function gitEnvForPnpm(env = process.env, coreSshCommand = probeCoreSshCommand()) {
+    const out = {};
+    // Blank counts as unset: an empty value is not a setting git can parse.
+    const speaks = (value) => (value ?? '').trim() !== '';
+    if (!speaks(env.GIT_TERMINAL_PROMPT))
+        out.GIT_TERMINAL_PROMPT = '0';
+    const choseElsewhere = speaks(env.GIT_SSH_COMMAND) || speaks(env.GIT_SSH) || speaks(coreSshCommand ?? '');
+    if (!choseElsewhere)
+        out.GIT_SSH_COMMAND = 'ssh -oBatchMode=yes';
+    return out;
 }
 /**
  * Every `--config.<key>=<value>` override in the argv, repeated as the

package/lib/pnpm-compat.js

@@ -344,6 +344,21 @@ export function classifyPnpmFailure(output, exitCode) {
             };
         }
     }
+    // #596: the ssh half of #587. git asks for a passphrase (or a host-key
+    // confirmation) on a terminal a spawned child does not have; the market
+    // closes that prompt with `BatchMode=yes` so the question becomes a fast
+    // failure instead of a fifteen-minute hang. This is that failure, and it
+    // needs its own message because git's own words send the reader to the
+    // wrong place: `Permission denied (publickey)` reads as "your key is
+    // wrong", and the key is usually fine — it wants a passphrase, and the
+    // channel that would have asked for it is exactly what was shut.
+    if (/Permission denied \(publickey\)|Could not read from remote repository/.test(output)) {
+        return {
+            code: 'ssh-auth-failed',
+            recoverable: false,
+            message: 'git 无法在无人值守的情况下完成 SSH 认证。如果你的 SSH key 设了密码，请用 ssh-agent（ssh-add），或自己设置 GIT_SSH_COMMAND 指向你的命令，市场不会覆盖它。 / git could not complete SSH authentication unattended. If your SSH key has a passphrase, use ssh-agent (ssh-add), or set GIT_SSH_COMMAND to your own command — the market leaves yours alone.',
+        };
+    }
     if (output.includes('ERR_PNPM_GIT_DEP_PREPARE_NOT_ALLOWED')) {
         return {
             code: 'git-prepare-not-allowed',

package/lib/types/dsh-cli.d.ts

@@ -79,39 +79,17 @@ export declare function proxyEnvForPnpm(env?: NodeJS.ProcessEnv, region?: Region
  */
 export declare function toolSearchDirs(platform?: string, env?: NodeJS.ProcessEnv, home?: string): string[];
 /**
- * Stop git asking for credentials down a channel nobody is listening on
- * (#587).
+ * `core.sshCommand` from the user's git configuration, or null.
  *
- * `CI=true` below is the same defence one layer up, and pnpm reads it. git
- * does not — it has its own switch, and it was not set. The gap only opens
- * when a spec reaches pnpm's git fetcher instead of the codeload tarball
- * path `accelerate.ts` describes: `github:owner/repo#path:/sub` is one, and
- * pnpm really does shell out to `git` for it, trying HTTPS first.
+ * The third place an ssh identity hides, and the one the environment cannot
+ * show: `git config --get` answers it. Memoized for the process — a user
+ * does not reconfigure git mid-install, and this runs on every spawn.
  *
- * git's credential prompt opens the controlling terminal, not stdin. There
- * is no terminal here, so the question is never seen and never answered:
- * the reporter caught `git.exe` alive for eight minutes having burned 0.05s
- * of CPU, and only the fifteen-minute install timeout ended it. Refusing
- * the prompt turns that into a fast, readable failure.
- *
- * It is a default, not an override: a value the caller set wins, and blank
- * counts as unset because an empty `GIT_TERMINAL_PROMPT` is not a setting
- * git can parse either. Credential helpers and `GIT_ASKPASS` are untouched
- * and still answer first — this closes only the terminal fallback, which is
- * precisely the branch that cannot work from a spawned child.
- *
- * Scope, stated plainly because it is narrower than the issue title
- * suggests: this is the HTTPS half. pnpm falls back to `git@github.com:`
- * when HTTPS fails, and the ssh side needs `GIT_SSH_COMMAND`, which
- * overrides `core.sshCommand` and `GIT_SSH` — the two ordinary ways to
- * choose an identity — and whose `BatchMode=yes` would disable
- * `SSH_ASKPASS`, breaking key-passphrase installs that work today. That
- * half needs a policy decision, so it is not made here. Note also that on
- * POSIX `runDshPlugin` spawns detached, so the subtree has no controlling
- * terminal and the prompt already dies instantly; the hang the issue
- * reports needs Windows, where the spawn is not detached.
+ * @returns the configured command, or null when git has none (including
+ *   when git is absent — an unreadable answer is not a choice).
  */
-export declare function gitEnvForPnpm(env?: NodeJS.ProcessEnv): NodeJS.ProcessEnv;
+export declare function probeCoreSshCommand(env?: NodeJS.ProcessEnv): string | null;
+export declare function gitEnvForPnpm(env?: NodeJS.ProcessEnv, coreSshCommand?: string | null): NodeJS.ProcessEnv;
 /**
  * Every `--config.<key>=<value>` override in the argv, repeated as the
  * `PNPM_CONFIG_<KEY>` environment variable that pnpm 12 still reads.

package/lib/types/pnpm-compat.d.ts

@@ -33,7 +33,7 @@ export declare function pluginArgsFor(profileDir: string, pluginArgs: string[]):
  */
 export declare const HOST_NAMESPACE_RE: RegExp;
 export interface PnpmFailure {
-    code: 'adding-to-root' | 'not-a-workspace' | 'hoist-pattern-diff' | 'pnpm-missing' | 'release-age-violation' | 'ignored-builds' | 'git-prepare-not-allowed' | 'git-prepare-failed' | 'tarball-url-mismatch' | 'fetch-404' | 'no-matching-version' | 'transient-network' | 'fetch-timeout' | 'unexpected-store' | 'patch-failed' | 'missing-tarball-integrity' | 'windows-file-locked' | 'pnpm-unusable' | 'missing-local-dependency' | 'unparseable-build-key' | 'native-oom';
+    code: 'adding-to-root' | 'not-a-workspace' | 'hoist-pattern-diff' | 'pnpm-missing' | 'release-age-violation' | 'ignored-builds' | 'git-prepare-not-allowed' | 'git-prepare-failed' | 'tarball-url-mismatch' | 'fetch-404' | 'no-matching-version' | 'transient-network' | 'fetch-timeout' | 'unexpected-store' | 'patch-failed' | 'missing-tarball-integrity' | 'windows-file-locked' | 'pnpm-unusable' | 'missing-local-dependency' | 'unparseable-build-key' | 'native-oom' | 'ssh-auth-failed';
     /** Bilingual, actionable message shown to the user instead of the raw wall of text. */
     message: string;
     /** True when re-running `pnpm install` in the profile is the documented recovery. */

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dshmarket",
   "description": "Visual plugin market inside DeepSeek Harness — browse, search, and one-click install community plugins. · DSH 可视化插件市场：逛一逛，点一下，装好。",
-  "version": "1.61.0",
+  "version": "1.62.0",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/types/index.d.ts",

package/src/client/MarketSection.tsx

@@ -1527,6 +1527,20 @@ export function MarketSection(props: MarketSectionProps) {
    * first reply always has to ask which one it was.
    */
   const [version, setVersion] = useState<string | null>(null)
+  /**
+   * The catalog's own build date (#712). The version on a card is the
+   * catalog's copy, not a live npm lookup, so a plugin published after the
+   * last refresh shows the older number — the tooltip has to say so, or
+   * "npm latest" beside a number that is not npm's latest is a bug report
+   * waiting to be filed. Null until the catalog answers.
+   */
+  const [catalogUpdated, setCatalogUpdated] = useState<string | null>(null)
+  const catalogVersionTip = useMemo(
+    () => (catalogUpdated === null
+      ? t('catalogVersionUndated')
+      : t('catalogVersionDated').replace('{0}', catalogUpdated)),
+    [catalogUpdated, t],
+  )
   /** Non-live activation results from the last operation, shown as a banner. */
   const [activationWarnings, setActivationWarnings] = useState<{ name: string; info: ActivationInfo }[]>([])
   const [hostDependencyFindings, setHostDependencyFindings] = useState<SharedHostPackageDependencyFinding[]>([])
@@ -1739,6 +1753,8 @@ export function MarketSection(props: MarketSectionProps) {
         }
         cachedRegistry = body.registry
         setData(body.registry)
+        const catalogDate = body.registry.updated
+        setCatalogUpdated(typeof catalogDate === 'string' && catalogDate.trim() !== '' ? catalogDate : null)
         setHostVersion(typeof body.hostVersion === 'string' ? body.hostVersion : null)
         setLoadError(null)
       })
@@ -3579,7 +3595,7 @@ export function MarketSection(props: MarketSectionProps) {
             <div className={css.byline}>
               <OwnerAvatar name={p.name} owner={p.owner || ''} />
               <span className={css.owner} title={p.owner}>{p.owner}</span>
-              <CatalogVersionMark version={p.version} tip={t('catalogNpmLatest')} />
+              <CatalogVersionMark version={p.version} tip={catalogVersionTip} />
               {typeof p.downloads === 'number' && (
                 <Tooltip label={String(p.downloads)} side="top">
                   <span className={css.star}>{'· ↓ ' + formatCount(p.downloads)}</span>
@@ -3721,7 +3737,7 @@ export function MarketSection(props: MarketSectionProps) {
               <div className={css.byline}>
                 <OwnerAvatar name={p.name} owner={p.owner || ''} />
                 <span className={css.owner} title={p.owner}>{p.owner}</span>
-                <CatalogVersionMark version={p.version} tip={t('catalogNpmLatest')} />
+                <CatalogVersionMark version={p.version} tip={catalogVersionTip} />
                 {typeof p.downloads === 'number' && (
                   <Tooltip label={String(p.downloads)} side="top">
                     <span className={css.star}>{'· ↓ ' + formatCount(p.downloads)}</span>
@@ -5473,7 +5489,7 @@ export function MarketSection(props: MarketSectionProps) {
           <div className={css.byline}>
             <OwnerAvatar name={confirming.name} owner={confirming.owner || ''} />
             <span className={css.owner} title={confirming.owner}>{confirming.owner}</span>
-            <CatalogVersionMark version={confirming.version} tip={t('catalogNpmLatest')} />
+            <CatalogVersionMark version={confirming.version} tip={catalogVersionTip} />
             {typeof confirming.downloads === 'number' && (
               <Tooltip label={String(confirming.downloads)} side="top">
                 <span className={css.star}>{'· ↓ ' + formatCount(confirming.downloads)}</span>

package/src/client/locales.ts

@@ -245,6 +245,11 @@ export const zh = {
   sortDownloads: 'npm 下载量(近 30 天)',
   /** Discover/theme card byline tooltip for catalog `version`. */
   catalogNpmLatest: 'npm 当前 latest',
+  // #712: the number is the CATALOG's copy, refreshed daily — not a live npm
+  // lookup. Saying "npm latest" beside a number that is not npm's latest is
+  // how a stale display turns into a bug report.
+  catalogVersionDated: '目录数据（{0} 刷新）里记录的 npm 版本；在那之后发布的版本要等下一次目录刷新才会出现',
+  catalogVersionUndated: '目录数据里记录的 npm 版本；目录每日刷新，所以可能滞后于 npm 上的实际 latest',
   sortStars: 'Star 数',
   sortAdded: '发布时间',
   sortDesc: '降序',
@@ -841,6 +846,8 @@ export const en: Record<MarketKey, string> = {
   sortDownloads: 'npm downloads (30d)',
   /** Discover/theme card byline tooltip for catalog `version`. */
   catalogNpmLatest: 'npm latest',
+  catalogVersionDated: "the npm version as of the catalog's last refresh ({0}); a release published since then appears after the next refresh",
+  catalogVersionUndated: "the npm version as of the catalog's last refresh — the catalog updates daily, so this can lag npm's actual latest",
   sortStars: 'Stars',
   sortAdded: 'Release date',
   sortDesc: 'Descending',

package/src/dsh-cli.ts

@@ -7,7 +7,7 @@
  * the agent's sandboxed executor and denies writes to the profile directory.
  */
 
-import { spawn } from 'node:child_process'
+import { spawn, spawnSync } from 'node:child_process'
 import type { ChildProcess, SpawnOptions } from 'node:child_process'
 import { existsSync } from 'node:fs'
 import { homedir } from 'node:os'
@@ -217,19 +217,77 @@ export function toolSearchDirs(
  * precisely the branch that cannot work from a spawned child.
  *
  * Scope, stated plainly because it is narrower than the issue title
- * suggests: this is the HTTPS half. pnpm falls back to `git@github.com:`
- * when HTTPS fails, and the ssh side needs `GIT_SSH_COMMAND`, which
- * overrides `core.sshCommand` and `GIT_SSH` — the two ordinary ways to
- * choose an identity — and whose `BatchMode=yes` would disable
- * `SSH_ASKPASS`, breaking key-passphrase installs that work today. That
- * half needs a policy decision, so it is not made here. Note also that on
- * POSIX `runDshPlugin` spawns detached, so the subtree has no controlling
- * terminal and the prompt already dies instantly; the hang the issue
- * reports needs Windows, where the spawn is not detached.
+ * suggests: this is the HTTPS half, and the FIRST attempt HTTPS is. Measured
+ * with a `GIT_SSH_COMMAND` sentinel that always fails: pnpm's clone of a
+ * `github:owner/repo#path:/sub` spec succeeds without ever calling it, so
+ * ssh is the fallback that runs after HTTPS fails — which is the private
+ * repository case, not the common one.
+ *
+ * The ssh half (#596, @JINITAIMI121) is a policy decision, and it is made
+ * here: `BatchMode=yes`, so a passphrase or host-key question fails fast
+ * instead of waiting on a terminal nobody is watching. The cost is real and
+ * is why it is conditional — `BatchMode` also disables `SSH_ASKPASS`, so a
+ * key that NEEDS a passphrase stops prompting even where something could
+ * have answered, and the install fails where it used to work.
+ *
+ * So it is set only when the user has expressed NO ssh preference at all:
+ * `GIT_SSH_COMMAND` and `GIT_SSH` in the environment, and `core.sshCommand`
+ * in git config — the three ordinary ways to choose an identity, and
+ * `GIT_SSH_COMMAND` would silently override all three (measured: with
+ * `core.sshCommand` set, ours wins and theirs is never run). A user who
+ * has an agent or a specific key configured keeps exactly what they have;
+ * the prompt is closed for everyone else, and `classifyPnpmFailure` says
+ * what to do if that turns out to be the passphrase case.
+ */
+let coreSshCommandProbe: string | null | undefined
+
+/**
+ * `core.sshCommand` from the user's git configuration, or null.
+ *
+ * The third place an ssh identity hides, and the one the environment cannot
+ * show: `git config --get` answers it. Memoized for the process — a user
+ * does not reconfigure git mid-install, and this runs on every spawn.
+ *
+ * @returns the configured command, or null when git has none (including
+ *   when git is absent — an unreadable answer is not a choice).
  */
-export function gitEnvForPnpm(env: NodeJS.ProcessEnv = process.env): NodeJS.ProcessEnv {
-  if ((env.GIT_TERMINAL_PROMPT ?? '').trim() !== '') return {}
-  return { GIT_TERMINAL_PROMPT: '0' }
+export function probeCoreSshCommand(env?: NodeJS.ProcessEnv): string | null {
+  // Memoized only for the caller that has no opinion: a test that supplies
+  // its own environment is asking a different question and must get the
+  // fresh answer.
+  if (env === undefined && coreSshCommandProbe !== undefined) return coreSshCommandProbe ?? null
+  try {
+    const out = spawnSync('git', ['config', '--get', 'core.sshCommand'], {
+      encoding: 'utf8',
+      timeout: 5_000,
+      stdio: ['ignore', 'pipe', 'ignore'],
+      ...(env === undefined ? {} : { env }),
+      // A user's git may be a shim that prints to a console; nothing here
+      // wants a window.
+      windowsHide: true,
+    })
+    const answer = out.status === 0 && typeof out.stdout === 'string' && out.stdout.trim() !== ''
+      ? out.stdout.trim()
+      : null
+    if (env === undefined) coreSshCommandProbe = answer
+    return answer
+  } catch {
+    if (env === undefined) coreSshCommandProbe = null
+    return null
+  }
+}
+
+export function gitEnvForPnpm(
+  env: NodeJS.ProcessEnv = process.env,
+  coreSshCommand: string | null = probeCoreSshCommand(),
+): NodeJS.ProcessEnv {
+  const out: NodeJS.ProcessEnv = {}
+  // Blank counts as unset: an empty value is not a setting git can parse.
+  const speaks = (value: string | undefined): boolean => (value ?? '').trim() !== ''
+  if (!speaks(env.GIT_TERMINAL_PROMPT)) out.GIT_TERMINAL_PROMPT = '0'
+  const choseElsewhere = speaks(env.GIT_SSH_COMMAND) || speaks(env.GIT_SSH) || speaks(coreSshCommand ?? '')
+  if (!choseElsewhere) out.GIT_SSH_COMMAND = 'ssh -oBatchMode=yes'
+  return out
 }
 
 /**

package/src/pnpm-compat.ts

@@ -48,7 +48,7 @@ export interface PnpmFailure {
     | 'ignored-builds' | 'git-prepare-not-allowed' | 'git-prepare-failed' | 'tarball-url-mismatch'
     | 'fetch-404' | 'no-matching-version' | 'transient-network' | 'fetch-timeout'
     | 'unexpected-store' | 'patch-failed' | 'missing-tarball-integrity' | 'windows-file-locked'
-    | 'pnpm-unusable' | 'missing-local-dependency' | 'unparseable-build-key' | 'native-oom'
+    | 'pnpm-unusable' | 'missing-local-dependency' | 'unparseable-build-key' | 'native-oom' | 'ssh-auth-failed'
   /** Bilingual, actionable message shown to the user instead of the raw wall of text. */
   message: string
   /** True when re-running `pnpm install` in the profile is the documented recovery. */
@@ -381,6 +381,21 @@ export function classifyPnpmFailure(output: string, exitCode?: number | null): P
       }
     }
   }
+  // #596: the ssh half of #587. git asks for a passphrase (or a host-key
+  // confirmation) on a terminal a spawned child does not have; the market
+  // closes that prompt with `BatchMode=yes` so the question becomes a fast
+  // failure instead of a fifteen-minute hang. This is that failure, and it
+  // needs its own message because git's own words send the reader to the
+  // wrong place: `Permission denied (publickey)` reads as "your key is
+  // wrong", and the key is usually fine — it wants a passphrase, and the
+  // channel that would have asked for it is exactly what was shut.
+  if (/Permission denied \(publickey\)|Could not read from remote repository/.test(output)) {
+    return {
+      code: 'ssh-auth-failed',
+      recoverable: false,
+      message: 'git 无法在无人值守的情况下完成 SSH 认证。如果你的 SSH key 设了密码，请用 ssh-agent（ssh-add），或自己设置 GIT_SSH_COMMAND 指向你的命令，市场不会覆盖它。 / git could not complete SSH authentication unattended. If your SSH key has a passphrase, use ssh-agent (ssh-add), or set GIT_SSH_COMMAND to your own command — the market leaves yours alone.',
+    }
+  }
   if (output.includes('ERR_PNPM_GIT_DEP_PREPARE_NOT_ALLOWED')) {
     return {
       code: 'git-prepare-not-allowed',