@mkterswingman/5mghost-wonder 0.0.18 → 0.0.20

package/dist/commands/read.js

@@ -3,8 +3,9 @@
 // Phase 1: URL routing, export, metadata output.
 // Phase 2: --tab cell/merge/image parsing.
 import { parseWecomUrl } from "../wecom/url.js";
-import { exportWecomDoc, ExportError } from "../wecom/export.js";
-import { loadCookies, getCookieStatus } from "../wecom/cookies.js";
+import { exportWecomDoc, ExportError, isExportAuthError } from "../wecom/export.js";
+import { loadCookies, getCookieStatus, saveCookies, validateCookies } from "../wecom/cookies.js";
+import { collectWecomCookiesViaBrowser } from "../wecom/browser.js";
 import { resolveWonderPaths } from "../platform/paths.js";
 import { lookupCachedExport, saveExportToCache } from "../wecom/cache.js";
 import { parseTab } from "../xlsx/parse-tab.js";
@@ -32,6 +33,7 @@ export async function runReadCommand(args, context) {
         writeError({ error: "missing_url", message: "用法：wonder read <url> [--save <dir>]" });
         return { exitCode: 1, telemetry: { outcome: "failure", errorKind: "missing_url" } };
     }
+    const sourceUrl = url;
     // --- Parse URL ---
     const parsed = parseWecomUrl(url);
     if (!parsed.ok) {
@@ -72,14 +74,12 @@ export async function runReadCommand(args, context) {
         return { exitCode: 1, telemetry: { outcome: "failure", errorKind: "cookie_invalid" } };
     }
     // Load cookies and convert Record<string,string> → CookieEntry[]
-    const rawCookies = loadCookies(paths.cookiesPath);
-    const cookies = rawCookies
-        ? Object.entries(rawCookies).map(([name, value]) => ({ name, value }))
-        : [];
+    let rawCookies = loadCookies(paths.cookiesPath);
+    let cookies = toCookieEntries(rawCookies);
     // --- Resolve save dir ---
     const resolvedSaveDir = saveDir ?? paths.defaultSaveDir;
     // --- Export (with local cache) ---
-    const tokValue = rawCookies?.["TOK"] ?? "";
+    let tokValue = rawCookies?.["TOK"] ?? "";
     const cacheDir = paths.cacheDir;
     const noCache = args.includes("--no-cache");
     let result = null;
@@ -113,17 +113,7 @@ export async function runReadCommand(args, context) {
     }
     if (!result) {
         try {
-            const fresh = await exportWecomDoc({
-                docId,
-                docType,
-                sourceUrl: url,
-                cookies,
-                saveDir: resolvedSaveDir,
-                onProgress: (pct) => {
-                    // Progress → stderr only, so stdout stays valid JSON for pipes.
-                    context.io.stderr(`Exporting… ${Math.max(1, Math.min(99, pct))}%`);
-                },
-            });
+            const fresh = await exportWithCurrentCookies();
             if (!noCache && tokValue) {
                 try {
                     saveExportToCache({
@@ -149,19 +139,57 @@ export async function runReadCommand(args, context) {
         }
         catch (err) {
             if (err instanceof ExportError) {
+                if (isExportAuthError(err)) {
+                    const retry = await refreshCookiesAndRetryExport();
+                    if (retry.ok) {
+                        const fresh = retry.fresh;
+                        if (!noCache && tokValue) {
+                            try {
+                                saveExportToCache({
+                                    cacheDir,
+                                    docId,
+                                    tokValue,
+                                    sourceFilePath: fresh.filePath,
+                                    fileName: fresh.fileName,
+                                    fileSizeBytes: fresh.fileSizeBytes,
+                                    docType,
+                                });
+                            }
+                            catch {
+                                // Cache save failure must not break the command.
+                            }
+                        }
+                        result = {
+                            filePath: fresh.filePath,
+                            fileName: fresh.fileName,
+                            fileSizeBytes: fresh.fileSizeBytes,
+                            docType,
+                        };
+                    }
+                    else {
+                        return retry.result;
+                    }
+                }
+                else {
+                    writeError({
+                        error: "export_failed",
+                        errorKind: err.kind,
+                        message: err.message,
+                    });
+                    return {
+                        exitCode: 1,
+                        telemetry: { outcome: "failure", errorKind: err.kind, errorMessage: err.message },
+                    };
+                }
+            }
+            else {
+                const msg = err instanceof Error ? err.message : String(err);
                 writeError({
                     error: "export_failed",
-                    errorKind: err.kind,
-                    message: err.message,
+                    message: msg,
                 });
-                return {
-                    exitCode: 1,
-                    telemetry: { outcome: "failure", errorKind: err.kind, errorMessage: err.message },
-                };
+                return { exitCode: 1, telemetry: { outcome: "failure", errorKind: "unknown", errorMessage: msg } };
             }
-            const msg = err instanceof Error ? err.message : String(err);
-            writeError({ error: "export_failed", message: msg });
-            return { exitCode: 1, telemetry: { outcome: "failure", errorKind: "unknown", errorMessage: msg } };
         }
     }
     // --- Build output ---
@@ -199,4 +227,91 @@ export async function runReadCommand(args, context) {
     const outputType = docType === "doc" ? "doc" : "slide";
     context.io.stdout(JSON.stringify({ type: outputType, path: result.filePath }));
     return { exitCode: 0, telemetry: { outcome: "success" } };
+    function exportWithCurrentCookies() {
+        return exportWecomDoc({
+            docId,
+            docType,
+            sourceUrl,
+            cookies,
+            saveDir: resolvedSaveDir,
+            onProgress: (pct) => {
+                // Progress → stderr only, so stdout stays valid JSON for pipes.
+                context.io.stderr(`Exporting… ${Math.max(1, Math.min(99, pct))}%`);
+            },
+        });
+    }
+    async function refreshCookiesAndRetryExport() {
+        context.io.stderr("WeCom export returned 401/403. Opening browser to refresh cookies, then retrying once...");
+        let refreshed;
+        try {
+            refreshed = await collectWecomCookiesViaBrowser({
+                chromeProfilePath: paths.chromeProfilePath,
+                io: context.io,
+            });
+        }
+        catch (refreshErr) {
+            const msg = refreshErr instanceof Error ? refreshErr.message : String(refreshErr);
+            writeError({ error: "cookie_refresh_failed", message: msg });
+            return {
+                ok: false,
+                result: {
+                    exitCode: 1,
+                    telemetry: { outcome: "failure", errorKind: "cookie_refresh_failed", errorMessage: msg },
+                },
+            };
+        }
+        saveCookies(paths.cookiesPath, refreshed);
+        const valid = await validateCookies(refreshed);
+        if (!valid) {
+            const msg = "Cookies were refreshed but WeCom still returned 401/403.";
+            writeError({ error: "cookie_refresh_invalid", message: msg });
+            return {
+                ok: false,
+                result: {
+                    exitCode: 1,
+                    telemetry: { outcome: "failure", errorKind: "cookie_refresh_invalid", errorMessage: msg },
+                },
+            };
+        }
+        rawCookies = refreshed;
+        cookies = toCookieEntries(rawCookies);
+        tokValue = rawCookies["TOK"] ?? "";
+        try {
+            return { ok: true, fresh: await exportWithCurrentCookies() };
+        }
+        catch (retryErr) {
+            if (retryErr instanceof ExportError) {
+                writeError({
+                    error: "export_failed",
+                    errorKind: retryErr.kind,
+                    message: retryErr.message,
+                });
+                return {
+                    ok: false,
+                    result: {
+                        exitCode: 1,
+                        telemetry: {
+                            outcome: "failure",
+                            errorKind: retryErr.kind,
+                            errorMessage: retryErr.message,
+                        },
+                    },
+                };
+            }
+            const msg = retryErr instanceof Error ? retryErr.message : String(retryErr);
+            writeError({ error: "export_failed", message: msg });
+            return {
+                ok: false,
+                result: {
+                    exitCode: 1,
+                    telemetry: { outcome: "failure", errorKind: "unknown", errorMessage: msg },
+                },
+            };
+        }
+    }
+}
+function toCookieEntries(rawCookies) {
+    return rawCookies
+        ? Object.entries(rawCookies).map(([name, value]) => ({ name, value }))
+        : [];
 }

package/dist/wecom/browser-probe.js

@@ -161,6 +161,9 @@ export async function runBrowserNoExportRead(options) {
                 evidence.push("initial-attributed-text");
             if ((extracted?.tables.length ?? 0) > 0)
                 evidence.push("table-control-characters");
+            if ((extracted?.tables ?? []).some((table) => table.rows.some((row) => row.some((cell) => (cell.colSpan ?? 1) > 1)))) {
+                evidence.push("horizontal-colspan-inference");
+            }
             if (extracted?.structureHints)
                 evidence.push("structure-hints");
             const images = options.saveDir && extracted?.imageUrls
@@ -192,7 +195,7 @@ export async function runBrowserNoExportRead(options) {
                     "No readable opendoc initialAttributedText was captured.",
                 ],
                 missing: [
-                    "table merge ranges",
+                    "vertical table merge ranges",
                     ...(images.some((image) => image.status === "downloaded") ? [] : ["image original resources"]),
                     "image anchors",
                     "floating vs fixed image classification",
@@ -333,6 +336,9 @@ export function extractTextFromOpendoc(body) {
         structureHints,
         warnings: [
             "No-export text is decoded from opendoc initialAttributedText; rich styles are not reconstructed yet.",
+            ...(tables.some((table) => table.rows.some((row) => row.some((cell) => (cell.colSpan ?? 1) > 1)))
+                ? ["Horizontal table colSpan is inferred from row cell counts; vertical rowSpan is not reconstructed yet."]
+                : []),
             ...(imageUrls.length > 0
                 ? ["Image resource URLs were detected, but image anchors and fixed/floating placement are not reconstructed yet."]
                 : []),
@@ -352,11 +358,22 @@ function extractTablesFromDecodedText(decodedText) {
             .filter((text) => text.length > 0)
             .map((text) => ({ text })))
             .filter((row) => row.length > 0);
+        inferHorizontalColSpans(rows);
         if (rows.length > 0)
             tables.push({ rows });
     }
     return tables;
 }
+function inferHorizontalColSpans(rows) {
+    const maxColumnCount = Math.max(0, ...rows.map((row) => row.length));
+    if (maxColumnCount <= 1)
+        return;
+    for (const row of rows) {
+        if (row.length !== 1)
+            continue;
+        row[0].colSpan = maxColumnCount;
+    }
+}
 function normalizeTableCellText(value) {
     return value
         .replace(/\r/g, "")

package/dist/wecom/export.js

@@ -20,6 +20,27 @@ export class ExportError extends Error {
         this.name = "ExportError";
     }
 }
+export function isExportAuthError(err) {
+    if (containsAuthFailure(err.detail))
+        return true;
+    return /(?:\b(?:401|403)\b|用户身份认证失败|not authenticated|unauthorized|forbidden)/i.test(err.message);
+}
+function containsAuthFailure(value) {
+    if (value === null || value === undefined)
+        return false;
+    if (typeof value === "number")
+        return value === 401 || value === 403;
+    if (typeof value === "string") {
+        return /(?:\b(?:401|403)\b|用户身份认证失败|not authenticated|unauthorized|forbidden)/i.test(value);
+    }
+    if (typeof value !== "object")
+        return false;
+    for (const entry of Object.values(value)) {
+        if (containsAuthFailure(entry))
+            return true;
+    }
+    return false;
+}
 // ---------------------------------------------------------------------------
 // Internal helpers
 // ---------------------------------------------------------------------------

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mkterswingman/5mghost-wonder",
-  "version": "0.0.18",
+  "version": "0.0.20",
   "description": "企微文档读取 CLI — WeCom document reader",
   "type": "module",
   "engines": {

package/skills/setup-5mghost-wonder/SKILL.md

@@ -7,9 +7,9 @@ description: Use this skill when the user wants to install or set up wonder, say
 
 ## Skill version
 
-This skill matches **wonder 0.0.18**.
+This skill matches **wonder 0.0.20**.
 
-Once the CLI is installed in Step 1, run `wonder --version`. If the output does not equal `0.0.18`, the CLI on disk has drifted from the skill text loaded in this session. Ask the user to run `/update-5mghost-wonder`, then **start a fresh AI session** (`/exit` and re-enter, or open a new chat) — skill text already loaded into a running session does not refresh after `wonder update`, even though the file on disk has been replaced.
+Once the CLI is installed in Step 1, run `wonder --version`. If the output does not equal `0.0.20`, the CLI on disk has drifted from the skill text loaded in this session. Ask the user to run `/update-5mghost-wonder`, then **start a fresh AI session** (`/exit` and re-enter, or open a new chat) — skill text already loaded into a running session does not refresh after `wonder update`, even though the file on disk has been replaced.
 
 After a successful first install, also remind the user to start a fresh AI session before invoking `/use-5mghost-wonder` for the first time. The skill files were just written to disk; the current session never loaded them.
 

package/skills/update-5mghost-wonder/SKILL.md

@@ -7,7 +7,7 @@ description: Use this skill when the user wants to update or upgrade wonder, say
 
 ## Skill version
 
-This skill matches **wonder 0.0.18**.
+This skill matches **wonder 0.0.20**.
 
 ---
 

package/skills/use-5mghost-wonder/SKILL.md

@@ -10,10 +10,10 @@ the referenced workflow files needed for the current task.
 
 ## Version Gate
 
-This skill matches **wonder 0.0.18**.
+This skill matches **wonder 0.0.20**.
 
 On first use in a session, follow `references/session-init.md`. If the installed
-CLI version differs from `0.0.18`, stop and ask the user to run
+CLI version differs from `0.0.20`, stop and ask the user to run
 `/update-5mghost-wonder`, then start a fresh AI session.
 
 ## Hard Rules

package/skills/use-5mghost-wonder/references/read-no-export-browser.md

@@ -38,10 +38,11 @@ wonder browser read <url> --save /tmp/wonder-browser-read
 
 This currently attempts text extraction from the browser `opendoc`
 `initialAttributedText`, decodes simple table cells from WeCom table control
-characters, downloads detected image resources when `--save` is present, and
-returns safe `structureHints` for `htmlData`, `initialAttributedText`, and the
-full `opendoc` body. Treat it as `partial` unless it also proves merge ranges
-and image anchors.
+characters, infers horizontal `colSpan` when a single-cell row spans the
+table's max row width, downloads detected image resources when `--save` is
+present, and returns safe `structureHints` for `htmlData`,
+`initialAttributedText`, and the full `opendoc` body. Treat it as `partial`
+unless it also proves vertical merge ranges and image anchors.
 
 3. If the read is insufficient, run the evidence probe:
 
@@ -63,11 +64,12 @@ Use `--headed` only when login/debug visibility is needed.
    - screenshots only as a fallback or visual cross-check
 6. For tables, specifically look for:
    - `tables[].rows[].text` for simple table cell content
+   - `tables[].rows[].colSpan` for inferred horizontal merged cells
    - `structureHints.*.hasTableSignals` and `hasMergeSignals`
    - `structureHints.htmlData.hasTableMarkup`
    - cell coordinates
    - displayed text
-   - merge ranges
+   - vertical merge ranges / `rowSpan`
    - row/column sizes if available
    - fixed cell images
    - floating images with position, size, and anchor
@@ -91,7 +93,8 @@ Return a concise result:
   "tables": [
     {
       "rows": [
-        [{ "text": "A1" }, { "text": "B1" }]
+        [{ "text": "A1B1", "colSpan": 2 }],
+        [{ "text": "A2" }, { "text": "B2" }]
       ]
     }
   ],

package/skills/use-5mghost-wonder/references/verification.md

@@ -41,7 +41,8 @@ The goal is lossless structured data. Verify each field independently:
 
 - text
 - table cell coordinates
-- merge ranges
+- horizontal `colSpan`
+- vertical merge ranges / `rowSpan`
 - image original resources or URLs
 - image anchors, positions, and sizes
 - floating vs fixed cell images