@auto-ai/agent 2.1.120 → 2.1.121

package/dist/ws-test.html

@@ -4814,8 +4814,14 @@
           if (typeof payload.sessionId === 'string' && payload.sessionId) {
             sessionIdInput.value = payload.sessionId
             sessionIdInput.placeholder = '留空下次新建'
-            if (window.__lastSessions) renderSessionList(window.__lastSessions)
-            else updateMainHeader()
+            void loadSessions()
+            if (pendingSessionOverrides) {
+              void flushPendingSessionOverridesIfAny()
+            } else {
+              void loadSessionOverridesIntoComposer()
+            }
+          } else {
+            updateMainHeader()
           }
           return true
         }
@@ -4827,6 +4833,8 @@
           const phase = typeof payload.phase === 'string' ? payload.phase : ''
           if (phase === 'idle') {
             if (serverReady) setStatus('已就绪。', 'ready')
+            // 一轮 prompt 收尾后 transcript 已落盘，刷新列表以更新页签 firstPrompt/summary
+            void loadSessions()
           } else if (phase) {
             setStatus('查询阶段: ' + phase + '…', '')
           }
@@ -5536,12 +5544,6 @@
         return u.toString()
       }
 
-      function buildToolBaseListUrl() {
-        const u = new URL('/api/tools/base-list', httpOriginForApi() + '/')
-        u.searchParams.set('agent', currentAgentParam())
-        return u.toString()
-      }
-
       function buildToolInstalledListUrl() {
         const u = new URL('/api/tools/installed-list', httpOriginForApi() + '/')
         u.searchParams.set('agent', currentAgentParam())
@@ -6781,19 +6783,6 @@
               runId: data.runId,
               seq: data.seq,
             })
-            if (
-              data.type === 'session.meta' &&
-              data.data &&
-              typeof data.data === 'object' &&
-              data.data.sessionId
-            ) {
-              void loadSessions()
-              if (pendingSessionOverrides) {
-                void flushPendingSessionOverridesIfAny()
-              } else {
-                void loadSessionOverridesIntoComposer()
-              }
-            }
             updateButtons()
             return
           }
@@ -7913,8 +7902,7 @@
 
         if (kind === 'tools') {
           const toolPickerState = {
-            activeTab: 'base',
-            baseRows: [],
+            activeTab: 'installed',
             installedRows: [],
             cloudRows: [],
             cloudQuery: '',
@@ -7951,17 +7939,28 @@
                 if (!x.r.ok) throw new Error(x.b.message || x.r.statusText)
                 const tools = Array.isArray(x.b.tools) ? x.b.tools : []
                 return tools.map(function (t) {
-                  return { id: t.name, t: t }
+                  const pkg = t.packageName ? String(t.packageName) : ''
+                  const layer = t.layer === 'system' || t.layer === 'agent' ? t.layer : ''
+                  const layerTag = layer === 'system' ? ' [系统]' : layer === 'agent' ? ' [Agent]' : ''
+                  return {
+                    id: t.name,
+                    t: t,
+                    packageId: pkg,
+                    deletable: t.deletable === true,
+                    layerTag: layerTag,
+                  }
                 })
               })
           }
-          const makeManageRow = function (row, canDelete) {
+          const makeManageRow = function (row) {
             const id = row.id
+            const canDelete = row.deletable === true
+            const packageId = row.packageId || ''
             const div = document.createElement('div')
             div.className = 'agent-picker-item'
             const labelEl = document.createElement('div')
             labelEl.className = 'agent-picker-item-label'
-            labelEl.textContent = toolLabel(row)
+            labelEl.textContent = toolLabel(row) + (row.layerTag || '')
             div.appendChild(labelEl)
             const actions = document.createElement('div')
             actions.className = 'agent-picker-actions'
@@ -7976,13 +7975,13 @@
               renderToolsRows()
             })
             actions.appendChild(toggleBtn)
