deepfish-ai 1.0.27 → 1.0.29

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/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,
+}

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

@@ -7,6 +7,7 @@
  * @Description: Skill configuration manager
  */
 const path = require('path')
+const { spawnSync } = require('child_process')
 const fs = require('fs-extra')
 const axios = require('axios')
 const cheerio = require('cheerio')
@@ -156,6 +157,16 @@ class SkillConfigManager {
       aiConsole.logError('Invalid skill URL. Please provide a valid ClawHub URL.')
       return
     }
+    // 判断url是否是github的url，如果是github的url则使用git命令拉取、执行add函数、删除目录
+    if (skillUrl.endsWith('.git')) {
+      spawnSync('git', ['clone', skillUrl], {
+        stdio: 'inherit',
+      })
+      const repoName = path.basename(skillUrl, '.git')
+      await this.add(repoName)
+      fs.removeSync(path.join(process.cwd(), repoName))
+      return
+    }
 
     let parsedUrl
     try {

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,
+}

package/src/cli/ai-config.js

@@ -11,6 +11,8 @@ const { program } = require('commander')
 const { aiCliConfig } = require('./DefaultConfig.js')
 const ConfigManager = require('./ConfigManager.js')
 const aiInquirer = require('../AgentRobot/BaseAgentRobot/utils/aiInquirer.js')
+const aiConsole = require('../AgentRobot/BaseAgentRobot/utils/aiConsole.js')
+const { githubDeviceLogin } = require('./ai-auth.js')
 
 const configManager = new ConfigManager()
 const configCommand = program
@@ -87,6 +89,7 @@ configCommand
         type: 'input',
         name: 'baseUrl',
         message: 'Enter API base URL:',
+        when: (answers) => answers.Type !== 'Copilot',
         default: (answers) => {
           return aiCliConfig[answers.Type].baseUrl
         },
@@ -122,6 +125,7 @@ configCommand
         type: 'input',
         name: 'apiKey',
         message: 'Enter API key:',
+        when: (answers) => answers.Type !== 'Copilot',
         default: (answers) => {
           return aiCliConfig[answers.Type].apiKey
         },
@@ -143,7 +147,6 @@ configCommand
         default: (answers) => {
           return aiCliConfig[answers.Type].maxTokens
         },
-        validate: (value) => value > 0 || 'Max tokens must be greater than 0',
       },
       {
         type: 'number',
@@ -167,14 +170,29 @@ configCommand
     const aiConfig = {
       name: answers.name,
       type: aiCliConfig[answers.Type].type,
-      baseUrl: answers.baseUrl,
+      baseUrl: answers.baseUrl || aiCliConfig[answers.Type].baseUrl,
       model: answers.model,
-      apiKey: answers.apiKey,
+      apiKey: answers.apiKey || aiCliConfig[answers.Type].apiKey,
       temperature: answers.temperature,
       maxTokens: answers.maxTokens,
       maxContextLength: answers.maxContextLength,
       stream: answers.stream,
     }
+
+    if (answers.Type === 'Copilot') {
+      const loginRes = await githubDeviceLogin({
+        configManager,
+        targetName: answers.name,
+        saveToConfig: false,
+      })
+      if (!loginRes) {
+        aiConsole.logError('Copilot login failed. Configuration was not added.')
+        return
+      }
+      aiConfig.apiKey = loginRes.accessToken
+      aiConfig.githubAuth = loginRes.githubAuth
+    }
+
     return configManager.addAiConfig(aiConfig)
   })
 

package/src/cli/index.js

@@ -5,6 +5,7 @@ const { GlobalVariable } = require('./GlobalVariable.js')
 require('./ai-config.js')
 require('./ai-skill.js')
 require('./ai-memory.js')
+require('./ai-auth.js')
 const aiConsole = require('../AgentRobot/BaseAgentRobot/utils/aiConsole.js')
 program
   .version('1.0.0')
@@ -23,7 +24,8 @@ async function main() {
     if (
       (program.args &&
         (program.args[0] === 'config' ||
-          program.args[0] === 'skill')) ||
+          program.args[0] === 'skill' ||
+          program.args[0] === 'auth')) ||
           program.args[0] === 'memory'
     ) {
       return