commanderclaw 1.1.15 → 1.1.20

package/dist/plugin/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/plugin/client.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EACV,OAAO,EAGP,QAAQ,EACR,eAAe,EACf,IAAI,EACJ,iBAAiB,EACjB,eAAe,EACf,WAAW,EACZ,MAAM,SAAS,CAAC;AAwCjB,MAAM,WAAW,aAAa;IAC5B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,SAAS,CAAC,EAAE;QACV,OAAO,EAAE,OAAO,CAAC;QACjB,WAAW,EAAE,MAAM,CAAC;QACpB,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC;CACH;AAED,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,EAAE,CAA8B;IACxC,OAAO,CAAC,OAAO,CAAgB;IAC/B,OAAO,CAAC,MAAM,CAAuB;IACrC,OAAO,CAAC,KAAK,CAAkB;IAC/B,OAAO,CAAC,WAAW,CAAuB;IAC1C,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,iBAAiB,CAAK;IAC9B,OAAO,CAAC,eAAe,CAAkD;IACzE,OAAO,CAAC,aAAa,CAAqE;IAC1F,OAAO,CAAC,iBAAiB,CAA+C;IACxE,OAAO,CAAC,iBAAiB,CAGT;gBAEJ,OAAO,EAAE,aAAa;IAI5B,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAwC9B,OAAO,CAAC,aAAa;IAiFrB,OAAO,CAAC,WAAW;IAoBnB,OAAO,CAAC,gBAAgB;IAWxB,OAAO,CAAC,cAAc;IAQtB,OAAO,CAAC,gBAAgB;IAkBlB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAajC,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,IAAI;IAiC3C,EAAE,CAAC,KAAK,EAAE,eAAe,EAAE,OAAO,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,GAAG,IAAI;IAMvE,GAAG,CAAC,KAAK,EAAE,eAAe,EAAE,OAAO,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,GAAG,IAAI;IAQxE,OAAO,CAAC,IAAI;IAWZ,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,IAAI,GAAG,IAAI;IAI9D,WAAW,IAAI,OAAO;IAItB,SAAS,IAAI,MAAM,GAAG,IAAI;IAI1B,QAAQ,IAAI,QAAQ,EAAE;IAItB,cAAc,IAAI,MAAM,GAAG,IAAI;IAI/B,OAAO,CAAC,UAAU;YAIJ,QAAQ;IAwBhB,SAAS,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;IAKhC,SAAS,IAAI,OAAO,CAAC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAIvD,UAAU,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAOjD,SAAS,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;IAK5B,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAItC,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IAOvE,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IAMtD,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IAMvD,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE,CAAC;IAOxF,cAAc,CAAC,OAAO,EAAE,iBAAiB,GAAG,IAAI;IAIhD,cAAc,CAAC,OAAO,EAAE,iBAAiB,GAAG;QAAE,MAAM,CAAC,EAAE,OAAO,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;CAG1G"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/plugin/client.ts"],"names":[],"mappings":"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"}

package/dist/plugin/index.cjs

@@ -140,6 +140,12 @@ class CommanderClawClient {
                 this.emit("chat", { type: "chat", data: msg });
                 break;
             }
