maka-agent 0.2.0-dev.39.20260916 → 0.2.0-dev.40.20260917

package/LICENSE

@@ -252,8 +252,8 @@ Copyright (c) 2026 Meta Platforms, Inc.
 License: MIT
 
 Maka includes an ejected adaptation of Astryx ChatReasoning v0.1.9 and generated
-theme artifacts based on Astryx theme-neutral v0.5.2. Maka also redistributes
-`patches/@astryxdesign+core+0.5.2.patch`, which modifies the MIT-licensed Astryx
+theme artifacts based on Astryx theme-neutral v0.6.1. Maka also redistributes
+`patches/@astryxdesign+core+0.6.1.patch`, which modifies the MIT-licensed Astryx
 core package. The following MIT License applies to that material:
 
 MIT License
@@ -314,10 +314,10 @@ THE SOFTWARE.
 
 Pi TUI dependency patch
 
-Source: https://www.npmjs.com/package/@earendil-works/pi-tui/v/0.84.4
-Repository: https://github.com/earendil-works/pi/tree/v0.84.4/packages/tui
-Version: 0.84.4
-Dependency patch: patches/@earendil-works+pi-tui+0.84.4.patch
+Source: https://www.npmjs.com/package/@earendil-works/pi-tui/v/0.85.1
+Repository: https://github.com/earendil-works/pi/tree/v0.85.1/packages/tui
+Version: 0.85.1
+Dependency patch: patches/@earendil-works+pi-tui+0.85.1.patch
 Copyright (c) 2025 Mario Zechner
 License: MIT
 
@@ -349,10 +349,10 @@ SOFTWARE.
 
 Zod dependency patch
 
-Source: https://www.npmjs.com/package/zod/v/4.5.4
+Source: https://www.npmjs.com/package/zod/v/4.6.5
 Repository: https://github.com/colinhacks/zod
-Version: 4.5.4
-Dependency patch: patches/zod+4.5.4.patch
+Version: 4.6.5
+Dependency patch: patches/zod+4.6.5.patch
 Copyright (c) 2025 Colin McDonnell
 License: MIT
 

package/THIRD_PARTY_NOTICES.txt

@@ -616,7 +616,7 @@ Apache License
 
 ================================================================================
 
-Package: @earendil-works/pi-tui@0.84.4
+Package: @earendil-works/pi-tui@0.85.1
 Declared license: MIT
 Selected license: MIT
 Repository: git+https://github.com/earendil-works/pi.git#packages/tui
@@ -664,7 +664,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 ================================================================================
 
-Package: @formatjs/icu-messageformat-parser@3.5.17
+Package: @formatjs/icu-messageformat-parser@3.5.18
 Declared license: MIT
 Selected license: MIT
 Repository: https://github.com/formatjs/formatjs.git#packages/icu-messageformat-parser
@@ -700,7 +700,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 ================================================================================
 
-Package: @larksuiteoapi/node-sdk@1.73.0
+Package: @larksuiteoapi/node-sdk@1.73.3
 Declared license: MIT
 Selected license: MIT
 Repository: https://github.com/larksuite/node-sdk.git
@@ -1224,7 +1224,7 @@ limitations under the License.
 
 ================================================================================
 
-Package: @openai/agents-core@0.17.0
+Package: @openai/agents-core@0.18.0
 Declared license: MIT
 Selected license: MIT
 Repository: https://github.com/openai/openai-agents-js
@@ -1723,7 +1723,7 @@ SOFTWARE.
 
 ================================================================================
 
-Package: @types/node@26.4.0
+Package: @types/node@26.5.1
 Declared license: MIT
 Selected license: MIT
 Repository: https://github.com/DefinitelyTyped/DefinitelyTyped.git#types/node
@@ -4739,7 +4739,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 ================================================================================
 
-Package: intl-messageformat@11.2.14
+Package: intl-messageformat@11.2.15
 Declared license: BSD-3-Clause
 Selected license: BSD-3-Clause
 Repository: git@github.com:formatjs/formatjs.git
