@myassis/gateway 1.0.69 → 1.0.71

package/dist/services/ServiceManager.js

@@ -746,12 +746,19 @@ async function updateService() {
                     `$tmpExe = '${escapePowerShellString(tmpExe)}'`,
                     `$backupExe = '${escapePowerShellString(`${currentExe}.bak`)}'`,
                     `$pidFile = '${escapePowerShellString(GATEWAY_PID_FILE)}'`,
+                    `$daemonPidFile = '${escapePowerShellString(GATEWAY_DAEMON_PID_FILE)}'`,
+                    `$stopFlag = '${escapePowerShellString(GATEWAY_STOP_FLAG_FILE)}'`,
                     `$launcher = '${escapePowerShellString(GATEWAY_LAUNCHER_FILE)}'`,
                     `$logPath = Join-Path $env:TEMP 'myassis-gateway-update.log'`,
                     `$logDir = Split-Path -Parent $logPath`,
                     `if (-not (Test-Path $logDir)) { New-Item -ItemType Directory -Path $logDir -Force | Out-Null }`,
                     `function Write-UpdateLog { param([string]$Message) Add-Content -Path $logPath -Encoding UTF8 -Value \"$(Get-Date -Format 'yyyy-MM-dd HH:mm:ss') $Message\" }`,
                     `function Stop-GatewayProcess {`,
+                    `  # 先写停止标记，告诉守护进程这是主动停止，不要自动重启`,
+                    `  try {`,
+                    `    New-Item -ItemType File -Path $stopFlag -Force | Out-Null`,
+                    `    Write-UpdateLog 'stop flag written'`,
+                    `  } catch { Write-UpdateLog \"write stop flag failed: $($_.Exception.Message)\" }`,
                     `  $stoppedPids = @{}`,
                     `  if (Test-Path $pidFile) {`,
                     `    try {`,
@@ -786,6 +793,33 @@ async function updateService() {
                     `      Start-Sleep -Milliseconds 500`,
                     `    }`,
                     `  }`,
+                    `  # 等待守护进程退出：gateway 退出后，守护检测到 stop-flag 会自行 break 退出`,
+                    `  $daemonPid = $null`,
+                    `  if (Test-Path $daemonPidFile) {`,
+                    `    try {`,
+                    `      $dpStr = (Get-Content $daemonPidFile -Raw).Trim()`,
+                    `      if ($dpStr) { $daemonPid = [int]$dpStr }`,
+                    `    } catch { Write-UpdateLog \"read daemon pid failed: $($_.Exception.Message)\" }`,
+                    `  }`,
+                    `  if ($daemonPid) {`,
+                    `    Write-UpdateLog \"waiting daemon exit pid=$daemonPid\"`,
+                    `    $daemonGone = $false`,
+                    `    for ($w = 0; $w -lt 60; $w++) {`,
+                    `      $dp = Get-Process -Id $daemonPid -ErrorAction SilentlyContinue`,
+                    `      if (-not $dp) { $daemonGone = $true; break }`,
+                    `      Start-Sleep -Milliseconds 500`,
+                    `    }`,
+                    `    if ($daemonGone) {`,
+                    `      Write-UpdateLog 'daemon exited gracefully'`,
+                    `    } else {`,
+                    `      Write-UpdateLog \"daemon still alive after 30s, force kill pid=$daemonPid\"`,
+                    `      try { Stop-Process -Id $daemonPid -Force -ErrorAction Stop } catch { Write-UpdateLog \"kill daemon failed: $($_.Exception.Message)\" }`,
+                    `      Start-Sleep -Milliseconds 1000`,
+                    `    }`,
+                    `    Remove-Item $daemonPidFile -Force -ErrorAction SilentlyContinue`,
+                    `  } else { Write-UpdateLog 'daemon pid file not found, skip daemon wait' }`,
+                    `  # 清理停止标记，避免影响后续启动`,
+                    `  Remove-Item $stopFlag -Force -ErrorAction SilentlyContinue`,
                     `}`,
                     `function Start-GatewayProcess {`,
                     `  if (-not (Test-Path $launcher)) { Write-UpdateLog \"launcher script not found: $launcher\"; return }`,

package/dist/services/tools/exec.js

@@ -197,7 +197,7 @@ exports.execTool = {
             },
             cwd: {
                 type: 'string',
-                description: '命令执行的工作目录（可选）。',
+                description: '命令执行的工作目录',
             },
             timeout: {
                 type: 'number',
@@ -216,6 +216,14 @@ exports.execTool = {
         return new Promise(async (resolve) => {
             const { cwd, timeout = 60000, approved, isUserAsk = false } = args;
             let command = args.command;
+            // 没有指定工作目录，直接返回错误信息给大模型
+            if (!cwd || (typeof cwd === 'string' && cwd.trim() === '')) {
+                resolve({
+                    success: false,
+                    errorMessage: '执行命令必须指定工作目录（cwd），请提供 cwd 参数后重试。',
+                });
+                return;
+            }
             // 检查危险命令（如果已批准或用户主动要求则跳过拦截）
             if (!approved && isDangerousCommand(command)) {
                 if (isUserAsk) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@myassis/gateway",
-  "version": "1.0.69",
+  "version": "1.0.71",
   "description": "我的助手 Gateway Service - 本地 AI 网关服务，支持认证、WebSocket 实时通信和任务调度",
   "main": "dist/index.js",
   "bin": {