pi-codex-marketplace 1.0.0 → 1.0.2

package/bin/ts-resolver.mjs

@@ -1,3 +1,23 @@
+import { readFile } from "node:fs/promises";
+import { stripTypeScriptTypes } from "node:module";
+
+const STRIP_TYPES_WARNING = "stripTypeScriptTypes is an experimental feature and might change at any time";
+
+function stripTypes(source) {
+  const emitWarning = process.emitWarning;
+  process.emitWarning = (warning, ...args) => {
+    const message = warning instanceof Error ? warning.message : String(warning);
+    if (message === STRIP_TYPES_WARNING) return;
+    emitWarning.call(process, warning, ...args);
+  };
+
+  try {
+    return stripTypeScriptTypes(source, { mode: "strip" });
+  } finally {
+    process.emitWarning = emitWarning;
+  }
+}
+
 export async function resolve(specifier, context, nextResolve) {
   try {
     return await nextResolve(specifier, context);
@@ -13,3 +33,16 @@ export async function resolve(specifier, context, nextResolve) {
     throw err;
   }
 }
+
+export async function load(url, context, nextLoad) {
+  if (!url.endsWith(".ts")) {
+    return nextLoad(url, context);
+  }
+
+  const source = await readFile(new URL(url), "utf8");
+  return {
+    format: "module",
+    shortCircuit: true,
+    source: stripTypes(source),
+  };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-codex-marketplace",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "Bridge Package for Codex and Claude Marketplace compatibility in Pi — 極簡 /codex-marketplace 純文字指令與 Headless CLI（add/list/install/update/disable/enable/remove/forget）、單一 Global Bridge State、當下最新安裝與即時投影",
   "type": "module",
   "keywords": [

package/src/bridge/command.ts

@@ -45,6 +45,8 @@ import { buildGitSnapshot } from '../registration/snapshot.js';
 import { SourceCache } from '../cache/source-cache.js';
 
 export interface CommandOptions {
+  /** Optional presentation-only update progress; final result remains authoritative. */
+  onProgress?: (message: string) => void;
   statePath?: string;
   agentDir?: string;
   cwd?: string;
@@ -482,6 +484,20 @@ export async function runCommand(
 ): Promise<CommandResult> {
   const rawArgs = typeof argv === 'string' ? argv.trim().split(/\s+/).filter(Boolean) : [...argv];
 
+  // Strip the optional command token before normalizing the subcommand. Progress
+  // must follow the same parsing path as dispatch, including prefixed and mixed-case
+  // invocations.
+  if (rawArgs.length > 0 && (rawArgs[0] === '/codex-marketplace' || rawArgs[0] === 'codex-marketplace')) {
+    rawArgs.shift();
+  }
+  const subcmd = rawArgs[0]?.toLowerCase();
+
+  const progress = (message: string): void => {
+    // An observer must never affect acquisition or durable state.
+    try { opts.onProgress?.(message); } catch {}
+  };
+  if (subcmd === 'update') progress('開始更新 Marketplace…');
+
   // Credentialed Acquisition (#109，#117)：逐次核准的 credential helper allowlist。
   // env 顯式設定 → 完全覆蓋；未設定／空白 → 自動偵測固定白名單（gh／keychain／store），
   // 開箱即用（私有 repo 不再要求先設 env）。解析結果只經既有 AcquisitionTrustOptions
@@ -491,10 +507,6 @@ export async function runCommand(
   const acquireTrust: { allowedCredentialHelpers: string[]; helperMode: 'detected' | 'approved' } | undefined =
     resolved.helpers.length > 0 ? { allowedCredentialHelpers: resolved.helpers, helperMode: resolved.mode as 'detected' | 'approved' } : undefined;
 
-  // Strip leading command token if passed
-  if (rawArgs.length > 0 && (rawArgs[0] === '/codex-marketplace' || rawArgs[0] === 'codex-marketplace')) {
-    rawArgs.shift();
-  }
 
   let state: MinimalBridgeState;
   let wasReset = false;
@@ -521,7 +533,6 @@ export async function runCommand(
     // Overview (no arguments)
     messages.push(...formatOverview(state));
   } else {
-    const subcmd = rawArgs[0].toLowerCase();
     const subargs = rawArgs.slice(1);
 
     switch (subcmd) {
@@ -572,14 +583,13 @@ export async function runCommand(
                 executor: opts.gitExecutor,
                 trust: acquireTrust,
               });
-            } catch (e) {
-              const msg = e instanceof Error ? e.message : String(e);
-              messages.push(`錯誤：git 取得失敗 — ${msg}`);
+            } catch {
+              messages.push('錯誤：git 取得失敗');
               break;
             }
             if (!acquireResult.ok) {
-              const outcome = acquireResult.findings[0]?.outcome ?? acquireResult.stderr ?? 'git 取得失敗';
-              messages.push(`錯誤：git 取得失敗 — ${outcome}`);
+              const outcome = acquireResult.findings[0]?.outcome;
+              messages.push(outcome ? `錯誤：git 取得失敗 — ${outcome}` : '錯誤：git 取得失敗');
               if (acquireResult.findings.length > 1) {
                 const extra = acquireResult.findings.slice(1, 3).map((f) => f.outcome).join('；');
                 if (extra) messages.push(`詳細：${extra}`);
@@ -959,11 +969,16 @@ export async function runCommand(
         // 整包 deep backup：任一 marketplace 失敗不影響其他；最後一次寫入，寫失敗即回滾全部。
         const stateBackup = JSON.parse(JSON.stringify(state)) as MinimalBridgeState;
         const updateLines: string[] = [];
+        const report = (line: string): void => {
+          updateLines.push(line);
+          progress(line);
+        };
         let anyChanged = false;   // 有 plugin 實際升到最新 → reload＋結尾「已重新載入生效」
         let gitAdvanced = false; // git registration 已推進到新 fingerprint → 需持久化（即使無已安裝 plugin）
 
         for (const reg of state.registrations) {
           const display = reg.marketplaceName || reg.alias || reg.id;
+          progress(`${display}  ${reg.sourceKind === 'git' ? '重新抓取' : '檢查本機來源'}…`);
           const format = (reg.format ?? 'codex') as 'codex' | 'claude';
           const insts = state.installations.filter((i) => i.registrationId === reg.id);
           const upgraded: string[] = [];
@@ -972,12 +987,12 @@ export async function runCommand(
           if (reg.sourceKind === 'git') {
             // ---- git 重抓（當下最新）：ls-remote → clone → checkout → snapshot fingerprint ----
             if (!reg.snapshot || !/^[0-9a-f]{64}$/.test(reg.snapshot)) {
-              updateLines.push(`⚠ marketplace [${display}] git cache 指紋缺失，無法重抓（請先重新 add）`);
+              report(`⚠ marketplace [${display}] git cache 指紋缺失，無法重抓（請先重新 add）`);
               continue;
             }
             const locRes = normalizeGitLocator(reg.source);
             if (!locRes.ok) {
-              updateLines.push(`⚠ marketplace [${display}] Git 網址不合法：${locRes.findings[0]?.outcome ?? '未知錯誤'}`);
+              report(`⚠ marketplace [${display}] Git 網址不合法：${locRes.findings[0]?.outcome ?? '未知錯誤'}`);
               continue;
             }
             let acquireResult;
@@ -987,17 +1002,16 @@ export async function runCommand(
                 executor: opts.gitExecutor,
                 trust: acquireTrust,
               });
-            } catch (e) {
-              const msg = e instanceof Error ? e.message : String(e);
-              updateLines.push(`錯誤：git 重抓失敗 — ${msg}`);
+            } catch {
+              report('錯誤：git 重抓失敗');
               continue;
             }
             if (!acquireResult.ok) {
-              const outcome = acquireResult.findings[0]?.outcome ?? acquireResult.stderr ?? 'git 重抓失敗';
-              updateLines.push(`錯誤：git 重抓失敗 — ${outcome}`);
+              const outcome = acquireResult.findings[0]?.outcome;
+              report(outcome ? `錯誤：git 重抓失敗 — ${outcome}` : '錯誤：git 重抓失敗');
               if (acquireResult.findings.length > 1) {
                 const extra = acquireResult.findings.slice(1, 3).map((f) => f.outcome).join('；');
-                if (extra) updateLines.push(`詳細：${extra}`);
+                if (extra) report(`詳細：${extra}`);
               }
               if (acquireResult.acquiredPath && acquireResult.createdTemp) {
                 try { cleanupAcquisition(acquireResult.acquiredPath); } catch {}
@@ -1014,6 +1028,7 @@ export async function runCommand(
               }
             };
 
+            progress(`${display}  檢查來源…`);
             const sourceKey = gitSourceKey(locRes.locator!);
             const snapRes = buildGitSnapshot(acquiredPath, sourceKey, {
               canonicalLocator: reg.source,
@@ -1022,7 +1037,7 @@ export async function runCommand(
             });
             if (!snapRes.ok || !snapRes.snapshot) {
               cleanupAcquired();
-              updateLines.push(`⚠ marketplace [${display}] snapshot 建立失敗 — ${snapRes.findings[0]?.outcome ?? '未知錯誤'}`);
+              report(`⚠ marketplace [${display}] snapshot 建立失敗 — ${snapRes.findings[0]?.outcome ?? '未知錯誤'}`);
               continue;
             }
             const fingerprint = snapRes.snapshot.fingerprint;
@@ -1030,7 +1045,7 @@ export async function runCommand(
             if (fingerprint === reg.snapshot) {
               // 當下最新與上次相同 → 無變化
               cleanupAcquired();
-              updateLines.push(`${display}  重新抓取… 無變化`);
+              report(`${display}  重新抓取… 無變化`);
               continue;
             }
 
@@ -1047,7 +1062,7 @@ export async function runCommand(
             } catch (e) {
               cleanupAcquired();
               const msg = e instanceof Error ? e.message : String(e);
-              updateLines.push(`錯誤：cache 寫入失敗（fingerprint ${fingerprint.slice(0, 12)}…）：${msg}`);
+              report(`錯誤：cache 寫入失敗（fingerprint ${fingerprint.slice(0, 12)}…）：${msg}`);
               continue;
             }
             cleanupAcquired();
@@ -1069,35 +1084,35 @@ export async function runCommand(
                 inst.snapshot = fingerprint;
                 upgraded.push(outcome.manifestName);
                 for (const c of outcome.colliding) {
-                  updateLines.push(`⚠ skill "${c}" 與既有同名，未投影（名稱衝突）`);
+                  report(`⚠ skill "${c}" 與既有同名，未投影（名稱衝突）`);
                 }
               }
             } else {
               for (const inst of insts) failures.push(`${inst.manifestName} 更新失敗：cache 材料無法解析`);
             }
 
-            for (const f of failures) updateLines.push(`⚠ marketplace [${display}] ${f}`);
+            for (const f of failures) report(`⚠ marketplace [${display}] ${f}`);
             if (upgraded.length > 0) {
-              updateLines.push(`${display}  重新抓取… ${upgraded.join(', ')} 有新版本`);
+              report(`${display}  重新抓取… ${upgraded.join(', ')} 有新版本`);
               anyChanged = true;
             } else if (insts.length === 0) {
               // upstream 移動但沒有已安裝 plugin：registration 已指向最新，下次 install 即用最新
-              updateLines.push(`${display}  重新抓取… 有新版本`);
+              report(`${display}  重新抓取… 有新版本`);
             }
           } else {
             // ---- 本機重讀（live 路徑）----
             if (!reg.source || !existsSync(reg.source)) {
-              updateLines.push(`⚠ marketplace [${display}] 本機路徑不存在（${reg.source ?? '未記錄'}）`);
+              report(`⚠ marketplace [${display}] 本機路徑不存在（${reg.source ?? '未記錄'}）`);
               continue;
             }
             // 先 probe catalog：不可讀時不能聲稱「無變化」，必須明示（不靜默略過）
             const probe = readMarketplaceCatalog(reg.source, format);
             if (probe.error) {
-              updateLines.push(`⚠ marketplace [${display}] ${probe.error}`);
+              report(`⚠ marketplace [${display}] ${probe.error}`);
               continue;
             }
             if (insts.length === 0) {
-              updateLines.push(`${display}  重新抓取… 無變化`);
+              report(`${display}  重新抓取… 無變化`);
               continue;
             }
             let changed = false;
@@ -1113,21 +1128,22 @@ export async function runCommand(
               changed = changed || outcome.changed;
               upgraded.push(outcome.manifestName);
               for (const c of outcome.colliding) {
-                updateLines.push(`⚠ skill "${c}" 與既有同名，未投影（名稱衝突）`);
+                report(`⚠ skill "${c}" 與既有同名，未投影（名稱衝突）`);
               }
             }
-            for (const f of failures) updateLines.push(`⚠ marketplace [${display}] ${f}`);
+            for (const f of failures) report(`⚠ marketplace [${display}] ${f}`);
             if (upgraded.length === 0) continue; // 全部失敗，⚠ 已明示
             if (changed) {
-              updateLines.push(`${display}  重新抓取… ${upgraded.join(', ')} 有新版本`);
+              report(`${display}  重新抓取… ${upgraded.join(', ')} 有新版本`);
               anyChanged = true;
             } else {
-              updateLines.push(`${display}  重新抓取… 無變化`);
+              report(`${display}  重新抓取… 無變化`);
             }
           }
         }
 
         if (gitAdvanced || anyChanged) {
+          progress('寫入 Bridge State…');
           try {
             writeMinimalBridgeState(state, opts);
           } catch (e) {
@@ -1135,7 +1151,8 @@ export async function runCommand(
             state.registrations = stateBackup.registrations;
             state.installations = stateBackup.installations;
             const msg = e instanceof Error ? e.message : String(e);
-            messages.push(`錯誤：寫入 Bridge State 失敗：${msg}`);
+            // The final result remains a complete summary even though persistence failed.
+            messages.push(...updateLines, `錯誤：寫入 Bridge State 失敗：${msg}`);
             break;
           }
           if (anyChanged) reload = true;

package/src/cli/index.ts

@@ -13,7 +13,7 @@ export { getPackageVersion };
 
 export interface CliIO {
   stdout?: { write: (chunk: string) => unknown } | ((chunk: string) => unknown);
-  stderr?: { write: (chunk: string) => unknown } | ((chunk: string) => unknown);
+  stderr?: { write: (chunk: string) => unknown; isTTY?: boolean } | ((chunk: string) => unknown);
   exit?: (code: number) => unknown;
 }
 
@@ -63,7 +63,38 @@ export async function runCli(
       return exitWith(0);
     }
 
-    const result = await runCommand(argv, opts);
+    const terminal = typeof io.stderr === 'object' && io.stderr.isTTY ? io.stderr : undefined;
+    let timer: ReturnType<typeof setInterval> | undefined;
+    let frame = 0;
+    const clearActivity = (): void => {
+      if (timer !== undefined) {
+        clearInterval(timer);
+        timer = undefined;
+        try { terminal?.write('\r\x1b[2K'); } catch { /* Progress is best-effort. */ }
+      }
+    };
+    let result: CommandResult;
+    try {
+      result = await runCommand(argv, {
+        ...opts,
+        onProgress(message) {
+          clearActivity();
+          writeStream(io.stderr, message);
+          if (terminal) {
+            timer = setInterval(() => {
+              try { terminal.write(`\r${['|', '/', '-', '\\'][frame++ % 4]} 處理中…`); } catch {
+                clearInterval(timer);
+                timer = undefined;
+              }
+            }, 100);
+            timer.unref();
+          }
+          opts.onProgress?.(message);
+        },
+      });
+    } finally {
+      clearActivity();
+    }
     const output = formatCliOutput(result);
 
     if (result.ok) {

package/src/registration/git-acquisition.ts

@@ -186,25 +186,25 @@ function classifyFailure(stderr: string, mode: CredentialHelperMode): FailureKin
   return null;
 }
 
-function failureFinding(kind: FailureKind, locator: CanonicalGitLocator, stderr: string): ValidationFinding {
+function failureFinding(kind: FailureKind, locator: CanonicalGitLocator): ValidationFinding {
   switch (kind.kind) {
     case 'host-key':
       return trustFinding(
         kind.isChanged ? CODE.GIT_TRUST_HOST_KEY_CHANGED : CODE.GIT_TRUST_HOST_KEY_UNKNOWN,
         RULE.GIT_TRUST_HOST_KEY,
-        `Acquisition Trust Base violation: SSH host key ${kind.isChanged ? 'changed' : 'unknown'} for ${locator.host} — ${stderr.trim()} (only pre-established known-host keys are trusted)`,
+        `Acquisition Trust Base violation: SSH host key ${kind.isChanged ? 'changed' : 'unknown'} for ${locator.host} (only pre-established known-host keys are trusted)`,
       );
     case 'redirect':
       return trustFinding(
         CODE.GIT_TRUST_REDIRECT,
         RULE.GIT_TRUST_REDIRECT,
-        `Acquisition Trust Base violation: redirect that would change canonical locator (followRedirects disabled) — ${stderr.trim()}`,
+        'Acquisition Trust Base violation: redirect that would change canonical locator (followRedirects disabled)',
       );
     case 'not-found':
       return trustFinding(
         CODE.GIT_REPO_NOT_FOUND,
         RULE.GIT_TRUST_AUTH_REQUIRED,
-        `Acquisition Trust Base violation: repository not found — '${locator.canonicalUrl}' does not exist (check the URL or owner/repo name) — ${stderr.trim()}`,
+        `Acquisition Trust Base violation: repository not found — '${locator.canonicalUrl}' does not exist (check the URL or owner/repo name)`,
       );
     case 'invalid-helper': {
       // GIT-35：核准的 helper 名稱無效（git 找不到 `git-credential-<name>` 執行檔）。
@@ -213,7 +213,7 @@ function failureFinding(kind: FailureKind, locator: CanonicalGitLocator, stderr:
       return trustFinding(
         CODE.GIT_TRUST_CREDENTIAL_HELPER_INVALID,
         RULE.GIT_TRUST_CREDENTIAL_HELPER_INVALID,
-        `Acquisition Trust Base violation: '${kind.name}' is not a valid git credential helper — use a native helper name (osxkeychain / store) or a shell form like '!gh auth git-credential' — ${stderr.trim()}`,
+        "Acquisition Trust Base violation: a configured credential helper is not valid — use a native helper name (osxkeychain / store) or a shell form like '!gh auth git-credential'",
       );
     }
     case 'auth': {
@@ -230,7 +230,7 @@ function failureFinding(kind: FailureKind, locator: CanonicalGitLocator, stderr:
       return trustFinding(
         CODE.GIT_TRUST_AUTH_REQUIRED,
         RULE.GIT_TRUST_AUTH_REQUIRED,
-        `Acquisition Trust Base violation: ${why} — ${stderr.trim()}`,
+        `Acquisition Trust Base violation: ${why}`,
       );
     }
     case 'helper': {
@@ -243,7 +243,7 @@ function failureFinding(kind: FailureKind, locator: CanonicalGitLocator, stderr:
       return trustFinding(
         CODE.GIT_TRUST_CREDENTIAL_HELPER,
         RULE.GIT_TRUST_CREDENTIAL_HELPER,
-        `Acquisition Trust Base: ${why} — ${stderr.trim()}`,
+        `Acquisition Trust Base: ${why}`,
       );
     }
   }
@@ -263,13 +263,13 @@ async function resolveHead(
     if (kind) {
       return {
         ok: false,
-        findings: [failureFinding(kind, locator, res.stderr)],
+        findings: [failureFinding(kind, locator)],
         stderr: res.stderr,
       };
     }
     return {
       ok: false,
-      findings: [acquireFinding(`failed to resolve HEAD via ls-remote: ${res.stderr.trim() || `exit ${res.exitCode}`}`)],
+      findings: [acquireFinding(`failed to resolve HEAD via ls-remote (exit ${res.exitCode})`)],
       stderr: res.stderr,
     };
   }
@@ -341,8 +341,8 @@ export async function acquireGitSource(opts: AcquireOptions): Promise<AcquireRes
     const stderr = cloneRes.stderr || '';
     const kind = classifyFailure(stderr, mode);
     const finding = kind
-      ? failureFinding(kind, locator, stderr)
-      : acquireFinding(`git clone failed: ${stderr.trim() || `exit ${cloneRes.exitCode}`}`);
+      ? failureFinding(kind, locator)
+      : acquireFinding(`git clone failed (exit ${cloneRes.exitCode})`);
     if (createdTemp) try { rmSync(dest, { recursive: true, force: true }); } catch {}
     return { ok: false, findings: [finding], stderr };
   }
@@ -389,7 +389,7 @@ export async function acquireGitSource(opts: AcquireOptions): Promise<AcquireRes
       if (createdTemp) try { rmSync(dest, { recursive: true, force: true }); } catch {}
       return {
         ok: false,
-        findings: [acquireFinding(`resolved revision ${sha} not fetchable: ${fetchRes.stderr.trim()}`)],
+        findings: [acquireFinding(`resolved revision ${sha} not fetchable (git fetch exit ${fetchRes.exitCode})`)],
         stderr: fetchRes.stderr,
       };
     }
@@ -402,7 +402,7 @@ export async function acquireGitSource(opts: AcquireOptions): Promise<AcquireRes
       if (createdTemp) try { rmSync(dest, { recursive: true, force: true }); } catch {}
       return {
         ok: false,
-        findings: [acquireFinding(`failed to checkout resolved revision ${sha}: ${checkoutRes.stderr.trim() || checkout2.stderr.trim()}`)],
+        findings: [acquireFinding(`failed to checkout resolved revision ${sha} (git checkout exit ${checkout2.exitCode})`)],
         stderr: checkoutRes.stderr,
       };
     }