manualofme-bridge 0.2.0 → 0.2.1

package/cli.js

@@ -4257,6 +4257,11 @@ var init_session = __esm({
       }
       sdk;
       abort = null;
+      /**
+       * Query của lượt đã xong nhưng chưa đóng: Claude bật tác vụ nền (server, tunnel...) thì SDK
+       * còn chạy tiếp tới khi tác vụ đó tắt. Gửi tin mới / đổi session thì đóng nó trước.
+       */
+      tail = null;
       pending = /* @__PURE__ */ new Map();
       get sessionId() {
         return this.deps.state.sessionId;
@@ -4311,6 +4316,7 @@ var init_session = __esm({
       }
       async open(sessionId) {
         if (this.busy) throw new BridgeError("Claude \u0111ang ch\u1EA1y, d\u1EEBng l\u01B0\u1EE3t n\xE0y tr\u01B0\u1EDBc khi \u0111\u1ED5i session");
+        this.closeTail();
         this.deps.state.sessionId = sessionId;
         this.deps.broadcast(this.stateMessage());
         const history = await this.historyMessage();
@@ -4327,6 +4333,7 @@ var init_session = __esm({
           throw new BridgeError("Kh\xF4ng l\u01B0u \u0111\u01B0\u1EE3c t\u1EC7p \u0111\xEDnh k\xE8m tr\xEAn PC");
         }
         const text = promptWithFiles(input, paths);
+        this.closeTail();
         const abort = new AbortController();
         this.abort = abort;
         this.deps.broadcast(this.stateMessage());
@@ -4350,6 +4357,11 @@ var init_session = __esm({
           this.setOptions({ permissionMode: "default" });
         }
       }
+      closeTail() {
+        const tail = this.tail;
+        this.tail = null;
+        tail?.close();
+      }
       async run(text, abort) {
         const { config: config2, broadcast, push } = this.deps;
         const started = Date.now();
@@ -4357,9 +4369,31 @@ var init_session = __esm({
         let resultText = "";
         let costUsd = 0;
         let durationMs = 0;
+        let ended = false;
         const mode = this.permissionMode;
+        const endTurn = () => {
+          if (ended) return;
+          ended = true;
+          if (this.abort === abort) this.abort = null;
+          for (const p of this.pending.values())
+            p.finish({ behavior: "deny", message: "L\u01B0\u1EE3t \u0111\xE3 k\u1EBFt th\xFAc" });
+          if (!durationMs) durationMs = Date.now() - started;
+          if (!ok && !resultText) resultText = abort.signal.aborted ? "\u0110\xE3 d\u1EEBng" : "L\u1ED7i kh\xF4ng r\xF5";
+          const sessionId = this.sessionId;
+          broadcast({ type: "turn_end", sessionId, ok, text: resultText, costUsd, durationMs });
+          broadcast(this.stateMessage());
+          if (!abort.signal.aborted) {
+            void push({
+              event: "turn_end",
+              title: ok ? "Claude xong vi\u1EC7c" : "Claude g\u1EB7p l\u1ED7i",
+              body: resultText || "(kh\xF4ng c\xF3 n\u1ED9i dung)",
+              sessionId
+            });
+          }
+        };
+        let q = null;
         try {
-          const q = this.sdk.query({
+          q = this.sdk.query({
             prompt: text,
             options: {
               cwd: config2.cwd,
@@ -4376,6 +4410,7 @@ var init_session = __esm({
               systemPrompt: { type: "preset", preset: "claude_code", append: APPEND_PROMPT }
             }
           });
+          this.tail = q;
           for await (const msg of q) {
             if (msg.type === "system" && msg.subtype === "init") {
               if (msg.session_id !== this.sessionId) {
@@ -4385,33 +4420,25 @@ var init_session = __esm({
             } else if (msg.type === "assistant") {
               for (const item of toChatItems(msg))
                 broadcast({ type: "item", sessionId: this.sessionId, item });
-            } else if (msg.type === "result") {
+            } else if (msg.type === "result" && !ended) {
               ok = msg.subtype === "success" && !msg.is_error;
               resultText = msg.subtype === "success" ? msg.result : msg.errors.join("\n") || msg.subtype;
               costUsd = msg.total_cost_usd;
               durationMs = msg.duration_ms;
+              endTurn();
             }
           }
         } catch (e) {
-          ok = false;
-          resultText = abort.signal.aborted ? "\u0110\xE3 d\u1EEBng" : errorText(e);
+          if (!ended) {
+            ok = false;
+            resultText = abort.signal.aborted ? "\u0110\xE3 d\u1EEBng" : errorText(e);
+          }
         } finally {
-          this.abort = null;
-          for (const p of this.pending.values())
-            p.finish({ behavior: "deny", message: "L\u01B0\u1EE3t \u0111\xE3 k\u1EBFt th\xFAc" });
-        }
-        if (!durationMs) durationMs = Date.now() - started;
-        if (!ok && !resultText) resultText = abort.signal.aborted ? "\u0110\xE3 d\u1EEBng" : "L\u1ED7i kh\xF4ng r\xF5";
-        const sessionId = this.sessionId;
-        broadcast({ type: "turn_end", sessionId, ok, text: resultText, costUsd, durationMs });
-        broadcast(this.stateMessage());
-        if (!abort.signal.aborted) {
-          void push({
-            event: "turn_end",
-            title: ok ? "Claude xong vi\u1EC7c" : "Claude g\u1EB7p l\u1ED7i",
-            body: resultText || "(kh\xF4ng c\xF3 n\u1ED9i dung)",
-            sessionId
-          });
+          if (q && this.tail === q) this.tail = null;
+          endTurn();
+          if (!this.busy)
+            for (const p of this.pending.values())
+              p.finish({ behavior: "deny", message: "L\u01B0\u1EE3t \u0111\xE3 k\u1EBFt th\xFAc" });
         }
       }
       canUseTool = (toolName, input, opts) => new Promise((resolve) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "manualofme-bridge",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Điều khiển Claude Code trên máy từ web/app ManualOfMe",
   "type": "module",
   "bin": {