@team-semicolon/semo-cli 4.1.3 → 4.1.5

package/dist/commands/bots.js

@@ -50,6 +50,7 @@ const chalk_1 = __importDefault(require("chalk"));
 const ora_1 = __importDefault(require("ora"));
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
+const child_process_1 = require("child_process");
 const database_1 = require("../database");
 function parseIdentityMd(content) {
     const nameMatch = content.match(/\*\*Name:\*\*\s*(.+)/);
@@ -343,11 +344,23 @@ function registerBotsCommands(program) {
         catch (err) {
             await client.query("ROLLBACK");
             spinner.fail(`sync 실패: ${err}`);
-            process.exit(1);
-        }
-        finally {
             client.release();
             await (0, database_1.closeConnection)();
+            process.exit(1);
+        }
+        client.release();
+        await (0, database_1.closeConnection)();
+        // sessions sync 연동: DB 연결 반납 후 별도 프로세스로 실행
+        console.log(chalk_1.default.gray("  → sessions sync 실행 중..."));
+        try {
+            const semoCmd = process.argv[1];
+            (0, child_process_1.spawnSync)(process.execPath, [semoCmd, "sessions", "sync", "--all"], {
+                stdio: "inherit",
+                timeout: 60000,
+            });
+        }
+        catch {
+            console.log(chalk_1.default.yellow("  ⚠ sessions sync 호출 실패 (무시)"));
         }
     });
     // ── semo bots set-status ─────────────────────────────────────

package/dist/commands/sessions.d.ts

@@ -1,16 +1,29 @@
 /**
  * semo sessions — 세션 추적
  *
- * Claude Code 훅(SessionStart / Stop)에서 stdin으로 전달되는 JSON을 파싱해
- * semo.bot_sessions 테이블에 upsert합니다.
+ * sync: 각 봇의 OpenClaw 게이트웨이(HTTP API) 또는 로컬 sessions.json에서
+ *       세션 데이터를 읽어 semo.bot_sessions에 upsert합니다.
  *
- * Claude Code hook stdin 구조:
- *   SessionStart: { session_id, transcript_path, cwd, hook_event_name }
- *   Stop:         { session_id, transcript_path, hook_event_name }
+ * push: Claude Code 훅(SessionStart / Stop)에서 stdin으로 전달되는 JSON을 파싱해
+ *       semo.bot_sessions 테이블에 upsert합니다. (Claude Code 직접 실행 시에만 유효)
  *
- * 사용법 (settings.json hooks):
- *   SessionStart → semo sessions push --bot-id workclaw --event start
- *   Stop         → semo sessions push --bot-id workclaw --event stop
+ * OpenClaw 봇은 게이트웨이(WS/HTTP 서버)로 운영되어 Claude Code 훅이 트리거되지 않으므로
+ * semo sessions sync --all 로 주기적으로 동기화해야 합니다.
+ *
+ * 게이트웨이 설정 위치: ~/.openclaw-{botId}/openclaw.json
+ *   gateway.port: 포트번호
+ *   gateway.auth.token: Bearer 토큰
+ *
+ * HTTP API: POST http://127.0.0.1:{port}/tools/invoke
+ *   { tool: "sessions_list", action: "json", args: {} }
+ *   응답: { ok: true, result: { content: [{ type: "text", text: "<JSON string>" }] } }
+ *   inner JSON: { count: N, sessions: [{ key, kind, channel, displayName, updatedAt, totalTokens }] }
+ *
+ * Fallback: ~/.openclaw-{botId}/agents/main/sessions/sessions.json
+ *   { "agent:main:slack:channel:xxx": { updatedAt: <unix ms>, ... }, ... }
  */
 import { Command } from "commander";
+export declare function syncBotSessions(botIds: string[], client: any): Promise<{
+    total: number;
+}>;
 export declare function registerSessionsCommands(program: Command): void;

package/dist/commands/sessions.js

