xabot-cli 1.4.10 → 1.5.1

package/dist/bridge/index.d.ts

@@ -77,6 +77,8 @@ export declare class Bridge {
     private endThinking;
     /** Send a single ContentPart to the cloud platform. */
     private _sendContentPart;
+    /** Route interaction command to pending queue. Shared by handleCommand for action_request/question/sensitive_info_operation. */
+    private _handleInteractionCommand;
     /** Handle Command from downstream Agent (forwarded via XabotSessionHandler.onCommand). */
     handleCommand(command: XacppCommand): Promise<XacppResponse>;
     /** Handle Event from downstream Agent (forwarded via XabotSessionHandler.onEvent). */

package/dist/bridge/index.d.ts.map

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

package/dist/bridge/index.js

@@ -1,4 +1,5 @@
 import { StreamCapability } from '../core/types.js';
+import { acknowledge, genericResponse, errorResponse, genericCommand, commandName } from 'xacpp';
 import { parseInput } from './input-parser.js';
 import { i18nResource } from '../i18n/index.js';
 import { createLogger } from '../core/logger.js';
@@ -137,9 +138,9 @@ export class Bridge {
         return lines.join('\n');
     }
     /** Format TraceableEvent (info/warn/error) for cloud display. */
-    formatTraceable(icon, event) {
-        const title = i18nResource(event.title?.trim() || '');
-        const content = i18nResource(event.content?.trim() || '');
+    formatTraceable(icon, data) {
+        const title = i18nResource(data.title?.trim() || '');
+        const content = i18nResource(data.content?.trim() || '');
         if (title && content)
             return `${icon} ${title}\n${content}`;
         return `${icon} ${title || content}`;
@@ -150,24 +151,24 @@ export class Bridge {
         switch (item.type) {
             case 'action_request': {
                 if (input === 'a')
-                    return { kind: 'action', requestId: item.requestId, type: 'approve_always' };
+                    return genericResponse("action", { requestId: item.requestId, type: 'approve_always' });
                 if (input === 'y')
-                    return { kind: 'action', requestId: item.requestId, type: 'approve' };
+                    return genericResponse("action", { requestId: item.requestId, type: 'approve' });
                 if (input === 'c')
-                    return { kind: 'action', requestId: item.requestId, type: 'reject', reason: '用户取消执行' };
-                return { kind: 'action', requestId: item.requestId, type: 'reject', reason: text.trim() };
+                    return genericResponse("action", { requestId: item.requestId, type: 'reject', reason: '用户取消执行' });
+                return genericResponse("action", { requestId: item.requestId, type: 'reject', reason: text.trim() });
             }
             case 'question': {
                 const payload = item.eventPayload;
                 if (input === 'c')
-                    return { kind: 'question', requestId: item.requestId, type: 'skip', reason: '用户取消执行' };
+                    return genericResponse("question", { requestId: item.requestId, type: 'skip', reason: '用户取消执行' });
                 if (payload.options.length > 0) {
                     const num = parseInt(input, 10);
                     if (!isNaN(num) && num >= 1 && num <= payload.options.length) {
-                        return { kind: 'question', requestId: item.requestId, type: 'answer', content: payload.options[num - 1] };
+                        return genericResponse("question", { requestId: item.requestId, type: 'answer', content: payload.options[num - 1] });
                     }
                 }
-                return { kind: 'question', requestId: item.requestId, type: 'answer', content: text.trim() };
+                return genericResponse("question", { requestId: item.requestId, type: 'answer', content: text.trim() });
             }
             case 'sensitive_info_operation': {
                 const siPayload = item.eventPayload;
@@ -175,7 +176,7 @@ export class Bridge {
                     const results = siPayload.operation.items.map((itm) => siPayload.operation.type === 'collect'
                         ? { type: 'collect_skipped', key: itm.key, reason: '用户取消执行' }
                         : { type: 'delete_rejected', id: itm.id ?? '', reason: '用户取消执行' });
-                    return { kind: 'sensitive_info_operation', requestId: item.requestId, results };
+                    return genericResponse("sensitive_info_operation", { requestId: item.requestId, results });
                 }
                 const lines = text.trim().split('\n');
                 const items = siPayload.operation.items;
@@ -186,10 +187,10 @@ export class Bridge {
                             ? { type: 'provided', key: itm.key, value }
                             : { type: 'collect_skipped', key: itm.key, reason: '未提供值' };
                     });
-                    return { kind: 'sensitive_info_operation', requestId: item.requestId, results };
+                    return genericResponse("sensitive_info_operation", { requestId: item.requestId, results });
                 }
                 const results = items.map((itm) => ({ type: 'deleted', id: itm.id ?? '' }));
-                return { kind: 'sensitive_info_operation', requestId: item.requestId, results };
+                return genericResponse("sensitive_info_operation", { requestId: item.requestId, results });
             }
         }
     }
@@ -283,45 +284,102 @@ export class Bridge {
             }
         }
     }
