@winmatrix/agent-sdk 1.0.4 → 1.0.5

package/dist/utils/processUtils.js

@@ -1,5 +1,12 @@
+import { execFileSync } from 'node:child_process';
 export const CANCEL_GRACE_MS = 10_000;
 export function waitForExit(proc) {
+    if (proc.exitCode !== null || proc.signalCode !== null) {
+        return Promise.resolve({
+            code: proc.exitCode,
+            error: proc.signalCode ? `Process killed by signal ${proc.signalCode}` : undefined,
+        });
+    }
     return new Promise((resolve) => {
         proc.once('exit', (code, sig) => {
             resolve({
@@ -12,20 +19,46 @@ export function waitForExit(proc) {
         });
     });
 }
+/**
+ * 进程树击杀（harden-external-computer-daemon P0）。
+ *
+ * Claude Code / Codex 等 CLI 会 spawn bash 等子进程，Windows 上还有 .cmd shell
+ * 垫层——只杀直接子进程会留下孙进程继续烧 token、改文件。
+ *
+ * - POSIX：要求 spawn 时 detached: true（子进程成为新进程组组长，pgid=pid），
+ *   用 kill(-pid) 向整组发信号；组杀失败（如旧调用点未 detached）回退单进程杀。
+ * - Windows：taskkill /T /F 杀整棵进程树（无需 detached）。
+ */
 export function killProcess(proc) {
     if (proc.exitCode !== null || proc.signalCode !== null)
         return;
-    try {
-        proc.kill('SIGTERM');
-        setTimeout(() => {
+    if (proc.pid == null)
+        return;
+    if (process.platform === 'win32') {
+        try {
+            execFileSync('taskkill', ['/PID', String(proc.pid), '/T', '/F'], { stdio: 'ignore' });
+        }
+        catch { /* already dead */ }
+        return;
+    }
+    const pid = proc.pid;
+    const killTree = (signal) => {
+        try {
+            // 负数 pid = 进程组（spawn detached: true 时子进程即组长）
+            process.kill(-pid, signal);
+        }
+        catch {
             try {
-                if (proc.exitCode === null && proc.signalCode === null) {
-                    proc.kill('SIGKILL');
-                }
+                proc.kill(signal);
             }
             catch { /* already dead */ }
-        }, CANCEL_GRACE_MS);
-    }
-    catch { /* already dead */ }
+        }
+    };
+    killTree('SIGTERM');
+    setTimeout(() => {
+        if (proc.exitCode === null && proc.signalCode === null) {
+            killTree('SIGKILL');
+        }
+    }, CANCEL_GRACE_MS).unref();
 }
 //# sourceMappingURL=processUtils.js.map

package/dist/utils/processUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"processUtils.js","sourceRoot":"","sources":["../../src/utils/processUtils.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,eAAe,GAAG,MAAM,CAAC;AAEtC,MAAM,UAAU,WAAW,CAAC,IAAkB;IAC5C,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC7B,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;YAC9B,OAAO,CAAC;gBACN,IAAI;gBACJ,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC,4BAA4B,GAAG,EAAE,CAAC,CAAC,CAAC,SAAS;aAC3D,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;YACzB,OAAO,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;QAC9C,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,IAAkB;IAC5C,IAAI,IAAI,CAAC,QAAQ,KAAK,IAAI,IAAI,IAAI,CAAC,UAAU,KAAK,IAAI;QAAE,OAAO;IAC/D,IAAI,CAAC;QACH,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACrB,UAAU,CAAC,GAAG,EAAE;YACd,IAAI,CAAC;gBACH,IAAI,IAAI,CAAC,QAAQ,KAAK,IAAI,IAAI,IAAI,CAAC,UAAU,KAAK,IAAI,EAAE,CAAC;oBACvD,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBACvB,CAAC;YACH,CAAC;YAAC,MAAM,CAAC,CAAC,kBAAkB,CAAC,CAAC;QAChC,CAAC,EAAE,eAAe,CAAC,CAAC;IACtB,CAAC;IAAC,MAAM,CAAC,CAAC,kBAAkB,CAAC,CAAC;AAChC,CAAC"}
+{"version":3,"file":"processUtils.js","sourceRoot":"","sources":["../../src/utils/processUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAGlD,MAAM,CAAC,MAAM,eAAe,GAAG,MAAM,CAAC;AAEtC,MAAM,UAAU,WAAW,CAAC,IAAkB;IAC5C,IAAI,IAAI,CAAC,QAAQ,KAAK,IAAI,IAAI,IAAI,CAAC,UAAU,KAAK,IAAI,EAAE,CAAC;QACvD,OAAO,OAAO,CAAC,OAAO,CAAC;YACrB,IAAI,EAAE,IAAI,CAAC,QAAQ;YACnB,KAAK,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,4BAA4B,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,SAAS;SACnF,CAAC,CAAC;IACL,CAAC;IACD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC7B,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;YAC9B,OAAO,CAAC;gBACN,IAAI;gBACJ,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC,4BAA4B,GAAG,EAAE,CAAC,CAAC,CAAC,SAAS;aAC3D,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;YACzB,OAAO,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;QAC9C,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,UAAU,WAAW,CAAC,IAAkB;IAC5C,IAAI,IAAI,CAAC,QAAQ,KAAK,IAAI,IAAI,IAAI,CAAC,UAAU,KAAK,IAAI;QAAE,OAAO;IAC/D,IAAI,IAAI,CAAC,GAAG,IAAI,IAAI;QAAE,OAAO;IAE7B,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QACjC,IAAI,CAAC;YACH,YAAY,CAAC,UAAU,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;QACxF,CAAC;QAAC,MAAM,CAAC,CAAC,kBAAkB,CAAC,CAAC;QAC9B,OAAO;IACT,CAAC;IAED,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;IACrB,MAAM,QAAQ,GAAG,CAAC,MAAsB,EAAQ,EAAE;QAChD,IAAI,CAAC;YACH,6CAA6C;YAC7C,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAC7B,CAAC;QAAC,MAAM,CAAC;YACP,IAAI,CAAC;gBAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAAC,CAAC;YAAC,MAAM,CAAC,CAAC,kBAAkB,CAAC,CAAC;QACzD,CAAC;IACH,CAAC,CAAC;IAEF,QAAQ,CAAC,SAAS,CAAC,CAAC;IACpB,UAAU,CAAC,GAAG,EAAE;QACd,IAAI,IAAI,CAAC,QAAQ,KAAK,IAAI,IAAI,IAAI,CAAC,UAAU,KAAK,IAAI,EAAE,CAAC;YACvD,QAAQ,CAAC,SAAS,CAAC,CAAC;QACtB,CAAC;IACH,CAAC,EAAE,eAAe,CAAC,CAAC,KAAK,EAAE,CAAC;AAC9B,CAAC"}

package/dist/utils/resumeFallback.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resumeFallback.d.ts","sourceRoot":"","sources":["../../src/utils/resumeFallback.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAuB9E,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAEnE;AAED,wBAAuB,yBAAyB,CAC9C,IAAI,EAAE,gBAAgB,EACtB,MAAM,EAAE,WAAW,GAAG,SAAS,EAC/B,WAAW,EAAE,CAAC,IAAI,EAAE,gBAAgB,EAAE,MAAM,CAAC,EAAE,WAAW,KAAK,cAAc,CAAC,YAAY,CAAC,GAC1F,cAAc,CAAC,YAAY,CAAC,CAkC9B"}
+{"version":3,"file":"resumeFallback.d.ts","sourceRoot":"","sources":["../../src/utils/resumeFallback.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAuB9E,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAEnE;AAaD,wBAAuB,yBAAyB,CAC9C,IAAI,EAAE,gBAAgB,EACtB,MAAM,EAAE,WAAW,GAAG,SAAS,EAC/B,WAAW,EAAE,CAAC,IAAI,EAAE,gBAAgB,EAAE,MAAM,CAAC,EAAE,WAAW,KAAK,cAAc,CAAC,YAAY,CAAC,GAC1F,cAAc,CAAC,YAAY,CAAC,CAkC9B"}

package/dist/utils/resumeFallback.js

@@ -21,6 +21,16 @@ const RESUME_SESSION_ERROR_PATTERNS = [
 export function isLikelyResumeSessionError(message) {
     return RESUME_SESSION_ERROR_PATTERNS.some((pattern) => pattern.test(message));
 }
+/**
+ * 是否按"会话失效"处理（harden-external-computer-daemon P2.2/D6）：
+ * 优先采信 adapter 显式给出的错误码；regex 仅作为未分类时的兜底。
+ */
+function isResumeSessionError(event) {
+    if (event.code) {
+        return event.code === 'session_expired';
+    }
+    return isLikelyResumeSessionError(event.message);
+}
 export async function* executeWithResumeFallback(task, signal, executeOnce) {
     if (!(task.resumeSession && task.sessionId)) {
         yield* executeOnce(task, signal);
@@ -29,7 +39,7 @@ export async function* executeWithResumeFallback(task, signal, executeOnce) {
     const bufferedEvents = [];
     for await (const event of executeOnce(task, signal)) {
         if (event.type === 'error') {
-            if (isLikelyResumeSessionError(event.message)) {
+            if (isResumeSessionError(event)) {
                 yield* executeOnce({ ...task, sessionId: undefined, resumeSession: false }, signal);
                 return;
             }

package/dist/utils/resumeFallback.js.map

@@ -1 +1 @@
-{"version":3,"file":"resumeFallback.js","sourceRoot":"","sources":["../../src/utils/resumeFallback.ts"],"names":[],"mappings":"AAEA,MAAM,6BAA6B,GAAG;IACpC,sBAAsB;IACtB,sBAAsB;IACtB,2BAA2B;IAC3B,oBAAoB;IACpB,oBAAoB;IACpB,oBAAoB;IACpB,oBAAoB;IACpB,oBAAoB;IACpB,qBAAqB;IACrB,mBAAmB;IACnB,mBAAmB;IACnB,qBAAqB;IACrB,qBAAqB;IACrB,0BAA0B;IAC1B,mBAAmB;IACnB,mBAAmB;IACnB,kBAAkB;IAClB,2BAA2B;CAC5B,CAAC;AAEF,MAAM,UAAU,0BAA0B,CAAC,OAAe;IACxD,OAAO,6BAA6B,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;AAChF,CAAC;AAED,MAAM,CAAC,KAAK,SAAS,CAAC,CAAC,yBAAyB,CAC9C,IAAsB,EACtB,MAA+B,EAC/B,WAA2F;IAE3F,IAAI,CAAC,CAAC,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;QAC5C,KAAK,CAAC,CAAC,WAAW,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACjC,OAAO;IACT,CAAC;IAED,MAAM,cAAc,GAAmB,EAAE,CAAC;IAC1C,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,WAAW,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC;QACpD,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YAC3B,IAAI,0BAA0B,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC9C,KAAK,CAAC,CAAC,WAAW,CAAC,EAAE,GAAG,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,aAAa,EAAE,KAAK,EAAE,EAAE,MAAM,CAAC,CAAC;gBACpF,OAAO;YACT,CAAC;YACD,KAAK,CAAC,CAAC,cAAc,CAAC;YACtB,MAAM,KAAK,CAAC;YACZ,OAAO;QACT,CAAC;QAED,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC5B,sFAAsF;YACtF,MAAM,mBAAmB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;YAC1D,IAAI,mBAAmB,IAAI,0BAA0B,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;gBACrE,KAAK,CAAC,CAAC,WAAW,CAAC,EAAE,GAAG,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,aAAa,EAAE,KAAK,EAAE,EAAE,MAAM,CAAC,CAAC;gBACpF,OAAO;YACT,CAAC;YACD,KAAK,CAAC,CAAC,cAAc,CAAC;YACtB,MAAM,KAAK,CAAC;YACZ,OAAO;QACT,CAAC;QAED,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,CAAC,cAAc,CAAC;AACxB,CAAC"}
+{"version":3,"file":"resumeFallback.js","sourceRoot":"","sources":["../../src/utils/resumeFallback.ts"],"names":[],"mappings":"AAEA,MAAM,6BAA6B,GAAG;IACpC,sBAAsB;IACtB,sBAAsB;IACtB,2BAA2B;IAC3B,oBAAoB;IACpB,oBAAoB;IACpB,oBAAoB;IACpB,oBAAoB;IACpB,oBAAoB;IACpB,qBAAqB;IACrB,mBAAmB;IACnB,mBAAmB;IACnB,qBAAqB;IACrB,qBAAqB;IACrB,0BAA0B;IAC1B,mBAAmB;IACnB,mBAAmB;IACnB,kBAAkB;IAClB,2BAA2B;CAC5B,CAAC;AAEF,MAAM,UAAU,0BAA0B,CAAC,OAAe;IACxD,OAAO,6BAA6B,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;AAChF,CAAC;AAED;;;GAGG;AACH,SAAS,oBAAoB,CAAC,KAAyC;IACrE,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC;QACf,OAAO,KAAK,CAAC,IAAI,KAAK,iBAAiB,CAAC;IAC1C,CAAC;IACD,OAAO,0BAA0B,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;AACnD,CAAC;AAED,MAAM,CAAC,KAAK,SAAS,CAAC,CAAC,yBAAyB,CAC9C,IAAsB,EACtB,MAA+B,EAC/B,WAA2F;IAE3F,IAAI,CAAC,CAAC,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;QAC5C,KAAK,CAAC,CAAC,WAAW,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACjC,OAAO;IACT,CAAC;IAED,MAAM,cAAc,GAAmB,EAAE,CAAC;IAC1C,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,WAAW,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC;QACpD,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YAC3B,IAAI,oBAAoB,CAAC,KAAK,CAAC,EAAE,CAAC;gBAChC,KAAK,CAAC,CAAC,WAAW,CAAC,EAAE,GAAG,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,aAAa,EAAE,KAAK,EAAE,EAAE,MAAM,CAAC,CAAC;gBACpF,OAAO;YACT,CAAC;YACD,KAAK,CAAC,CAAC,cAAc,CAAC;YACtB,MAAM,KAAK,CAAC;YACZ,OAAO;QACT,CAAC;QAED,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC5B,sFAAsF;YACtF,MAAM,mBAAmB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;YAC1D,IAAI,mBAAmB,IAAI,0BAA0B,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;gBACrE,KAAK,CAAC,CAAC,WAAW,CAAC,EAAE,GAAG,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,aAAa,EAAE,KAAK,EAAE,EAAE,MAAM,CAAC,CAAC;gBACpF,OAAO;YACT,CAAC;YACD,KAAK,CAAC,CAAC,cAAc,CAAC;YACtB,MAAM,KAAK,CAAC;YACZ,OAAO;QACT,CAAC;QAED,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,CAAC,cAAc,CAAC;AACxB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@winmatrix/agent-sdk",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -60,7 +60,7 @@
   },
   "dependencies": {
     "@winmatrix/protocol": "^1.0.4",
-    "ws": "^8.16.0"
+    "@anthropic-ai/claude-agent-sdk": "^0.3.0"
   },
   "peerDependencies": {
     "zod": ">=3.0.0"
@@ -72,7 +72,6 @@
   },
   "devDependencies": {
     "@types/node": "^22.15.0",
-    "@types/ws": "^8.5.10",
     "typescript": "^5.4.0",
     "vitest": "^4.0.18"
   }