deepfish-ai 1.0.26 → 1.0.28

package/src/AgentRobot/BaseAgentRobot/tools/GenerateTools.js

@@ -1,3 +1,6 @@
+const fs = require('fs-extra')
+const path = require('path')
+
 const descriptions = [
   {
     type: 'function',
@@ -59,6 +62,35 @@ const descriptions = [
       },
     },
   },
+  {
+    type: 'function',
+    function: {
+      name: 'generateClawSkillByHistory',
+      description:
+        '根据用户目标与对话历史日志或指定日志文件自动生成 OpenClaw Skill 工具包。logfile参数为日志文件名称，默认从日志目录中查找，如果不存在则从当前目录查找；若未设置该参数，则使用最新日志文件；该参数也可设置为绝对路径。',
+      parameters: {
+        type: 'object',
+        properties: {
+          goal: { type: 'string' },
+          logfile: { type: 'string' },
+        },
+        required: ['goal'],
+      },
+    },
+  },
+  {
+    type: 'function',
+    function: {
+      name: 'getSessionHistoryFile',
+      description:
+        '获取最后一次会话历史日志文件路径，用于生成Skill时引用会话历史。',
+      parameters: {
+        type: 'object',
+        properties: {},
+        required: [],
+      },
+    },
+  },
 ]
 
 async function getGenerateSkillRules(goal) {
@@ -77,6 +109,7 @@ async function getGenerateSkillRules(goal) {
    - git仓库地址：固定为 https://github.com/qq306863030/deepfish-extensions.git
    - author设置为"DeepFish AI"
    - type字段设置为"commonjs"，确保模块系统兼容
+   - main字段设置为"index.js"，指定入口文件
 3. 文件结构
    - 主文件：项目入口文件必须命名为index.js
    - 子文件：复杂的逻辑可以拆分到其他.js文件中;将descriptions、functions拆分到子文件;
@@ -224,7 +257,7 @@ async function generateSkill(rules) {
 }
 
 async function getGenerateClawSkillRules(goal) {
-   const newGoal = `
+  const newGoal = `
 ## 任务目标
 基于OpenClaw Skill规范创建一个标准化的Skill工具包，实现用户目标：${goal}，最终输出可被你直接加载使用。
 
@@ -236,7 +269,7 @@ async function getGenerateClawSkillRules(goal) {
 3. 文档文件：目录中需新增2个说明文档：
    - README_CN.md（中文说明文档）
    - README.md（英文说明文档）
-4. 辅助文件：如果Skill涉及复杂逻辑，可在目录中创建辅助脚本文件（如 .js、.sh、.py 等），并在 SKILL.md 中说明其用途和调用方式
+4. 辅助文件：如果Skill涉及复杂逻辑，可在目录中创建辅助脚本文件（如 .js、.sh、.py 等），并在 SKILL.md 中说明其用途和调用方式；如果是js文件，可以在函数中通过this.Tools调用内置函数，如直接使用this.Tools.createSubAgent(workGoal)。
 
 #### 标准目录结构
 \`\`\`
@@ -328,19 +361,81 @@ async function generateClawSkill(rules) {
   return this.Tools.executeTaskList(rules)
 }
 
+// 根据对话历史生成一个skill工具包
+async function generateClawSkillByHistory(goal, logfile) {
+  const logDirPath = this.agentRobot.logDirPath
+  const workspace = this.agentRobot.workspace
+  let logFilePath
+  if (!logfile) {
+    // 如果没有明确提出对话历史文件，则从最新的对话日志中获取skill生成所需的对话历史内容
+    let logFiles = fs.readdirSync(logDirPath)
+    logFiles = logFiles.filter((file) => file.startsWith(`log-messeage-`))
+    if (logFiles.length === 0) {
+      throw new Error('No log file found for generating skill by history')
+    }
+    // 根据文件名称排序，获取最新的日志文件 log-messeage-{logId}.txt
+    let latestLogFile = logFiles[0]
+    if (logFiles.length > 1) {
+      latestLogFile = logFiles.sort((a, b) => {
+        const aTime = parseInt(a.slice(12, -4))
+        const bTime = parseInt(b.slice(12, -4))
+        return bTime - aTime
+      })[1]
+    }
+    logFilePath = path.join(logDirPath, latestLogFile)
+  } else {
+    logFilePath = path.join(logDirPath, logfile)
+    if (!fs.existsSync(logFilePath)) {
+      // 如果在日志目录中没有找到，则尝试在当前目录中查找
+      logFilePath = path.resolve(workspace, logfile)
+      if (!fs.existsSync(logFilePath)) {
+        throw new Error(`Log file not found: ${logfile}`)
+      }
+    }
+  }
+  const rules = await this.Tools.getGenerateClawSkillRules(
+    `基于用户的任务目标和会话历史日志中的有效信息和，生成一个OpenClaw兼容的Skill工具包。用户目标: ${goal}, 会话历史路径: ${logFilePath}`,
+  )
+  return await this.Tools.generateClawSkill(rules)
+}
+
+// 获取会话历史文件
+function getSessionHistoryFile() {
+  const logDirPath = this.agentRobot.logDirPath
+  let logFiles = fs.readdirSync(logDirPath)
+  logFiles = logFiles.filter((file) => file.startsWith(`log-messeage-`))
+  if (logFiles.length === 0) {
+    throw new Error('No log file found for generating skill by history')
+  }
+  // 根据文件名称排序，获取最新的日志文件 log-messeage-{logId}.txt
+  let latestLogFile = logFiles[0]
+  if (logFiles.length > 1) {
+    latestLogFile = logFiles.sort((a, b) => {
+      const aTime = parseInt(a.slice(12, -4))
+      const bTime = parseInt(b.slice(12, -4))
+      return bTime - aTime
+    })[1]
+  }
+  const logFilePath = path.join(logDirPath, latestLogFile)
+  return logFilePath
+}
+
 const functions = {
   getGenerateClawSkillRules,
   getGenerateSkillRules,
   generateClawSkill,
   generateSkill,
+  generateClawSkillByHistory,
+  getSessionHistoryFile,
 }
 
 const GenerateTools = {
   name: 'GenerateTools',
-  description: '提供扩展工具与Skill工具包生成规则能力，用于辅助AI构建标准化扩展项目模板',
+  description:
+    '提供扩展工具与Skill工具包生成规则能力，用于辅助AI构建标准化扩展项目模板',
   descriptions,
   functions,
-  isSystem: true
+  isSystem: true,
 }
 
-module.exports = GenerateTools
+module.exports = GenerateTools

package/src/AgentRobot/BaseAgentRobot/tools/InquirerTools.js

@@ -199,6 +199,14 @@ const descriptions = [
                   type: 'array',
                   description:
                     '选项数组，适用于list/checkbox/rawlist/expand类型',
+                  items: {
+                    type: 'object',
+                    properties: {
+                      name: { type: 'string' },
+                      value: { type: 'string' },
+                      short: { type: 'string' },
+                    },
+                  },
                 },
                 validate: {
                   type: 'string',

package/src/AgentRobot/BaseAgentRobot/tools/SystemTools.js

@@ -1,8 +1,8 @@
 /**
  * @Author: Roman 306863030@qq.com
  * @Date: 2026-03-17 11:59:19
- * @LastEditors: roman_123 306863030@qq.com
- * @LastEditTime: 2026-04-24 00:07:22
+ * @LastEditors: Roman 306863030@qq.com
+ * @LastEditTime: 2026-05-07 14:17:50
  * @FilePath: \deepfish\src\AgentRobot\BaseAgentRobot\tools\SystemTools.js
  * @Description: 默认扩展函数
  * @
@@ -12,7 +12,7 @@ const fs = require('fs-extra')
 const dayjs = require('dayjs')
 const iconv = require('iconv-lite')
 const { spawnSync } = require('child_process')
-const { detectEncoding } = require('../utils/normal.js')
+const { detectEncoding, analyzeReturn } = require('../utils/normal.js')
 const aiConsole = require('../utils/aiConsole.js')
 
 // 执行系统命令
@@ -82,11 +82,10 @@ async function requestAI(
 async function executeJSCode(code) {
   aiConsole.logSuccess('Executing JavaScript code: ')
   aiConsole.logSuccess(code)
-  // 检测code最后一行代码包含return，如果不包含，则返回一个错误信息，提示agent需要使用return返回结果
-  const codeLines = code.trim().split('\n')
-  const lastLine = codeLines[codeLines.length - 1].trim()
-  if (!lastLine.startsWith('return')) {
-    const error = new Error('The last line of the code must contain a return statement.')
+  // 校验代码片段中是否存在顶层 return，避免仅按最后一行判断导致误判。
+  const { hasReturnValue } = analyzeReturn(code)
+  if (!hasReturnValue) {
+    const error = new Error('The code must contain a return value.')
     throw error
   }
   try {
@@ -96,6 +95,7 @@ async function executeJSCode(code) {
       'require',
       `return (async () => {
           this.logMessages = []
+          this.Tools = Tools
           const originalLog = console.log
           const newLog = function () {
             originalLog.apply(console, arguments)

package/src/AgentRobot/BaseAgentRobot/utils/AIRequest.js

@@ -1,9 +1,49 @@
 const { OpenAI } = require('openai')
+const {
+  refreshGithubModelsTokenIfNeeded,
+  buildDefaultHeaders,
+} = require('./copilot.js')
+
+function normalizeAiRequestConfig(aiConfig = {}) {
+  const max_tokens = (!aiConfig.maxTokens || aiConfig.maxTokens === -1)
+    ? undefined
+    : aiConfig.maxTokens * 1024 // 兼容旧配置，按 1KB ~= 1024 tokens 估算
+
+  const requestConfig = {
+    model: aiConfig.model,
+    temperature: aiConfig.temperature,
+    stream: aiConfig.stream,
+    max_tokens,
+  }
+
+  // 仅 DeepSeek 兼容端注入扩展字段，避免其它网关因未知参数报错
+  if (aiConfig.type === 'deepseek') {
+    requestConfig.extra_body = { reasoning_split: true }
+  }
+
+  return requestConfig
+}
 
 function creatClient(aiConfig) {
+  if (aiConfig.type === 'github-models') {
+    if (!aiConfig.apiKey || !String(aiConfig.apiKey).trim()) {
+      throw new Error(
+        'GitHub Models requires apiKey. Please set a GitHub token with models:read permission in your current AI config.',
+      )
+    }
+  }
+  if (aiConfig.type === 'copilot') {
+    if (!aiConfig.apiKey || !String(aiConfig.apiKey).trim()) {
+      throw new Error(
+        'GitHub Copilot requires apiKey. Please set a GitHub Copilot access token in your current AI config.',
+      )
+    }
+  }
+
   return new OpenAI({
     baseURL: aiConfig.baseUrl,
     apiKey: aiConfig.apiKey || '',
+    defaultHeaders: buildDefaultHeaders(aiConfig),
   })
 }
 
@@ -28,13 +68,16 @@ async function think(
   streamEnd,
 ) {
   try {
+    await refreshGithubModelsTokenIfNeeded(aiConfig)
+    const requestClient = creatClient(aiConfig)
+    const requestConfig = normalizeAiRequestConfig(aiConfig)
     const opt = {
       messages: messages,
-      extra_body: {"reasoning_split": true},
-      ...aiConfig,
+      ...requestConfig,
     }
     await thinkBefore()
-    const response = await openAiClient.chat.completions.create(opt)
+    const extraHeaders = aiConfig.type === 'copilot' ? { 'x-initiator': 'user' } : undefined
+    const response = await requestClient.chat.completions.create(opt, extraHeaders ? { headers: extraHeaders } : undefined)
     if (aiConfig.stream) {
       const messageRes = await _streamToNonStream(
         response,
@@ -73,14 +116,20 @@ async function thinkByTool(
   streamEnd,
 ) {
   try {
+    await refreshGithubModelsTokenIfNeeded(aiConfig)
+    const requestClient = creatClient(aiConfig)
+    const requestConfig = normalizeAiRequestConfig(aiConfig)
     await thinkBefore()
-    const response = await openAiClient.chat.completions.create({
-      messages: messages,
-      tools: functionDescriptions,
-      tool_choice: 'auto',
-      extra_body: {"reasoning_split": true},
-      ...aiConfig,
-    })
+    const extraHeaders = aiConfig.type === 'copilot' ? { 'x-initiator': 'agent' } : undefined
+    const response = await requestClient.chat.completions.create(
+      {
+        messages: messages,
+        tools: functionDescriptions,
+        tool_choice: 'auto',
+        ...requestConfig,
+      },
+      extraHeaders ? { headers: extraHeaders } : undefined,
+    )
     if (aiConfig.stream) {
       const messageRes = await _streamToNonStream(
         response,

package/src/AgentRobot/BaseAgentRobot/utils/AIToolManager.js

@@ -49,6 +49,7 @@ class AIToolManager {
     // 外部工具扫描
     this.toolCollection = AttachmentToolScanner.getToolCollection(
       this.agentRobot.workspace,
+      this.agentRobot.basespace,
     ) // 加载工具集合
     this.clawSkillCollection = AttachmentToolScanner.getClawSkillCollection(
       this.agentRobot.basespace,

package/src/AgentRobot/BaseAgentRobot/utils/AttachmentToolScanner.js

@@ -9,7 +9,7 @@ class AttachmentToolType {
 
 class AttachmentToolScanner {
   // 获取附加工具
-  static getToolCollection(workspace) {
+  static getToolCollection(workspace, basespace) {
     // 从文件中加载附加技能
     // 动态加载这些文件，获取工具对象
     const attachTools = []
@@ -51,12 +51,14 @@ class AttachmentToolScanner {
      */
     // 1. 子agent创建时，不能拥有其他附加能力
     // 2. 使用platform过滤
-    const dir1 = path.resolve(__dirname, '../../../../') // 程序所在目录
+    const dir1 = path.resolve(__dirname, '../../../../../') // 程序所在目录
     const dir2 = path.resolve(workspace, './node_modules') // 工作目录下node_modules目录
     const dir3 = path.resolve(workspace, './') // 工作目录
     const dir4 = getGlobalNodeModulesPath()
+    const dir5 = path.resolve(basespace, 'skills') // 工作目录的父目录
+    const dir6 = path.resolve(basespace, 'clawSkills') // 工作目录的父目录
     const result = []
-    const searchDirs = [...new Set([dir1, dir2, dir3, dir4])]
+    const searchDirs = [...new Set([dir1, dir2, dir3, dir4, dir5, dir6])]
     for (const dirPath of searchDirs) {
       if (!fs.existsSync(dirPath)) {
         continue
@@ -172,7 +174,7 @@ ${table}
 - 使用用户请求匹配 skill description，
 - 一次只加载一个Skill，优先匹配最具体的Skill
 - 当用户请求不匹配任何Skill描述时，不加载任何Skill
-- 使用Skill前先使用readFile函数读取SKILL.md文件获取调用说明，通过仔细阅读说明文件学习Skill的使用方法，来完成任务 
+- 使用Skill前先使用readFile函数读取SKILL.md文件获取调用说明，通过仔细阅读说明文件学习Skill的使用方法，直接完成任务，无需创建子Agent来完成任务
 ## Available Skills
 
 | Skill | Type | Description | Location | SkillFilePath |

package/src/AgentRobot/BaseAgentRobot/utils/analyzeReturn.test.js

@@ -0,0 +1,104 @@
+const assert = require('assert')
+const { analyzeReturn } = require('./normal')
+
+function runCase(name, code, expected) {
+  const actual = analyzeReturn(code)
+  assert.deepStrictEqual(
+    actual,
+    expected,
+    `${name} failed\nexpected: ${JSON.stringify(expected)}\nactual:   ${JSON.stringify(actual)}\ncode:\n${code}`,
+  )
+}
+
+function run() {
+  const cases = [
+    {
+      name: 'empty input',
+      code: '',
+      expected: { hasReturn: false, hasReturnValue: false },
+    },
+    {
+      name: 'non-string input',
+      code: null,
+      expected: { hasReturn: false, hasReturnValue: false },
+    },
+    {
+      name: 'top-level return with number',
+      code: 'const x = 1\nreturn x + 1',
+      expected: { hasReturn: true, hasReturnValue: true },
+    },
+    {
+      name: 'top-level bare return',
+      code: 'if (ok) {\n  return\n}\nreturn;',
+      expected: { hasReturn: true, hasReturnValue: false },
+    },
+    {
+      name: 'ASI after return newline',
+      code: "return\n'hello'",
+      expected: { hasReturn: true, hasReturnValue: false },
+    },
+    {
+      name: 'return with inline comment and value',
+      code: 'return /* explain */ 42',
+      expected: { hasReturn: true, hasReturnValue: true },
+    },
+    {
+      name: 'return with line comment then newline',
+      code: 'return // explain\n42',
+      expected: { hasReturn: true, hasReturnValue: false },
+    },
+    {
+      name: 'return object literal',
+      code: 'return { ok: true }',
+      expected: { hasReturn: true, hasReturnValue: true },
+    },
+    {
+      name: 'return template literal',
+      code: 'return `done:${1}`',
+      expected: { hasReturn: true, hasReturnValue: true },
+    },
+    {
+      name: 'ignore return in string/comment',
+      code: "const s = 'return 1'\n// return 2\n/* return 3 */\nconst n = 4",
+      expected: { hasReturn: false, hasReturnValue: false },
+    },
+    {
+      name: 'ignore return in nested function declaration',
+      code: 'function inner() { return 1 }\nconst n = 1',
+      expected: { hasReturn: false, hasReturnValue: false },
+    },
+    {
+      name: 'ignore return in nested arrow block',
+      code: 'const fn = () => { return 1 }\nconst n = 1',
+      expected: { hasReturn: false, hasReturnValue: false },
+    },
+    {
+      name: 'ignore return in class method',
+      code: 'class A { m() { return 1 } }\nconst n = 1',
+      expected: { hasReturn: false, hasReturnValue: false },
+    },
+    {
+      name: 'ignore return in object method',
+      code: 'const obj = { m() { return 1 } }\nconst n = 1',
+      expected: { hasReturn: false, hasReturnValue: false },
+    },
+    {
+      name: 'top-level return exists even with nested returns',
+      code: 'const fn = () => { return 1 }\nif (ok) { return 2 }',
+      expected: { hasReturn: true, hasReturnValue: true },
+    },
+    {
+      name: 'real-world code snippet from code.txt shape',
+      code: "const fs = require('fs')\nconst content = 'x'\nreturn 'File updated successfully.'",
+      expected: { hasReturn: true, hasReturnValue: true },
+    },
+  ]
+
+  for (const testCase of cases) {
+    runCase(testCase.name, testCase.code, testCase.expected)
+  }
+
+  console.log(`analyzeReturn tests passed: ${cases.length} cases`)
+}
+
+run()

package/src/AgentRobot/BaseAgentRobot/utils/copilot.js

@@ -0,0 +1,117 @@
+const axios = require('axios')
+const { GlobalVariable } = require('../../../cli/GlobalVariable.js')
+
+function isExpiring(isoTime, thresholdSec = 120) {
+	if (!isoTime) {
+		return false
+	}
+	const target = new Date(isoTime).getTime()
+	if (!Number.isFinite(target)) {
+		return false
+	}
+	return target - Date.now() <= thresholdSec * 1000
+}
+
+function secondsToISO(seconds) {
+	if (!seconds || Number(seconds) <= 0) {
+		return ''
+	}
+	return new Date(Date.now() + Number(seconds) * 1000).toISOString()
+}
+
+async function refreshGithubModelsTokenIfNeeded(aiConfig = {}) {
+	if (aiConfig.type !== 'github-models' && aiConfig.type !== 'copilot') {
+		return
+	}
+	const githubAuth = aiConfig.githubAuth || {}
+	if (!isExpiring(githubAuth.accessTokenExpiresAt)) {
+		return
+	}
+	if (!githubAuth.refreshToken) {
+		throw new Error(
+			'GitHub access token expired and no refresh token is available. Please run "ai auth github-login" again.',
+		)
+	}
+	if (!githubAuth.clientId || !githubAuth.clientSecret) {
+		throw new Error(
+			'GitHub token refresh requires clientId and clientSecret. Please run "ai auth github-login" and provide both values.',
+		)
+	}
+	if (isExpiring(githubAuth.refreshTokenExpiresAt, 0)) {
+		throw new Error(
+			'GitHub refresh token expired. Please run "ai auth github-login" again.',
+		)
+	}
+
+	const form = new URLSearchParams()
+	form.set('client_id', githubAuth.clientId)
+	form.set('client_secret', githubAuth.clientSecret)
+	form.set('grant_type', 'refresh_token')
+	form.set('refresh_token', githubAuth.refreshToken)
+
+	const response = await axios.post(
+		'https://github.com/login/oauth/access_token',
+		form.toString(),
+		{
+			headers: {
+				Accept: 'application/json',
+				'Content-Type': 'application/x-www-form-urlencoded',
+			},
+			timeout: 20000,
+		},
+	)
+
+	const tokenData = response.data || {}
+	if (!tokenData.access_token) {
+		const errMessage = tokenData.error_description || tokenData.error || 'Unknown token refresh error'
+		throw new Error(`GitHub token refresh failed: ${errMessage}`)
+	}
+
+	const newAuth = {
+		...githubAuth,
+		tokenType: tokenData.token_type || githubAuth.tokenType || 'bearer',
+		accessTokenExpiresAt: secondsToISO(tokenData.expires_in),
+		refreshToken: tokenData.refresh_token || githubAuth.refreshToken,
+		refreshTokenExpiresAt: tokenData.refresh_token_expires_in
+			? secondsToISO(tokenData.refresh_token_expires_in)
+			: githubAuth.refreshTokenExpiresAt,
+		lastUpdatedAt: new Date().toISOString(),
+	}
+
+	aiConfig.apiKey = tokenData.access_token
+	aiConfig.githubAuth = newAuth
+
+	const configManager = GlobalVariable.configManager
+	if (configManager && aiConfig.name && configManager.updateAiConfigByName) {
+		configManager.updateAiConfigByName(aiConfig.name, (current) => {
+			return {
+				...current,
+				apiKey: tokenData.access_token,
+				githubAuth: {
+					...(current.githubAuth || {}),
+					...newAuth,
+				},
+			}
+		})
+	}
+}
+
+function buildDefaultHeaders(aiConfig = {}) {
+	if (aiConfig.type === 'github-models') {
+		return {
+			Accept: 'application/vnd.github+json',
+			'X-GitHub-Api-Version': '2026-03-10',
+		}
+	}
+	if (aiConfig.type === 'copilot') {
+		return {
+			'Openai-Intent': 'conversation-edits',
+		}
+	}
+	return undefined
+}
+
+module.exports = {
+	refreshGithubModelsTokenIfNeeded,
+	buildDefaultHeaders,
+}