-            if (canDelete) {
+            if (canDelete && packageId) {
               const exportBtn = document.createElement('button')
               exportBtn.type = 'button'
               exportBtn.className = 'btn-picker-action'
               exportBtn.textContent = '导出'
               exportBtn.addEventListener('click', function () {
-                window.open(buildRuntimeToolExportUrl(id), '_blank', 'noopener')
+                window.open(buildRuntimeToolExportUrl(packageId), '_blank', 'noopener')
               })
               actions.appendChild(exportBtn)
             }
@@ -7990,10 +7989,13 @@
             delBtn.type = 'button'
             delBtn.className = 'btn-picker-action is-delete'
             delBtn.textContent = '删除'
-            delBtn.disabled = !canDelete
+            delBtn.disabled = !canDelete || !packageId
+            if (!canDelete) {
+              delBtn.title = '系统内置工具不可删除'
+            }
             delBtn.addEventListener('click', function () {
               if (delBtn.disabled) return
-              fetch(buildRuntimeToolDeleteUrl(id), { method: 'DELETE' })
+              fetch(buildRuntimeToolDeleteUrl(packageId), { method: 'DELETE' })
                 .then(function (r) {
                   return r.json().catch(function () { return {} }).then(function (b) { return { r: r, b: b } })
                 })
@@ -8011,111 +8013,21 @@
             div.appendChild(actions)
             return div
           }
-          const loadCloudRows = function () { return Promise.resolve() }
           const renderToolsRows = function () {
             if (!agentPickerList) return
             agentPickerList.innerHTML = ''
-            renderPickerHeaderTabs(
-              [
-                { id: 'base', label: '基础工具' },
-                { id: 'installed', label: '已安装工具' },
-              ],
-              toolPickerState.activeTab,
-              function (id) {
-                toolPickerState.activeTab = id
-                renderToolsRows()
-              },
-            )
-            if (toolPickerState.activeTab === 'base') {
-              const rows = toolPickerState.baseRows
-              if (!rows.length) {
-                agentPickerList.appendChild(document.createTextNode('（暂无）'))
-                return
-              }
-              for (let i = 0; i < rows.length; i++) agentPickerList.appendChild(makeManageRow(rows[i], false))
-              return
-            }
-            if (toolPickerState.activeTab === 'installed') {
-              const rows = toolPickerState.installedRows
-              if (!rows.length) {
-                agentPickerList.appendChild(document.createTextNode('（暂无）'))
-                return
-              }
-              for (let i = 0; i < rows.length; i++) agentPickerList.appendChild(makeManageRow(rows[i], true))
-              return
-            }
-            const cloudSearch = document.createElement('input')
-            cloudSearch.type = 'search'
-            cloudSearch.className = 'agent-picker-cloud-search'
-            cloudSearch.placeholder = '搜索云端工具…'
-            cloudSearch.value = toolPickerState.cloudQuery
-            cloudSearch.oninput = function () {
-              toolPickerState.cloudQuery = cloudSearch.value.trim()
-              toolPickerState.cloudPage = 1
-              void loadCloudRows()
-            }
-            agentPickerList.appendChild(cloudSearch)
-            agentPickerList.appendChild(createCloudPager({
-              page: toolPickerState.cloudPage,
-              totalPages: toolPickerState.cloudTotalPages,
-              loading: toolPickerState.cloudLoading,
-            }, function (nextPage) {
-              toolPickerState.cloudPage = nextPage
-              void loadCloudRows()
-            }))
-            if (toolPickerState.cloudError) {
-              agentPickerList.appendChild(document.createTextNode('加载失败：' + toolPickerState.cloudError))
+            const rows = toolPickerState.installedRows
+            if (!rows.length) {
+              agentPickerList.appendChild(document.createTextNode('（暂无已安装工具）'))
               return
             }
-            if (!toolPickerState.cloudRows.length) {
-              agentPickerList.appendChild(document.createTextNode(toolPickerState.cloudLoading ? '加载中…' : '（无匹配项）'))
-              return
-            }
-            for (let i = 0; i < toolPickerState.cloudRows.length; i++) {
-              const item = toolPickerState.cloudRows[i]
-              const row = document.createElement('div')
-              row.className = 'agent-picker-item'
-              const label = document.createElement('div')
-              label.className = 'agent-picker-item-label'
-              label.textContent = item.title + ' · ' + item.toolName + (item.description ? ' — ' + item.description : '')
-              row.appendChild(label)
-              const actions = document.createElement('div')
-              actions.className = 'agent-picker-actions'
-              const opBtn = document.createElement('button')
-              opBtn.type = 'button'
-              opBtn.className = 'btn-picker-action' + (item.installed ? ' is-delete' : '')
-              const running = !!toolPickerState.loadingMap[item.id]
-              opBtn.disabled = running
-              opBtn.textContent = running ? '处理中…' : item.installed ? '卸载' : '安装'
-              opBtn.addEventListener('click', function () {
-                if (opBtn.disabled) return
-                toolPickerState.loadingMap[item.id] = true
-                renderToolsRows()
-                const req = item.installed
-                  ? fetch(buildRuntimeToolDeleteUrl(item.packageId), { method: 'DELETE' })
-                  : Promise.reject(new Error('云端工具安装接口已下线'))
-                req
-                  .then(function (r) { return r.json().catch(function () { return {} }).then(function (b) { return { r: r, b: b } }) })
-                  .then(function (x) {
-                    if (!x.r.ok) throw new Error(x.b.message || x.r.statusText)
-                    restartCurrentSessionSubprocessWithReason(item.installed ? 'cloud-tool-uninstall' : 'cloud-tool-install')
-                    return refreshToolPickerRows()
-                  })
-                  .catch(function (e) { window.alert((item.installed ? '卸载' : '安装') + '失败: ' + e) })
-                  .finally(function () { delete toolPickerState.loadingMap[item.id]; renderToolsRows() })
-              })
-              actions.appendChild(opBtn)
-              row.appendChild(actions)
-              agentPickerList.appendChild(row)
+            for (let i = 0; i < rows.length; i++) {
+              agentPickerList.appendChild(makeManageRow(rows[i]))
             }
           }
           refreshToolPickerRows = function () {
-            return Promise.all([
-              fetchToolRows(buildToolBaseListUrl),
-              fetchToolRows(buildToolInstalledListUrl),
-            ]).then(function (allRows) {
-              toolPickerState.baseRows = allRows[0]
-              toolPickerState.installedRows = allRows[1]
+            return fetchToolRows(buildToolInstalledListUrl).then(function (rows) {
+              toolPickerState.installedRows = rows
               renderToolsRows()
             })
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@auto-ai/agent",
-  "version": "2.1.120",
+  "version": "2.1.121",
   "description": "Auto AI Agent 网关 CLI（WebSocket，独立二进制，无需 Bun）",
   "type": "module",
   "maintainers": [
@@ -32,11 +32,11 @@
     "zod": "^4.3.6"
   },
   "optionalDependencies": {
-    "@auto-ai/agent-linux-x64": "2.1.120",
-    "@auto-ai/agent-linux-arm64": "2.1.120",
-    "@auto-ai/agent-darwin-x64": "2.1.120",
-    "@auto-ai/agent-darwin-arm64": "2.1.120",
-    "@auto-ai/agent-win-x64": "2.1.120"
+    "@auto-ai/agent-linux-x64": "2.1.121",
+    "@auto-ai/agent-linux-arm64": "2.1.121",
+    "@auto-ai/agent-darwin-x64": "2.1.121",
+    "@auto-ai/agent-darwin-arm64": "2.1.121",
+    "@auto-ai/agent-win-x64": "2.1.121"
   },
   "scripts": {
     "prepare": "node ../../scripts/sync-launcher-env.js",

package/tools-runtime/code-tool/index.cjs

@@ -46,6 +46,7 @@ __export(exports_src, {
   ensureConfigured: () => ensureConfigured,
   default: () => src_default,
   configure: () => configure,
+  buildSessionAppend: () => buildCodeToolSessionAppend,
   buildCodeToolSessionAppend: () => buildCodeToolSessionAppend,
   CodeTool: () => CodeTool
 });

package/tools-runtime/code-tool/src/index.ts

@@ -13,7 +13,13 @@ import { configure, requireCodeWorkDir, resetConfigure, getCachedConfigure } fro
 import { buildCodeToolSessionAppend } from './sessionAppend.js'
 import { initWsSession } from './wsInit.js'
 
-export { configure, resetConfigure, initWsSession, buildCodeToolSessionAppend }
+export {
+  configure,
+  resetConfigure,
+  initWsSession,
+  buildCodeToolSessionAppend,
+  buildCodeToolSessionAppend as buildSessionAppend,
+}
 export { resolveCodeWorkDir } from './workspace.js'
 export type { CodeToolConfigureHooks } from './hooks.js'
 export { isEnabledInAgentConfig } from './agentConfig.js'

package/tools-runtime/git-tool/index.cjs

@@ -14568,9 +14568,25 @@ function ensureConfigured() {
 async function initWsSession(ctx) {
   if (!isEnabledInAgentConfig(ctx.agent)) {
     resetConfigure();
-    return;
+    return { state: "skipped", reason: "GitTool disabled in agent config" };
+  }
+  try {
+    const result = await prepareForAgent({ operWorkspaceDir: ctx.operWorkspaceDir });
+    if (result === "skipped") {
+      resetConfigure();
+      return {
+        state: "skipped",
+        reason: "git work directory not ready (configure WS_GIT_REPO_URL or existing repo)"
+      };
+    }
+    return { state: "ready" };
+  } catch (e) {
+    resetConfigure();
+    return {
+      state: "failed",
+      error: e instanceof Error ? e.message : String(e)
+    };
   }
-  await prepareForAgent({ operWorkspaceDir: ctx.operWorkspaceDir });
 }
 
 // src/index.ts

package/tools-runtime/git-tool/src/wsInit.ts

@@ -15,11 +15,34 @@ export type GitToolWsInitContext = {
   }
 }
 
+export type GitToolWsInitResult =
+  | { state: 'ready' }
+  | { state: 'skipped'; reason?: string }
+  | { state: 'failed'; error: string }
+
 /** WS init：按 agent 白名单与环境变量准备 git 工作区 */
-export async function initWsSession(ctx: GitToolWsInitContext): Promise<void> {
+export async function initWsSession(
+  ctx: GitToolWsInitContext,
+): Promise<GitToolWsInitResult> {
   if (!isEnabledInAgentConfig(ctx.agent)) {
     resetConfigure()
-    return
+    return { state: 'skipped', reason: 'GitTool disabled in agent config' }
+  }
+  try {
+    const result = await prepareForAgent({ operWorkspaceDir: ctx.operWorkspaceDir })
+    if (result === 'skipped') {
+      resetConfigure()
+      return {
+        state: 'skipped',
+        reason: 'git work directory not ready (configure WS_GIT_REPO_URL or existing repo)',
+      }
+    }
+    return { state: 'ready' }
+  } catch (e: unknown) {
+    resetConfigure()
+    return {
+      state: 'failed',
+      error: e instanceof Error ? e.message : String(e),
+    }
   }
-  await prepareForAgent({ operWorkspaceDir: ctx.operWorkspaceDir })
 }