@owlmeans/viable-sdk 0.1.18-rc.8 → 0.1.18

package/build/session/index.js

@@ -1,16 +1,20 @@
 import { ConnectOpErrorKind, ConnectOpKind, ConnectSessionStatus } from '@owlmeans/viable-common';
 import { PULL_WAIT_MS } from '../consts.js';
-import { writeEnv } from '../project/env.js';
-import { readMarker, writeMarker } from '../project/marker.js';
+import { makeProjectEnvHelper } from '../project/env.js';
+import { makeMarkerHelper } from '../project/marker.js';
+import { QuestionQueue } from './questions.js';
 import { TaskQueue } from './tasks.js';
+import { EMPTY_PULL_PAUSE_MS, FAST_PULL_MS } from './consts.local.js';
 /**
  * One attached connector, running.
  *
- * The loop is deliberately simple and deliberately serial: pull operations, answer them one at a
- * time, put model tasks aside for the parent agent to drain. Serial because the thing on the other
- * end of a local operation is a filesystem the platform believes it is the only writer of — two
- * concurrent template writes into the same tree is not a throughput problem, it is a corrupted
- * tree.
+ * Two loops. The PULL loop never stops to execute anything: it files model tasks and questions for
+ * the parent agent and hands every local operation to the WORKER, which answers them one at a time.
+ * Serial because the thing on the other end of a local operation is a filesystem the platform
+ * believes it is the only writer of — two concurrent template writes into the same tree is not a
+ * throughput problem, it is a corrupted tree. Separate because a local command can take minutes (a
+ * `bun install`), and a pull loop that waited for it would leave a model task the platform is
+ * blocked on undelivered for exactly that long.
  *
  * Results are remembered by operation id. A connector that reconnects is handed everything still
  * outstanding, including whatever it had already answered when the connection dropped, and
@@ -32,12 +36,13 @@ const recordMarker = async (opts, projectId) => {
     const dir = opts.open.projectDir;
     if (dir == null)
         return;
+    const markers = makeMarkerHelper(dir);
     try {
-        const existing = await readMarker(dir);
+        const existing = await markers.readMarker();
         if (existing?.projectId === projectId)
             return;
         const status = await opts.api.project.status(projectId);
-        await writeMarker(dir, {
+        await markers.writeMarker({
             version: 1,
             apiUrl: opts.apiUrl ?? '',
             projectId,
@@ -55,12 +60,18 @@ export const openSession = async (opts) => {
     if (session.projectId != null)
         await recordMarker(opts, session.projectId);
     const tasks = new TaskQueue();
+    const questions = new QuestionQueue();
     const answered = new Map();
+    /** Local operations queued for or running on the worker — a redelivery of one is not queued twice. */
+    const working = new Set();
+    let worker = Promise.resolve();
     const stats = {
         opsDone: 0,
         opsFailed: 0,
         tasksDelivered: 0,
         tasksSubmitted: 0,
+        questionsDelivered: 0,
+        questionsAnswered: 0,
         lastActivityAt: Date.now(),
         transport: 'pull',
     };
@@ -92,9 +103,37 @@ export const openSession = async (opts) => {
             }
             return;
         }
