pi-codex-marketplace 1.0.2 → 1.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-codex-marketplace",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "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

@@ -46,7 +46,7 @@ import { SourceCache } from '../cache/source-cache.js';
 
 export interface CommandOptions {
   /** Optional presentation-only update progress; final result remains authoritative. */
-  onProgress?: (message: string) => void;
+  onProgress?: (message: string, kind?: 'activity' | 'result') => void;
   statePath?: string;
   agentDir?: string;
   cwd?: string;
@@ -492,9 +492,9 @@ export async function runCommand(
   }
   const subcmd = rawArgs[0]?.toLowerCase();
 
-  const progress = (message: string): void => {
+  const progress = (message: string, kind: 'activity' | 'result' = 'activity'): void => {
     // An observer must never affect acquisition or durable state.
-    try { opts.onProgress?.(message); } catch {}
+    try { opts.onProgress?.(message, kind); } catch {}
   };
   if (subcmd === 'update') progress('開始更新 Marketplace…');
 
@@ -971,7 +971,7 @@ export async function runCommand(
         const updateLines: string[] = [];
         const report = (line: string): void => {
           updateLines.push(line);
-          progress(line);
+          progress(line, 'result');
         };
         let anyChanged = false;   // 有 plugin 實際升到最新 → reload＋結尾「已重新載入生效」
         let gitAdvanced = false; // git registration 已推進到新 fingerprint → 需持久化（即使無已安裝 plugin）

package/src/cli/index.ts

@@ -12,8 +12,8 @@ import { runCommand, getPackageVersion, type CommandOptions, type CommandResult
 export { getPackageVersion };
 
 export interface CliIO {
-  stdout?: { write: (chunk: string) => unknown } | ((chunk: string) => unknown);
-  stderr?: { write: (chunk: string) => unknown; isTTY?: boolean } | ((chunk: string) => unknown);
+  stdout?: { write: (chunk: string) => unknown; isTTY?: boolean } | ((chunk: string) => unknown);
+  stderr?: { write: (chunk: string) => unknown; isTTY?: boolean; columns?: number } | ((chunk: string) => unknown);
   exit?: (code: number) => unknown;
 }
 
@@ -63,13 +63,19 @@ export async function runCli(
       return exitWith(0);
     }
 
-    const terminal = typeof io.stderr === 'object' && io.stderr.isTTY ? io.stderr : undefined;
+    const interactive = typeof io.stdout === 'object' && io.stdout.isTTY;
+    const terminal = interactive && typeof io.stderr === 'object' && io.stderr.isTTY ? io.stderr : undefined;
     let timer: ReturnType<typeof setInterval> | undefined;
     let frame = 0;
+    let activityVisible = false;
+    let updating = false;
     const clearActivity = (): void => {
       if (timer !== undefined) {
         clearInterval(timer);
         timer = undefined;
+      }
+      if (activityVisible) {
+        activityVisible = false;
         try { terminal?.write('\r\x1b[2K'); } catch { /* Progress is best-effort. */ }
       }
     };
@@ -77,25 +83,44 @@ export async function runCli(
     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;
+        onProgress(message, kind) {
+          updating = true; // Only update emits progress; other command formatting stays unchanged.
+          if (kind !== 'result' && terminal) {
+            clearActivity();
+            const render = (): void => {
+              // Reserve the last column to prevent wrapping into permanent history.
+              const width = Math.max(0, (terminal.columns ?? 80) - 1);
+              const text = `${['|', '/', '-', '\\'][frame++ % 4]} ${message}`;
+              let line = '';
+              let used = 0;
+              for (const char of text.replace(/[\x00-\x1f\x7f-\x9f]/g, ' ')) {
+                const cells = char.codePointAt(0)! < 128 ? 1 : 2;
+                if (used + cells > width) break;
+                line += char;
+                used += cells;
               }
-            }, 100);
-            timer.unref();
+              try {
+                activityVisible = true;
+                terminal.write(`\r\x1b[2K${line}`);
+              } catch { clearActivity(); }
+            };
+            render();
+            if (activityVisible) {
+              timer = setInterval(render, 100);
+              timer.unref();
+            }
           }
-          opts.onProgress?.(message);
+          opts.onProgress?.(message, kind);
         },
       });
     } finally {
       clearActivity();
     }
-    const output = formatCliOutput(result);
+    const formatted = formatCliOutput(result);
+    const output = updating
+      ? formatted.split('\n').filter((line) => line.length > 0)
+        .map((line) => line.replace(/^(.+?  )重新抓取… /, '$1')).join('\n')
+      : formatted;
 
     if (result.ok) {
       if (output) {