deepfish-ai 1.0.26 → 1.0.28

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

@@ -101,6 +101,293 @@ function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms))
 }
 
+// 判断代码是否有返回值
+function analyzeReturn(code) {
+  if (typeof code !== 'string' || !code.trim()) {
+    return {
+      hasReturn: false,
+      hasReturnValue: false,
+    }
+  }
+
+  // 移除字符串和注释，避免把文本中的 return 误判为代码关键字。
+  function stripStringsAndComments(input) {
+    const chars = input.split('')
+    let i = 0
+    let state = 'normal'
+
+    while (i < chars.length) {
+      const ch = chars[i]
+      const next = chars[i + 1]
+
+      if (state === 'normal') {
+        if (ch === '/' && next === '/') {
+          state = 'line-comment'
+          chars[i] = ' '
+          chars[i + 1] = ' '
+          i += 2
+          continue
+        }
+        if (ch === '/' && next === '*') {
+          state = 'block-comment'
+          chars[i] = ' '
+          chars[i + 1] = ' '
+          i += 2
+          continue
+        }
+        if (ch === "'") {
+          state = 'single-quote'
+          chars[i] = ' '
+          i += 1
+          continue
+        }
+        if (ch === '"') {
+          state = 'double-quote'
+          chars[i] = ' '
+          i += 1
+          continue
+        }
+        if (ch === '`') {
+          state = 'template'
+          chars[i] = ' '
+          i += 1
+          continue
+        }
+        i += 1
+        continue
+      }
+
+      if (state === 'line-comment') {
+        if (ch === '\n') {
+          state = 'normal'
+        } else {
+          chars[i] = ' '
+        }
+        i += 1
+        continue
+      }
+
+      if (state === 'block-comment') {
+        if (ch === '*' && next === '/') {
+          chars[i] = ' '
+          chars[i + 1] = ' '
+          state = 'normal'
+          i += 2
+        } else {
+          if (ch !== '\n') {
+            chars[i] = ' '
+          }
+          i += 1
+        }
+        continue
+      }
+
+      if (state === 'single-quote') {
+        if (ch === '\\') {
+          chars[i] = ' '
+          if (i + 1 < chars.length) {
+            chars[i + 1] = ' '
+          }
+          i += 2
+          continue
+        }
+        chars[i] = ch === '\n' ? '\n' : ' '
+        if (ch === "'") {
+          state = 'normal'
+        }
+        i += 1
+        continue
+      }
+
+      if (state === 'double-quote') {
+        if (ch === '\\') {
+          chars[i] = ' '
+          if (i + 1 < chars.length) {
+            chars[i + 1] = ' '
+          }
+          i += 2
+          continue
+        }
+        chars[i] = ch === '\n' ? '\n' : ' '
+        if (ch === '"') {
+          state = 'normal'
+        }
+        i += 1
+        continue
+      }
+
+      if (state === 'template') {
+        if (ch === '\\') {
+          chars[i] = ' '
+          if (i + 1 < chars.length) {
+            chars[i + 1] = ' '
+          }
+          i += 2
+          continue
+        }
+        chars[i] = ch === '\n' ? '\n' : ' '
+        if (ch === '`') {
+          state = 'normal'
+        }
+        i += 1
+      }
+    }
+
+    return chars.join('')
+  }
+
+  function isReturnWithValue(input, startIndex) {
+    let i = startIndex
+    while (i < input.length) {
+      const ch = input[i]
+      const next = input[i + 1]
+      if (ch === ' ' || ch === '\t' || ch === '\r') {
+        i += 1
+        continue
+      }
+
+      if (ch === '/' && next === '/') {
+        i += 2
+        while (i < input.length && input[i] !== '\n') {
+          i += 1
+        }
+        continue
+      }
+
+      if (ch === '/' && next === '*') {
+        i += 2
+        while (i < input.length) {
+          if (input[i] === '*' && input[i + 1] === '/') {
+            i += 2
+            break
+          }
+          i += 1
+        }
+        continue
+      }
+
+      if (ch === '\n' || ch === ';' || ch === '}' || ch === ')') {
+        return false
+      }
+      return true
+    }
+    return false
+  }
+
+  function isControlKeyword(token) {
+    return ['if', 'for', 'while', 'switch', 'catch', 'with'].includes(token)
+  }
+
+  const cleaned = stripStringsAndComments(code)
+  const tokenRegex = /[A-Za-z_$][\w$]*|=>|[{}()\[\]]/g
+  const blockStack = []
+  const parenStack = []
+  let functionDepth = 0
+  let pendingFunctionBlock = 0
+  let pendingArrow = false
+  let hasReturn = false
+  let hasReturnValue = false
+  let lastToken = ''
+  let recentClosedParen = null
+  let match
+
+  while ((match = tokenRegex.exec(cleaned)) !== null) {
+    const token = match[0]
+    const index = match.index
+
+    if (token === '(') {
+      parenStack.push({
+        beforeToken: lastToken,
+      })
+      lastToken = token
+      continue
+    }
+
+    if (token === ')') {
+      recentClosedParen = parenStack.pop() || null
+      lastToken = token
+      continue
+    }
+
+    if (token === 'function') {
+      pendingFunctionBlock += 1
+      pendingArrow = false
+      lastToken = token
+      recentClosedParen = null
+      continue
+    }
+
+    if (token === '=>') {
+      pendingArrow = true
+      lastToken = token
+      recentClosedParen = null
+      continue
+    }
+
+    if (token === '{') {
+      let isFunctionBlock = false
+      if (pendingFunctionBlock > 0 || pendingArrow) {
+        isFunctionBlock = true
+      } else if (lastToken === ')' && recentClosedParen) {
+        const beforeToken = recentClosedParen.beforeToken
+        if (beforeToken && !isControlKeyword(beforeToken)) {
+          // 识别 class/object method 这类无 function 关键字的方法体。
+          isFunctionBlock = true
+        }
+      }
+
+      if (isFunctionBlock) {
+        blockStack.push('function')
+        functionDepth += 1
+        if (pendingFunctionBlock > 0) {
+          pendingFunctionBlock -= 1
+        }
+      } else {
+        blockStack.push('block')
+      }
+
+      pendingArrow = false
+      lastToken = token
+      recentClosedParen = null
+      continue
+    }
+
+    if (token === '}') {
+      const top = blockStack.pop()
+      if (top === 'function' && functionDepth > 0) {
+        functionDepth -= 1
+      }
+      pendingArrow = false
+      lastToken = token
+      recentClosedParen = null
+      continue
+    }
+
+    if (token === 'return' && functionDepth === 0) {
+      hasReturn = true
+      if (isReturnWithValue(code, index + token.length)) {
+        hasReturnValue = true
+      }
+      if (hasReturn && hasReturnValue) {
+        break
+      }
+    }
+
+    if (pendingArrow) {
+      // 箭头函数表达式体不带 {} 时，不会有 return 关键字参与判断。
+      pendingArrow = false
+    }
+
+    lastToken = token
+    recentClosedParen = null
+  }
+
+  return {
+    hasReturn,
+    hasReturnValue,
+  }
+}
+
 module.exports = {
   objStrToObj,
   delay,
@@ -108,4 +395,5 @@ module.exports = {
   openDirectory,
   detectEncoding,
   sleep,
+  analyzeReturn,
 }

package/src/cli/ConfigManager.js

@@ -130,6 +130,29 @@ class ConfigManager {
     return this.config.ai.find((item) => item.name === aiName)
   }
 
+  getAiConfig(aiName) {
+    return this._getAiConfig(aiName)
+  }
+
+  updateAiConfigByName(aiName, updater) {
+    const existingIndex = this.config.ai.findIndex(
+      (item) => item.name === aiName,
+    )
+    if (existingIndex === -1) {
+      aiConsole.logError(`Configuration with name "${aiName}" not found.`)
+      return null
+    }
+
+    const current = this.config.ai[existingIndex]
+    const next = typeof updater === 'function'
+      ? updater(lodash.cloneDeep(current))
+      : lodash.merge(lodash.cloneDeep(current), updater)
+
+    this.config.ai[existingIndex] = next
+    this.writeConfig(this.config)
+    return next
+  }
+
   // 获取Ai列表
   getAiList() {
     console.log('AI Configurations')
@@ -188,7 +211,8 @@ class ConfigManager {
     aiConsole.logInfo(`API Base URL: ${aiConfig.baseUrl}`)
     aiConsole.logInfo(`Model: ${aiConfig.model}`)
     if (aiConfig.apiKey) {
-      aiConsole.logInfo(`API Key: ${aiConfig.apiKey}`)
+      const maskPrefix = String(aiConfig.apiKey).slice(0, 6)
+      aiConsole.logInfo(`API Key: ${maskPrefix}... (masked)`)
     }
     aiConsole.logInfo(`Temperature: ${aiConfig.temperature}`)
     aiConsole.logInfo(`Max Tokens: ${aiConfig.maxTokens}`)

package/src/cli/DefaultConfig.js

@@ -15,13 +15,13 @@ const aiCliConfig = {
   DeepSeek: {
     baseUrl: 'https://api.deepseek.com',
     model: {
-      list: ['deepseek-chat', 'deepseek-reasoner', 'other'],
+      list: ['deepseek-chat', 'deepseek-reasoner', 'deepseek-v4-flash', 'deepseek-v4-pro', 'other'],
       defaultValue: '',
     },
     type: 'deepseek',
     apiKey: '',
     temperature: 0.7,
-    maxTokens: 8, // 单位KB
+    maxTokens: -1, // 单位KB
     maxContextLength: 64, // 单位KB
     stream: true,
   },
@@ -34,7 +34,7 @@ const aiCliConfig = {
     type: 'minimax',
     apiKey: '',
     temperature: 0.7,
-    maxTokens: 8, // 单位KB
+    maxTokens: -1, // 单位KB
     maxContextLength: 64, // 单位KB
     stream: true,
   },
@@ -47,7 +47,7 @@ const aiCliConfig = {
     type: 'qwen',
     apiKey: '',
     temperature: 0.7,
-    maxTokens: 8, // 单位KB
+    maxTokens: -1, // 单位KB
     maxContextLength: 64, // 单位KB
     stream: true,
   },
@@ -60,7 +60,7 @@ const aiCliConfig = {
     type: 'ollama',
     apiKey: 'ollama',
     temperature: 0.7,
-    maxTokens: 8, // 单位KB
+    maxTokens: -1, // 单位KB
     maxContextLength: 64, // 单位KB
     stream: true,
   },
@@ -73,9 +73,25 @@ const aiCliConfig = {
     type: 'openai',
     apiKey: '',
     temperature: 0.7,
-    maxTokens: 8, // 单位KB
+    maxTokens: -1, // 单位KB
     maxContextLength: 64, // 单位KB
     stream: true,
+  },
+  Copilot: {
+    baseUrl: 'https://api.githubcopilot.com',
+    model: {
+      list: [
+        'gpt-4o',
+        'gpt-4o-mini',
+      ],
+      defaultValue: 'gpt-4o',
+    },
+    type: 'copilot',
+    apiKey: '',
+    temperature: 0.7,
+    maxTokens: -1, // 单位KB
+    maxContextLength: 400, // 单位KB
+    stream: true,
   }
 }
 

package/src/cli/SkillConfigManager.js

@@ -2,7 +2,7 @@
  * @Author: Roman 306863030@qq.com
  * @Date: 2026-03-23 15:23:42
  * @LastEditors: Roman 306863030@qq.com
- * @LastEditTime: 2026-04-17 09:38:33
+ * @LastEditTime: 2026-05-06 14:53:07
  * @FilePath: \deepfish\src\cli\SkillConfigManager.js
  * @Description: Skill configuration manager
  */
@@ -89,7 +89,8 @@ class SkillConfigManager {
     // 如果数组的数量与目录中的数量不一致，则自动同步
     const skills = this.readSkills()
     const skillDirs = fs.readdirSync(this.skillDir).filter((file) => {
-      return fs.statSync(path.join(this.skillDir, file)).isDirectory()
+      const fullPath = path.join(this.skillDir, file)
+      return fs.statSync(fullPath).isDirectory() && fs.existsSync(path.join(fullPath, 'SKILL.md'))
     })
     if (skills.length === skillDirs.length) {
       return

package/src/cli/ai-auth.js

@@ -0,0 +1,231 @@
+const axios = require('axios')
+const { program } = require('commander')
+const aiInquirer = require('../AgentRobot/BaseAgentRobot/utils/aiInquirer.js')
+const aiConsole = require('../AgentRobot/BaseAgentRobot/utils/aiConsole.js')
+const ConfigManager = require('./ConfigManager.js')
+const { GlobalVariable } = require('./GlobalVariable.js')
+
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms))
+}
+
+function secondsToISO(seconds) {
+  if (!seconds || Number(seconds) <= 0) {
+    return ''
+  }
+  return new Date(Date.now() + Number(seconds) * 1000).toISOString()
+}
+
+function getConfigManager() {
+  return GlobalVariable.configManager || new ConfigManager()
+}
+
+async function githubDeviceLogin({
+  configManager,
+  targetName,
+  currentAuth = {},
+  saveToConfig = true,
+} = {}) {
+  const manager = configManager || getConfigManager()
+  let aiConfig = null
+
+  if (saveToConfig) {
+    if (!targetName) {
+      aiConsole.logError('No target AI configuration. Please pass a config name or set current AI first.')
+      return null
+    }
+    aiConfig = manager.getAiConfig(targetName)
+    if (!aiConfig) {
+      aiConsole.logError(`Configuration with name "${targetName}" not found.`)
+      return null
+    }
+    if (aiConfig.type !== 'copilot') {
+      aiConsole.logError(
+        `Configuration "${targetName}" is type "${aiConfig.type}". GitHub login only supports "copilot" type.`,
+      )
+      return null
+    }
+  }
+
+  const authSeed = saveToConfig ? (aiConfig.githubAuth || {}) : (currentAuth || {})
+  const questions = [
+    {
+      type: 'input',
+      name: 'clientId',
+      message: 'Enter GitHub OAuth App Client ID:',
+      default: authSeed.clientId || process.env.GITHUB_OAUTH_CLIENT_ID || '',
+      validate: (value) => !!String(value || '').trim() || 'Client ID is required',
+    },
+    {
+      type: 'password',
+      name: 'clientSecret',
+      message: 'Enter GitHub OAuth App Client Secret (optional, needed for refresh in some OAuth app settings):',
+      mask: '*',
+      default: authSeed.clientSecret || process.env.GITHUB_OAUTH_CLIENT_SECRET || '',
+    },
+    {
+      type: 'input',
+      name: 'scope',
+      message: 'Enter OAuth scope:',
+      default: authSeed.scope || 'models:read',
+    },
+  ]
+
+  const answers = await aiInquirer.askAny(questions)
+  const clientId = String(answers.clientId || '').trim()
+  const clientSecret = String(answers.clientSecret || '').trim()
+  const scope = String(answers.scope || 'models:read').trim()
+
+  let deviceCodeResponse
+  try {
+    const form = new URLSearchParams()
+    form.set('client_id', clientId)
+    form.set('scope', scope)
+
+    const res = await axios.post(
+      'https://github.com/login/device/code',
+      form.toString(),
+      {
+        headers: {
+          Accept: 'application/json',
+          'Content-Type': 'application/x-www-form-urlencoded',
+        },
+        timeout: 20000,
+      },
+    )
+    deviceCodeResponse = res.data
+  } catch (error) {
+    const message = error?.response?.data?.error_description || error.message
+    aiConsole.logError(`Failed to request GitHub device code: ${message}`)
+    return null
+  }
+
+  const deviceCode = deviceCodeResponse.device_code
+  const userCode = deviceCodeResponse.user_code
+  const verificationUri = deviceCodeResponse.verification_uri || 'https://github.com/login/device'
+  const expiresIn = Number(deviceCodeResponse.expires_in || 900)
+  let intervalSec = Number(deviceCodeResponse.interval || 5)
+
+  aiConsole.logSuccess('Please complete GitHub login in browser:')
+  aiConsole.logInfo(`URL: ${verificationUri}`)
+  aiConsole.logInfo(`Code: ${userCode}`)
+
+  const deadline = Date.now() + expiresIn * 1000
+
+  while (Date.now() < deadline) {
+    await sleep(intervalSec * 1000)
+    try {
+      const form = new URLSearchParams()
+      form.set('client_id', clientId)
+      form.set('device_code', deviceCode)
+      form.set('grant_type', 'urn:ietf:params:oauth:grant-type:device_code')
+
+      const res = 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 = res.data || {}
+
+      if (tokenData.error) {
+        if (tokenData.error === 'authorization_pending') {
+          continue
+        }
+        if (tokenData.error === 'slow_down') {
+          intervalSec = Number(tokenData.interval || intervalSec + 5)
+          continue
+        }
+        if (tokenData.error === 'expired_token') {
+          aiConsole.logError('Device code expired. Please run the login command again.')
+          return null
+        }
+        if (tokenData.error === 'access_denied') {
+          aiConsole.logError('GitHub authorization denied by user.')
+          return null
+        }
+        aiConsole.logError(tokenData.error_description || tokenData.error)
+        return null
+      }
+
+      if (!tokenData.access_token) {
+        aiConsole.logError('GitHub login failed: no access_token returned.')
+        return null
+      }
+
+      const githubAuthPatch = {
+        provider: 'github-oauth-device',
+        clientId,
+        clientSecret,
+        scope,
+        tokenType: tokenData.token_type || 'bearer',
+        accessTokenExpiresAt: secondsToISO(tokenData.expires_in),
+        refreshToken: tokenData.refresh_token || '',
+        refreshTokenExpiresAt: secondsToISO(tokenData.refresh_token_expires_in),
+        lastUpdatedAt: new Date().toISOString(),
+      }
+
+      if (saveToConfig) {
+        manager.updateAiConfigByName(targetName, (current) => {
+          return {
+            ...current,
+            apiKey: tokenData.access_token,
+            githubAuth: {
+              ...(current.githubAuth || {}),
+              ...githubAuthPatch,
+            },
+          }
+        })
+      }
+
+      aiConsole.logSuccess('GitHub login success.')
+      if (githubAuthPatch.accessTokenExpiresAt) {
+        aiConsole.logInfo(`Access token expires at: ${githubAuthPatch.accessTokenExpiresAt}`)
+      }
+      if (!githubAuthPatch.refreshToken) {
+        aiConsole.logInfo('No refresh token returned. Re-login may be required after access token expires.')
+      }
+
+      return {
+        accessToken: tokenData.access_token,
+        githubAuth: githubAuthPatch,
+      }
+    } catch (error) {
+      const message = error?.response?.data?.error_description || error.message
+      aiConsole.logError(`Polling GitHub token failed: ${message}`)
+      return null
+    }
+  }
+
+  aiConsole.logError('GitHub login timeout. Please run the command again.')
+  return null
+}
+
+const authCommand = program
+  .command('auth')
+  .description('Authenticate third-party model providers')
+
+authCommand
+  .command('github-login [name]')
+  .description('Login with GitHub account (Device Flow) and store short-lived token into a copilot config')
+  .action(async (name) => {
+    const configManager = getConfigManager()
+    const targetName = name || configManager.getCurrentAi()
+    const res = await githubDeviceLogin({
+      configManager,
+      targetName,
+      saveToConfig: true,
+    })
+    if (res) {
+      aiConsole.logSuccess(`Token has been saved to AI config "${targetName}".`)
+    }
+  })
+
+module.exports = {
+  githubDeviceLogin,
+}