+        if (op.kind === ConnectOpKind.Inquiry) {
+            // Executed by nobody: it is a decision about the user's own project, and a connector that
+            // answered one itself would build a whole application on a guess nobody made. Queued for
+            // the parent agent to put to a person, exactly as a model task is queued for its subagent.
+            if (questions.push(op.payload, op.id)) {
+                stats.questionsDelivered += 1;
+                stats.lastActivityAt = Date.now();
+            }
+            return;
+        }
+        // Handed to the worker and never awaited here, so the next pull still delivers the model task
+        // the platform may be blocked on while this one runs. A redelivery of an operation that is
+        // still queued or running is the same operation, and is not queued again.
+        if (working.has(op.id))
+            return;
+        working.add(op.id);
+        worker = worker.then(async () => {
+            try {
+                if (!closed)
+                    await execute(op);
+            }
+            finally {
+                working.delete(op.id);
+            }
+        });
+    };
+    /** One local operation, answered. Never throws: a failure is an answer too. */
+    const execute = async (op) => {
         try {
             const value = op.kind === ConnectOpKind.Configure
-                ? await writeEnv(requireExecutor().dir, op.payload)
+                ? await makeProjectEnvHelper(requireExecutor().dir).writeEnv(op.payload)
                 : await requireExecutor().execute(op.payload);
             stats.opsDone += 1;
             await submit({ opId: op.id, sessionId: session.id, ok: true, value });
@@ -126,13 +165,13 @@ export const openSession = async (opts) => {
     /**
      * The pull loop.
      *
-     * A long poll rather than a socket, as the first transport: it works through every proxy, needs
-     * no reconnection logic, and is the only option the URL-configured host has at all. The socket
-     * is an optimisation over it, not a replacement for it.
+     * A long poll, the connector's only transport: it works through every proxy and needs no
+     * reconnection logic.
      */
     const loop = async () => {
         while (!closed) {
             try {
+                const startedAt = Date.now();
                 const ops = await opts.api.pullOps(session.id, Math.floor(PULL_WAIT_MS / 1000));
                 stats.lastActivityAt = Date.now();
                 for (const op of ops) {
@@ -140,6 +179,11 @@ export const openSession = async (opts) => {
                         break;
                     await perform(op);
                 }
+                // A long poll that came back empty at once held nothing open — asking again straight away
+                // would spin against the platform.
+                if (ops.length < 1 && Date.now() - startedAt < FAST_PULL_MS) {
+                    await new Promise(resolve => setTimeout(resolve, EMPTY_PULL_PAUSE_MS));
+                }
             }
             catch (e) {
                 if (closed)
@@ -153,12 +197,13 @@ export const openSession = async (opts) => {
     return {
         session,
         stats,
-        nextTask: async (waitMs) => {
-            const task = await tasks.take(waitMs);
+        nextTask: async (waitMs, signal) => {
+            const task = await tasks.take(waitMs, signal);
             if (task != null)
                 stats.lastActivityAt = Date.now();
             return task;
         },
+        taskAvailable: async (waitMs, signal) => await tasks.available(waitMs, signal),
         submitTask: async (result) => {
             const opId = tasks.opIdOf(result.taskId);
             if (opId == null) {
@@ -172,6 +217,28 @@ export const openSession = async (opts) => {
         taskById: taskId => tasks.outstandingById(taskId),
         outstandingTasks: () => tasks.outstandingTasks(),
         pendingTasks: () => tasks.size(),
+        nextQuestion: async (waitMs) => {
+            const question = await questions.take(waitMs);
+            if (question != null)
+                stats.lastActivityAt = Date.now();
+            return question;
+        },
+        answerQuestion: async (answer) => {
+            const opId = questions.opIdOf(answer.inquiryId);
+            if (opId == null) {
+                // The question outlived its operation — the run parked and stopped waiting on this
+                // session. The answer is not lost: it is sent by id through `connect.inquiry.answer`,
+                // which is the caller's fallback and the reason this reports rather than throws.
+                log(`no operation is waiting for question ${answer.inquiryId}`);
+                return;
+            }
+            questions.settle(answer.inquiryId);
+            stats.questionsAnswered += 1;
+            await submit({ opId, sessionId: session.id, ok: true, value: answer });
+        },
+        questionById: inquiryId => questions.outstandingById(inquiryId),
+        outstandingQuestions: () => questions.outstandingQuestions(),
+        pendingQuestions: () => questions.size(),
         close: async () => {
             closed = true;
             try {
@@ -184,5 +251,7 @@ export const openSession = async (opts) => {
     };
 };
 export { ConnectSessionStatus };
+export * from './queue.js';
 export * from './tasks.js';
+export * from './questions.js';
 //# sourceMappingURL=index.js.map

package/build/session/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/session/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAAE,aAAa,EAAE,oBAAoB,EACxD,MAAM,yBAAyB,CAAA;AAIhC,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAE3C,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAC5C,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AAYtC;;;;;;;;;;;;;GAaG;AACH;;;;;;;;;;GAUG;AACH,MAAM,YAAY,GAAG,KAAK,EAAE,IAAoB,EAAE,SAAiB,EAAiB,EAAE;IACpF,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,CAAA;IAChC,IAAI,GAAG,IAAI,IAAI;QAAE,OAAM;IAEvB,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,GAAG,CAAC,CAAA;QACtC,IAAI,QAAQ,EAAE,SAAS,KAAK,SAAS;YAAE,OAAM;QAE7C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;QACvD,MAAM,WAAW,CAAC,GAAG,EAAE;YACrB,OAAO,EAAE,CAAC;YACV,MAAM,EAAE,IAAI,CAAC,MAAM,IAAI,EAAE;YACzB,SAAS;YACT,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,IAAI,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK;YAC/C,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;SACpC,CAAC,CAAA;IACJ,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,wCAAyC,CAAW,CAAC,OAAO,EAAE,CAAC,CAAA;IACjG,CAAC;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,WAAW,GAAG,KAAK,EAAE,IAAoB,EAA2B,EAAE;IACjF,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAA;IACzC,MAAM,OAAO,GAAuB,MAAM,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IACzE,IAAI,OAAO,CAAC,SAAS,IAAI,IAAI;QAAE,MAAM,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,CAAA;IAC1E,MAAM,KAAK,GAAG,IAAI,SAAS,EAAE,CAAA;IAC7B,MAAM,QAAQ,GAAG,IAAI,GAAG,EAA2B,CAAA;IAEnD,MAAM,KAAK,GAAiB;QAC1B,OAAO,EAAE,CAAC;QACV,SAAS,EAAE,CAAC;QACZ,cAAc,EAAE,CAAC;QACjB,cAAc,EAAE,CAAC;QACjB,cAAc,EAAE,IAAI,CAAC,GAAG,EAAE;QAC1B,SAAS,EAAE,MAAM;KAClB,CAAA;IAED,IAAI,MAAM,GAAG,KAAK,CAAA;IAElB,MAAM,MAAM,GAAG,KAAK,EAAE,MAAuB,EAAiB,EAAE;QAC9D,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;QACjC,KAAK,CAAC,cAAc,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;QACjC,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,EAAE,MAAM,CAAC,CAAA;QAC7C,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,2FAA2F;YAC3F,qFAAqF;YACrF,GAAG,CAAC,qBAAqB,MAAM,CAAC,IAAI,KAAM,CAAW,CAAC,OAAO,EAAE,CAAC,CAAA;QAClE,CAAC;IACH,CAAC,CAAA;IAED,MAAM,OAAO,GAAG,KAAK,EAAE,EAAa,EAAiB,EAAE;QACrD,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAA;QAClC,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC;YACnB,MAAM,MAAM,CAAC,MAAM,CAAC,CAAA;YAEpB,OAAM;QACR,CAAC;QAED,IAAI,EAAE,CAAC,IAAI,KAAK,aAAa,CAAC,SAAS,EAAE,CAAC;YACxC,yFAAyF;YACzF,uDAAuD;YACvD,IAAI,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,OAAoB,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;gBAC/C,KAAK,CAAC,cAAc,IAAI,CAAC,CAAA;gBACzB,KAAK,CAAC,cAAc,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;YACnC,CAAC;YAED,OAAM;QACR,CAAC;QAED,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,EAAE,CAAC,IAAI,KAAK,aAAa,CAAC,SAAS;gBAC/C,CAAC,CAAC,MAAM,QAAQ,CAAC,eAAe,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,OAA2B,CAAC;gBACvE,CAAC,CAAC,MAAM,eAAe,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,OAA6B,CAAC,CAAA;YACrE,KAAK,CAAC,OAAO,IAAI,CAAC,CAAA;YAClB,MAAM,MAAM,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAA;QACvE,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,KAAK,CAAC,SAAS,IAAI,CAAC,CAAA;YACpB,MAAM,KAAK,GAAG,CAAU,CAAA;YACxB,GAAG,CAAC,aAAa,EAAE,CAAC,EAAE,YAAY,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;YAClD,MAAM,MAAM,CAAC;gBACX,IAAI,EAAE,EAAE,CAAC,EAAE;gBACX,SAAS,EAAE,OAAO,CAAC,EAAE;gBACrB,EAAE,EAAE,KAAK;gBACT,KAAK,EAAE;oBACL,IAAI,EAAE,KAAK,CAAC,IAAI;oBAChB,OAAO,EAAE,KAAK,CAAC,OAAO;oBACtB,qFAAqF;oBACrF,+EAA+E;oBAC/E,IAAI,EAAE,kBAAkB,CAAC,OAAO;iBACjC;aACF,CAAC,CAAA;QACJ,CAAC;IACH,CAAC,CAAA;IAED,MAAM,eAAe,GAAG,GAAkB,EAAE;QAC1C,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,EAAE,CAAC;YAC1B,MAAM,IAAI,KAAK,CAAC,uEAAuE,CAAC,CAAA;QAC1F,CAAC;QAED,OAAO,IAAI,CAAC,QAAQ,CAAA;IACtB,CAAC,CAAA;IAED;;;;;;OAMG;IACH,MAAM,IAAI,GAAG,KAAK,IAAmB,EAAE;QACrC,OAAO,CAAC,MAAM,EAAE,CAAC;YACf,IAAI,CAAC;gBACH,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC,CAAC,CAAA;gBAC/E,KAAK,CAAC,cAAc,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;gBACjC,KAAK,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC;oBACrB,IAAI,MAAM;wBAAE,MAAK;oBACjB,MAAM,OAAO,CAAC,EAAE,CAAC,CAAA;gBACnB,CAAC;YACH,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,IAAI,MAAM;oBAAE,MAAK;gBACjB,GAAG,CAAC,gBAAiB,CAAW,CAAC,OAAO,EAAE,CAAC,CAAA;gBAC3C,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAA;YAC1D,CAAC;QACH,CAAC;IACH,CAAC,CAAA;IAED,KAAK,IAAI,EAAE,CAAA;IAEX,OAAO;QACL,OAAO;QACP,KAAK;QAEL,QAAQ,EAAE,KAAK,EAAC,MAAM,EAAC,EAAE;YACvB,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;YACrC,IAAI,IAAI,IAAI,IAAI;gBAAE,KAAK,CAAC,cAAc,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;YAEnD,OAAO,IAAI,CAAA;QACb,CAAC;QAED,UAAU,EAAE,KAAK,EAAC,MAAM,EAAC,EAAE;YACzB,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;YACxC,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;gBACjB,GAAG,CAAC,oCAAoC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAA;gBAExD,OAAM;YACR,CAAC;YACD,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;YAC3B,KAAK,CAAC,cAAc,IAAI,CAAC,CAAA;YACzB,MAAM,MAAM,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAA;QACxE,CAAC;QAED,QAAQ,EAAE,MAAM,CAAC,EAAE,CAAC,KAAK,CAAC,eAAe,CAAC,MAAM,CAAC;QAEjD,gBAAgB,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,gBAAgB,EAAE;QAEhD,YAAY,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE;QAEhC,KAAK,EAAE,KAAK,IAAI,EAAE;YAChB,MAAM,GAAG,IAAI,CAAA;YACb,IAAI,CAAC;gBACH,MAAM,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;YACzC,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,GAAG,CAAC,iBAAkB,CAAW,CAAC,OAAO,EAAE,CAAC,CAAA;YAC9C,CAAC;QACH,CAAC;KACF,CAAA;AACH,CAAC,CAAA;AAED,OAAO,EAAE,oBAAoB,EAAE,CAAA;AAC/B,cAAc,YAAY,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/session/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAE,oBAAoB,EAAsJ,MAAM,yBAAyB,CAAA;AACrP,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAE3C,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAA;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AAEtC,OAAO,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAErE;;;;;;;;;;;;;;;GAeG;AACH;;;;;;;;;;GAUG;AACH,MAAM,YAAY,GAAG,KAAK,EAAE,IAAoB,EAAE,SAAiB,EAAiB,EAAE;IACpF,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,CAAA;IAChC,IAAI,GAAG,IAAI,IAAI;QAAE,OAAM;IAEvB,MAAM,OAAO,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAA;IACrC,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,UAAU,EAAE,CAAA;QAC3C,IAAI,QAAQ,EAAE,SAAS,KAAK,SAAS;YAAE,OAAM;QAE7C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;QACvD,MAAM,OAAO,CAAC,WAAW,CAAC;YACxB,OAAO,EAAE,CAAC;YACV,MAAM,EAAE,IAAI,CAAC,MAAM,IAAI,EAAE;YACzB,SAAS;YACT,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,IAAI,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK;YAC/C,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;SACpC,CAAC,CAAA;IACJ,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,wCAAyC,CAAW,CAAC,OAAO,EAAE,CAAC,CAAA;IACjG,CAAC;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,WAAW,GAAG,KAAK,EAAE,IAAoB,EAA2B,EAAE;IACjF,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAA;IACzC,MAAM,OAAO,GAAuB,MAAM,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IACzE,IAAI,OAAO,CAAC,SAAS,IAAI,IAAI;QAAE,MAAM,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,CAAA;IAC1E,MAAM,KAAK,GAAG,IAAI,SAAS,EAAE,CAAA;IAC7B,MAAM,SAAS,GAAG,IAAI,aAAa,EAAE,CAAA;IACrC,MAAM,QAAQ,GAAG,IAAI,GAAG,EAA2B,CAAA;IACnD,sGAAsG;IACtG,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAA;IACjC,IAAI,MAAM,GAAkB,OAAO,CAAC,OAAO,EAAE,CAAA;IAE7C,MAAM,KAAK,GAAiB;QAC1B,OAAO,EAAE,CAAC;QACV,SAAS,EAAE,CAAC;QACZ,cAAc,EAAE,CAAC;QACjB,cAAc,EAAE,CAAC;QACjB,kBAAkB,EAAE,CAAC;QACrB,iBAAiB,EAAE,CAAC;QACpB,cAAc,EAAE,IAAI,CAAC,GAAG,EAAE;QAC1B,SAAS,EAAE,MAAM;KAClB,CAAA;IAED,IAAI,MAAM,GAAG,KAAK,CAAA;IAElB,MAAM,MAAM,GAAG,KAAK,EAAE,MAAuB,EAAiB,EAAE;QAC9D,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;QACjC,KAAK,CAAC,cAAc,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;QACjC,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,EAAE,MAAM,CAAC,CAAA;QAC7C,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,2FAA2F;YAC3F,qFAAqF;YACrF,GAAG,CAAC,qBAAqB,MAAM,CAAC,IAAI,KAAM,CAAW,CAAC,OAAO,EAAE,CAAC,CAAA;QAClE,CAAC;IACH,CAAC,CAAA;IAED,MAAM,OAAO,GAAG,KAAK,EAAE,EAAa,EAAiB,EAAE;QACrD,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAA;QAClC,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC;YACnB,MAAM,MAAM,CAAC,MAAM,CAAC,CAAA;YAEpB,OAAM;QACR,CAAC;QAED,IAAI,EAAE,CAAC,IAAI,KAAK,aAAa,CAAC,SAAS,EAAE,CAAC;YACxC,yFAAyF;YACzF,uDAAuD;YACvD,IAAI,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,OAAoB,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;gBAC/C,KAAK,CAAC,cAAc,IAAI,CAAC,CAAA;gBACzB,KAAK,CAAC,cAAc,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;YACnC,CAAC;YAED,OAAM;QACR,CAAC;QAED,IAAI,EAAE,CAAC,IAAI,KAAK,aAAa,CAAC,OAAO,EAAE,CAAC;YACtC,0FAA0F;YAC1F,yFAAyF;YACzF,2FAA2F;YAC3F,IAAI,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,OAAyB,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;gBACxD,KAAK,CAAC,kBAAkB,IAAI,CAAC,CAAA;gBAC7B,KAAK,CAAC,cAAc,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;YACnC,CAAC;YAED,OAAM;QACR,CAAC;QAED,8FAA8F;QAC9F,2FAA2F;QAC3F,0EAA0E;QAC1E,IAAI,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;YAAE,OAAM;QAC9B,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAA;QAClB,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE;YAC9B,IAAI,CAAC;gBACH,IAAI,CAAC,MAAM;oBAAE,MAAM,OAAO,CAAC,EAAE,CAAC,CAAA;YAChC,CAAC;oBAAS,CAAC;gBACT,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,CAAA;YACvB,CAAC;QACH,CAAC,CAAC,CAAA;IACJ,CAAC,CAAA;IAED,+EAA+E;IAC/E,MAAM,OAAO,GAAG,KAAK,EAAE,EAAa,EAAiB,EAAE;QACrD,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,EAAE,CAAC,IAAI,KAAK,aAAa,CAAC,SAAS;gBAC/C,CAAC,CAAC,MAAM,oBAAoB,CAAC,eAAe,EAAE,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,OAA2B,CAAC;gBAC5F,CAAC,CAAC,MAAM,eAAe,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,OAA6B,CAAC,CAAA;YACrE,KAAK,CAAC,OAAO,IAAI,CAAC,CAAA;YAClB,MAAM,MAAM,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAA;QACvE,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,KAAK,CAAC,SAAS,IAAI,CAAC,CAAA;YACpB,MAAM,KAAK,GAAG,CAAU,CAAA;YACxB,GAAG,CAAC,aAAa,EAAE,CAAC,EAAE,YAAY,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;YAClD,MAAM,MAAM,CAAC;gBACX,IAAI,EAAE,EAAE,CAAC,EAAE;gBACX,SAAS,EAAE,OAAO,CAAC,EAAE;gBACrB,EAAE,EAAE,KAAK;gBACT,KAAK,EAAE;oBACL,IAAI,EAAE,KAAK,CAAC,IAAI;oBAChB,OAAO,EAAE,KAAK,CAAC,OAAO;oBACtB,qFAAqF;oBACrF,+EAA+E;oBAC/E,IAAI,EAAE,kBAAkB,CAAC,OAAO;iBACjC;aACF,CAAC,CAAA;QACJ,CAAC;IACH,CAAC,CAAA;IAED,MAAM,eAAe,GAAG,GAAkB,EAAE;QAC1C,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,EAAE,CAAC;YAC1B,MAAM,IAAI,KAAK,CAAC,uEAAuE,CAAC,CAAA;QAC1F,CAAC;QAED,OAAO,IAAI,CAAC,QAAQ,CAAA;IACtB,CAAC,CAAA;IAED;;;;;OAKG;IACH,MAAM,IAAI,GAAG,KAAK,IAAmB,EAAE;QACrC,OAAO,CAAC,MAAM,EAAE,CAAC;YACf,IAAI,CAAC;gBACH,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;gBAC5B,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC,CAAC,CAAA;gBAC/E,KAAK,CAAC,cAAc,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;gBACjC,KAAK,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC;oBACrB,IAAI,MAAM;wBAAE,MAAK;oBACjB,MAAM,OAAO,CAAC,EAAE,CAAC,CAAA;gBACnB,CAAC;gBACD,0FAA0F;gBAC1F,mCAAmC;gBACnC,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,GAAG,YAAY,EAAE,CAAC;oBAC5D,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,mBAAmB,CAAC,CAAC,CAAA;gBACxE,CAAC;YACH,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,IAAI,MAAM;oBAAE,MAAK;gBACjB,GAAG,CAAC,gBAAiB,CAAW,CAAC,OAAO,EAAE,CAAC,CAAA;gBAC3C,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAA;YAC1D,CAAC;QACH,CAAC;IACH,CAAC,CAAA;IAED,KAAK,IAAI,EAAE,CAAA;IAEX,OAAO;QACL,OAAO;QACP,KAAK;QAEL,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE;YACjC,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;YAC7C,IAAI,IAAI,IAAI,IAAI;gBAAE,KAAK,CAAC,cAAc,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;YAEnD,OAAO,IAAI,CAAA;QACb,CAAC;QAED,aAAa,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC,MAAM,KAAK,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;QAE9E,UAAU,EAAE,KAAK,EAAC,MAAM,EAAC,EAAE;YACzB,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;YACxC,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;gBACjB,GAAG,CAAC,oCAAoC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAA;gBAExD,OAAM;YACR,CAAC;YACD,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;YAC3B,KAAK,CAAC,cAAc,IAAI,CAAC,CAAA;YACzB,MAAM,MAAM,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAA;QACxE,CAAC;QAED,QAAQ,EAAE,MAAM,CAAC,EAAE,CAAC,KAAK,CAAC,eAAe,CAAC,MAAM,CAAC;QAEjD,gBAAgB,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,gBAAgB,EAAE;QAEhD,YAAY,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE;QAEhC,YAAY,EAAE,KAAK,EAAC,MAAM,EAAC,EAAE;YAC3B,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;YAC7C,IAAI,QAAQ,IAAI,IAAI;gBAAE,KAAK,CAAC,cAAc,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;YAEvD,OAAO,QAAQ,CAAA;QACjB,CAAC;QAED,cAAc,EAAE,KAAK,EAAC,MAAM,EAAC,EAAE;YAC7B,MAAM,IAAI,GAAG,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;YAC/C,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;gBACjB,mFAAmF;gBACnF,sFAAsF;gBACtF,iFAAiF;gBACjF,GAAG,CAAC,wCAAwC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAA;gBAE/D,OAAM;YACR,CAAC;YACD,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;YAClC,KAAK,CAAC,iBAAiB,IAAI,CAAC,CAAA;YAC5B,MAAM,MAAM,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAA;QACxE,CAAC;QAED,YAAY,EAAE,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,eAAe,CAAC,SAAS,CAAC;QAE/D,oBAAoB,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,oBAAoB,EAAE;QAE5D,gBAAgB,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE;QAExC,KAAK,EAAE,KAAK,IAAI,EAAE;YAChB,MAAM,GAAG,IAAI,CAAA;YACb,IAAI,CAAC;gBACH,MAAM,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;YACzC,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,GAAG,CAAC,iBAAkB,CAAW,CAAC,OAAO,EAAE,CAAC,CAAA;YAC9C,CAAC;QACH,CAAC;KACF,CAAA;AACH,CAAC,CAAA;AAED,OAAO,EAAE,oBAAoB,EAAE,CAAA;AAC/B,cAAc,YAAY,CAAA;AAC1B,cAAc,YAAY,CAAA;AAC1B,cAAc,gBAAgB,CAAA"}

package/build/session/questions.d.ts

@@ -0,0 +1,16 @@
+import type { InquiryPayload } from '@owlmeans/viable-common';
+import { OpQueue } from './queue.js';
+/**
+ * Questions waiting for the person the parent agent is working for.
+ *
+ * The same queue as the model tasks, and deliberately a SEPARATE one: a question outranks a task
+ * because a person is slower than a subagent, and a parent draining one list would hand a question
+ * to a subagent — which is precisely the outcome the whole primitive exists to prevent. Nothing
+ * here executes anything: a question is delivered, and its answer comes back through the tool the
+ * parent calls after asking.
+ */
+export declare class QuestionQueue extends OpQueue<InquiryPayload> {
+    /** Put to the parent and still unanswered, oldest first. */
+    outstandingQuestions(): InquiryPayload[];
+}
+//# sourceMappingURL=questions.d.ts.map

package/build/session/questions.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"questions.d.ts","sourceRoot":"","sources":["../../src/session/questions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AAE7D,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AAEpC;;;;;;;;GAQG;AACH,qBAAa,aAAc,SAAQ,OAAO,CAAC,cAAc,CAAC;IACxD,4DAA4D;IAC5D,oBAAoB,IAAI,cAAc,EAAE,CAEvC;CACF"}

package/build/session/questions.js

@@ -0,0 +1,17 @@
+import { OpQueue } from './queue.js';
+/**
+ * Questions waiting for the person the parent agent is working for.
+ *
+ * The same queue as the model tasks, and deliberately a SEPARATE one: a question outranks a task
+ * because a person is slower than a subagent, and a parent draining one list would hand a question
+ * to a subagent — which is precisely the outcome the whole primitive exists to prevent. Nothing
+ * here executes anything: a question is delivered, and its answer comes back through the tool the
+ * parent calls after asking.
+ */
+export class QuestionQueue extends OpQueue {
+    /** Put to the parent and still unanswered, oldest first. */
+    outstandingQuestions() {
+        return this.outstanding();
+    }
+}
+//# sourceMappingURL=questions.js.map

package/build/session/questions.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"questions.js","sourceRoot":"","sources":["../../src/session/questions.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AAEpC;;;;;;;;GAQG;AACH,MAAM,OAAO,aAAc,SAAQ,OAAuB;IACxD,4DAA4D;IAC5D,oBAAoB;QAClB,OAAO,IAAI,CAAC,WAAW,EAAE,CAAA;IAC3B,CAAC;CACF"}

package/build/session/queue.d.ts

@@ -0,0 +1,61 @@
+export declare class OpQueue<T extends {
+    id: string;
+}> {
+    private readonly order?;
+    private readonly queue;
+    private readonly ops;
+    /**
+     * Every item this session has ever been handed.
+     *
+     * The platform redelivers an operation on every poll until it is answered — that is what makes a
+     * connector restart cost a round trip instead of a run. A model task takes a parent agent tens of
+     * seconds to answer, so without this the queue grew one copy per poll for the whole time it was
+     * being answered, and the parent then ran the same task over and over: real model calls, paid
+     * for, thrown away. Kept after settling too, so a redelivery that raced the platform's deletion
+     * is ignored rather than answered a second time.
+     */
+    private readonly seen;
+    /**
+     * Handed out and not yet answered. An answer is checked against the item that asked for it.
+     *
+     * Named `held` rather than `outstanding` so the public reading of it can carry that name: the
+     * two subclasses expose it as `outstandingTasks()` / `outstandingQuestions()`, and a field and
+     * a method cannot share one name.
+     */
+    private readonly held;
+    private readonly waiting;
+    /** Callers told when an item is QUEUED, without taking it — see {@link OpQueue.available}. */
+    private readonly watching;
+    /**
+     * @param order Which queued item goes first; absent, the oldest. Applied only among items that
+     *   are queued — one pushed while a caller waits goes straight to that caller.
+     */
+    constructor(order?: ((a: T, b: T) => number) | undefined);
+    /** @returns whether the item was accepted — `false` for a redelivery of one already handed over. */
+    push(item: T, opId: string): boolean;
+    /**
+     * The next item, or null once `waitMs` elapses or `signal` aborts. Never rejects: nothing to do
+     * is not a failure.
+     *
+     * An aborted wait is REMOVED, not merely ignored. A caller that gave up — a tool that answered on
+     * something else first — would otherwise leave a waiter behind that swallows the next item: handed
+     * out to nobody, held as outstanding, and never shown to the parent that has to perform it.
+     */
+    take(waitMs: number, signal?: AbortSignal): Promise<T | null>;
+    /**
+     * Whether an item is queued, waiting up to `waitMs` for one; consumes nothing.
+     *
+     * For a caller that races an item against something else and must not take one it may not use:
+     * it learns one is there, then takes it with `take(0)` — which may still answer null when another
+     * caller was quicker, so the race goes on.
+     */
+    available(waitMs: number, signal?: AbortSignal): Promise<boolean>;
+    opIdOf(id: string): string | null;
+    outstandingById(id: string): T | null;
+    /** Handed out and still unanswered, oldest first. */
+    outstanding(): T[];
+    settle(id: string): void;
+    size(): number;
+    private shiftReady;
+}
+//# sourceMappingURL=queue.d.ts.map

package/build/session/queue.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"queue.d.ts","sourceRoot":"","sources":["../../src/session/queue.ts"],"names":[],"mappings":"AAoBA,qBAAa,OAAO,CAAC,CAAC,SAAS;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE;IA8B/B,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC;IA7BnC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAU;IAChC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAA4B;IAChD;;;;;;;;;OASG;IACH,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAoB;IACzC;;;;;;OAMG;IACH,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAuB;IAC5C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAwB;IAChD,8FAA8F;IAC9F,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAiB;IAE1C;;;OAGG;IACH,YAA6B,KAAK,CAAC,GAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,MAAM,aAAA,EAAI;IAE/D,oGAAoG;IACpG,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAgBnC;IAED;;;;;;;OAOG;IACG,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,CA+BlE;IAED;;;;;;OAMG;IACG,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,CAyBtE;IAED,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAEhC;IAED,eAAe,CAAC,EAAE,EAAE,MAAM,GAAG,CAAC,GAAG,IAAI,CAEpC;IAED,qDAAqD;IACrD,WAAW,IAAI,CAAC,EAAE,CAEjB;IAED,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAGvB;IAED,IAAI,IAAI,MAAM,CAEb;IAED,OAAO,CAAC,UAAU;CASnB"}

package/build/session/queue.js

@@ -0,0 +1,156 @@
+export class OpQueue {
+    order;
+    queue = [];
+    ops = new Map();
+    /**
+     * Every item this session has ever been handed.
+     *
+     * The platform redelivers an operation on every poll until it is answered — that is what makes a
+     * connector restart cost a round trip instead of a run. A model task takes a parent agent tens of
+     * seconds to answer, so without this the queue grew one copy per poll for the whole time it was
+     * being answered, and the parent then ran the same task over and over: real model calls, paid
+     * for, thrown away. Kept after settling too, so a redelivery that raced the platform's deletion
+     * is ignored rather than answered a second time.
+     */
+    seen = new Set();
+    /**
+     * Handed out and not yet answered. An answer is checked against the item that asked for it.
+     *
+     * Named `held` rather than `outstanding` so the public reading of it can carry that name: the
+     * two subclasses expose it as `outstandingTasks()` / `outstandingQuestions()`, and a field and
+     * a method cannot share one name.
+     */
+    held = new Map();
+    waiting = [];
+    /** Callers told when an item is QUEUED, without taking it — see {@link OpQueue.available}. */
+    watching = [];
+    /**
+     * @param order Which queued item goes first; absent, the oldest. Applied only among items that
+     *   are queued — one pushed while a caller waits goes straight to that caller.
+     */
+    constructor(order) {
+        this.order = order;
+    }
+    /** @returns whether the item was accepted — `false` for a redelivery of one already handed over. */
+    push(item, opId) {
+        // The op id is refreshed even for a known item: a redelivery carries the same id today, and
+        // answering the wrong operation is worse than answering none.
+        this.ops.set(item.id, opId);
+        if (this.seen.has(item.id))
+            return false;
+        this.seen.add(item.id);
+        const next = this.waiting.shift();
+        if (next != null) {
+            next.resolve(item);
+            return true;
+        }
+        this.queue.push(item);
+        for (const watcher of this.watching.splice(0))
+            watcher.resolve(true);
+        return true;
+    }
+    /**
+     * The next item, or null once `waitMs` elapses or `signal` aborts. Never rejects: nothing to do
+     * is not a failure.
+     *
+     * An aborted wait is REMOVED, not merely ignored. A caller that gave up — a tool that answered on
+     * something else first — would otherwise leave a waiter behind that swallows the next item: handed
+     * out to nobody, held as outstanding, and never shown to the parent that has to perform it.
+     */
+    async take(waitMs, signal) {
+        const ready = this.shiftReady();
+        if (ready != null) {
+            this.held.set(ready.id, ready);
+            return ready;
+        }
+        if (waitMs <= 0 || signal?.aborted === true)
+            return null;
+        return await new Promise(resolve => {
+            const leave = () => {
+                clearTimeout(entry.timer);
+                signal?.removeEventListener('abort', abandon);
+                const at = this.waiting.indexOf(entry);
+                if (at >= 0)
+                    this.waiting.splice(at, 1);
+            };
+            const abandon = () => {
+                leave();
+                resolve(null);
+            };
+            const entry = {
+                resolve: item => {
+                    leave();
+                    if (item != null)
+                        this.held.set(item.id, item);
+                    resolve(item);
+                },
+                timer: setTimeout(abandon, waitMs),
+            };
+            signal?.addEventListener('abort', abandon, { once: true });
+            this.waiting.push(entry);
+        });
+    }
+    /**
+     * Whether an item is queued, waiting up to `waitMs` for one; consumes nothing.
+     *
+     * For a caller that races an item against something else and must not take one it may not use:
+     * it learns one is there, then takes it with `take(0)` — which may still answer null when another
+     * caller was quicker, so the race goes on.
+     */
+    async available(waitMs, signal) {
+        if (this.queue.length > 0)
+            return true;
+        if (waitMs <= 0 || signal?.aborted === true)
+            return false;
+        return await new Promise(resolve => {
+            const leave = () => {
+                clearTimeout(entry.timer);
+                signal?.removeEventListener('abort', abandon);
+                const at = this.watching.indexOf(entry);
+                if (at >= 0)
+                    this.watching.splice(at, 1);
+            };
+            const abandon = () => {
+                leave();
+                resolve(false);
+            };
+            const entry = {
+                resolve: ready => {
+                    leave();
+                    resolve(ready);
+                },
+                timer: setTimeout(abandon, waitMs),
+            };
+            signal?.addEventListener('abort', abandon, { once: true });
+            this.watching.push(entry);
+        });
+    }
+    opIdOf(id) {
+        return this.ops.get(id) ?? null;
+    }
+    outstandingById(id) {
+        return this.held.get(id) ?? null;
+    }
+    /** Handed out and still unanswered, oldest first. */
+    outstanding() {
+        return [...this.held.values()];
+    }
+    settle(id) {
+        this.ops.delete(id);
+        this.held.delete(id);
+    }
+    size() {
+        return this.queue.length;
+    }
+    shiftReady() {
+        if (this.order == null || this.queue.length < 2)
+            return this.queue.shift();
+        let first = 0;
+        for (let at = 1; at < this.queue.length; at++) {
+            if (this.order(this.queue[at], this.queue[first]) < 0)
+                first = at;
+        }
+        return this.queue.splice(first, 1)[0];
+    }
+}
+//# sourceMappingURL=queue.js.map

package/build/session/queue.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"queue.js","sourceRoot":"","sources":["../../src/session/queue.ts"],"names":[],"mappings":"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"}

package/build/session/tasks.d.ts

@@ -1,40 +1,21 @@
 import type { ModelTask } from '@owlmeans/viable-common';
+import { OpQueue } from './queue.js';
 /**
  * Model tasks waiting for the parent agent.
  *
- * A queue rather than a callback because of who drains it: the parent agent asks for work when it
- * is ready, through a tool call, and may take minutes to answer. Nothing here pushes — the whole
- * point of the local-LLM mode is that the platform waits on somebody else's schedule.
- *
- * The operation id is kept beside each task and never shown to the parent. It is what an answer is
- * routed back on, and a parent that could name one could answer an operation it was never given.
+ * Everything about how they queue, redeliver and settle is {@link OpQueue}'s; what is left here is
+ * the name the rest of the SDK reads them under. A task is a model CALL — the parent runs it in a
+ * clean subagent and submits the answer back — which is a different thing from a question, and the
+ * two must never drain into one another's tools.
  */
-export declare class TaskQueue {
-    private readonly queue;
-    private readonly ops;
+export declare class TaskQueue extends OpQueue<ModelTask> {
     /**
-     * Every task this session has ever been handed.
-     *
-     * The platform redelivers an operation on every poll until it is answered — that is what makes a
-     * connector restart cost a round trip instead of a run. A model task takes a parent agent tens of
-     * seconds to answer, so without this the queue grew one copy per poll for the whole time it was
-     * being answered, and the parent then ran the same task over and over: real model calls, paid
-     * for, thrown away. Kept after settling too, so a redelivery that raced the platform's deletion
-     * is ignored rather than answered a second time.
+     * The task that expires first goes first. The platform gives up on a task at its `expiresAt` —
+     * a synchronous check inside a blocked call within seconds, a run's call within minutes — so the
+     * one with the least time left is the one a parent must not find behind the others.
      */
-    private readonly seen;
-    /** Handed out and not yet answered. An answer is checked against the task that asked for it. */
-    private readonly outstanding;
-    private readonly waiting;
-    /** @returns whether the task was accepted — `false` for a redelivery of one already handed over. */
-    push(task: ModelTask, opId: string): boolean;
-    /** The next task, or null once `waitMs` elapses. Never rejects: nothing to do is not a failure. */
-    take(waitMs: number): Promise<ModelTask | null>;
-    opIdOf(taskId: string): string | null;
-    outstandingById(taskId: string): ModelTask | null;
-    /** Handed out and still unanswered, oldest first. */
+    constructor();
+    /** Handed to the parent and still unanswered, oldest first. */
     outstandingTasks(): ModelTask[];
-    settle(taskId: string): void;
-    size(): number;
 }
 //# sourceMappingURL=tasks.d.ts.map

package/build/session/tasks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tasks.d.ts","sourceRoot":"","sources":["../../src/session/tasks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAOxD;;;;;;;;;GASG;AACH,qBAAa,SAAS;IACpB,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAkB;IACxC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAA4B;IAChD;;;;;;;;;OASG;IACH,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAoB;IACzC,gGAAgG;IAChG,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA+B;IAC3D,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAgB;IAExC,oGAAoG;IACpG,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAgB3C;IAED,mGAAmG;IAC7F,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CAuBpD;IAED,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAEpC;IAED,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAEhD;IAED,qDAAqD;IACrD,gBAAgB,IAAI,SAAS,EAAE,CAE9B;IAED,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAG3B;IAED,IAAI,IAAI,MAAM,CAEb;CACF"}
+{"version":3,"file":"tasks.d.ts","sourceRoot":"","sources":["../../src/session/tasks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAExD,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AASpC;;;;;;;GAOG;AACH,qBAAa,SAAU,SAAQ,OAAO,CAAC,SAAS,CAAC;IAC/C;;;;OAIG;IACH,cAEC;IAED,+DAA+D;IAC/D,gBAAgB,IAAI,SAAS,EAAE,CAE9B;CACF"}