+    /** Route interaction command to pending queue. Shared by handleCommand for action_request/question/sensitive_info_operation. */
+    async _handleInteractionCommand(type, payload) {
+        if (!this.cloud)
+            return acknowledge();
+        // Look up target from activity
+        const target = this.activityToTarget.get(payload.activity);
+        if (!target)
+            return acknowledge();
+        const { chatId, senderId } = target;
+        const key = this.targetKey(chatId, senderId);
+        const pq = this.ensureQueue(key);
+        const item = this.createPendingItem(chatId, senderId, type, payload);
+        const pendingPromise = new Promise((resolve) => { item.resolve = resolve; });
+        if (!pq.active) {
+            pq.active = item;
+            try {
+                let message;
+                switch (type) {
+                    case 'action_request':
+                        message = this.formatActionMessage(payload);
+                        break;
+                    case 'question':
+                        message = this.formatQuestionMessage(payload);
+                        break;
+                    case 'sensitive_info_operation':
+                        message = this.formatSensitiveInfoMessage(payload);
+                        break;
+                }
+                await this.cloud.send(chatId, { type: 'text', text: message });
+            }
+            catch {
+                pq.active = null;
+                item.resolve(errorResponse('send_failed', `failed to forward ${type} to cloud`));
+            }
+        }
+        else {
+            pq.queue.push(item);
+        }
+        return pendingPromise;
+    }
     /** Handle Command from downstream Agent (forwarded via XabotSessionHandler.onCommand). */
     async handleCommand(command) {
         if (!this.cloud)
-            return { kind: 'acknowledge' };
-        if (typeof command === 'object' && 'message' in command) {
+            return acknowledge();
+        const name = commandName(command);
+        // Message command: agent sends content directly to the session's chatId
+        if (name === 'message' && typeof command === 'object' && 'generic' in command) {
             const chatId = this.sessionChatId;
             if (!chatId)
-                return { kind: 'acknowledge' };
-            for (const part of command.message.content) {
+                return acknowledge();
+            const args = command.generic.arguments;
+            for (const part of args.content) {
                 await this._sendContentPart(chatId, '', '', part);
             }
-            return { kind: 'acknowledge' };
+            return acknowledge();
+        }
+        // Interaction commands (moved from Event to Command in xacpp 0.7.x)
+        if (typeof command === 'object' && 'generic' in command) {
+            const args = command.generic.arguments;
+            switch (name) {
+                case 'action_request':
+                    return this._handleInteractionCommand('action_request', args);
+                case 'question':
+                    return this._handleInteractionCommand('question', args);
+                case 'sensitive_info_operation':
+                    return this._handleInteractionCommand('sensitive_info_operation', args);
+            }
         }
-        return { kind: 'acknowledge' };
+        return acknowledge();
     }
     /** Handle Event from downstream Agent (forwarded via XabotSessionHandler.onEvent). */
     async handleEvent(activityId, event) {
         if (!this.cloud)
-            return { kind: 'acknowledge' };
+            return acknowledge();
         const target = this.activityToTarget.get(activityId);
         if (!target)
-            return { kind: 'acknowledge' };
+            return acknowledge();
         const { chatId } = target;
+        const eventName = event.event.name;
+        const data = event.event.data;
         // Non-think events end the thinking phase
-        if (event.event.type !== 'think') {
+        if (eventName !== 'think') {
             const state = this.activityStates.get(activityId);
             if (state?.thinkingStart) {
                 await this.endThinking(chatId, activityId);
             }
         }
         // Non-content_delta events clear expressing phase
-        if (event.event.type !== 'content_delta') {
+        if (eventName !== 'content_delta') {
             const state = this.activityStates.get(activityId);
             if (state?.expressingStart !== undefined) {
                 delete state.expressingStart;
             }
         }
         // Handle typing indicator: refresh for non-complete, release for complete
-        if (event.event.type === 'complete') {
+        if (eventName === 'complete') {
             const state = this.activityStates.get(activityId);
             if (state?.processingMessageId !== undefined) {
                 await this.cloud.releaseTypingIndicator(chatId, target.senderId, state.processingMessageId);
@@ -336,10 +394,10 @@ export class Bridge {
                 log.debug('refreshTypingIndicator failed: %s', err);
             }
         }
-        switch (event.event.type) {
+        switch (eventName) {
             case 'think': {
                 if (!chatId)
-                    return { kind: 'acknowledge' };
+                    return acknowledge();
                 let state = this.activityStates.get(activityId);
                 if (!state) {
                     state = {};
@@ -356,14 +414,14 @@ export class Bridge {
                         }
                     }
                 }
-                return { kind: 'acknowledge' };
+                return acknowledge();
             }
             case 'content_delta': {
                 if (!chatId)
-                    return { kind: 'acknowledge' };
+                    return acknowledge();
                 // content_delta is only emitted in streaming mode — forward only on streaming platforms
                 if (this.cloud.streamCapability() === StreamCapability.NonStreaming) {
-                    return { kind: 'acknowledge' };
+                    return acknowledge();
                 }
                 let state = this.activityStates.get(activityId);
                 if (!state) {
@@ -379,131 +437,63 @@ export class Bridge {
                         log.debug('expressing indicator send failed: %s', err);
                     }
                 }
-                const payload = event.event.payload;
+                const payload = data.payload;
                 await this._sendContentPart(chatId, target.senderId, activityId, payload);
-                return { kind: 'acknowledge' };
+                return acknowledge();
             }
             case 'content_part': {
                 if (!chatId)
-                    return { kind: 'acknowledge' };
+                    return acknowledge();
                 // content_part is emitted in non-streaming mode — forward only if verbose
                 if (this.verbose) {
-                    const payload = event.event.payload;
+                    const payload = data.payload;
                     await this._sendContentPart(chatId, target.senderId, activityId, payload);
                 }
-                return { kind: 'acknowledge' };
+                return acknowledge();
             }
             case 'tool_result': {
                 if (!chatId)
-                    return { kind: 'acknowledge' };
-                const payload = event.event;
-                if (payload.toolName === 'send_file') {
-                    for (const part of payload.parts) {
+                    return acknowledge();
+                if (data.toolName === 'send_file') {
+                    for (const part of data.parts) {
                         await this._sendContentPart(chatId, target.senderId, activityId, part);
                     }
                 }
-                return { kind: 'acknowledge' };
+                return acknowledge();
             }
             case 'complete': {
-                const payload = event.event;
-                for (const part of payload.assistantReply) {
+                for (const part of data.assistantReply) {
                     await this._sendContentPart(chatId, target.senderId, activityId, part);
                 }
-                return { kind: 'acknowledge' };
+                return acknowledge();
             }
             case 'notify': {
                 if (!chatId)
-                    return { kind: 'acknowledge' };
-                await this.cloud.send(chatId, { type: 'text', text: event.event.message });
-                return { kind: 'acknowledge' };
-            }
-            case 'action_request': {
-                if (!chatId)
-                    return { kind: 'acknowledge' };
-                const key = this.targetKey(chatId, target.senderId);
-                const pq = this.ensureQueue(key);
-                const item = this.createPendingItem(chatId, target.senderId, 'action_request', event.event);
-                const pendingPromise = new Promise((resolve) => { item.resolve = resolve; });
-                if (!pq.active) {
-                    pq.active = item;
-                    try {
-                        await this.cloud.send(chatId, { type: 'text', text: this.formatActionMessage(event.event) });
-                    }
-                    catch {
-                        pq.active = null;
-                        item.resolve({ kind: 'error', code: 'send_failed', message: 'failed to forward action_request to cloud' });
-                    }
-                }
-                else {
-                    pq.queue.push(item);
-                }
-                return pendingPromise;
-            }
-            case 'question': {
-                if (!chatId)
-                    return { kind: 'acknowledge' };
-                const key = this.targetKey(chatId, target.senderId);
-                const pq = this.ensureQueue(key);
-                const item = this.createPendingItem(chatId, target.senderId, 'question', event.event);
-                const pendingPromise = new Promise((resolve) => { item.resolve = resolve; });
-                if (!pq.active) {
-                    pq.active = item;
-                    try {
-                        await this.cloud.send(chatId, { type: 'text', text: this.formatQuestionMessage(event.event) });
-                    }
-                    catch {
-                        pq.active = null;
-                        item.resolve({ kind: 'error', code: 'send_failed', message: 'failed to forward question to cloud' });
-                    }
-                }
-                else {
-                    pq.queue.push(item);
-                }
-                return pendingPromise;
-            }
-            case 'sensitive_info_operation': {
-                if (!chatId)
-                    return { kind: 'acknowledge' };
-                const key = this.targetKey(chatId, target.senderId);
-                const pq = this.ensureQueue(key);
-                const item = this.createPendingItem(chatId, target.senderId, 'sensitive_info_operation', event.event);
-                const pendingPromise = new Promise((resolve) => { item.resolve = resolve; });
-                if (!pq.active) {
-                    pq.active = item;
-                    try {
-                        await this.cloud.send(chatId, { type: 'text', text: this.formatSensitiveInfoMessage(event.event) });
-                    }
-                    catch {
-                        pq.active = null;
-                        item.resolve({ kind: 'error', code: 'send_failed', message: 'failed to forward sensitive_info_operation to cloud' });
-                    }
-                }
-                else {
-                    pq.queue.push(item);
-                }
-                return pendingPromise;
+                    return acknowledge();
+                await this.cloud.send(chatId, { type: 'text', text: data.message });
+                return acknowledge();
             }
             case 'info': {
                 if (!chatId)
-                    return { kind: 'acknowledge' };
-                await this.cloud.send(chatId, { type: 'text', text: this.formatTraceable('ℹ️', event.event) });
-                return { kind: 'acknowledge' };
+                    return acknowledge();
+                await this.cloud.send(chatId, { type: 'text', text: this.formatTraceable('ℹ️', data) });
+                return acknowledge();
             }
             case 'warn': {
                 if (!chatId)
-                    return { kind: 'acknowledge' };
-                await this.cloud.send(chatId, { type: 'text', text: this.formatTraceable('⚠️', event.event) });
-                return { kind: 'acknowledge' };
+                    return acknowledge();
+                await this.cloud.send(chatId, { type: 'text', text: this.formatTraceable('⚠️', data) });
+                return acknowledge();
             }
             case 'error': {
                 if (!chatId)
-                    return { kind: 'acknowledge' };
-                await this.cloud.send(chatId, { type: 'text', text: this.formatTraceable('❌', event.event) });
-                return { kind: 'acknowledge' };
+                    return acknowledge();
+                await this.cloud.send(chatId, { type: 'text', text: this.formatTraceable('❌', data) });
+                return acknowledge();
             }
             case 'tool_use': {
                 if (!chatId)
-                    return { kind: 'acknowledge' };
+                    return acknowledge();
                 let state = this.activityStates.get(activityId);
                 if (!state) {
                     state = {};
@@ -520,7 +510,7 @@ export class Bridge {
                         }
                     }
                 }
-                return { kind: 'acknowledge' };
+                return acknowledge();
             }
             case 'pair_complete': {
                 if (this.verbose) {
@@ -530,10 +520,17 @@ export class Bridge {
                         // Elapsed time available for future use: (Date.now() - start) / 1000
                     }
                 }
-                return { kind: 'acknowledge' };
-            }
+                return acknowledge();
+            }
+            case 'think_start':
+            case 'think_end':
+            case 'content_start':
+            case 'content_end':
+            case 'think_part':
+            case 'start':
+                return acknowledge();
             default: {
-                return { kind: 'acknowledge' };
+                return acknowledge();
             }
         }
     }
@@ -565,7 +562,7 @@ export class Bridge {
                     pq.active = next;
                     this.sendNextPending(next).catch(() => {
                         pq.active = null;
-                        next.resolve({ kind: 'error', code: 'send_failed', message: 'failed to forward queued event to cloud' });
+                        next.resolve(errorResponse('send_failed', 'failed to forward queued event to cloud'));
                     });
                 }
                 else {
@@ -613,14 +610,6 @@ export class Bridge {
                 const { chatId, senderId } = msg;
                 // ── Text messages: parse and dispatch by kind ─────────────────────
                 if (msg.content.type === 'text' && msg.fallback) {
-                    const mediaKey = this.targetKey(chatId, senderId);
-                    let buffered = this.pendingMediaByTarget.get(mediaKey);
-                    if (!buffered) {
-                        buffered = [];
-                        this.pendingMediaByTarget.set(mediaKey, buffered);
-                    }
-                    buffered.push({ ...msg.content });
-                    log.debug('← cloud recv: fallback (chatId=%s, buffered=%d)', chatId, buffered.length);
                     continue;
                 }
                 if (msg.content.type === 'text') {
@@ -628,30 +617,29 @@ export class Bridge {
                     switch (parsed.kind) {
                         case 'new': {
                             this.unbindActivity(chatId, senderId);
-                            const createResponse = await this.session.requestCommand({
-                                new_activity: { title: '' },
-                            });
-                            if (createResponse.kind === 'activity_ready') {
-                                const newActivityId = createResponse.activity;
-                                this.bindActivity(chatId, senderId, newActivityId);
-                                if (parsed.prompt) {
-                                    await this.session.requestCommand({
-                                        invoke_activity: {
-                                            activity: newActivityId,
-                                            messages: [{ type: 'text', text: parsed.prompt }],
-                                        },
-                                    });
-                                    await this.setTypingIndicatorIfNeeded(chatId, senderId, newActivityId, msg.id);
+                            if (parsed.prompt) {
+                                const createResponse = await this.session.requestCommand(genericCommand("new_activity", { title: '' }));
+                                if (createResponse.kind === 'generic' && createResponse.name === 'activity_ready') {
+                                    const activityId = createResponse.data.activity;
+                                    this.bindActivity(chatId, senderId, activityId);
+                                    await this.session.requestCommand(genericCommand("invoke_activity", {
+                                        activity: activityId,
+                                        messages: [{ type: 'text', text: parsed.prompt }],
+                                    }));
+                                    await this.setTypingIndicatorIfNeeded(chatId, senderId, activityId, msg.id);
                                 }
                             }
+                            else {
+                                await this.session.requestCommand(genericCommand("new_activity", { title: '' }));
+                            }
                             continue;
                         }
                         case 'compact': {
                             let activityId = this.getActivityForUser(chatId, senderId);
                             if (!activityId) {
-                                const lastResponse = await this.session.requestCommand('last_activity');
-                                if (lastResponse.kind === 'activity_ready') {
-                                    activityId = lastResponse.activity;
+                                const lastResponse = await this.session.requestCommand(genericCommand("last_activity", {}));
+                                if (lastResponse.kind === 'generic' && lastResponse.name === 'activity_ready') {
+                                    activityId = lastResponse.data.activity;
                                     this.bindActivity(chatId, senderId, activityId);
                                 }
                                 else {
@@ -659,17 +647,15 @@ export class Bridge {
                                     continue;
                                 }
                             }
-                            await this.session.requestCommand({
-                                compact_activity: { activity: activityId },
-                            });
+                            await this.session.requestCommand(genericCommand("compact_activity", { activity: activityId }));
                             continue;
                         }
                         case 'cancel': {
                             let activityId = this.getActivityForUser(chatId, senderId);
                             if (!activityId) {
-                                const lastResponse = await this.session.requestCommand('last_activity');
-                                if (lastResponse.kind === 'activity_ready') {
-                                    activityId = lastResponse.activity;
+                                const lastResponse = await this.session.requestCommand(genericCommand("last_activity", {}));
+                                if (lastResponse.kind === 'generic' && lastResponse.name === 'activity_ready') {
+                                    activityId = lastResponse.data.activity;
                                     this.bindActivity(chatId, senderId, activityId);
                                 }
                                 else {
@@ -677,9 +663,7 @@ export class Bridge {
                                     continue;
                                 }
                             }
-                            await this.session.requestCommand({
-                                cancel_activity: { activity: activityId },
-                            });
+                            await this.session.requestCommand(genericCommand("cancel_activity", { activity: activityId }));
                             continue;
                         }
                         case 'unknown_command': {
@@ -701,7 +685,7 @@ export class Bridge {
                                     if (parsed.text.trim().toLowerCase() === 'c') {
                                         const actId = this.getActivityForUser(chatId, senderId);
                                         if (actId) {
-                                            await this.session.requestCommand({ cancel_activity: { activity: actId } });
+                                            await this.session.requestCommand(genericCommand("cancel_activity", { activity: actId }));
                                             await this.cloud.send(chatId, { type: 'text', text: '✅ 已终止当前任务，可下达新的指令' });
                                         }
                                     }
@@ -714,16 +698,14 @@ export class Bridge {
                             // ── Original invoke logic ──
                             let activityId = this.getActivityForUser(chatId, senderId);
                             if (!activityId) {
-                                const lastResponse = await this.session.requestCommand('last_activity');
-                                if (lastResponse.kind === 'activity_ready') {
-                                    activityId = lastResponse.activity;
+                                const lastResponse = await this.session.requestCommand(genericCommand("last_activity", {}));
+                                if (lastResponse.kind === 'generic' && lastResponse.name === 'activity_ready') {
+                                    activityId = lastResponse.data.activity;
                                 }
                                 else {
-                                    const createResponse = await this.session.requestCommand({
-                                        new_activity: { title: '' },
-                                    });
-                                    if (createResponse.kind === 'activity_ready') {
-                                        activityId = createResponse.activity;
+                                    const createResponse = await this.session.requestCommand(genericCommand("new_activity", { title: '' }));
+                                    if (createResponse.kind === 'generic' && createResponse.name === 'activity_ready') {
+                                        activityId = createResponse.data.activity;
                                     }
                                     else {
                                         continue;
@@ -736,12 +718,10 @@ export class Bridge {
                             if (bufferedMedia.length > 0) {
                                 this.pendingMediaByTarget.delete(invokeKey);
                             }
-                            await this.session.requestCommand({
-                                invoke_activity: {
-                                    activity: activityId,
-                                    messages: [...bufferedMedia, { type: 'text', text: parsed.text }],
-                                },
-                            });
+                            await this.session.requestCommand(genericCommand("invoke_activity", {
+                                activity: activityId,
+                                messages: [...bufferedMedia, { type: 'text', text: parsed.text }],
+                            }));
                             await this.setTypingIndicatorIfNeeded(chatId, senderId, activityId, msg.id);
                             continue;
                         }
@@ -784,10 +764,10 @@ export class Bridge {
         this.runPromise = null;
         for (const [, pq] of this.pendingQueues) {
             if (pq.active) {
-                pq.active.resolve({ kind: 'error', code: 'cancelled', message: 'Bridge closing' });
+                pq.active.resolve(errorResponse('cancelled', 'Bridge closing'));
             }
             for (const item of pq.queue) {
-                item.resolve({ kind: 'error', code: 'cancelled', message: 'Bridge closing' });
+                item.resolve(errorResponse('cancelled', 'Bridge closing'));
             }
         }
         this.pendingQueues.clear();