@@ -7265,7 +7265,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ================================================================================
 
-Package: socks@2.8.9
+Package: socks@2.8.10
 Declared license: MIT
 Selected license: MIT
 Repository: git+https://github.com/JoshGlazebrook/socks.git
@@ -7361,7 +7361,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 ================================================================================
 
-Package: systeminformation@5.33.8
+Package: systeminformation@5.33.10
 Declared license: MIT
 Selected license: MIT
 Repository: git+https://github.com/sebhildebrandt/systeminformation.git
@@ -7474,7 +7474,7 @@ SOFTWARE.
 
 ================================================================================
 
-Package: undici@8.10.1
+Package: undici@8.10.2
 Declared license: MIT
 Selected license: MIT
 Repository: git+https://github.com/nodejs/undici.git
@@ -7504,7 +7504,7 @@ SOFTWARE.
 
 ================================================================================
 
-Package: undici-types@8.3.0
+Package: undici-types@8.9.0
 Declared license: MIT
 Selected license: MIT
 Repository: git+https://github.com/nodejs/undici.git
@@ -7859,7 +7859,7 @@ THIS SOFTWARE.
 
 ================================================================================
 
-Package: yaml@2.9.0
+Package: yaml@2.9.1
 Declared license: ISC
 Selected license: ISC
 Repository: github:eemeli/yaml
@@ -7934,7 +7934,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ================================================================================
 
-Package: zod@4.5.4
+Package: zod@4.6.5
 Declared license: MIT
 Selected license: MIT
 Repository: git+https://github.com/colinhacks/zod.git

package/dist/acp/active-promise.js

@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+/** Races cooperative work against cancellation while observing the losing task. */
+export function whileActive(task, signal) {
+    return new Promise((resolve, reject) => {
+        const cancelled = () => resolve({ active: false });
+        if (signal.aborted)
+            cancelled();
+        else
+            signal.addEventListener('abort', cancelled, { once: true });
+        task.then((value) => {
+            signal.removeEventListener('abort', cancelled);
+            resolve(signal.aborted ? { active: false } : { active: true, value });
+        }, (error) => {
+            signal.removeEventListener('abort', cancelled);
+            if (signal.aborted)
+                resolve({ active: false });
+            else
+                reject(error);
+        });
+    });
+}

package/dist/acp/session-event-mapper.js

@@ -18,21 +18,26 @@
  */
 import { foldRuntimeHostAssistantDelta } from '@maka/runtime-host/adapter';
 import { RequestError, } from '@agentclientprotocol/sdk';
+import { whileActive } from './active-promise.js';
+import { AcpToolEventMapper } from './tool-event-mapper.js';
 /** Serializes one ACP prompt's live projection delivery. */
 export class AcpSessionEventMapper {
     #sessionId;
     #notify;
+    #signal;
     #streams = new Map();
+    #tools;
     #tail = Promise.resolve();
     #failure;
+    #failed = false;
     constructor(options) {
         this.#sessionId = options.sessionId;
         this.#notify = options.notify;
+        this.#signal = options.signal;
+        this.#tools = new AcpToolEventMapper((update) => this.#deliver({ sessionId: this.#sessionId, update }));
     }
     accept(event) {
         return this.#enqueue(async () => {
-            if (this.#failure)
-                throw this.#failure;
             switch (event.type) {
                 case 'text_delta':
                     await this.#acceptText('text', event.messageId, deltaText(event, this.#streams.get(streamKey('text', event.messageId))));
@@ -46,26 +51,45 @@ export class AcpSessionEventMapper {
                 case 'thinking_complete':
                     await this.#acceptText('thinking', event.messageId, event.text);
                     break;
+                case 'tool_start':
+                case 'tool_output_delta':
+                case 'tool_progress':
+                case 'tool_result_preview':
+                case 'tool_result':
+                    await this.#tools.accept(event);
+                    break;
                 default:
                     break;
             }
         });
     }
     replaceTranscript(turnId, messages) {
+        return this.acceptTranscriptMessages(turnId, messages);
+    }
+    /** Apply a bounded authoritative batch; absence from one batch never removes a tool. */
+    acceptTranscriptMessages(turnId, messages) {
         return this.#enqueue(async () => {
-            if (this.#failure)
-                throw this.#failure;
             for (const message of messages) {
-                if (message.turnId !== turnId || message.type !== 'assistant')
+                if (message.turnId !== turnId)
                     continue;
-                await this.#acceptText('thinking', message.id, message.thinking?.text ?? '');
-                await this.#acceptText('text', message.id, message.text);
+                if (message.type === 'assistant') {
+                    await this.#acceptText('thinking', message.id, message.thinking?.text ?? '');
+                    await this.#acceptText('text', message.id, message.text);
+                }
+                else
+                    await this.#tools.acceptMessage(message);
             }
         });
     }
