w-dispatch-ai 1.0.7 → 1.0.8

package/test/unit-dispatchApiOpenaiCompat.test.mjs

@@ -289,4 +289,43 @@ describe('dispatchApiOpenaiCompat', function() {
         assert.strict.deepEqual(r, rr)
     })
 
+    it('usage原樣透傳: 成功帶回應之token用量, 網路層與HTTP錯誤為null', async function() {
+        let t1 = await dispatchApiOpenaiCompat('abc', { baseURL: svr.url, key: 'sk-good-1', model: 'echo' })
+        let t2 = await dispatchApiOpenaiCompat('abc', { baseURL: svr.url, key: 'sk-good-1', model: 'err-500' })
+        let r = [t1.ok, t1.usage, t2.ok, t2.usage]
+        let rr = [true, { prompt_tokens: 3, completion_tokens: 7, total_tokens: 10 }, false, null]
+        assert.strict.deepEqual(r, rr)
+    })
+
+    it('usage經遞補層與工作流層流出於結果與tried, CLI路徑無此欄', async function() {
+        let tf = await dispatchAiFallback('abc', {
+            providers: [{ id: 'us-api', kind: 'api-openai-compat', baseURL: svr.url, model: 'echo', keys: ['sk-good-us'] }],
+        })
+        let wkf = dispatchAiWkf({
+            providers: {
+                'us-w-api': { kind: 'api-openai-compat', baseURL: svr.url, model: 'echo', keys: ['sk-good-us2'] },
+            },
+            defaults: { promptPrefix: '' },
+        })
+        let tw = await wkf.callAi('abc', { spec: { use: 'us-w-api' } })
+        let r = [
+            tf.usage.total_tokens,
+            tf.tried[0].usage.total_tokens, //tried歷程各項一併帶上, 供加總實際耗用
+            tw.usage.total_tokens,
+        ]
+        let rr = [10, 10, 10]
+        assert.strict.deepEqual(r, rr)
+    })
+
+    it('errorType機器可讀分類: http/tool-unsupported/validation/timeout, 成功無此欄', async function() {
+        let t1 = await dispatchApiOpenaiCompat('abc', { baseURL: svr.url, key: 'sk-good-1', model: 'err-500' })
+        let t2 = await dispatchApiOpenaiCompat('abc', { baseURL: svr.url, key: 'sk-good-1', model: 'tool-calls' })
+        let t3 = await dispatchApiOpenaiCompat('abc', { baseURL: svr.url, key: 'sk-good-1', model: 'echo', validate: 'min:100000' })
+        let t4 = await dispatchApiOpenaiCompat('abc', { baseURL: svr.url, key: 'sk-good-1', model: 'slow', timeoutMs: 500 })
+        let t5 = await dispatchApiOpenaiCompat('abc', { baseURL: svr.url, key: 'sk-good-1', model: 'echo' })
+        let r = [t1.errorType, t2.errorType, t3.errorType, t4.errorType, t5.errorType]
+        let rr = ['http', 'tool-unsupported', 'validation', 'timeout', undefined]
+        assert.strict.deepEqual(r, rr)
+    })
+
 })

package/test/unit-getErrorResult.test.mjs