+            case "SESSION_SWITCH": {
+                const payload = msg.payload;
+                console.log(`[CommanderClawClient] SESSION_SWITCH: sessionId=${payload.sessionId}, action=${payload.action || "legacy"}`);
+                this.emit("session_switch", { type: "session_switch", data: payload });
+                break;
+            }
             default: {
                 console.log(`[CommanderClawClient] Unknown message type: ${msg.type}`);
                 const handler = this.messageHandlers.get(msg.type);
@@ -4272,6 +4278,314 @@ Note: Some commands may require King-level permissions.`,
     };
 }
 
+/**
+ * OpenClaw Session Strategy
+ *
+ * Uses ACP Runtime to create and manage sessions for OpenClaw-based agents (QClaw, OpenCode, etc.).
+ */
+class OpenClawSessionStrategy {
+    name;
+    runtime = null;
+    sessions = new Map();
+    activeSessionId = null;
+    initialized = false;
+    initPromise = null;
+    constructor(backendType) {
+        this.name = backendType;
+        this.initPromise = this.initRuntime();
+    }
+    async initRuntime() {
+        try {
+            // Dynamic import to handle cases where openclaw is not available
+            const openclaw = await import('openclaw/plugin-sdk');
+            const backend = openclaw.requireAcpRuntimeBackend();
+            this.runtime = backend?.runtime;
+            this.initialized = true;
+            console.log(`[CommanderClaw] ACP Runtime initialized for ${this.name}`);
+        }
+        catch (e) {
+            console.warn(`[CommanderClaw] ACP Runtime not available for ${this.name}:`, e);
+            this.initialized = true; // Mark as initialized even on failure
+        }
+    }
+    async ensureInitialized() {
+        if (!this.initialized && this.initPromise) {
+            await this.initPromise;
+        }
+    }
+    isAvailable() {
+        return !!this.runtime;
+    }
+    async createSession(sessionId, options) {
+        await this.ensureInitialized();
+        if (!this.runtime) {
+            throw new Error('ACP Runtime not available');
+        }
+        const sessionKey = options?.sessionKey || `commanderclaw:${sessionId}`;
+        try {
+            const handle = await this.runtime.ensureSession({
+                sessionKey,
+                agent: 'default',
+                mode: options?.mode || 'persistent',
+                cwd: options?.cwd,
+                env: options?.env,
+            });
+            const sessionHandle = {
+                sessionId,
+                localSessionKey: handle.sessionKey,
+                createdAt: new Date(),
+                metadata: {
+                    backendSessionId: handle.backendSessionId,
+                    agentSessionId: handle.agentSessionId,
+                    cwd: handle.cwd,
+                },
+            };
+            this.sessions.set(sessionId, sessionHandle);
+            this.activeSessionId = sessionId;
+            console.log(`[CommanderClaw] Session created via ACP Runtime: ${sessionId} -> ${handle.sessionKey}`);
+            return sessionHandle;
+        }
+        catch (e) {
+            console.error(`[CommanderClaw] Failed to create session ${sessionId}:`, e);
+            throw e;
+        }
+    }
+    getSession(sessionId) {
+        return this.sessions.get(sessionId) || null;
+    }
+    switchSession(sessionId) {
+        if (!this.sessions.has(sessionId)) {
+            throw new Error(`Session ${sessionId} not found`);
+        }
+        this.activeSessionId = sessionId;
+        console.log(`[CommanderClaw] Switched to session: ${sessionId}`);
+    }
+    getActiveSession() {
+        if (!this.activeSessionId)
+            return null;
+        return this.sessions.get(this.activeSessionId) || null;
+    }
+    async closeSession(sessionId) {
+        const session = this.sessions.get(sessionId);
+        if (!session)
+            return;
+        if (this.runtime?.close) {
+            try {
+                await this.runtime.close({
+                    handle: { sessionKey: session.localSessionKey },
+                    reason: 'Session closed by CommanderClaw',
+                });
+            }
+            catch (e) {
+                console.warn(`[CommanderClaw] Failed to close session ${sessionId} via ACP Runtime:`, e);
+            }
+        }
+        this.sessions.delete(sessionId);
+        if (this.activeSessionId === sessionId) {
+            this.activeSessionId = null;
+        }
+        console.log(`[CommanderClaw] Session closed: ${sessionId}`);
+    }
+}
+
+/**
+ * Simple Session Strategy
+ *
+ * Fallback strategy that uses in-memory session mapping.
+ * Used when ACP Runtime is not available.
+ */
+class SimpleSessionStrategy {
+    name = 'simple';
+    sessions = new Map();
+    activeSessionId = null;
+    isAvailable() {
+        return true; // Always available as fallback
+    }
+    async createSession(sessionId, options) {
+        const existing = this.sessions.get(sessionId);
+        if (existing) {
+            this.activeSessionId = sessionId;
+            return existing;
+        }
+        const sessionKey = options?.sessionKey || `simple:${sessionId}:${Date.now()}`;
+        const sessionHandle = {
+            sessionId,
+            localSessionKey: sessionKey,
+            createdAt: new Date(),
+        };
+        this.sessions.set(sessionId, sessionHandle);
+        this.activeSessionId = sessionId;
+        console.log(`[CommanderClaw] Simple session created: ${sessionId} -> ${sessionKey}`);
+        return sessionHandle;
+    }
+    getSession(sessionId) {
+        return this.sessions.get(sessionId) || null;
+    }
+    switchSession(sessionId) {
+        if (!this.sessions.has(sessionId)) {
+            throw new Error(`Session ${sessionId} not found`);
+        }
+        this.activeSessionId = sessionId;
+        console.log(`[CommanderClaw] Switched to simple session: ${sessionId}`);
+    }
+    getActiveSession() {
+        if (!this.activeSessionId)
+            return null;
+        return this.sessions.get(this.activeSessionId) || null;
+    }
+    async closeSession(sessionId) {
+        this.sessions.delete(sessionId);
+        if (this.activeSessionId === sessionId) {
+            this.activeSessionId = null;
+        }
+        console.log(`[CommanderClaw] Simple session closed: ${sessionId}`);
+    }
+}
+
+/**
+ * Backend Detector
+ *
+ * Detects the ACP backend type for the current environment.
+ */
+function detectBackend() {
+    // 1. Check environment variables
+    if (process.env.QCLAW_BACKEND)
+        return 'qclaw';
+    if (process.env.OPENCODE_BACKEND)
+        return 'opencode';
+    // 2. Try to load OpenClaw SDK and detect backend
+    try {
+        // Use require for synchronous detection
+        // eslint-disable-next-line @typescript-eslint/no-var-requires
+        const openclaw = require('openclaw/plugin-sdk');
+        const backend = openclaw.requireAcpRuntimeBackend();
+        if (!backend)
+            return 'simple';
+        const id = (backend.id || '').toLowerCase();
+        if (id.includes('qclaw'))
+            return 'qclaw';
+        if (id.includes('opencode'))
+            return 'opencode';
+        if (id.includes('claude'))
+            return 'claude';
+        if (id.includes('cursor'))
+            return 'cursor';
+        // Has backend but unknown type
+        return 'custom';
+    }
+    catch {
+        // OpenClaw SDK not available or backend not registered
+    }
+    return 'simple';
+}
+
+/**
+ * Session Manager
+ *
+ * Manages session strategies and provides a unified interface for session operations.
+ */
+class SessionManager {
+    activeStrategy = null;
+    backendType = 'unknown';
+    constructor() {
+        this.initStrategy();
+    }
+    initStrategy() {
+        const backend = detectBackend();
+        this.backendType = backend;
+        console.log(`[CommanderClaw] Detected backend: ${backend}`);
+        if (backend === 'simple') {
+            // No ACP Runtime available, use simple strategy
+            this.activeStrategy = new SimpleSessionStrategy();
+            console.log(`[CommanderClaw] Using strategy: simple (no ACP Runtime)`);
+        }
+        else {
+            // Try OpenClaw strategy first
+            const openclawStrategy = new OpenClawSessionStrategy(backend);
+            // Check availability asynchronously
+            openclawStrategy['initPromise']?.then(() => {
+                if (openclawStrategy.isAvailable()) {
+                    console.log(`[CommanderClaw] Using strategy: ${backend} (ACP Runtime)`);
+                }
+                else {
+                    console.warn(`[CommanderClaw] OpenClaw strategy not available, using simple fallback`);
+                    this.activeStrategy = new SimpleSessionStrategy();
+                }
+            });
+            this.activeStrategy = openclawStrategy;
+        }
+    }
+    /**
+     * Get the backend type that was detected
+     */
+    getBackendType() {
+        return this.backendType;
+    }
+    /**
+     * Get the active strategy name
+     */
+    getStrategyName() {
+        return this.activeStrategy?.name || 'none';
+    }
+    /**
+     * Get the active strategy
+     */
+    getActiveStrategy() {
+        return this.activeStrategy;
+    }
+    /**
+     * Create a new session
+     */
+    async createSession(sessionId, options) {
+        if (!this.activeStrategy) {
+            console.warn('[CommanderClaw] No session strategy available');
+            return null;
+        }
+        try {
+            return await this.activeStrategy.createSession(sessionId, options);
+        }
+        catch (e) {
+            console.error(`[CommanderClaw] Failed to create session ${sessionId}:`, e);
+            return null;
+        }
+    }
+    /**
+     * Get an existing session
+     */
+    getSession(sessionId) {
+        return this.activeStrategy?.getSession(sessionId) || null;
+    }
+    /**
+     * Switch to an existing session
+     */
+    switchSession(sessionId) {
+        this.activeStrategy?.switchSession(sessionId);
+    }
+    /**
+     * Get the currently active session
+     */
+    getActiveSession() {
+        return this.activeStrategy?.getActiveSession() || null;
+    }
+    /**
+     * Close a session
+     */
+    async closeSession(sessionId) {
+        await this.activeStrategy?.closeSession(sessionId);
+    }
+}
+// Singleton instance
+let sessionManager$1 = null;
+/**
+ * Get the singleton SessionManager instance
+ */
+function getSessionManager() {
+    if (!sessionManager$1) {
+        sessionManager$1 = new SessionManager();
+    }
+    return sessionManager$1;
+}
+
 /**
  * CommanderClaw Channel Plugin for OpenClaw
  *
@@ -4283,6 +4597,8 @@ const { setRuntime, getRuntime } = pluginSdk.createPluginRuntimeStore("Commander
 let client = null;
 let pluginConfig = null;
 let currentLog = null;
+let currentSessionKey = null;
+const sessionManager = getSessionManager();
 const DEFAULT_CONFIG = {
     deviceName: "OpenClaw Agent",
     autoConnect: true,
@@ -4340,6 +4656,8 @@ async function handleChatMessage(msg) {
                 id: senderId,
             },
         });
+        const sessionHandle = sessionManager.getActiveSession();
+        const sessionKey = sessionHandle?.localSessionKey || currentSessionKey || route.sessionKey;
         const ctxPayload = rt.channel.reply.finalizeInboundContext({
             Body: content,
             RawBody: content,
@@ -4348,7 +4666,7 @@ async function handleChatMessage(msg) {
             From: `${CHANNEL_ID}:${senderId}`,
             To: `${CHANNEL_ID}:${nodeId}`,
             SenderId: senderId,
-            SessionKey: route.sessionKey,
+            SessionKey: sessionKey,
             AccountId: "default",
             ChatType: "direct",
             ConversationLabel: `user:${senderId}`,
@@ -4423,6 +4741,61 @@ function initializeClient(config, log) {
     client.on("chat", (event) => {
         handleChatMessage(event.data);
     });
+    client.on("session_switch", async (event) => {
+        const payload = event.data;
+        log.info("SESSION_SWITCH received", {
+            sessionId: payload.sessionId,
+            sessionKey: payload.sessionKey,
+            action: payload.action || "legacy",
+        });
+        const action = payload.action || "switch";
+        switch (action) {
+            case "create": {
+                try {
+                    const handle = await sessionManager.createSession(payload.sessionId, { ...payload.options, sessionKey: payload.sessionKey });
+                    currentSessionKey = handle.localSessionKey;
+                    log.info("Session created", {
+                        sessionId: payload.sessionId,
+                        localSessionKey: handle.localSessionKey,
+                    });
+                }
+                catch (e) {
+                    log.error("Failed to create session", {
+                        sessionId: payload.sessionId,
+                        error: String(e),
+                    });
+                }
+                break;
+            }
+            case "switch": {
+                const existing = sessionManager.getSession(payload.sessionId);
+                if (existing) {
+                    sessionManager.switchSession(payload.sessionId);
+                    currentSessionKey = existing.localSessionKey;
+                    log.info("Session switched", { sessionId: payload.sessionId });
+                }
+                else {
+                    log.info("Session not found, creating", { sessionId: payload.sessionId });
+                    try {
+                        const handle = await sessionManager.createSession(payload.sessionId, { sessionKey: payload.sessionKey });
+                        currentSessionKey = handle.localSessionKey;
+                    }
+                    catch (e) {
+                        log.error("Failed to create session on switch", {
+                            sessionId: payload.sessionId,
+                            error: String(e),
+                        });
+                    }
+                }
+                break;
+            }
+            case "close":
+                await sessionManager.closeSession(payload.sessionId);
+                currentSessionKey = null;
+                log.info("Session closed", { sessionId: payload.sessionId });
+                break;
+        }
+    });
     client.connect().catch((error) => {
         log.error("Failed to connect to CommanderClaw server", {
             error: error.message,