@cotal-ai/core 0.79.0 → 0.81.1

package/dist/startup-confirm.js

@@ -2,37 +2,89 @@ const CSI = /\x1b\[[0-?]*[ -/]*[@-~]/g;
 const OSC = /\x1b\][^\x07\x1b]*(?:\x07|\x1b\\)/g;
 const ESC = /\x1b(?:.|$)/g;
 const POLL_MS = 250;
-/** How long a runtime waits for a {@link LaunchSpec.confirm} prompt before it ends the seat. */
 const CONFIRM_TIMEOUT_MS = 15_000;
-/** Normalize terminal text according to {@link LaunchSpec.confirm}: ignore ANSI control sequences and whitespace. */
 function normalizeConfirmText(value) {
     return value.replace(OSC, "").replace(CSI, "").replace(ESC, "").replace(/\s+/g, "");
 }
-/**
- * Honor {@link LaunchSpec.confirm} for a runtime that reads its pane instead of owning the child's
- * output: the returned watch presses Enter once when the declared text is on screen, and ends the
- * seat with the pty runtime's message when it is not there within {@link CONFIRM_TIMEOUT_MS}. An
- * Enter sent without looking answers whatever dialog the harness shows first with that dialog's
- * default. The prompt is checked here so a runtime refuses it before it opens the pane.
- */
-export function confirmWatch(prompt) {
-    const needle = normalizeConfirmText(prompt);
-    if (!needle)
-        throw new Error("startup confirmation prompt is empty after ANSI and whitespace normalization");
+/** The seat package repeats this small matcher because it has no core dependency. Both operate on
+ * current screen snapshots, never scrollback accumulated from an earlier dialog. */
+export class StartupConfirmSequence {
+    #final;
+    #before;
+    #step = 0;
+    #stable = false;
+    #done = false;
+    constructor(prompt, before = []) {
+        this.#final = normalizeConfirmText(prompt);
+        if (!this.#final)
+            throw new Error("startup confirmation prompt is empty after ANSI and whitespace normalization");
+        if (!Array.isArray(before) || before.length > 8)
+            throw new Error("invalid startup choices");
+        this.#before = before.map((reply) => {
+            if (!reply || typeof reply.prompt !== "string" || reply.prompt.length > 1024 || !["Down", "Enter"].includes(reply.key))
+                throw new Error("invalid startup choice");
+            const normalized = reply.prompt.split(/\r?\n/).map(normalizeConfirmText).filter(Boolean).join("\n");
+            if (!normalized)
+                throw new Error("startup choice prompt is empty after normalization");
+            return { prompt: normalized, key: reply.key };
+        });
+    }
+    observe(screen) {
+        if (this.#done)
+            return undefined;
+        const lines = screen.split(/\r?\n/).map(normalizeConfirmText).filter(Boolean);
+        const matches = (prompt) => {
+            const expected = prompt.split("\n");
+            return lines.some((_, start) => expected.every((line, offset) => lines[start + offset] === line));
+        };
+        const step = this.#before[this.#step];
+        // Workspace paths can contain the warning text. Prefer a real menu over that text and match
+        // whole visible lines, rather than a substring in the displayed path.
+        if (!step || !matches(step.prompt)) {
+            this.#stable = false;
+            const final = this.#before.length ? matches(this.#final) : normalizeConfirmText(screen).includes(this.#final);
+            if (!final)
+                return undefined;
+            this.#done = true;
+            return { key: "Enter", done: true };
+        }
+        // A partial first paint is not an interactive menu yet. Require the same choice on two
+        // consecutive snapshots; a changed screen clears the observation instead of receiving a key.
+        if (!this.#stable) {
+            this.#stable = true;
+            return undefined;
+        }
+        this.#step++;
+        this.#stable = false;
+        return { key: step.key, done: false };
+    }
+}
+/** Honor {@link LaunchSpec.confirm} and its optional preceding choices within one startup bound.
+ * No key is sent for an unrelated dialog, after exit, or after the final confirmation. */
+export function confirmWatch(prompt, before = []) {
+    // Validate before a runtime starts a child, but allocate mutable state per watch.
+    new StartupConfirmSequence(prompt, before);
     return (pane) => {
+        const sequence = new StartupConfirmSequence(prompt, before);
         const deadline = Date.now() + CONFIRM_TIMEOUT_MS;
         const poll = () => {
             let failure = `Cotal startup confirmation failed: prompt ${JSON.stringify(prompt)} did not appear within ${CONFIRM_TIMEOUT_MS}ms.`;
             try {
-                // A read blocks the event loop, so none starts past the deadline, and none that returns past
-                // it is acted on.
                 if (Date.now() < deadline) {
                     const screen = pane.read();
                     if (screen === undefined)
                         return;
                     if (Date.now() < deadline) {
-                        if (normalizeConfirmText(screen).includes(needle))
-                            return pane.enter();
+                        const action = sequence.observe(screen);
+                        if (action?.key === "Down") {
+                            if (!pane.down)
+                                throw new Error("this runtime cannot answer a Down startup choice");
+                            pane.down();
+                        }
+                        else if (action)
+                            pane.enter();
+                        if (action?.done)
+                            return;
                         setTimeout(poll, POLL_MS);
                         return;
                     }

package/dist/startup-confirm.js.map

@@ -1 +1 @@
-{"version":3,"file":"startup-confirm.js","sourceRoot":"","sources":["../src/startup-confirm.ts"],"names":[],"mappings":"AAEA,MAAM,GAAG,GAAG,0BAA0B,CAAC;AACvC,MAAM,GAAG,GAAG,oCAAoC,CAAC;AACjD,MAAM,GAAG,GAAG,cAAc,CAAC;AAC3B,MAAM,OAAO,GAAG,GAAG,CAAC;AAEpB,gGAAgG;AAChG,MAAM,kBAAkB,GAAG,MAAM,CAAC;AAElC,qHAAqH;AACrH,SAAS,oBAAoB,CAAC,KAAa;IACzC,OAAO,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;AACtF,CAAC;AAcD;;;;;;GAMG;AACH,MAAM,UAAU,YAAY,CAAC,MAAc;IACzC,MAAM,MAAM,GAAG,oBAAoB,CAAC,MAAM,CAAC,CAAC;IAC5C,IAAI,CAAC,MAAM;QAAE,MAAM,IAAI,KAAK,CAAC,8EAA8E,CAAC,CAAC;IAC7G,OAAO,CAAC,IAAI,EAAE,EAAE;QACd,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,kBAAkB,CAAC;QACjD,MAAM,IAAI,GAAG,GAAS,EAAE;YACtB,IAAI,OAAO,GAAG,6CAA6C,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,0BAA0B,kBAAkB,KAAK,CAAC;YACnI,IAAI,CAAC;gBACH,6FAA6F;gBAC7F,kBAAkB;gBAClB,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,QAAQ,EAAE,CAAC;oBAC1B,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;oBAC3B,IAAI,MAAM,KAAK,SAAS;wBAAE,OAAO;oBACjC,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,QAAQ,EAAE,CAAC;wBAC1B,IAAI,oBAAoB,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC;4BAAE,OAAO,IAAI,CAAC,KAAK,EAAE,CAAC;wBACvE,UAAU,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;wBAC1B,OAAO;oBACT,CAAC;gBACH,CAAC;YACH,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,OAAO,GAAG,sCAAuC,GAAa,CAAC,OAAO,EAAE,CAAC;YAC3E,CAAC;YACD,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACrB,CAAC,CAAC;QACF,UAAU,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC5B,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"startup-confirm.js","sourceRoot":"","sources":["../src/startup-confirm.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cotal-ai/core",
   "description": "The Cotal protocol: endpoint, subjects, message types, the NATS client layer, and the extension contracts.",
-  "version": "0.79.0",
+  "version": "0.81.1",
   "license": "Apache-2.0",
   "keywords": [
     "cotal",
@@ -65,8 +65,11 @@
   "scripts": {
     "typecheck": "tsc -p tsconfig.json --noEmit && tsc -p tsconfig.smoke.json",
     "build": "tsc -p tsconfig.json",
-    "test": "tsx smoke/resolve.smoke.ts && tsx smoke/backup.smoke.ts && tsx smoke/space-auth.smoke.ts",
+    "test": "tsx smoke/resolve.smoke.ts && tsx smoke/backup.smoke.ts && tsx smoke/space-auth.smoke.ts && pnpm smoke:schema-own-properties && pnpm smoke:schema-own-properties-controls",
     "smoke:backup": "tsx smoke/backup.smoke.ts",
-    "smoke:backup:live": "tsx smoke/backup-live.smoke.ts"
+    "smoke:backup:live": "tsx smoke/backup-live.smoke.ts",
+    "smoke:schema-own-properties": "node smoke/schema-own-properties.public.mjs --gate partial",
+    "smoke:schema-own-properties-controls": "node smoke/schema-own-properties.public.mjs --gate controls",
+    "smoke:schema-conformance-20": "node smoke/schema-own-properties.public.mjs --gate full"
   }
 }