dsh-harbor-evolution 0.8.2 → 0.9.2

package/lib/process.js

@@ -1,10 +1,36 @@
 import { spawn } from 'node:child_process'
+import { existsSync } from 'node:fs'
+import path from 'node:path'
+
+const DOCKER_DESKTOP_BIN = '/Applications/Docker.app/Contents/Resources/bin'
+
+/**
+ * On macOS, Docker Desktop keeps `docker-credential-desktop` (and the other
+ * credential helpers) inside the app bundle, outside the default PATH that a
+ * GUI-launched Harness inherits. A missing helper makes `docker build`/`pull`
+ * fail with `exec: "docker-credential-desktop": executable file not found in
+ * $PATH` even though the CLI and daemon are reachable. Prepend that directory
+ * to PATH for every child process we spawn so Harbor inherits a resolvable
+ * helper. The change is macOS-only, existence-checked, and idempotent.
+ */
+export function dockerDesktopAwareEnv(env, {
+  platform = process.platform,
+  pathExists = existsSync,
+} = {}) {
+  const base = env ?? process.env
+  if (platform !== 'darwin') return base
+  if (!pathExists(DOCKER_DESKTOP_BIN)) return base
+  const current = String(base.PATH ?? '')
+  const segments = current.split(path.delimiter).filter(Boolean)
+  if (segments.includes(DOCKER_DESKTOP_BIN)) return base
+  return { ...base, PATH: [DOCKER_DESKTOP_BIN, ...segments].join(path.delimiter) }
+}
 
 export function runProcess(command, args, options = {}) {
   return new Promise((resolve, reject) => {
     const child = spawn(command, args, {
       cwd: options.cwd,
-      env: options.env ?? process.env,
+      env: dockerDesktopAwareEnv(options.env ?? process.env),
       shell: false,
       stdio: [options.input === undefined ? 'ignore' : 'pipe', 'pipe', 'pipe'],
     })

package/lib/runtime-identity.js

@@ -3,5 +3,4 @@ import { readFileSync } from 'node:fs'
 const packageJson = JSON.parse(readFileSync(new URL('../package.json', import.meta.url), 'utf8'))
 
 export const DSH_RUNTIME_VERSION = packageJson.harborEvolution.dshRuntimeVersion
-export const CANDIDATE_ACP_PACKAGE = packageJson.harborEvolution.candidateAcpPackage
 export const RUNTIME_POLICY = packageJson.harborEvolution.runtimePolicy