@nextclaw/x-harness 0.2.54 → 0.2.56

package/SOURCE.md

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

package/dist/browser-dom-editing.js

@@ -196,9 +196,11 @@ export class DOMEditing {
             throw new Error("翻页须有已观察原帖链接");
         const anchor = await this.#unique(this.#tab.playwright
             .locator(`a[href=${JSON.stringify(primary)}]`)
-            .filter({ visible: true }));
+            .filter({ has: this.#tab.playwright.locator("time") }));
         this.#session.current = null;
-        await anchor.press("PageDown");
+        // A retained timestamp can be far below the viewport. Validate it, then
+        // scroll the page without waiting for that offscreen link to take focus.
+        await (await this.#unique(this.#tab.playwright.locator("body"))).press("PageDown");
         return { completed: true };
         return { completed: false, loc, submittedEditor };
     }

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

@@ -3,6 +3,5 @@ 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, sameHandle, sameText } from "./platform-rules.js";
+import { xURL } from "./platform-rules.js";
 import { valueOf } from "./browser-common.js";
 export class DOMSubmission {
     #submitAX;
@@ -29,7 +29,6 @@ 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)) ?? [];
@@ -89,7 +88,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 this.waitSubmittedEditor(submittedEditor, result);
+            await submittedEditor.waitFor({ state: "hidden", timeoutMs: 10000 });
         if (["submitPost", "submitReply"].includes(command.operation)) {
             try {
                 await this.#tab.playwright.waitForLoadState({
@@ -105,36 +104,6 @@ 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/growth-publishing.js

@@ -83,7 +83,7 @@ export class IndependentPublishing {
             const baseline = await this.#platform.findSubmission({
                 ...action,
                 intentAt: this.#stamp(),
-            });
+            }, { phase: "baseline" });
             if (baseline.needsStateCheck || baseline.alerts?.length)
                 throw new Error("publication-baseline-unconfirmed");
             token = `${action.id}:${this.#stamp()}:${Math.random()}`;

package/dist/platform-collections.js

@@ -158,38 +158,50 @@ export class PlatformCollections {
     }
     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;
+        let advanced;
+        for (let step = 0; step < 10; step++) {
+            await this.#browser.act({ operation: "nextPosts" });
+            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,
+                };
+            if (advanced.paginationBoundary ||
+                !Number.isFinite(advanced.viewportScrollTop) ||
+                advanced.renderedArticles !== previous.renderedArticles ||
+                (advanced.renderedIds ?? advanced.posts?.map((p) => p.id))?.some((id) => !renderedIds.includes(id)))
+                return advanced;
         }
