maka-agent 0.2.0-dev.64.20260929 → 0.2.0-dev.68.20261003

package/LICENSE

@@ -253,7 +253,7 @@ License: MIT
 
 Maka includes an ejected adaptation of Astryx ChatReasoning v0.1.9 in
 `packages/ui/src/astryx-chat-reasoning.tsx` and generated theme artifacts in
-`apps/desktop/src/renderer/astryx-theme/`, based on Astryx theme-neutral v0.6.2.
+`apps/desktop/src/renderer/astryx-theme/`, based on Astryx theme-neutral v0.6.3.
 Maka also redistributes
 `patches/@astryxdesign+core+0.6.3.patch`, which modifies the MIT-licensed Astryx
 core package. The following MIT License applies to that material:

package/THIRD_PARTY_NOTICES.txt

@@ -2304,7 +2304,7 @@ SOFTWARE.
 
 ================================================================================
 
-Package: axios@1.18.1
+Package: axios@1.20.0
 Declared license: MIT
 Selected license: MIT
 Repository: https://github.com/axios/axios.git
@@ -3004,7 +3004,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ================================================================================
 
-Package: brace-expansion@5.0.9
+Package: brace-expansion@5.0.12
 Declared license: MIT
 Selected license: MIT
 Repository: git+https://github.com/juliangruber/brace-expansion.git
@@ -3970,7 +3970,7 @@ SOFTWARE.
 
 ================================================================================
 
-Package: fast-uri@3.1.7
+Package: fast-uri@3.1.8
 Declared license: BSD-3-Clause
 Selected license: BSD-3-Clause
 Repository: git+https://github.com/fastify/fast-uri.git

package/dist/pi-tui-runner.js

@@ -786,7 +786,7 @@ export async function runMakaPiTui(input) {
         return true;
     };
     // Refill the editor from a retract result, prepended to any current draft.
-    // Shared by the interrupt path and the alt+↑ path. The text always comes
+    // Shared by the interrupt path and the Shift+← path. The text always comes
     // from `driver.retractQueued()` — an authoritative queue mutation — never
     // from the render mirror, which can
     // lag a step-boundary consumption and would resurrect an already-consumed
@@ -879,7 +879,7 @@ export async function runMakaPiTui(input) {
             return;
         }
         // First-run has no connection, so the wizard is the only surface. This is
-        // the single choke point for idle submits (Enter, Alt+Enter, steer
+        // the single choke point for idle submits (Enter, steer
         // fallback): reopen the wizard instead of opening a turn against a
         // connection-less driver. Slash commands above already routed to the
         // command layer (/exit still exits, /help still shows help).
@@ -959,29 +959,16 @@ export async function runMakaPiTui(input) {
         }
         submitMessage(text, 'current_turn');
     };
