tickmarkr 1.77.0 → 1.78.0

package/dist/drivers/herdr.d.ts

@@ -2,6 +2,10 @@ import { type ExecutorDriver, type NotifyOpts, type Slot, type SlotOpts } from "
 export declare const TRAILER_SAFE_FLOOR_COLS = 108;
 export declare const TRAILER_WIDTH_MARGIN = 2;
 export declare const DELIVERY_ATTEMPTS = 3;
+export interface HerdrTimeSource {
+    now: () => number;
+    sleep: (ms: number) => Promise<void>;
+}
 export declare class DeliveryReadinessError extends Error {
     readonly waitedMs: number;
     readonly transcript: string;
@@ -13,6 +17,7 @@ export declare function workerSplitDirection(paneCols: number | null, safeFloor?
 export declare class HerdrDriver implements ExecutorDriver {
     private bin;
     private workersPerTab;
+    private time;
     id: string;
     interactive: boolean;
     private groups;
@@ -24,12 +29,13 @@ export declare class HerdrDriver implements ExecutorDriver {
     private ws;
     private callerPane;
     private watches;
-    constructor(bin?: string, workersPerTab?: number);
+    constructor(bin?: string, workersPerTab?: number, time?: HerdrTimeSource);
     private serial;
     private deliveryQueue;
     private reserveDispatch;
     private verifyPaneIdentityBinding;
     private deliveryMatches;
+    private shellExecutionEchoed;
     private submissionRegistered;
     static available(): boolean;
     private herdr;

package/dist/drivers/herdr.js

@@ -14,6 +14,10 @@ const DELIVERY_READ_LINES = 80;
 const DELIVERY_SETTLE_READ_ATTEMPTS = 6;
 const DELIVERY_SETTLE_POLL_MS = 100;
 const DELIVERY_READINESS_TIMEOUT_MS = 1_000;
+const SYSTEM_TIME = {
+    now: () => Date.now(),
+    sleep: (ms) => new Promise((resolve) => setTimeout(resolve, ms)),
+};
 // OBS-142: a typed identity lets the daemon's next task distinguish cold-start variance from
 // structural driver faults without parsing prose. The message also carries the bounded wait and
 // final pane evidence so a terminal failure is diagnosable on its own.
@@ -37,6 +41,7 @@ export function workerSplitDirection(paneCols, safeFloor = TRAILER_SAFE_FLOOR_CO
 export class HerdrDriver {
     bin;
     workersPerTab;
+    time;
     id = "herdr";
     interactive = true;
     groups = new Map();
@@ -55,9 +60,10 @@ export class HerdrDriver {
     ws = process.env.HERDR_WORKSPACE_ID;
     callerPane = process.env.HERDR_PANE_ID;
     watches = new Map();
-    constructor(bin = "herdr", workersPerTab = 3) {
+    constructor(bin = "herdr", workersPerTab = 3, time = SYSTEM_TIME) {
         this.bin = bin;
         this.workersPerTab = workersPerTab;
+        this.time = time;
     }
     serial(fn) {
         const p = this.groupSerial.then(fn, fn);
@@ -111,9 +117,27 @@ export class HerdrDriver {
         const needle = norm(cmd);
         return needle.length > 0 && hay.includes(needle);
     }
+    shellExecutionEchoed(transcript, cmd) {
+        const norm = (s) => s.replace(/\u001B\[[0-9;?]*[ -/]*[@-~]/g, "").replace(/\s+/g, " ").trim();
+        const needle = norm(cmd);
+        if (!needle)
+            return false;
+        return transcript.split("\n").some((rawLine) => {
+            const line = norm(rawLine);
+            if (line === needle || !line.endsWith(needle))
+                return false;
+            const prefix = line.slice(0, -needle.length).trimEnd();
+            if (/[│┃╭╰┌└]/.test(prefix))
+                return false;
+            return /^(?:[$%#>]|[➜❯❱›»λ])(?:\s|$)/.test(prefix)
+                || /[$%#>✗❯❱›»λ]$/.test(prefix);
+        });
+    }
     // Submission requires positive post-Enter evidence. A prompt echoed above a fresh input target
     // proves registration; a declared box that is visibly empty after the verified paste also proves
-    // it consumed the prompt. Prompt absence alone is never success (OBS-142).
+    // it consumed the prompt. At the launch stage, a structurally prompt-prefixed shell execution echo
+    // is stronger evidence than waiting for first paint from the launched interface (OBS-144).
+    // Prompt absence alone is never success (OBS-142).
     submissionRegistered(transcript, cmd, inputBox) {
         const norm = (s) => s.replace(/\s+/g, "");
         const hay = norm(transcript);
@@ -121,6 +145,8 @@ export class HerdrDriver {
         const promptAt = hay.lastIndexOf(needle);
         if (needle.length === 0)
             return false;
+        if (inputBox?.launchCommand?.(cmd) === true && this.shellExecutionEchoed(transcript, cmd))
+            return true;
         if (promptAt < 0)
             return inputBox !== undefined && matchesEmptyInputBox(transcript, inputBox);
         if (inputBox && matchesInputBox(transcript, inputBox)) {
@@ -527,7 +553,7 @@ export class HerdrDriver {
             }
             transcript = read.stdout;
             if (readAttempt < readAttempts - 1) {
-                await new Promise((resolve) => setTimeout(resolve, DELIVERY_SETTLE_POLL_MS));
+                await this.time.sleep(DELIVERY_SETTLE_POLL_MS);
             }
         }
         return { ok: false, transcript, recognizedInputBox: false };
@@ -536,19 +562,19 @@ export class HerdrDriver {
         const inputBox = this.inputBoxes.get(slot);
         const requireInputBox = inputBox !== undefined && inputBox.launchCommand?.(cmd) !== true;
         const timeoutMs = inputBox?.readinessTimeoutMs ?? DELIVERY_READINESS_TIMEOUT_MS;
-        const started = Date.now();
+        const started = this.time.now();
         let previous;
         let transcript = "";
         let reads = 0;
         while (true) {
-            const elapsedBeforeRead = Date.now() - started;
+            const elapsedBeforeRead = this.time.now() - started;
             const remainingBeforeRead = timeoutMs - elapsedBeforeRead;
             if (remainingBeforeRead <= 0)
                 throw new DeliveryReadinessError(elapsedBeforeRead, transcript);
             const read = await this.herdr(`pane read ${shq(pane)} --source recent-unwrapped --lines ${DELIVERY_READ_LINES}`, slot.cwd, Math.max(1, Math.ceil(remainingBeforeRead)));
             reads++;
             transcript = read.stdout || transcript;
-            const waitedMs = Date.now() - started;
+            const waitedMs = this.time.now() - started;
             if (read.code !== 0) {
                 // Once at least one valid frame has been observed, a read that consumes the remainder of
                 // the readiness budget is the bounded window expiring, not a new submission/protocol
@@ -574,7 +600,7 @@ export class HerdrDriver {
             // The second read is immediate: an already-painted stable target proves readiness with no
             // added delay. Only observed change spends a poll interval, and every path remains bounded.
             if (reads > 1) {
-                await new Promise((resolve) => setTimeout(resolve, Math.min(DELIVERY_SETTLE_POLL_MS, remaining)));
+                await this.time.sleep(Math.min(DELIVERY_SETTLE_POLL_MS, remaining));
             }
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tickmarkr",
-  "version": "1.77.0",
+  "version": "1.78.0",
   "description": "Spec in, verified work out.",
   "type": "module",
   "license": "MIT",