@dsh-workbench/shared 0.2.3 → 0.2.4

package/dist/host/opencli.d.ts

@@ -16,7 +16,7 @@ export interface OpencliResult {
     readonly value: unknown;
     readonly at: number;
 }
-export type OpencliSession = 'persistent' | 'ephemeral';
+export type OpencliSession = 'persistent' | 'ephemeral' | 'none';
 export declare function opencliCommandLine(command: string, argv: readonly string[], session?: OpencliSession): string;
 export interface Opencli {
     json(args: readonly string[], options?: {

package/dist/lib/text.js

@@ -7,6 +7,23 @@ export function tailLines(text, lines = 6) {
         .split('\n');
     return all.slice(-lines).join('\n');
 }
+function candidateStarts(raw) {
+    const starts = [];
+    for (let index = 0; index < raw.length; index += 1) {
+        const char = raw[index];
+        if (char !== '[' && char !== '{')
+            continue;
+        if (index === 0 || raw[index - 1] === '\n')
+            starts.push(index);
+    }
+    const earliest = [raw.indexOf('['), raw.indexOf('{')].filter((index) => index >= 0);
+    if (earliest.length > 0) {
+        const head = Math.min(...earliest);
+        if (!starts.includes(head))
+            starts.push(head);
+    }
+    return starts;
+}
 export function parseJsonLoose(text) {
     const raw = String(text ?? '').trim();
     if (!raw)
@@ -15,21 +32,19 @@ export function parseJsonLoose(text) {
         return JSON.parse(raw);
     }
     catch {
-        const starts = [raw.indexOf('['), raw.indexOf('{')].filter((index) => index >= 0);
-        if (starts.length === 0)
-            return undefined;
-        const from = Math.min(...starts);
-        const open = raw[from];
-        const close = open === '[' ? ']' : '}';
-        const to = raw.lastIndexOf(close);
-        if (to <= from)
-            return undefined;
-        try {
-            return JSON.parse(raw.slice(from, to + 1));
-        }
-        catch {
-            return undefined;
+        for (const from of candidateStarts(raw)) {
+            const close = raw[from] === '[' ? ']' : '}';
+            const to = raw.lastIndexOf(close);
+            if (to <= from)
+                continue;
+            try {
+                return JSON.parse(raw.slice(from, to + 1));
+            }
+            catch {
+                continue;
+            }
         }
+        return undefined;
     }
 }
 const MARKDOWN_IMAGE = /!\[[^\]]*\]\([^)]*\)/g;

package/dist/testing/host-fakes.d.ts

@@ -25,6 +25,7 @@ export interface OpencliCall {
     args: readonly string[];
     key?: string;
     workdir?: string;
+    session?: string;
     refresh?: boolean;
 }
 export declare function createFakeOpencli(replies?: Array<unknown | Error> | ((call: OpencliCall, index: number) => unknown | Error)): {

package/dist/testing/host-fakes.js

@@ -47,6 +47,7 @@ export function createFakeOpencli(replies = []) {
                 args,
                 ...(options.key === undefined ? {} : { key: options.key }),
                 ...(options.workdir === undefined ? {} : { workdir: options.workdir }),
+                ...(options.session === undefined ? {} : { session: options.session }),
             };
             calls.push(call);
             const index = calls.length - 1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dsh-workbench/shared",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "description": "工作台与模块共享的纯代码与契约类型：类型、纯逻辑、哑组件、平台解析。宿主侧的东西从 /host 进（不影响浏览器产物）。",
   "license": "MIT",
   "type": "module",

package/src/host/opencli.ts

@@ -36,7 +36,7 @@ export interface OpencliResult {
   readonly at: number;
 }
 
-export type OpencliSession = 'persistent' | 'ephemeral';
+export type OpencliSession = 'persistent' | 'ephemeral' | 'none';
 
 export function opencliCommandLine(
   command: string,

package/src/lib/text.test.ts

@@ -58,6 +58,28 @@ describe('parseJsonLoose', () => {
     expect(parseJsonLoose('[1,2]\n完成')).toEqual([1, 2]);
   });
 
+  it('★ 噪音行自己带方括号时也不认错起点（真机：pagoda 的调试命令先打两行带 [] 的话）', () => {
+    const stdout = [
+      '数据源 [dify_dataset] 调试成功',
+      '结构类型: 3, 字段: code, name',
+      '[',
+      '  {',
+      '    "code": "dify_dataset",',
+      '    "success": "成功",',
+      '    "detail": "structure=3, keys=[code, name], fields=[{code=知识库ID}]"',
+      '  }',
+      ']',
+    ].join('\n');
+
+    expect(parseJsonLoose(stdout)).toEqual([
+      {
+        code: 'dify_dataset',
+        success: '成功',
+        detail: 'structure=3, keys=[code, name], fields=[{code=知识库ID}]',
+      },
+    ]);
+  });
+
   it('解析不出来给 undefined，让调用方报 coding-bad-output', () => {
     expect(parseJsonLoose('')).toBeUndefined();
     expect(parseJsonLoose('not json at all')).toBeUndefined();

package/src/lib/text.ts

@@ -9,24 +9,38 @@ export function tailLines(text: string | null | undefined, lines = 6): string {
   return all.slice(-lines).join('\n');
 }
 
+function candidateStarts(raw: string): number[] {
+  const starts: number[] = [];
+  for (let index = 0; index < raw.length; index += 1) {
+    const char = raw[index];
+    if (char !== '[' && char !== '{') continue;
+    if (index === 0 || raw[index - 1] === '\n') starts.push(index);
+  }
+  const earliest = [raw.indexOf('['), raw.indexOf('{')].filter((index) => index >= 0);
+  if (earliest.length > 0) {
+    const head = Math.min(...earliest);
+    if (!starts.includes(head)) starts.push(head);
+  }
+  return starts;
+}
+
 export function parseJsonLoose(text: string | null | undefined): unknown {
   const raw = String(text ?? '').trim();
   if (!raw) return undefined;
   try {
     return JSON.parse(raw) as unknown;
   } catch {
-    const starts = [raw.indexOf('['), raw.indexOf('{')].filter((index) => index >= 0);
-    if (starts.length === 0) return undefined;
-    const from = Math.min(...starts);
-    const open = raw[from];
-    const close = open === '[' ? ']' : '}';
-    const to = raw.lastIndexOf(close);
-    if (to <= from) return undefined;
-    try {
-      return JSON.parse(raw.slice(from, to + 1)) as unknown;
-    } catch {
-      return undefined;
+    for (const from of candidateStarts(raw)) {
+      const close = raw[from] === '[' ? ']' : '}';
+      const to = raw.lastIndexOf(close);
+      if (to <= from) continue;
+      try {
+        return JSON.parse(raw.slice(from, to + 1)) as unknown;
+      } catch {
+        continue;
+      }
     }
+    return undefined;
   }
 }
 

package/src/testing/host-fakes.ts

@@ -70,6 +70,7 @@ export interface OpencliCall {
   args: readonly string[];
   key?: string;
   workdir?: string;
+  session?: string;
   refresh?: boolean;
 }
 
@@ -84,6 +85,7 @@ export function createFakeOpencli(
         args,
         ...(options.key === undefined ? {} : { key: options.key }),
         ...(options.workdir === undefined ? {} : { workdir: options.workdir }),
+        ...(options.session === undefined ? {} : { session: options.session }),
       };
       calls.push(call);
       const index = calls.length - 1;