@nextclaw/x-harness 0.2.52 → 0.2.54

package/SOURCE.md

@@ -1,8 +1,8 @@
 # Corresponding source
 
-Version 0.2.52, commit b3e3310d4977db067f05ee409f58ae619f042c9a.
+Version 0.2.54, commit a9b2bb0d7399463a8dc259e433e3a2bd31dc9bc7.
 
-Complete source, build scripts and dependencies: https://github.com/Peiiii/x-harness/tree/b3e3310d4977db067f05ee409f58ae619f042c9a
+Complete source, build scripts and dependencies: https://github.com/Peiiii/x-harness/tree/a9b2bb0d7399463a8dc259e433e3a2bd31dc9bc7
 
 Clone this revision, run npm ci, npm run bootstrap and npm run release:build.
 

package/dist/browser-dom-editing.js

@@ -198,7 +198,7 @@ export class DOMEditing {
             .locator(`a[href=${JSON.stringify(primary)}]`)
             .filter({ visible: true }));
         this.#session.current = null;
-        await anchor.press("End");
+        await anchor.press("PageDown");
         return { completed: true };
         return { completed: false, loc, submittedEditor };
     }

package/dist/browser-dom-submission.d.ts

@@ -3,5 +3,6 @@ export declare class DOMSubmission {
     #private;
     constructor(dependencies: Pick<DOMDependencies, "submitAX" | "session" | "tab" | "observe" | "unique" | "locator">);
     finishDOMAction(command: any, prepared: any, query: any, result: any): Promise<void>;
+    private waitSubmittedEditor;
 }
 export declare function createDOMSubmission(...args: ConstructorParameters<typeof DOMSubmission>): (command: any, prepared: any, query: any, result: any) => Promise<void>;

package/dist/browser-dom-submission.js