@@ -2,16 +2,26 @@
 /**
  * semo sessions — 세션 추적
  *
- * Claude Code 훅(SessionStart / Stop)에서 stdin으로 전달되는 JSON을 파싱해
- * semo.bot_sessions 테이블에 upsert합니다.
+ * sync: 각 봇의 OpenClaw 게이트웨이(HTTP API) 또는 로컬 sessions.json에서
+ *       세션 데이터를 읽어 semo.bot_sessions에 upsert합니다.
  *
- * Claude Code hook stdin 구조:
- *   SessionStart: { session_id, transcript_path, cwd, hook_event_name }
- *   Stop:         { session_id, transcript_path, hook_event_name }
+ * push: Claude Code 훅(SessionStart / Stop)에서 stdin으로 전달되는 JSON을 파싱해
+ *       semo.bot_sessions 테이블에 upsert합니다. (Claude Code 직접 실행 시에만 유효)
  *
- * 사용법 (settings.json hooks):
- *   SessionStart → semo sessions push --bot-id workclaw --event start
- *   Stop         → semo sessions push --bot-id workclaw --event stop
+ * OpenClaw 봇은 게이트웨이(WS/HTTP 서버)로 운영되어 Claude Code 훅이 트리거되지 않으므로
+ * semo sessions sync --all 로 주기적으로 동기화해야 합니다.
+ *
+ * 게이트웨이 설정 위치: ~/.openclaw-{botId}/openclaw.json
+ *   gateway.port: 포트번호
+ *   gateway.auth.token: Bearer 토큰
+ *
+ * HTTP API: POST http://127.0.0.1:{port}/tools/invoke
+ *   { tool: "sessions_list", action: "json", args: {} }
+ *   응답: { ok: true, result: { content: [{ type: "text", text: "<JSON string>" }] } }
+ *   inner JSON: { count: N, sessions: [{ key, kind, channel, displayName, updatedAt, totalTokens }] }
+ *
+ * Fallback: ~/.openclaw-{botId}/agents/main/sessions/sessions.json
+ *   { "agent:main:slack:channel:xxx": { updatedAt: <unix ms>, ... }, ... }
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -50,13 +60,94 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.syncBotSessions = syncBotSessions;
 exports.registerSessionsCommands = registerSessionsCommands;
 const chalk_1 = __importDefault(require("chalk"));
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const readline = __importStar(require("readline"));
+const os = __importStar(require("os"));
 const child_process_1 = require("child_process");
 const database_1 = require("../database");
+function readOpenClawConfig(botId) {
+    const configPath = path.join(os.homedir(), `.openclaw-${botId}`, "openclaw.json");
+    if (!fs.existsSync(configPath))
+        return null;
+    try {
+        return JSON.parse(fs.readFileSync(configPath, "utf-8"));
+    }
+    catch {
+        return null;
+    }
+}
+// HTTP API로 게이트웨이에서 세션 목록 조회
+async function fetchSessionsFromGateway(botId) {
+    const config = readOpenClawConfig(botId);
+    if (!config?.gateway?.port || !config?.gateway?.auth?.token)
+        return null;
+    const { port, auth } = config.gateway;
+    const token = auth.token;
+    const url = `http://127.0.0.1:${port}/tools/invoke`;
+    try {
+        const res = await fetch(url, {
+            method: "POST",
+            headers: {
+                "Authorization": `Bearer ${token}`,
+                "Content-Type": "application/json",
+            },
+            body: JSON.stringify({ tool: "sessions_list", action: "json", args: {} }),
+            signal: AbortSignal.timeout(5000),
+        });
+        if (!res.ok)
+            return null;
+        const outer = await res.json();
+        if (!outer.ok)
+            return null;
+        // 이중 JSON 파싱: result.content[0].text가 JSON 문자열
+        const textContent = outer.result?.content?.find(c => c.type === "text")?.text;
+        if (!textContent)
+            return null;
+        const inner = JSON.parse(textContent);
+        return inner.sessions ?? null;
+    }
+    catch {
+        return null;
+    }
+}
+// Fallback: 로컬 sessions.json 파일 파싱
+function readSessionsFromFile(botId) {
+    const sessionsPath = path.join(os.homedir(), `.openclaw-${botId}`, "agents", "main", "sessions", "sessions.json");
+    if (!fs.existsSync(sessionsPath))
+        return null;
+    try {
+        const raw = JSON.parse(fs.readFileSync(sessionsPath, "utf-8"));
+        return Object.entries(raw).map(([key, val]) => ({
+            key,
+            updatedAt: val.updatedAt,
+        }));
+    }
+    catch {
+        return null;
+    }
+}
+// GatewaySession → DB 컬럼 매핑
+function mapSessionToDb(s) {
+    // kind: "group" → isolated, 나머지 → main
+    const kind = s.kind === "group" ? "isolated" : "main";
+    // chat_type: key 패턴으로 파싱 (API의 channel 필드 우선)
+    let chatType = s.channel ?? "direct";
+    if (!s.channel) {
+        if (s.key.includes(":slack:"))
+            chatType = "slack";
+        else if (s.key.includes(":cron:"))
+            chatType = "cron";
+    }
+    // label: displayName 우선, 없으면 key에서 마지막 부분
+    const label = s.displayName ?? s.key.split(":").slice(-2).join(":");
+    // last_activity: unix ms → ISO string
+    const lastActivity = s.updatedAt ? new Date(s.updatedAt).toISOString() : null;
+    return { kind, chatType, label, lastActivity, totalTokens: s.totalTokens ?? null };
+}
 async function readStdin() {
     // stdin이 TTY면 hook에서 호출된 게 아님 → 빈 객체 반환
     if (process.stdin.isTTY)
@@ -120,6 +211,57 @@ async function countMessages(transcriptPath) {
         rl.on("error", () => resolve(0));
     });
 }
+// ─── 외부에서 호출 가능한 sync 헬퍼 ──────────────────────────────────────────
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+async function syncBotSessions(botIds, client) {
+    let totalUpserted = 0;
+    for (const botId of botIds) {
+        let sessions = await fetchSessionsFromGateway(botId);
+        if (!sessions)
+            sessions = readSessionsFromFile(botId);
+        if (!sessions || sessions.length === 0)
+            continue;
+        let upserted = 0;
+        let latestActivity = null;
+        for (const s of sessions) {
+            try {
+                const { kind, chatType, label, lastActivity, totalTokens } = mapSessionToDb(s);
+                await client.query(`INSERT INTO semo.bot_sessions
+             (bot_id, session_key, label, kind, chat_type, last_activity, message_count, synced_at)
+           VALUES ($1, $2, $3, $4, $5, $6, $7, NOW())
+           ON CONFLICT (bot_id, session_key) DO UPDATE SET
+             label         = EXCLUDED.label,
+             kind          = EXCLUDED.kind,
+             chat_type     = EXCLUDED.chat_type,
+             last_activity = COALESCE(EXCLUDED.last_activity, semo.bot_sessions.last_activity),
+             message_count = COALESCE(EXCLUDED.message_count, semo.bot_sessions.message_count),
+             synced_at     = NOW()`, [botId, s.key, label, kind, chatType, lastActivity, totalTokens]);
+                upserted++;
+                if (lastActivity) {
+                    const d = new Date(lastActivity);
+                    if (!latestActivity || d > latestActivity)
+                        latestActivity = d;
+                }
+            }
+            catch { /* 개별 세션 실패 무시 */ }
+        }
+        try {
+            await client.query(`UPDATE semo.bot_status
+         SET session_count = (SELECT COUNT(*) FROM semo.bot_sessions WHERE bot_id = $1),
+             last_active   = CASE
+               WHEN $2::timestamptz IS NOT NULL
+                 AND (last_active IS NULL OR $2::timestamptz > last_active)
+               THEN $2::timestamptz
+               ELSE last_active
+             END,
+             synced_at = NOW()
+         WHERE bot_id = $1`, [botId, latestActivity?.toISOString() ?? null]);
+        }
+        catch { /* bot_status 없으면 무시 */ }
+        totalUpserted += upserted;
+    }
+    return { total: totalUpserted };
+}
 // ─── Command registration ─────────────────────────────────────────────────────
 function registerSessionsCommands(program) {
     const sessionsCmd = program
@@ -209,6 +351,117 @@ function registerSessionsCommands(program) {
             await (0, database_1.closeConnection)();
         }
     });