+    finishTools(turnId, terminalStatus = 'completed') {
+        return this.#enqueue(() => this.#tools.finishTools(turnId, terminalStatus));
+    }
     /** Waits until every notification already accepted by this mapper has settled. */
     flush() {
-        return this.#tail.then(() => undefined);
+        return this.#tail.then(() => {
+            if (this.#failed)
+                throw this.#failure;
+        });
     }
     async #acceptText(kind, hostMessageId, nextText) {
         const key = streamKey(kind, hostMessageId);
@@ -84,10 +108,29 @@ export class AcpSessionEventMapper {
             content: { type: 'text', text: chunk },
             messageId: hostMessageId,
         };
-        await this.#notify({ sessionId: this.#sessionId, update });
+        await this.#deliver({ sessionId: this.#sessionId, update });
+    }
+    async #deliver(notification) {
+        if (this.#signal?.aborted)
+            return;
+        const delivery = this.#notify(notification);
+        if (!this.#signal)
+            return delivery;
+        await whileActive(delivery, this.#signal);
     }
     #enqueue(operation) {
-        const result = this.#tail.then(operation, operation);
+        const result = this.#tail.then(async () => {
+            if (this.#failed)
+                throw this.#failure;
+            try {
+                return await operation();
+            }
+            catch (error) {
+                this.#failure = error;
+                this.#failed = true;
+                throw error;
+            }
+        });
         this.#tail = result.then(() => undefined, () => undefined);
         return result;
     }

package/dist/acp/session-registry.js

@@ -133,6 +133,8 @@ export class AcpSessionRegistry {
     }
     async #prompt(params, context) {
         const turnId = this.#newTurnId();
+        const projectionAbort = new AbortController();
+        const reconciliationAbort = new AbortController();
         const active = {
             sessionId: params.sessionId,
             turnId,
@@ -143,8 +145,11 @@ export class AcpSessionRegistry {
                         await context.notify(notification);
                     }
                 },
+                signal: projectionAbort.signal,
             }),
             waiters: new Set(),
+            projectionAbort,
+            reconciliationAbort,
             dispatchStarted: false,
             startRequestSettled: false,
             admissionSettled: false,
@@ -209,6 +214,7 @@ export class AcpSessionRegistry {
             }
             if (active.cancelled)
                 return { stopReason: await this.#cancelledStopReason(active) };
+            active.transcript = attachment.trackPromptTranscript(turnId);
             const observation = this.#consumePromptEvents(active, attachment.eventsForTurn(turnId));
             // Mark the observer as handled immediately: turn.start may still be in flight
             // when the live subscription reports a failure.
@@ -265,17 +271,37 @@ export class AcpSessionRegistry {
             // A terminal subscription event can precede the Stop response. Retain this
             // prompt so close/dispose cannot release its connection while Stop is in flight.
             await active.stopTask?.catch(() => undefined);
+            active.projectionAbort.abort();
+            active.reconciliationAbort.abort();
+            active.transcript?.dispose();
             active.finished = true;
             this.#wake(active);
             this.#removeActivePrompt(active);
         }
     }
     async #consumePromptEvents(active, events) {