-    // Alt+Enter: during a turn, queue the text to open the next turn; when idle,
-    // it submits like Enter.
-    const handleAltEnter = () => {
-        // Mirror Enter's control-busy guard BEFORE touching the editor: during a
-        // control action (busy without a running turn) submitPrompt would drop the
-        // prompt, so keep the draft in place instead of clearing it into the void.
-        if (busy && !turnRunning)
-            return;
-        // Interrupt convergence window: the turn is being stopped, so nothing may
-        // be queued onto it and no fresh turn may open — keep the draft.
-        if (interruptRequested)
-            return;
+    // Tab: during a turn, queue the draft to open the next turn. Idle Tab never
+    // reaches this — it stays the editor's completion trigger (key handler gate).
+    const queueDraftForNextTurn = () => {
         const text = editor.getExpandedText().trim();
         if (!text)
             return;
         editor.setText('');
-        if (!turnRunning) {
-            submitPrompt(text);
-            return;
-        }
         submitMessage(text, 'next_turn');
     };
-    // Alt+↑: take back every queued message from the Runtime Host, joined and
+    // Shift+←: take back every queued message from the Runtime Host, joined and
     // prepended to the current draft for re-editing.
     const retractQueuedMessages = () => {
         void (async () => {
@@ -4119,20 +4106,30 @@ export async function runMakaPiTui(input) {
             }
             return { consume: true };
         }
-        // Alt+Enter: queue a followup (during a turn) or submit (when idle). Alt+↑:
-        // take back the queued messages to re-edit. Neither is an editor binding
-        // (newline is shift+enter/ctrl+j; history is plain up), so intercepting
-        // here does not collide with the editor's own keys.
-        if (matchesKey(data, Key.alt('enter')) && !isKeyRepeat(data)) {
-            handleAltEnter();
+        // Tab: queue a followup during a turn — the route terminals deliver
+        // reliably, unlike the Alt chords they claim for themselves (#3538;
+        // Codex's default). The editor owns Tab everywhere else: it
+        // triggers/accepts completion, so a turn-running Tab only queues a
+        // non-empty draft while no completion popup is open. Idle Tab stays
+        // with the editor rather than submitting.
+        if (turnRunning &&
+            !interruptRequested &&
+            !editorPastePending &&
+            editor.getText().trim().length > 0 &&
+            !editor.isShowingAutocomplete() &&
+            matchesKey(data, Key.tab) &&
+            !isKeyRepeat(data)) {
+            queueDraftForNextTurn();
             return { consume: true };
         }
-        if (matchesKey(data, Key.alt('up')) && !isKeyRepeat(data)) {
+        // Shift+←: retract queued messages (Codex's edit_queued_message
+        // default). Not an editor binding, and an empty retract refill is a
+        // no-op, so consuming unconditionally loses nothing — same rationale
+        // the old Alt+↑ binding used.
+        if (matchesKey(data, Key.shift('left')) && !isKeyRepeat(data)) {
             // Always retract from the authority: the render mirror lags the
-            // queue_update event, so an enqueue followed by Alt+Up in the same
+            // queue_update event, so an enqueue followed by Shift+← in the same
             // tick would see an empty mirror while the runtime holds the message.
-            // Alt+Up is not an editor binding, and an empty retract refill is a
-            // no-op, so consuming unconditionally loses nothing.
             retractQueuedMessages();
             return { consume: true };
         }

package/dist/tui-copy-catalog.js

@@ -1032,8 +1032,8 @@ export const TUI_COPY_RESOURCES = {
                     '  Ctrl+T — expand or collapse all thinking in view',
                     '  Scroll the transcript with your terminal or trackpad',
                     '  Enter (during a turn) — steer: inject a message into the running turn',
-                    '  Alt+Enter (during a turn) — queue a message for the next turn',
-                    '  Alt+↑ — take queued messages back into the editor to re-edit',
+                    '  Tab (during a turn) — queue a message for the next turn',
+                    '  Shift+← — take queued messages back into the editor to re-edit',
                     '  Esc Esc (during a turn) — interrupt the turn',
                     '  Esc Esc (when idle) — rewind to an earlier turn',
                     '  Ctrl+C — stop the turn, clear input, or press twice to exit',
@@ -1086,8 +1086,8 @@ export const TUI_COPY_RESOURCES = {
                     '  Ctrl+T — 展开或折叠视图中的所有思考块',
                     '  使用终端或触控板滚动对话记录',
                     '  Enter（任务运行中）— 将消息注入当前任务',
-                    '  Alt+Enter（任务运行中）— 将消息排入下一轮',
-                    '  Alt+↑ — 将已排队消息取回编辑器重新编辑',
+                    '  Tab（任务运行中）— 将消息排入下一轮',
+                    '  Shift+← — 将已排队消息取回编辑器重新编辑',
                     '  Esc Esc（任务运行中）— 中断当前任务',
                     '  Esc Esc（空闲时）— 回退到较早的轮次',
                     '  Ctrl+C — 停止任务、清空输入，或连续按两次退出',
@@ -1140,8 +1140,8 @@ export const TUI_COPY_RESOURCES = {
                     '  Ctrl+T — 展開或摺疊檢視中的所有思考區塊',
                     '  使用終端機或觸控板捲動對話記錄',
                     '  Enter（任務執行中）— 將訊息注入目前任務',
-                    '  Alt+Enter（任務執行中）— 將訊息排入下一輪',
-                    '  Alt+↑ — 將已排隊訊息取回編輯器重新編輯',
+                    '  Tab（任務執行中）— 將訊息排入下一輪',
+                    '  Shift+← — 將已排隊訊息取回編輯器重新編輯',
                     '  Esc Esc（任務執行中）— 中斷目前任務',
                     '  Esc Esc（空閒時）— 回退到較早的輪次',
                     '  Ctrl+C — 停止任務、清空輸入，或連續按兩次退出',
@@ -1372,17 +1372,17 @@ export const TUI_COPY_RESOURCES = {
         en: {
             steeringLabel: 'Steering:',
             queuedLabel: 'Queued:',
-            requeueHint: 'Alt+↑ take queued messages back to re-edit',
+            requeueHint: 'Shift+← take queued messages back to re-edit',
         },
         'zh-CN': {
             steeringLabel: '注入：',
             queuedLabel: '已排队：',
-            requeueHint: 'Alt+↑ 取回队列以重新编辑',
+            requeueHint: 'Shift+← 取回队列以重新编辑',
         },
         'zh-TW': {
             steeringLabel: '調整方向：',
             queuedLabel: '已排入佇列：',
-            requeueHint: 'Alt+↑ 取回佇列訊息重新編輯',
+            requeueHint: 'Shift+← 取回佇列訊息重新編輯',
         },
     },
     'session-status': {

package/node_modules/@maka/acp-executor-plugin/dist/acp-catalog.js

@@ -0,0 +1,132 @@
+/*
+ * 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.
+ */
+const CATALOG_TTL_MS = 60_000;
+const PROBE_TIMEOUT_MS = 30_000;
+/** Instance-scoped candidates. Only a retained task Session owns workspace configuration. */
+export class AcpCatalog {
+    admission;
+    probe;
+    unavailable;
+    #cached;
+    #pending;
+    #tail;
+    #operations = new Set();
+    #revision = 0;
+    #disposed = false;
+    constructor(admission, probe, unavailable) {
+        this.admission = admission;
+        this.probe = probe;
+        this.unavailable = unavailable;
+    }
+    async get(signal, refresh = false) {
+        signal.throwIfAborted();
+        if (this.#disposed)
+            return this.unavailable();
+        if (refresh)
+            this.invalidate();
+        while (true) {
+            signal.throwIfAborted();
+            if (this.#disposed)
+                return this.unavailable();
+            const cached = this.#cached;
+            if (cached && cached.expires > Date.now())
+                return cached.entry;
+            const pending = this.#ensureProbe();
+            const result = await waitForSignal(pending.promise, signal);
+            signal.throwIfAborted();
+            if (this.#disposed)
+                return this.unavailable();
+            // An invalidation need not have another caller to start its replacement.
+            // Only superseded revisions retry; genuine failures remain terminal.
+            if (pending.revision !== this.#revision)
+                continue;
+            return result;
+        }
+    }
+    #ensureProbe() {
+        if (!this.#pending) {
+            const revision = this.#revision;
+            const controller = new AbortController();
+            const startup = AbortSignal.any([controller.signal, AbortSignal.timeout(PROBE_TIMEOUT_MS)]);
+            const previous = this.#tail;
+            const run = async () => {
+                try {
+                    // A refresh must drain the superseded process before starting its replacement.
+                    await previous;
+                    startup.throwIfAborted();
+                    const permit = await this.admission.acquire(startup);
+                    let entry;
+                    try {
+                        startup.throwIfAborted();
+                        // probe settles only after its process and temporary directory have been disposed.
+                        entry = await this.probe(startup);
+                    }
+                    finally {
+                        permit.release();
+                    }
+                    if (startup.aborted || revision !== this.#revision || this.#disposed)
+                        return this.unavailable();
+                    if (entry.readiness === 'ready')
+                        this.#cached = { entry, expires: Date.now() + CATALOG_TTL_MS };
+                    return entry;
+                }
+                catch {
+                    return this.unavailable();
+                }
+            };
+            const promise = run().finally(() => {
+                this.#operations.delete(promise);
+                if (this.#pending?.promise === promise)
+                    this.#pending = undefined;
+                if (this.#tail === promise)
+                    this.#tail = undefined;
+            });
+            this.#pending = { revision, controller, promise };
+            this.#tail = promise;
+            this.#operations.add(promise);
+        }
+        return this.#pending;
+    }
+    invalidate() {
+        this.#revision++;
+        this.#cached = undefined;
+        this.#pending?.controller.abort(new Error('ACP catalog invalidated'));
+        this.#pending = undefined;
+    }
+    async dispose() {
+        this.#disposed = true;
+        this.invalidate();
+        await Promise.allSettled(this.#operations);
+    }
+}
+/** A caller can stop waiting without cancelling a probe shared by other drafts. */
+async function waitForSignal(promise, signal) {
+    signal.throwIfAborted();
+    return await new Promise((resolve, reject) => {
+        const aborted = () => reject(signal.reason);
+        signal.addEventListener('abort', aborted, { once: true });
+        void promise.then((value) => {
+            signal.removeEventListener('abort', aborted);
+            resolve(value);
+        }, (error) => {
+            signal.removeEventListener('abort', aborted);
+            reject(error);
+        });
+    });
+}