dsh-agy-cli 0.12.3 → 0.12.4

package/README.md

@@ -30,7 +30,7 @@
 
 - **双工具路线**：MCP 桥把 DSH 工具交给 AGY（真工具事件、过程流可视化，推荐），失败自动降级为 prompt 契约
 - **DSH 主导 harness**：工作区、审批、沙箱、上下文预算全在 DSH；AGY 只出模型
-- **流式 + 状态机**：`stdinMode: hold` 防回滚、思考链折叠、尾流交付、断连保文本
+- **流式 + 状态机**：`stdinMode: hold` 防回滚、工具步骤折叠显示（只列执行了哪些工具，不显示模型的内部思考内容）、尾流交付、断连保文本
 - **会话管理 + 历史指纹链**：resume / full 双模式，每轮成功后记录 DSH 历史指纹；resume 前本地比对前缀，检出历史被编辑/压缩/截断即废弃旧会话并从完整历史重建，delta prompt 不会落在过期上下文上；死亡会话自动重放，会话映射落盘可迁移
 - **图片输入**（experimental）：附件经图片桥落盘，由最小权限的 view_file Agent 查看
 - **配额面板与凭据保活**：loopback-only；面板显示真实双窗口配额，令牌临近过期时自动拉起官方 CLI 续期

package/lib/agy/experimental-transport.js

@@ -1,4 +1,5 @@
 import { spawn } from 'node:child_process';
+import { buildWindowsNoConsoleLaunch } from './windows-launcher.js';
 import { randomUUID } from 'node:crypto';
 export class PersistentTransportError extends Error {
     code;
@@ -200,8 +201,9 @@ class PersistentAgyWorker {
             await this.stop('reset');
             throw new PersistentTransportError('Persistent AGY request aborted before write', 'ABORTED');
         }
-        const timeoutMs = input.timeoutMs ?? this.options.defaultRequestTimeoutMs;
-        validateInteger('timeoutMs', timeoutMs, 1, 3_600_000);
+        const timeoutMs = input.timeoutMs !== undefined
+            ? validateInteger('timeoutMs', input.timeoutMs, 1, 3_600_000)
+            : undefined;
         const maxOutputBytes = Math.min(input.maxOutputBytes ?? this.options.maxOutputBytes, this.options.maxOutputBytes);
         validateInteger('maxOutputBytes', maxOutputBytes, 1, this.options.maxOutputBytes);
         this.clearIdleTimer();
@@ -225,7 +227,9 @@ class PersistentAgyWorker {
             this.active = active;
             active.abortListener = () => this.failActiveAndReset(new PersistentTransportError('Persistent AGY request aborted', 'ABORTED'));
             input.signal?.addEventListener('abort', active.abortListener, { once: true });
-            active.timer = setTimeout(() => this.failActiveAndReset(new PersistentTransportError('Persistent AGY request exceeded its timeout', 'TIMEOUT')), timeoutMs);
+            if (timeoutMs !== undefined) {
+                active.timer = setTimeout(() => this.failActiveAndReset(new PersistentTransportError('Persistent AGY request exceeded its timeout', 'TIMEOUT')), timeoutMs);
+            }
             void this.sendRequest(active, input.payload);
         });
     }