+        let terminalStatus = 'completed';
         try {
             for await (const event of events) {
+                if (event.type === 'abort')
+                    terminalStatus = 'cancelled';
+                else if (event.type === 'error' && !event.recoverable)
+                    terminalStatus = 'failed';
+                if (terminalStatus !== 'completed')
+                    active.reconciliationAbort.abort();
                 if (!active.cancelled)
                     await active.mapper.accept(event);
             }
+            if (active.cancelled)
+                return this.#cancelledStopReason(active);
+            if (terminalStatus === 'completed')
+                await this.#reconcilePrompt(active, true);
+            else
+                active.reconciliationAbort.abort();
+            if (active.projectionFailure)
+                throw active.projectionFailure;
+            await active.mapper.finishTools(active.turnId, terminalStatus);
+            await active.mapper.flush();
             return active.cancelled ? this.#cancelledStopReason(active) : 'end_turn';
         }
         catch (error) {
@@ -284,8 +310,29 @@ export class AcpSessionRegistry {
             throw error;
         }
     }
+    async #reconcilePrompt(active, replay = false) {
+        if (active.cancelled || active.finished || !active.transcript)
+            return;
+        try {
+            await active.transcript.reconcile((messages) => active.mapper.acceptTranscriptMessages(active.turnId, messages), AbortSignal.any([active.projectionAbort.signal, active.reconciliationAbort.signal]), 
+            // One final replay observes revisions below the consumed cut before end_turn.
+            { replay });
+        }
+        catch (error) {
+            if (active.cancelled ||
+                active.finished ||
+                active.projectionAbort.signal.aborted ||
+                active.reconciliationAbort.signal.aborted)
+                return;
+            active.projectionFailure ??= error;
+            active.attachment?.failTurn(active.turnId, error);
+            throw error;
+        }
+    }
     async #cancelledStopReason(active) {
-        await active.mapper.flush();
+        // A failed notification must not change the outcome of an explicit Host
+        // cancellation. The projection failure still fails uncancelled prompts.
+        await active.mapper.flush().catch(() => undefined);
         return 'cancelled';
     }
     #cancelSession(sessionId) {
@@ -317,9 +364,11 @@ export class AcpSessionRegistry {
         if ([...(this.#activePrompts.get(active.sessionId) ?? [])].every((prompt) => prompt.cancelled && !prompt.dispatchStarted)) {
             this.#attachmentOpenControllers.get(active.sessionId)?.abort();
         }
+        active.projectionAbort.abort();
+        active.reconciliationAbort.abort();
         active.stopTask ??= this.#stopPromptWhenObservable(active);
         await Promise.all([
-            active.mapper.flush(),
+            active.mapper.flush().catch(() => undefined),
             active.stopTask.catch((error) => {
                 // End only this prompt's observation. Failed delivery does not establish
                 // a terminal Host Turn, and teardown still receives the original error.
@@ -490,12 +539,16 @@ export class AcpSessionRegistry {
                     // identity so a later ACP cancel/close can still stop that root.
                     return;
                 }
-                // Full interaction mapping belongs to the next ACP capability increment.
-                // Retire observation so the prompt's existing failure path stops its exact Turn.
+                // Interaction mapping is added by the next independently reviewable ACP increment.
                 failAttachment(RequestError.internalError({ source: 'adapter', code: 'unsupported_interaction', kind: pending.request.kind }, 'This ACP adapter does not support interactions yet; the prompt failed'));
             },
             onInteractionResolved: () => undefined,
-            onTranscriptSettlement: () => undefined,
+            onTranscriptSettlement: (turnId) => {
+                for (const active of this.#activePrompts.get(sessionId) ?? []) {
+                    if (active.turnId === turnId)
+                        void this.#reconcilePrompt(active).catch(() => undefined);
+                }
+            },
             onGoalChanged: () => undefined,
             onFailed: failAttachment,
             onRecovered: () => {