@@ -12,6 +12,7 @@ describe('getErrorResult', function() {
             stderr: '',
             code: null,
             error: 'something wrong',
+            errorType: 'params',
             durationMs: 0,
             attempts: 0,
         }
@@ -20,7 +21,18 @@ describe('getErrorResult', function() {
 
     it('鍵名與順序固定', function() {
         let r = Object.keys(getErrorResult('abc'))
-        let rr = ['ok', 'stdout', 'stderr', 'code', 'error', 'durationMs', 'attempts']
+        let rr = ['ok', 'stdout', 'stderr', 'code', 'error', 'errorType', 'durationMs', 'attempts']
+        assert.strict.deepEqual(r, rr)
+    })
+
+    it('errorType可指定, 非有效字串回退params', function() {
+        let r = [
+            getErrorResult('x').errorType,
+            getErrorResult('x', 'aborted').errorType,
+            getErrorResult('x', null).errorType,
+            getErrorResult('x', '').errorType,
+        ]
+        let rr = ['params', 'aborted', 'params', 'params']
         assert.strict.deepEqual(r, rr)
     })
 

package/test/unit-getErrorType.test.mjs

@@ -0,0 +1,36 @@
+import assert from 'assert'
+import getErrorType, { attachErrorType } from '../src/getErrorType.mjs'
+
+
+describe('getErrorType', function() {
+
+    it('機械可判之類別: timeout/spawn/validation, 其餘歸exec', function() {
+        let r = [
+            getErrorType({ error: 'TIMEOUT after 300s' }),
+            getErrorType({ error: 'spawn my-cli ENOENT' }),
+            getErrorType({ error: 'ENAMETOOLONG: spawn error' }),
+            getErrorType({ error: 'OUTPUT_VALIDATION_FAILED' }),
+            getErrorType({ error: 'Exit code 1' }),
+            getErrorType({ error: 'Invalid API key.' }),
+            getErrorType({}),
+            getErrorType({ error: '' }),
+        ]
+        let rr = ['timeout', 'spawn', 'spawn', 'validation', 'exec', 'exec', 'exec', 'exec']
+        assert.strict.deepEqual(r, rr)
+    })
+
+    it('attachErrorType僅對失敗且未帶errorType之結果追加', function() {
+        let rOk = { ok: true, stdout: 'abc' }
+        let rFail = { ok: false, error: 'TIMEOUT after 10s' }
+        let rTyped = { ok: false, error: 'HTTP 429', errorType: 'http' }
+        let r = [
+            attachErrorType(rOk).errorType,
+            attachErrorType(rOk) === rOk, //成功結果原樣回傳
+            attachErrorType(rFail).errorType,
+            attachErrorType(rTyped).errorType, //已帶有效errorType則不覆寫
+        ]
+        let rr = [undefined, true, 'timeout', 'http']
+        assert.strict.deepEqual(r, rr)
+    })
+
+})

package/test/unit-runFanout.test.mjs

@@ -202,6 +202,20 @@ describe('runFanout', function() {
         assert.strict.deepEqual(r, rr)
     })
 
+    it('meta為保留鍵: 名額與integrate規格掛meta不影響呼叫行為', async function() {
+        let t = await runFanout({
+            providers,
+            task: 'abc',
+            agents: [{ use: 'p-a', meta: { stage: 'draft' } }],
+            integrate: { use: 'p-int', meta: { stage: 'final' } },
+            callOpt,
+        })
+        //單稿放行, 假CLI收到之args與未掛meta時完全一致(meta未被轉傳成未知旗標)
+        let r = [t.ok, t.integrated, t.result.args]
+        let rr = [true, false, ['-p', '--dangerously-skip-permissions', '--model', 'sonnet']]
+        assert.strict.deepEqual(r, rr)
+    })
+
     it('defaultIntegratePrompt嵌入候選數與schema', function() {
         let s = defaultIntegratePrompt([{ a: 1 }, { b: 2 }], { schema: '{"x":"..."}' })
         let r = [s.includes('2 個獨立執行'), s.includes('{"x":"..."}'), s.includes('【候選 2】')]

package/test/unit-runRolePipeline.test.mjs

@@ -160,4 +160,16 @@ describe('runRolePipeline', function() {
         assert.strict.deepEqual(r, rr)
     })
 
+    it('meta為保留鍵: 階段規格掛meta(如draft/audit分類)不影響呼叫行為', async function() {
+        let t = await runRolePipeline({
+            providers,
+            stages: [{ id: 's1', use: 'p-a', prompt: () => 'abc', meta: { stage: 'draft' } }],
+            callOpt,
+        })
+        //假CLI收到之args與未掛meta時完全一致(meta未被轉傳成未知旗標)
+        let r = [t.ok, t.result.args, t.result.stdin]
+        let rr = [true, ['-p', '--dangerously-skip-permissions', '--model', 'sonnet'], 'abc']
+        assert.strict.deepEqual(r, rr)
+    })
+
 })