@@ -279,7 +283,11 @@ class PersistentAgyWorker {
             this.readyReject = reject;
         });
         try {
-            const child = spawn(this.options.executable, [...this.options.args], {
+            const args = [...this.options.args];
+            const launch = process.platform === 'win32'
+                ? buildWindowsNoConsoleLaunch(this.options.executable, args)
+                : { executable: this.options.executable, args };
+            const child = spawn(launch.executable, [...launch.args], {
                 cwd: this.options.cwd,
                 env: {
                     ...process.env,

package/lib/agy/keepalive.js

@@ -56,46 +56,46 @@ export const AGY_KEYRING_TARGET = 'gemini:antigravity';
  * 2026-10-22. Duplicated rather than imported so the keep-alive path has no
  * dependency on the HTTP layer.
  */
-const WIN_CRED_SCRIPT = `
-param($target)
-$sig = @'
-using System;
-using System.Runtime.InteropServices;
-public class WinCredKeepalive {
-  [DllImport("advapi32.dll", SetLastError=true, CharSet=CharSet.Unicode)]
-  public static extern bool CredRead(string target, int type, int flags, out IntPtr credential);
-  [DllImport("advapi32.dll", SetLastError=true)]
-  public static extern void CredFree(IntPtr cred);
-  [StructLayout(LayoutKind.Sequential, CharSet=CharSet.Unicode)]
-  public struct CREDENTIAL {
-    public int Flags;
-    public int Type;
-    public string TargetName;
-    public string Comment;
-    public long LastWritten;
-    public int CredentialBlobSize;
-    public IntPtr CredentialBlob;
-    public int Persist;
-    public int AttributeCount;
-    public IntPtr Attributes;
-    public string TargetAlias;
-    public string UserName;
-  }
-  public static string Read(string target) {
-    IntPtr ptr;
-    if (CredRead(target, 1, 0, out ptr)) {
-      CREDENTIAL c = (CREDENTIAL)Marshal.PtrToStructure(ptr, typeof(CREDENTIAL));
-      byte[] b = new byte[c.CredentialBlobSize];
-      Marshal.Copy(c.CredentialBlob, b, 0, c.CredentialBlobSize);
-      CredFree(ptr);
-      return System.Convert.ToBase64String(b);
-    }
-    return null;
-  }
-}
-'@
-Add-Type -TypeDefinition $sig -ErrorAction SilentlyContinue
-[Console]::Out.Write([WinCredKeepalive]::Read($target))
+const WIN_CRED_SCRIPT = `
+param($target)
+$sig = @'
+using System;
+using System.Runtime.InteropServices;
+public class WinCredKeepalive {
+  [DllImport("advapi32.dll", SetLastError=true, CharSet=CharSet.Unicode)]
+  public static extern bool CredRead(string target, int type, int flags, out IntPtr credential);
+  [DllImport("advapi32.dll", SetLastError=true)]
+  public static extern void CredFree(IntPtr cred);
+  [StructLayout(LayoutKind.Sequential, CharSet=CharSet.Unicode)]
+  public struct CREDENTIAL {
+    public int Flags;
+    public int Type;
+    public string TargetName;
+    public string Comment;
+    public long LastWritten;
+    public int CredentialBlobSize;
+    public IntPtr CredentialBlob;
+    public int Persist;
+    public int AttributeCount;
+    public IntPtr Attributes;
+    public string TargetAlias;
+    public string UserName;
+  }
+  public static string Read(string target) {
+    IntPtr ptr;
+    if (CredRead(target, 1, 0, out ptr)) {
+      CREDENTIAL c = (CREDENTIAL)Marshal.PtrToStructure(ptr, typeof(CREDENTIAL));
+      byte[] b = new byte[c.CredentialBlobSize];
+      Marshal.Copy(c.CredentialBlob, b, 0, c.CredentialBlobSize);
+      CredFree(ptr);
+      return System.Convert.ToBase64String(b);
+    }
+    return null;
+  }
+}
+'@
+Add-Type -TypeDefinition $sig -ErrorAction SilentlyContinue
+[Console]::Out.Write([WinCredKeepalive]::Read($target))
 `;
 /** macOS/Linux read path: untouched, never part of the Windows hot path. */
 function readKeyringTokenStateSyncImpl() {
@@ -401,6 +401,7 @@ export async function startAgyKeepaliveRun(input) {
             executable: input.executable,
             args: buildKeepaliveArgs(input.model),
             stdinMode: 'close',
+            windowsNoConsole: true,
             ...(home === undefined ? {} : { cwd: home }),
             timeoutMs: input.timeoutMs ?? 45_000,
         });

package/lib/agy/persistent-transport.js

@@ -276,10 +276,12 @@ class PersistentAgyWorker {
             await this.stop('reset');
             throw new PersistentTransportError('Persistent AGY request aborted before write', 'ABORTED');
         }
-        const timeoutMs = input.timeoutMs ?? this.options.defaultRequestTimeoutMs;
-        validateInteger('timeoutMs', timeoutMs, 1, 3_600_000);
-        const idleTimeoutMs = input.idleTimeoutMs ?? timeoutMs;
-        validateInteger('idleTimeoutMs', idleTimeoutMs, 1, 3_600_000);
+        const timeoutMs = input.timeoutMs !== undefined
+            ? validateInteger('timeoutMs', input.timeoutMs, 1, 3_600_000)
+            : undefined;
+        const idleTimeoutMs = input.idleTimeoutMs !== undefined
+            ? validateInteger('idleTimeoutMs', input.idleTimeoutMs, 1, 3_600_000)
+            : this.options.defaultRequestTimeoutMs;
         const maxOutputBytes = Math.min(input.maxOutputBytes ?? this.options.maxOutputBytes, this.options.maxOutputBytes);
         validateInteger('maxOutputBytes', maxOutputBytes, 1, this.options.maxOutputBytes);
         this.clearIdleTimer();
@@ -305,10 +307,12 @@ class PersistentAgyWorker {
             this.active = active;
             active.abortListener = () => this.failActiveAndReset(new PersistentTransportError('Persistent AGY request aborted', 'ABORTED'));
             input.signal?.addEventListener('abort', active.abortListener, { once: true });
-            // Two independent clocks: the wall clock is a hard ceiling, the idle clock
-            // is re-armed by every frame so a long thinking or tool pause is not a kill.
-            const wallClock = setTimeout(() => this.failActiveAndReset(new PersistentTransportError('Persistent AGY request exceeded its wall-clock timeout', 'TIMEOUT')), timeoutMs);
-            active.timer = wallClock;
+            // Idle watchdog is re-armed by every frame so a long thinking or tool pause is not a kill.
+            // Wall clock is an optional ceiling only armed when an explicit timeoutMs is requested.
+            if (timeoutMs !== undefined) {
+                const wallClock = setTimeout(() => this.failActiveAndReset(new PersistentTransportError('Persistent AGY request exceeded its wall-clock timeout', 'TIMEOUT')), timeoutMs);
+                active.timer = wallClock;
+            }
             this.touchActive(active);
             void this.sendRequest(active, input.text);
         });

package/lib/provider/agy.js

@@ -914,7 +914,7 @@ export class AgyAdapter extends LlmAdapter {
         const envTimeout = process.env.DSH_AGY_TIMEOUT_MS ? Number(process.env.DSH_AGY_TIMEOUT_MS) : undefined;
         this.timeoutMs = envTimeout !== undefined && Number.isFinite(envTimeout) && envTimeout > 0
             ? envTimeout
-            : (config.timeoutMs ?? 600_000);
+            : undefined;
         const envIdleTimeout = process.env.DSH_AGY_IDLE_TIMEOUT_MS ? Number(process.env.DSH_AGY_IDLE_TIMEOUT_MS) : undefined;
         this.idleTimeoutMs = envIdleTimeout !== undefined && Number.isFinite(envIdleTimeout) && envIdleTimeout > 0
             ? envIdleTimeout
@@ -1048,7 +1048,7 @@ export class AgyAdapter extends LlmAdapter {
             ...(this.agyPath === undefined ? {} : { executable: this.agyPath }),
             expectedAgent: this.agent,
             minimumVersion: this.minimumAgyVersion,
-            timeoutMs: Math.min(this.timeoutMs, 10_000),
+            timeoutMs: Math.min(this.timeoutMs ?? 10_000, 10_000),
         });
     }
     providerInfo(provider) {
@@ -1168,7 +1168,7 @@ export class AgyAdapter extends LlmAdapter {
             ...(persistentExtraArgsOf(this.mode).length === 0
                 ? {}
                 : { extraArgs: persistentExtraArgsOf(this.mode) }),
-            timeoutMs: this.timeoutMs,
+            ...(this.timeoutMs === undefined ? {} : { timeoutMs: this.timeoutMs }),
             idleTimeoutMs: this.idleTimeoutMs,
             maxOutputBytes: this.maxOutputBytes,
             ...(options.signal === undefined ? {} : { signal: options.signal }),
@@ -1799,7 +1799,7 @@ export class AgyAdapter extends LlmAdapter {
             prompt,
             agent: imageRuntime?.agent ?? route.agent,
             model: route.model,
-            timeoutMs: this.timeoutMs,
+            ...(this.timeoutMs === undefined ? {} : { timeoutMs: this.timeoutMs }),
             idleTimeoutMs: this.idleTimeoutMs,
             maxStdoutBytes: this.maxOutputBytes,
             maxStderrBytes: this.maxOutputBytes,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-agy-cli",
-  "version": "0.12.3",
+  "version": "0.12.4",
   "private": false,
   "publishConfig": {
     "access": "public"