@@ -1,4 +1,4 @@
-import { xURL } from "./platform-rules.js";
+import { xURL, sameHandle, sameText } from "./platform-rules.js";
 import { valueOf } from "./browser-common.js";
 export class DOMSubmission {
     #submitAX;
@@ -29,6 +29,7 @@ export class DOMSubmission {
             : null;
         let nativeSubmitIndex;
         if (this.#submitAX &&
+            command.activation !== "keyboard" &&
             ["submitPost", "submitReply"].includes(command.operation)) {
             const native = await this.#submitAX.observe({ mode: "composer" });
             const editors = native.evidence?.filter((e) => /^(?:文本输入区(?:域)?|文本区域|文本栏) /.test(e.label)) ?? [];
@@ -88,7 +89,7 @@ export class DOMSubmission {
         // Inline replies keep the editor mounted. Wait for this submitted text to clear before
         // receipt navigation/reload can interrupt the actual submission request.
         if (submittedEditor)
-            await submittedEditor.waitFor({ state: "hidden", timeoutMs: 10000 });
+            await this.waitSubmittedEditor(submittedEditor, result);
         if (["submitPost", "submitReply"].includes(command.operation)) {
             try {
                 await this.#tab.playwright.waitForLoadState({
@@ -104,6 +105,36 @@ export class DOMSubmission {
             }
         }
     }
+    async waitSubmittedEditor(editor, submitted) {
+        const deadline = Date.now() + 10000;
+        for (let attempt = 0; attempt < 4; attempt++) {
+            const remaining = deadline - Date.now();
+            if (remaining <= 0)
+                throw Error("submitted-editor-clear-timeout");
+            try {
+                await editor.waitFor({ state: "hidden", timeoutMs: remaining });
+                return;
+            }
+            catch (error) {
+                if (!/timed out|timeout|deadline exceeded/i.test(error.message) ||
+                    attempt === 3 ||
+                    Date.now() >= deadline)
+                    throw error;
+                // Resume only the wait, never the submission or a navigation that could interrupt it.
+                const current = await this.#observe({ view: "composer" });
+                if (current.alerts?.length ||
+                    !current.accountHandle ||
+                    !submitted.accountHandle ||
+                    !sameHandle(current.accountHandle, submitted.accountHandle) ||
+                    xURL(current.page).href !== xURL(submitted.page).href ||
+                    (typeof current.editorText === "string" &&
+                        current.editorText.trim() &&
+                        (!sameText(current.editorText, submitted.editorText) ||
+                            current.replyToId !== submitted.replyToId)))
+                    throw error;
+            }
+        }
+    }
 }
 export function createDOMSubmission(...args) {
     return new DOMSubmission(...args).finishDOMAction;

package/dist/platform-collections.d.ts

@@ -7,8 +7,10 @@ export declare class PlatformCollections {
     searchSources: ({ query, limit, maxPages, processedIds, }?: any) => Promise<any>;
     constructor(dependencies: Pick<PlatformDependencies, "ready" | "observed" | "browser" | "choose">);
     private handleCollectSources;
+    private advanceSourceWindow;
     private handleReadCreator;
     private handleReadBookmarks;
+    private resumeBookmarks;
     private confirmBookmarkFolder;
     private bookmarkDiscovery;
     private waitForBookmarkLabel;

package/dist/platform-collections.js

@@ -117,28 +117,19 @@ export class PlatformCollections {
                 if (last.moreInDOM)
                     offset += 5;
                 else {
-                    await this.#browser.act({ operation: "nextPosts" });
-                    const scrolled = await this.#ready({ view: "posts", limit: 5 });
-                    if (scrolled.needsStateCheck || scrolled.alerts?.length)
+                    const advanced = await this.advanceSourceWindow(last, seen);
+                    if (advanced.needsStateCheck || advanced.alerts?.length)
                         return {
-                            ...scrolled,
+                            ...advanced,
                             sources,
                             complete: false,
                             missing: ["source-page-unconfirmed"],
                         };
-                    // Scroll and lazy loading settle asynchronously. Existing cards are
-                    // already visible, so waiting for the first article proves nothing.
-                    try {
-                        await this.#browser.act({
-                            operation: "waitForPosts",
-                            excludeIds: [...seen],
-                        });
+                    if (advanced.paginationBoundary) {
+                        last = advanced;
+                        missing.push("stable-rendered-tail");
+                        break;
                     }
-                    catch (error) {
-                        if (!/timed out|timeout/i.test(error.message))
-                            throw error;
-                    }
-                    const advanced = await this.#ready({ view: "posts", limit: 5 });
                     // Retained DOM prefixes include a partial final window too; skip
                     // exactly the consumed cards, while virtualized replacements restart.
                     offset =
@@ -157,11 +148,49 @@ export class PlatformCollections {
             sources,
             complete: sources.length >= limit,
             pageComplete: false,
+            ...(last?.paginationBoundary
+                ? { paginationBoundary: last.paginationBoundary }
+                : {}),
             missing: sources.length >= limit
                 ? []
                 : [...new Set([...missing, "bounded-source-window-exhausted"])],
         };
     }
+    async advanceSourceWindow(previous, seen) {
+        const renderedIds = previous.renderedIds ?? [...seen];
+        await this.#browser.act({ operation: "nextPosts" });
+        let advanced = await this.#ready({ view: "posts", limit: 5 });
+        if (advanced.needsStateCheck || advanced.alerts?.length)
+            return advanced;
+        let timedOut = false;
+        try {
+            // Wait for a newly rendered card, even if that source was processed on an
+            // earlier run. Global processed IDs do not describe the current DOM window.
+            await this.#browser.act({
+                operation: "waitForPosts",
+                excludeIds: renderedIds,
+            });
+        }
+        catch (error) {
+            if (!/timed out|timeout/i.test(error.message))
+                throw error;
+            timedOut = true;
+        }
+        advanced = await this.#ready({ view: "posts", limit: 5 });
+        if (timedOut &&
+            advanced.atRenderedTail &&
+            !advanced.loading &&
+            advanced.firstRenderedId === previous.firstRenderedId &&
+            advanced.renderedArticles === previous.renderedArticles)
+            advanced.paginationBoundary = {
+                kind: "stable-rendered-tail",
+                lastId: advanced.renderedIds?.at(-1),
+                renderedCount: advanced.renderedArticles,
+                waitMs: 5000,
+                scopeComplete: false,
+            };
+        return advanced;
+    }
     async handleReadCreator(args) {
         if (typeof this.#browser.collectCreator !== "function")
             return {
@@ -186,7 +215,7 @@ export class PlatformCollections {
             missing: absent,
         };
     }
-    async handleReadBookmarks({ folder, discoverOnly = false, ...window } = {}) {
+    async handleReadBookmarks({ folder, discoverOnly = false, resume = false, ...window } = {}) {
         if (!discoverOnly && (typeof folder !== "string" || !folder.trim()))
             throw new Error("需指定收藏文件夹；不以全部书签冒充命名文件夹");
         let nav = await this.#ready({
@@ -194,6 +223,10 @@ export class PlatformCollections {
             targetLabel: folder,
             bookmarkNavigation: true,
         });
+        if (resume && discoverOnly)
+            throw Error("bookmark-resume-discovery-conflict");
+        if (resume)
+            return this.resumeBookmarks(folder, window, nav.page);
         if (discoverOnly && nav.bookmarkFolders?.length)
             return this.bookmarkDiscovery(nav);
         const bookmark = (c) => /^(书签|收藏|Bookmarks)$/i.test(c.label);
@@ -308,6 +341,17 @@ export class PlatformCollections {
             },
         };
     }
+    async resumeBookmarks(folder, window, entryPage) {
+        const selected = await this.confirmBookmarkFolder(folder);
+        if (selected.status)
+            return selected;
+        const value = await this.handleCollectSources(window);
+        return {
+            ...value,
+            folder,
+            folderEvidence: { entryPage, selectedPage: selected.page, name: folder },
+        };
+    }
     async confirmBookmarkFolder(folder) {
         let selected = await this.#ready({ view: "navigation" });
         if (!selected.headings?.includes(folder)) {

package/dist/readers-posts.js

@@ -102,6 +102,17 @@ export function readPosts({ offset = 0, limit = 5, targetId = "", } = {}) {
             ?.getAttribute("href")
             ?.match(/\/status\/(\d+)/)?.[1] ?? null,
         renderedArticles: all.length,
+        renderedIds: all
+            .map((a) => primaryTime(a)
+            ?.closest("a")
+            ?.getAttribute("href")
+            ?.match(/\/status\/(\d+)/)?.[1])
+            .filter(Boolean),
+        atRenderedTail: Boolean(document.scrollingElement) &&
+            document.scrollingElement.scrollTop +
+                document.scrollingElement.clientHeight >=
+                document.scrollingElement.scrollHeight - 2,
+        loading: Array.from(document.querySelectorAll('[role="progressbar"]')).some(visible),
         matched: candidates.length,
         offset,
         moreInDOM: candidates.length > offset + posts.length,

package/dist/results.js

@@ -162,6 +162,14 @@ export function readResult(operation, value, mode) {
         "moreInDOM",
     ]);
     if (operation === "readBookmarks") {
+        if (raw.paginationBoundary)
+            out.paginationBoundary = pick(raw.paginationBoundary, [
+                "kind",
+                "lastId",
+                "renderedCount",
+                "waitMs",
+                "scopeComplete",
+            ]);
         if (raw.folders !== undefined)
             out.folders = strings(raw.folders);
         if (typeof raw.folder === "string")

package/dist/types.d.ts

@@ -116,6 +116,13 @@ export interface ReadResult {
         selectedPage?: string;
         name?: string;
     };
+    paginationBoundary?: {
+        kind?: string;
+        lastId?: string;
+        renderedCount?: number;
+        waitMs?: number;
+        scopeComplete?: boolean;
+    };
     sources?: PostEvidence[];
     post?: PostEvidence;
     context?: PostEvidence[];
@@ -198,6 +205,8 @@ export interface IncomingConversationResult {
 }
 export interface BookmarkOptions extends WindowOptions {
     folder?: string;
+    /** Continue the currently observed named-folder window without reselecting it. */
+    resume?: boolean;
     /** Discover names only; never read all bookmarks as a named folder. */
     discoverOnly?: boolean;
 }

package/generated/observation.mjs

@@ -103,6 +103,17 @@ export const readXObservation = (query) => {
             ?.getAttribute("href")
             ?.match(/\/status\/(\d+)/)?.[1] ?? null,
         renderedArticles: all.length,
+        renderedIds: all
+            .map((a) => primaryTime(a)
+            ?.closest("a")
+            ?.getAttribute("href")
+            ?.match(/\/status\/(\d+)/)?.[1])
+            .filter(Boolean),
+        atRenderedTail: Boolean(document.scrollingElement) &&
+            document.scrollingElement.scrollTop +
+                document.scrollingElement.clientHeight >=
+                document.scrollingElement.scrollHeight - 2,
+        loading: Array.from(document.querySelectorAll('[role="progressbar"]')).some(visible),
         matched: candidates.length,
         offset,
         moreInDOM: candidates.length > offset + posts.length,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nextclaw/x-harness",
-  "version": "0.2.52",
+  "version": "0.2.54",
   "type": "module",
   "description": "Typed X task harness with compact business results and explicit diagnostics.",
   "main": "./dist/index.js",
@@ -42,5 +42,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b3e3310d4977db067f05ee409f58ae619f042c9a"
+  "gitHead": "a9b2bb0d7399463a8dc259e433e3a2bd31dc9bc7"
 }

package/skill/references/reads.md

@@ -4,7 +4,7 @@
 | --- | --- | --- |
 | readIncomingReplies | none | processedIds, limit (5), maxPages (3), mode |
 | readCreator | handle | target (10;1–50), maxScrolls, navigate, expand, mode |
-| readBookmarks | folder (observed name), or discoverOnly:true | processedIds, limit (1–5), maxPages (1–10), mode |
+| readBookmarks | folder (observed name), or discoverOnly:true | processedIds, limit (1–5), maxPages (1–10), resume, mode |
 | searchSources | query | processedIds, limit (1–5), maxPages (1–10), mode |
 | readPost | target: {postId,url,evidenceRef} | includeContext, resolveQuote, mode |
 | readPerson | target: {handle,url,evidenceRef} | mode |
@@ -13,16 +13,18 @@
 | inspectAccount | none | mode |
 | inspectRound | taskId (original batch ID) | none |
 
-Targets need observed proof. Native creator: selected profile, navigate:false; relative time unknown; page changes stop.
+Targets require proof. Native creator: selected profile, navigate:false; relative time unknown; stop on page change.
+
+Bookmarks resume:true continues the bound folder; rendered tail ≠ full proof.
 
 observed ≠ field completeness; pageComplete:false = scope. View media before describing; preserve target text; keep other reads local.
 
 `readIncomingReplies`: ledger account; skip settled/intent/unknown and processedIds across dates. readPost(includeContext:true) for ancestors; missing context blocks review. Dedup publicly.
 
-Incoming work: use `readIncomingConversations({targets?,...window})` once for discovery + context (≤5); no preceding `readIncomingReplies`. It preflights required capabilities and preserves source failures. Returns ancestorPath, nodes, confirmed edges, unknown parents and attempts; rootCandidateId is only the earliest loaded ancestor. Missing context blocks review; never guess roots/edges or inbox clearance. Use `readIncomingReplies` only when the candidate list alone is the goal; it excludes settled/intent/unknown + cross-date processedIds.
+Incoming: `readIncomingConversations({targets?,...window})` combines discovery/context (≤5); no preceding `readIncomingReplies`. Preflight/source failures remain visible. Returns ancestorPath, nodes, confirmed edges, unknown parents and attempts; rootCandidateId is only the earliest loaded ancestor. Missing context blocks review; never guess roots/edges or inbox clearance. Use `readIncomingReplies` only when the candidate list alone is the goal; it excludes settled/intent/unknown + cross-date processedIds.
 
 `resolveQuote:true` follows one observed card and returns `post.quoteSource` only after exact destination/body/author/time binding.
 
-`readPeople`: observed follower/following lists; offsets reuse cells. advance scrolls a unique fresh handle. people has full bio, blue/relationship. Dedup; unknowns need profiles. Native unsupported.
+`readPeople`: observed follower/following; offset reuses cells; advance scrolls a fresh unique handle. Full bio/blue/relationship; dedup; unknowns need profiles. No Native.
 
-Discovery returns names only.
+Discovery: names only.