multiclaws 0.4.6 → 0.4.7

package/dist/service/a2a-adapter.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpenClawAgentExecutor = void 0;
-const node_crypto_1 = require("node:crypto");
 const gateway_client_1 = require("../infra/gateway-client");
 function extractTextFromMessage(message) {
     if (!message.parts)
@@ -11,34 +10,6 @@ function extractTextFromMessage(message) {
         .map((p) => p.text)
         .join("\n");
 }
-function buildTaskWithHistory(context) {
-    const currentText = extractTextFromMessage(context.userMessage);
-    const history = context.task?.history ?? [];
-    if (history.length <= 1) {
-        // First message — no prior context
-        return currentText;
-    }
-    // Build context from previous exchanges (exclude the last message, that's currentText)
-    const prior = history
-        .slice(0, -1)
-        .slice(-8) // keep last 8 messages max to avoid huge prompts
-        .map((m) => {
-        const text = extractTextFromMessage(m);
-        const role = m.role === "agent" ? "agent" : "user";
-        return `[${role}]: ${text}`;
-    })
-        .filter((line) => line.length > 10)
-        .join("\n");
-    if (!prior)
-        return currentText;
-    return [
-        "[conversation history]",
-        prior,
-        "",
-        "[latest message]",
-        currentText,
-    ].join("\n");
-}
 function sleep(ms) {
     return new Promise((resolve) => setTimeout(resolve, ms));
 }
@@ -71,15 +42,13 @@ class OpenClawAgentExecutor {
     gatewayConfig;
     taskTracker;
     logger;
-    // Map A2A task IDs → internal tracker IDs so cancelTask can find the right record
-    a2aToTracker = new Map();
     constructor(options) {
         this.gatewayConfig = options.gatewayConfig;
         this.taskTracker = options.taskTracker;
         this.logger = options.logger;
     }
     async execute(context, eventBus) {
-        const taskText = buildTaskWithHistory(context);
+        const taskText = extractTextFromMessage(context.userMessage);
         const taskId = context.taskId;
         if (!taskText.trim()) {
             this.publishMessage(eventBus, "Error: empty task received.");
@@ -87,17 +56,14 @@ class OpenClawAgentExecutor {
             return;
         }
         const fromAgent = context.userMessage.metadata?.agentUrl ?? "unknown";
-        const tracked = this.taskTracker.create({
+        this.taskTracker.create({
             fromPeerId: fromAgent,
             toPeerId: "local",
             task: taskText,
         });
-        const trackedId = tracked.taskId;
-        this.a2aToTracker.set(taskId, trackedId);
         if (!this.gatewayConfig) {
             this.logger.error("[a2a-adapter] gateway config not available, cannot execute task");
-            this.taskTracker.update(trackedId, { status: "failed", error: "gateway config not available" });
-            this.a2aToTracker.delete(taskId);
+            this.taskTracker.update(taskId, { status: "failed", error: "gateway config not available" });
             this.publishMessage(eventBus, "Error: gateway config not available, cannot execute task.");
             eventBus.finished();
             return;
@@ -124,19 +90,16 @@ class OpenClawAgentExecutor {
             this.logger.info(`[a2a-adapter] task ${taskId} spawned as ${childSessionKey}, waiting for result...`);
             const output = await this.waitForCompletion(childSessionKey, 180_000);
             // 3. Return result
-            this.taskTracker.update(trackedId, { status: "completed", result: output });
+            this.taskTracker.update(taskId, { status: "completed", result: output });
             this.logger.info(`[a2a-adapter] task ${taskId} completed`);
             this.publishMessage(eventBus, output || "Task completed with no output.");
         }
         catch (err) {
             const errorMsg = err instanceof Error ? err.message : String(err);
             this.logger.error(`[a2a-adapter] task execution failed: ${errorMsg}`);
-            this.taskTracker.update(trackedId, { status: "failed", error: errorMsg });
+            this.taskTracker.update(taskId, { status: "failed", error: errorMsg });
             this.publishMessage(eventBus, `Error: ${errorMsg}`);
         }
-        finally {
-            this.a2aToTracker.delete(taskId);
-        }
         eventBus.finished();
     }
     /**
@@ -192,21 +155,14 @@ class OpenClawAgentExecutor {
         const messages = (details.messages ?? []);
         if (messages.length === 0)
             return null;
-        // If no explicit flag, use conservative heuristic: only consider
-        // complete if the last message is an assistant message with text
-        // and NO tool calls (tool calls indicate ongoing work)
+        // If no explicit flag, check the last message for signs of ongoing execution
         if (details.isComplete === undefined) {
             const lastMsg = messages[messages.length - 1];
-            if (!lastMsg || lastMsg.role !== "assistant")
-                return null;
-            if (Array.isArray(lastMsg.content)) {
+            if (lastMsg && Array.isArray(lastMsg.content)) {
                 const content = lastMsg.content;
                 const hasToolCalls = content.some((c) => c?.type === "toolCall" || c?.type === "tool_use");
-                // If there are ANY tool calls, assume still running
-                if (hasToolCalls)
-                    return null;
                 const hasText = content.some((c) => c?.type === "text" && typeof c.text === "string" && c.text.trim());
-                if (!hasText)
+                if (hasToolCalls && !hasText)
                     return null;
             }
         }
@@ -232,9 +188,7 @@ class OpenClawAgentExecutor {
         return null;
     }
     async cancelTask(taskId, eventBus) {
-        const trackedId = this.a2aToTracker.get(taskId) ?? taskId;
-        this.taskTracker.update(trackedId, { status: "failed", error: "canceled" });
-        this.a2aToTracker.delete(taskId);
+        this.taskTracker.update(taskId, { status: "failed", error: "canceled" });
         this.publishMessage(eventBus, "Task was canceled.");
         eventBus.finished();
     }
@@ -245,7 +199,7 @@ class OpenClawAgentExecutor {
         const message = {
             kind: "message",
             role: "agent",
-            messageId: (0, node_crypto_1.randomUUID)(),
+            messageId: `msg-${Date.now()}`,
             parts: [{ kind: "text", text }],
         };
         eventBus.publish(message);

package/dist/service/agent-registry.d.ts

@@ -6,8 +6,6 @@ export type AgentRecord = {
     apiKey?: string;
     addedAtMs: number;
     lastSeenAtMs: number;
-    /** Which teams synced this agent. Empty or undefined = manually added. */
-    teamIds?: string[];
 };
 export declare class AgentRegistry {
     private readonly filePath;
@@ -23,13 +21,6 @@ export declare class AgentRegistry {
     remove(url: string): Promise<boolean>;
     list(): Promise<AgentRecord[]>;
     get(url: string): Promise<AgentRecord | null>;
-    addTeamSource(url: string, teamId: string): Promise<void>;
-    /**
-     * Remove a team source from an agent. Returns true if the agent
-     * was fully removed (no remaining sources), false otherwise.
-     * Manually-added agents (no teamIds) are never removed by this method.
-     */
-    removeTeamSource(url: string, teamId: string): Promise<boolean>;
     updateDescription(url: string, description: string): Promise<void>;
     updateLastSeen(url: string): Promise<void>;
 }

package/dist/service/agent-registry.js

@@ -32,17 +32,14 @@ class AgentRegistry {
             const normalizedUrl = params.url.replace(/\/+$/, "");
             const existing = store.agents.findIndex((a) => a.url === normalizedUrl);
             const now = Date.now();
-            const prev = existing >= 0 ? store.agents[existing] : null;
             const record = {
                 url: normalizedUrl,
                 name: params.name,
                 description: params.description ?? "",
                 skills: params.skills ?? [],
                 apiKey: params.apiKey,
-                addedAtMs: prev?.addedAtMs ?? now,
+                addedAtMs: existing >= 0 ? store.agents[existing].addedAtMs : now,
                 lastSeenAtMs: now,
-                // Preserve existing teamIds so that team associations are not lost on upsert
-                ...(prev?.teamIds?.length ? { teamIds: prev.teamIds } : {}),
             };
             if (existing >= 0) {
                 store.agents[existing] = record;
@@ -76,47 +73,6 @@ class AgentRegistry {
         const normalizedUrl = url.replace(/\/+$/, "");
         return store.agents.find((a) => a.url === normalizedUrl) ?? null;
     }
-    async addTeamSource(url, teamId) {
-        await (0, json_store_1.withJsonLock)(this.filePath, emptyStore(), async () => {
-            const store = await this.readStore();
-            const normalizedUrl = url.replace(/\/+$/, "");
-            const agent = store.agents.find((a) => a.url === normalizedUrl);
-            if (agent) {
-                const teams = new Set(agent.teamIds ?? []);
-                teams.add(teamId);
-                agent.teamIds = [...teams];
-                await (0, json_store_1.writeJsonAtomically)(this.filePath, store);
-            }
-        });
-    }
-    /**
-     * Remove a team source from an agent. Returns true if the agent
-     * was fully removed (no remaining sources), false otherwise.
-     * Manually-added agents (no teamIds) are never removed by this method.
-     */
-    async removeTeamSource(url, teamId) {
-        return await (0, json_store_1.withJsonLock)(this.filePath, emptyStore(), async () => {
-            const store = await this.readStore();
-            const normalizedUrl = url.replace(/\/+$/, "");
-            const agent = store.agents.find((a) => a.url === normalizedUrl);
-            if (!agent)
-                return false;
-            // Agent was manually added (no team tracking) — never auto-remove
-            if (!agent.teamIds || agent.teamIds.length === 0)
-                return false;
-            const teams = new Set(agent.teamIds);
-            teams.delete(teamId);
-            if (teams.size === 0) {
-                // No team sources remain — remove entirely
-                store.agents = store.agents.filter((a) => a.url !== normalizedUrl);
-                await (0, json_store_1.writeJsonAtomically)(this.filePath, store);
-                return true;
-            }
-            agent.teamIds = [...teams];
-            await (0, json_store_1.writeJsonAtomically)(this.filePath, store);
-            return false;
-        });
-    }
     async updateDescription(url, description) {
         await (0, json_store_1.withJsonLock)(this.filePath, emptyStore(), async () => {
             const store = await this.readStore();

package/dist/service/multiclaws-service.d.ts

@@ -2,7 +2,6 @@ import { EventEmitter } from "node:events";
 import { type AgentRecord } from "./agent-registry";
 import { type AgentProfile } from "./agent-profile";
 import { type TeamRecord, type TeamMember } from "../team/team-store";
-import { type ConversationSession } from "./session-store";
 import type { GatewayConfig } from "../infra/gateway-client";
 export type MulticlawsServiceOptions = {
     stateDir: string;
@@ -17,14 +16,10 @@ export type MulticlawsServiceOptions = {
         debug?: (message: string) => void;
     };
 };
-export type SessionStartResult = {
-    sessionId: string;
-    status: "running" | "failed";
-    error?: string;
-};
-export type SessionReplyResult = {
-    sessionId: string;
-    status: "ok" | "failed";
+export type DelegateTaskResult = {
+    taskId?: string;
+    output?: string;
+    status: string;
     error?: string;
 };
 export declare class MulticlawsService extends EventEmitter {
@@ -35,9 +30,6 @@ export declare class MulticlawsService extends EventEmitter {
     private readonly teamStore;
     private readonly profileStore;
     private readonly taskTracker;
-    private readonly sessionStore;
-    private readonly sessionLocks;
-    private readonly sessionAborts;
     private agentExecutor;
     private a2aRequestHandler;
     private agentCard;
@@ -45,51 +37,28 @@ export declare class MulticlawsService extends EventEmitter {
     private readonly httpRateLimiter;
     private selfUrl;
     private profileDescription;
-    private tailscaleStatus;
     constructor(options: MulticlawsServiceOptions);
     start(): Promise<void>;
     stop(): Promise<void>;
     updateGatewayConfig(config: GatewayConfig): void;
     listAgents(): Promise<AgentRecord[]>;
+    addAgent(params: {
+        url: string;
+        apiKey?: string;
+    }): Promise<AgentRecord>;
     removeAgent(url: string): Promise<boolean>;
-    startSession(params: {
+    delegateTask(params: {
         agentUrl: string;
-        message: string;
-    }): Promise<SessionStartResult>;
-    sendSessionMessage(params: {
-        sessionId: string;
-        message: string;
-    }): Promise<SessionReplyResult>;
-    getSession(sessionId: string): ConversationSession | null;
-    listSessions(): ConversationSession[];
-    waitForSessions(params: {
-        sessionIds: string[];
-        timeoutMs?: number;
-    }): Promise<{
-        results: Array<{
-            sessionId: string;
-            status: string;
-            agentName: string;
-            lastMessage?: string;
-            error?: string;
-        }>;
-        timedOut: boolean;
-    }>;
-    endSession(sessionId: string): boolean;
-    private acquireSessionLock;
-    private runSession;
-    private extractResultState;
-    private handleSessionResult;
-    private notifySessionUpdate;
+        task: string;
+    }): Promise<DelegateTaskResult>;
+    getTaskStatus(taskId: string): import("../task/tracker").TaskRecord | null;
     getProfile(): Promise<AgentProfile>;
     setProfile(patch: {
         ownerName?: string;
         bio?: string;
     }): Promise<AgentProfile>;
-    private autoClearPendingReviewIfReady;
     private updateProfileDescription;
     private getPendingReviewPath;
-    getTailscaleStatus(): "ready" | "needs_auth" | "not_installed" | "unavailable";
     getPendingProfileReview(): Promise<{
         pending: boolean;
         profile?: AgentProfile;
@@ -115,6 +84,7 @@ export declare class MulticlawsService extends EventEmitter {
     private fetchMemberDescriptions;
     private syncTeamToRegistry;
     private createA2AClient;
+    private processTaskResult;
     private extractArtifactText;
     private notifyTailscaleSetup;
     /** Fetch with up to 2 retries and exponential backoff. */