-        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;
+        return {
+            ...advanced,
+            needsStateCheck: true,
+            missing: ["bounded-scroll-window-exhausted"],
+        };
     }
     async handleReadCreator(args) {
         if (typeof this.#browser.collectCreator !== "function")

package/dist/platform-dependencies.d.ts

@@ -31,7 +31,9 @@ export interface PlatformDependencies {
     readFeedback: ({ targets, replyLimit }?: any) => Promise<any>;
     readPerson: (target: any) => Promise<any>;
     readPost: (target: any) => Promise<any>;
-    findSubmission: (action: any) => Promise<any>;
+    findSubmission: (action: any, context?: {
+        phase?: "baseline";
+    }) => Promise<any>;
     submitFollow: (action: any) => Promise<any>;
     submitPost: (action: any) => Promise<any>;
     submitReply: (action: any) => Promise<any>;

package/dist/platform-writing.d.ts

@@ -2,7 +2,9 @@ import type { PlatformDependencies } from "./platform-dependencies.js";
 export declare class PlatformWriting {
     #private;
     compose: (action: any) => Promise<any>;
-    findSubmission: (action: any) => Promise<any>;
+    findSubmission: (action: any, context?: {
+        phase?: "baseline";
+    }) => Promise<any>;
     submitFollow: (action: any) => Promise<any>;
     submitPost: (action: any) => Promise<any>;
     submitReply: (action: any) => Promise<any>;

package/dist/platform-writing.js

@@ -58,7 +58,7 @@ export class PlatformWriting {
             ...(action.activation ? { activation: action.activation } : {}),
         });
     }
-    async handleFindSubmission(action) {
+    async handleFindSubmission(action, context = {}) {
         if (action.kind === "follow") {
             let value = await this.#followStage(action, "verify-read", () => this.#readPerson(action));
             const verificationAlerts = [...(value.alerts ?? [])];
@@ -117,7 +117,8 @@ export class PlatformWriting {
                 ? { url: action.url, evidenceRef: action.evidenceRef }
                 : { url: action.accountURL, evidenceRef: action.accountEvidenceRef };
         let value = await this.#open(receiptTarget, { view: "posts", limit: 5 });
-        if (!(action.kind === "original" && observedReceipt) &&
+        if (context.phase !== "baseline" &&
+            !(action.kind === "original" && observedReceipt) &&
             !value.needsStateCheck &&
             !(this.#browser.capabilities?.("refreshPosts") ?? ["refreshPosts"]).length) {
             await this.#browser.act({

package/dist/platform.d.ts

@@ -11,7 +11,9 @@ export declare class XPlatform {
     readFeedback: ({ targets, replyLimit }?: any) => Promise<any>;
     readPerson: (target: any) => Promise<any>;
     readPost: (target: any) => Promise<any>;
-    findSubmission: (action: any) => Promise<any>;
+    findSubmission: (action: any, context?: {
+        phase?: "baseline";
+    }) => Promise<any>;
     submitFollow: (action: any) => Promise<any>;
     submitPost: (action: any) => Promise<any>;
     submitReply: (action: any) => Promise<any>;

package/dist/readers-navigation.js

@@ -23,7 +23,7 @@ export function readNavigation({ targetLabel, bookmarkNavigation = false, } = {}
         ...new Set([
             ...Array.from(document.querySelectorAll("nav a[href],nav button")).filter((el) => !el.closest("main")),
             ...Array.from(primary?.querySelectorAll('a[href],button,[role="button"],[role="tab"]') ?? []),
-            ...Array.from(document.querySelectorAll('[role="menu"] a[href], [role="menu"] button, [data-testid="Dropdown"] a[href], [data-testid="Dropdown"] button')),
+            ...Array.from(document.querySelectorAll('[role="menu"] a[href], [role="menu"] button, [data-testid="Dropdown"] a[href], [data-testid="Dropdown"] button, [data-testid="Dropdown"] [role="menuitemradio"]')),
         ]),
     ].filter((el) => visible(el) &&
         !el.closest("article") &&

package/dist/readers-posts.js

@@ -108,6 +108,7 @@ export function readPosts({ offset = 0, limit = 5, targetId = "", } = {}) {
             ?.getAttribute("href")
             ?.match(/\/status\/(\d+)/)?.[1])
             .filter(Boolean),
+        viewportScrollTop: document.scrollingElement?.scrollTop,
         atRenderedTail: Boolean(document.scrollingElement) &&
             document.scrollingElement.scrollTop +
                 document.scrollingElement.clientHeight >=

package/generated/observation.mjs

@@ -109,6 +109,7 @@ export const readXObservation = (query) => {
             ?.getAttribute("href")
             ?.match(/\/status\/(\d+)/)?.[1])
             .filter(Boolean),
+        viewportScrollTop: document.scrollingElement?.scrollTop,
         atRenderedTail: Boolean(document.scrollingElement) &&
             document.scrollingElement.scrollTop +
                 document.scrollingElement.clientHeight >=
@@ -445,7 +446,7 @@ export const readXObservation = (query) => {
         ...new Set([
             ...Array.from(document.querySelectorAll("nav a[href],nav button")).filter((el) => !el.closest("main")),
             ...Array.from(primary?.querySelectorAll('a[href],button,[role="button"],[role="tab"]') ?? []),
-            ...Array.from(document.querySelectorAll('[role="menu"] a[href], [role="menu"] button, [data-testid="Dropdown"] a[href], [data-testid="Dropdown"] button')),
+            ...Array.from(document.querySelectorAll('[role="menu"] a[href], [role="menu"] button, [data-testid="Dropdown"] a[href], [data-testid="Dropdown"] button, [data-testid="Dropdown"] [role="menuitemradio"]')),
         ]),
     ].filter((el) => visible(el) &&
         !el.closest("article") &&

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nextclaw/x-harness",
-  "version": "0.2.54",
+  "version": "0.2.56",
   "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": "a9b2bb0d7399463a8dc259e433e3a2bd31dc9bc7"
+  "gitHead": "84766d97c35a9cecbee5b8c6461aaa2e28d02c81"
 }