+    // ── semo sessions sync ──────────────────────────────────────────────────────
+    sessionsCmd
+        .command("sync")
+        .description("OpenClaw 게이트웨이에서 세션 읽어 DB upsert")
+        .option("--bot-id <id>", "특정 봇만 동기화")
+        .option("--all", "semo.bot_status의 모든 봇 동기화")
+        .action(async (options) => {
+        const connected = await (0, database_1.isDbConnected)();
+        if (!connected) {
+            console.log(chalk_1.default.red("❌ DB 연결 실패"));
+            await (0, database_1.closeConnection)();
+            process.exit(1);
+        }
+        const pool = (0, database_1.getPool)();
+        const client = await pool.connect();
+        // 대상 봇 목록 결정
+        let botIds = [];
+        if (options.botId) {
+            botIds = [options.botId];
+        }
+        else if (options.all) {
+            try {
+                const r = await client.query("SELECT bot_id FROM semo.bot_status ORDER BY bot_id");
+                botIds = r.rows.map((row) => row.bot_id);
+            }
+            catch {
+                // bot_status 없으면 openclaw 디렉토리에서 자동 감지
+                const home = os.homedir();
+                botIds = fs.readdirSync(home)
+                    .filter(d => d.startsWith(".openclaw-"))
+                    .map(d => d.replace(".openclaw-", ""))
+                    .filter(id => id.length > 0);
+            }
+        }
+        else {
+            console.log(chalk_1.default.yellow("  --bot-id <id> 또는 --all 옵션 필요"));
+            client.release();
+            await (0, database_1.closeConnection)();
+            process.exit(1);
+        }
+        if (botIds.length === 0) {
+            console.log(chalk_1.default.yellow("  동기화할 봇 없음"));
+            client.release();
+            await (0, database_1.closeConnection)();
+            return;
+        }
+        console.log(chalk_1.default.cyan(`\n🔄 sessions sync — ${botIds.length}개 봇\n`));
+        let totalUpserted = 0;
+        for (const botId of botIds) {
+            process.stdout.write(chalk_1.default.gray(`  ${botId.padEnd(14)}`));
+            // 1) HTTP API 시도
+            let sessions = await fetchSessionsFromGateway(botId);
+            let source = "gateway";
+            // 2) Fallback: 로컬 파일
+            if (!sessions) {
+                sessions = readSessionsFromFile(botId);
+                source = "file";
+            }
+            if (!sessions || sessions.length === 0) {
+                console.log(chalk_1.default.yellow("세션 없음 (게이트웨이 오프라인, 파일 없음)"));
+                continue;
+            }
+            // DB upsert
+            let upserted = 0;
+            let latestActivity = null;
+            for (const s of sessions) {
+                try {
+                    const { kind, chatType, label, lastActivity, totalTokens } = mapSessionToDb(s);
+                    await client.query(`INSERT INTO semo.bot_sessions
+                 (bot_id, session_key, label, kind, chat_type, last_activity, message_count, synced_at)
+               VALUES ($1, $2, $3, $4, $5, $6, $7, NOW())
+               ON CONFLICT (bot_id, session_key) DO UPDATE SET
+                 label         = EXCLUDED.label,
+                 kind          = EXCLUDED.kind,
+                 chat_type     = EXCLUDED.chat_type,
+                 last_activity = COALESCE(EXCLUDED.last_activity, semo.bot_sessions.last_activity),
+                 message_count = COALESCE(EXCLUDED.message_count, semo.bot_sessions.message_count),
+                 synced_at     = NOW()`, [botId, s.key, label, kind, chatType, lastActivity, totalTokens]);
+                    upserted++;
+                    if (lastActivity) {
+                        const d = new Date(lastActivity);
+                        if (!latestActivity || d > latestActivity)
+                            latestActivity = d;
+                    }
+                }
+                catch {
+                    // 개별 세션 실패는 무시
+                }
+            }
+            // bot_status session_count + last_active 갱신
+            try {
+                await client.query(`UPDATE semo.bot_status
+             SET session_count = (SELECT COUNT(*) FROM semo.bot_sessions WHERE bot_id = $1),
+                 last_active   = CASE
+                   WHEN $2::timestamptz IS NOT NULL
+                     AND (last_active IS NULL OR $2::timestamptz > last_active)
+                   THEN $2::timestamptz
+                   ELSE last_active
+                 END,
+                 synced_at = NOW()
+             WHERE bot_id = $1`, [botId, latestActivity?.toISOString() ?? null]);
+            }
+            catch { /* bot_status 없으면 무시 */ }
+            totalUpserted += upserted;
+            console.log(chalk_1.default.green(`✔ ${upserted}개`) +
+                chalk_1.default.gray(` (${source}, total ${sessions.length})`));
+        }
+        client.release();
+        console.log(chalk_1.default.green(`\n✅ sessions sync 완료 — 총 ${totalUpserted}건 upsert\n`));
+        await (0, database_1.closeConnection)();
+    });
     // ── semo sessions list ───────────────────────────────────────────────────────
     sessionsCmd
         .command("list")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@team-semicolon/semo-cli",
-  "version": "4.1.3",
+  "version": "4.1.5",
   "description": "SEMO CLI - AI Agent Orchestration Framework Installer",
   "main": "dist/index.js",
   "bin": {