@casatwy/deyo 0.2.1 → 0.2.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@casatwy/deyo",
-  "version": "0.2.1",
+  "version": "0.2.5",
   "description": "Deyo transcription CLI with link/file input, JSONL progress, and opt-in stable transcript streaming",
   "homepage": "https://deyo.miaobi.fun/docs",
   "license": "UNLICENSED",
@@ -8,6 +8,7 @@
   "files": [
     "deyo.mjs",
     "skill-manager.mjs",
+    "openclaw-skill-update.mjs",
     "README.md"
   ],
   "keywords": [
@@ -28,4 +29,4 @@
   "bin": {
     "deyo": "deyo.mjs"
   }
-}
+}

package/skill-manager.mjs

@@ -16,6 +16,13 @@ import { createHash, randomBytes } from 'node:crypto'
 import { homedir } from 'node:os'
 import { basename, dirname, isAbsolute, join, normalize, resolve } from 'node:path'
 import process from 'node:process'
+import {
+  CONFIRM_LATEST_PHRASE,
+  enrollOpenClawAutoUpdate,
+  inspectOpenClawAutoUpdate,
+  runOpenClawConfirmedUpdate,
+  runOpenClawInvocationCheck,
+} from './openclaw-skill-update.mjs'
 
 export const SKILL_PLATFORMS = ['codex', 'claude', 'gemini', 'openclaw']
 export const SKILL_SCOPES = ['user', 'workspace', 'global']
@@ -189,13 +196,17 @@ export function printSkillUsage(stream = process.stdout) {
                      [--replace-legacy sha256:<observed-hash>]
                      [--json]
   deyo skill status [--platform codex|claude|gemini|openclaw] [--json]
+  deyo skill update --platform openclaw [--scope workspace|global]
+                    --confirm-latest 'update @casatwy/deyo to latest now'
 
 默认 scope:
   codex=user，claude=user，gemini=user，openclaw=global
 
 说明:
   status 只读取本地配置和 manifest，不联网、不检查更新，也不修改 cache/lockfile。
-  install 只调用各平台原生管理器；不会用 --force、--all、固定 --ref 或 --consent。
+  install 只调用各平台原生管理器；OpenClaw 安装成功后登记调用时检查，不会自动更新已有安装。
+  update 仅用于当前用户明确同意后更新 OpenClaw；执行前会重新验证 latest，候选变化时必须重新确认。
+  所有原生命令都不会使用 --force、--all、--force-install、风险确认、固定 --ref 或 --consent。
   legacy 目录只有在完整树哈希属于官方历史版本，且 --replace-legacy 精确匹配时才会备份迁移。
 `)
 }
@@ -208,6 +219,7 @@ function parseSkillCommandArgs(argv) {
     platform: '',
     scope: '',
     replaceLegacy: '',
+    confirmLatest: '',
     json: false,
     help: requestedAction === '-h' || requestedAction === '--help',
   }
@@ -257,13 +269,19 @@ function parseSkillCommandArgs(argv) {
       index += 1
       continue
     }
+    if (current === '--confirm-latest') {
+      markSeen(current)
+      result.confirmLatest = readOptionValue(current, index)
+      index += 1
+      continue
+    }
     throw new SkillManagerError(`未知 skill 参数：${current}`, 'unknown_argument')
   }
 
   if (!action && !result.help) {
     throw new SkillManagerError('缺少 skill 子命令 install 或 status', 'missing_action')
   }
-  if (!['install', 'status'].includes(action) && !result.help) {
+  if (!['install', 'status', 'update', '_openclaw-check'].includes(action) && !result.help) {
     throw new SkillManagerError(`不支持的 skill 子命令：${action}`, 'invalid_action')
   }
   if (action === 'install' && !result.platform && !result.help) {
@@ -275,6 +293,38 @@ function parseSkillCommandArgs(argv) {
   if (action === 'status' && result.replaceLegacy) {
     throw new SkillManagerError('skill status 不接受 --replace-legacy', 'status_replace_legacy')
   }
+  if (action === 'status' && result.confirmLatest) {
+    throw new SkillManagerError('skill status 不接受 --confirm-latest', 'status_confirm_latest')
+  }
+  if (action === 'install' && result.confirmLatest) {
+    throw new SkillManagerError('skill install 不接受 --confirm-latest', 'install_confirm_latest')
+  }
+  if (action === 'update' && result.platform !== 'openclaw') {
+    throw new SkillManagerError('skill update 目前只支持 --platform openclaw', 'update_platform')
+  }
+  if (action === 'update' && result.replaceLegacy) {
+    throw new SkillManagerError('skill update 不接受 --replace-legacy', 'update_replace_legacy')
+  }
+  if (action === 'update' && result.json) {
+    throw new SkillManagerError('skill update 不接受 --json；更新输出不会写入 stdout', 'update_json')
+  }
+  if (action === 'update' && !result.confirmLatest) {
+    throw new SkillManagerError('skill update 必须提供 --confirm-latest', 'confirmation_required')
+  }
+  if (action === 'update' && result.confirmLatest !== CONFIRM_LATEST_PHRASE) {
+    throw new SkillManagerError(
+      `--confirm-latest 必须精确为 '${CONFIRM_LATEST_PHRASE}'`,
+      'confirmation_required',
+    )
+  }
+  if (action === '_openclaw-check') {
+    if (result.platform || result.replaceLegacy || result.confirmLatest || result.json) {
+      throw new SkillManagerError('内部 OpenClaw 检查只接受 --scope', 'internal_check_arguments')
+    }
+    if (!result.scope) {
+      throw new SkillManagerError('内部 OpenClaw 检查必须提供 --scope', 'missing_scope')
+    }
+  }
 
   return result
 }
@@ -1062,7 +1112,7 @@ async function inspectOpenClawSkill(scope) {
   }
 }
 
-async function buildOpenClawInstallPlan(scope, jsonMode) {
+async function buildOpenClawInstallPlan(scope, jsonMode, cliVersion) {
   const openclaw = await requireExecutable('openclaw')
   const skill = await inspectOpenClawSkill(scope)
   if (skill.managed && !skill.officialSource) {
@@ -1074,24 +1124,41 @@ async function buildOpenClawInstallPlan(scope, jsonMode) {
 
   return async () => {
     const scopeArgs = scope === 'global' ? ['--global'] : []
+    const actions = []
     if (skill.managed) {
+      actions.push('already_installed')
+    } else {
       await runManager(openclaw, [
-        'skills', 'update', OPENCLAW_SKILL, ...scopeArgs,
+        'skills', 'install', OPENCLAW_SKILL, ...scopeArgs,
       ], { interactive: true, jsonMode })
-      return { actions: ['skill_updated'], activation: 'invoke_again_if_updated' }
+      actions.push('skill_installed')
     }
-    await runManager(openclaw, [
-      'skills', 'install', OPENCLAW_SKILL, ...scopeArgs,
-    ], { interactive: true, jsonMode })
-    return { actions: ['skill_installed'], activation: 'next_invocation' }
+    const installed = await inspectOpenClawSkill(scope)
+    if (!installed.installed || !installed.officialSource) {
+      throw new SkillManagerError(
+        'OpenClaw 原生安装已返回，但无法从当前 scope 的 origin.json 确认 @casatwy/deyo',
+        'openclaw_origin_unverified',
+      )
+    }
+    let autoUpdate
+    try {
+      autoUpdate = await enrollOpenClawAutoUpdate({ scope, cliVersion })
+    } catch (error) {
+      throw new SkillManagerError(
+        `OpenClaw Skill 已处理，但调用时更新检查登记失败：${error instanceof Error ? error.message : String(error)}`,
+        'openclaw_enrollment_failed',
+      )
+    }
+    actions.push('invocation_update_check_enrolled')
+    return { actions, activation: 'next_invocation', autoUpdate }
   }
 }
 
-async function buildPlatformInstallPlan(platform, scope, jsonMode) {
+async function buildPlatformInstallPlan(platform, scope, jsonMode, cliVersion) {
   if (platform === 'codex') return await buildCodexInstallPlan(jsonMode)
   if (platform === 'claude') return await buildClaudeInstallPlan(scope, jsonMode)
   if (platform === 'gemini') return await buildGeminiInstallPlan(jsonMode)
-  return await buildOpenClawInstallPlan(scope, jsonMode)
+  return await buildOpenClawInstallPlan(scope, jsonMode, cliVersion)
 }
 
 function extractTomlSection(content, sectionName) {
@@ -1187,12 +1254,19 @@ async function inspectPlatformManaged(platform, scope) {
     }
   }
   const skill = await inspectOpenClawSkill(scope)
+  const update = await inspectOpenClawAutoUpdate({
+    scope,
+    ...(scope === 'workspace' ? { cwd: process.cwd() } : {}),
+  })
   return {
     installed: skill.installed,
     version: skill.version,
     source: skill.origin,
     officialSource: skill.officialSource,
-    autoUpdate: 'throttled_on_invocation',
+    autoUpdate: update.enrollment === 'enrolled'
+      ? 'confirmation_required_on_invocation'
+      : update.enrollment,
+    autoUpdateState: update,
     installPath: skill.path,
   }
 }
@@ -1216,7 +1290,7 @@ async function getSkillStatus(platform) {
   }
 }
 
-async function installSkill(options) {
+async function installSkill(options, cliVersion) {
   validatePlatform(options.platform)
   const scope = options.scope || getDefaultScope(options.platform)
   validateScope(options.platform, scope)
@@ -1224,7 +1298,7 @@ async function installSkill(options) {
 
   // All source-conflict and manager checks happen before the legacy directory
   // is moved or any provider configuration is mutated.
-  const execute = await buildPlatformInstallPlan(options.platform, scope, options.json)
+  const execute = await buildPlatformInstallPlan(options.platform, scope, options.json, cliVersion)
   const legacy = await inspectLegacy(options.platform, scope)
   let migration = null
   try {
@@ -1290,6 +1364,7 @@ function printStatusResult(result) {
 
 export async function handleSkillCommand(argv, cliVersion) {
   const wantsJson = argv.includes('--json')
+  const isolatesStdout = argv[1] === 'update' || argv[1] === '_openclaw-check'
   try {
     const args = parseSkillCommandArgs(argv)
     if (args.help) {
@@ -1299,13 +1374,32 @@ export async function handleSkillCommand(argv, cliVersion) {
     if (args.platform) validatePlatform(args.platform)
 
     if (args.action === 'install') {
-      const result = await installSkill(args)
+      const result = await installSkill(args, cliVersion)
       const output = { cliVersion, ...result }
       if (args.json) process.stdout.write(`${JSON.stringify(output)}\n`)
       else printInstallResult(output)
       return
     }
 
+    if (args.action === '_openclaw-check') {
+      const scope = args.scope
+      validateScope('openclaw', scope)
+      const result = await runOpenClawInvocationCheck({ scope })
+      if (result.message) process.stderr.write(`${result.message}\n`)
+      return result.exitCode
+    }
+
+    if (args.action === 'update') {
+      const scope = args.scope || getDefaultScope('openclaw')
+      validateScope('openclaw', scope)
+      const result = await runOpenClawConfirmedUpdate({
+        scope,
+        confirmation: args.confirmLatest,
+      })
+      if (result.message) process.stderr.write(`${result.message}\n`)
+      return result.exitCode
+    }
+
     const platforms = args.platform ? [args.platform] : SKILL_PLATFORMS
     const result = {
       command: 'skill.status',
@@ -1318,13 +1412,14 @@ export async function handleSkillCommand(argv, cliVersion) {
     }
     if (args.json) process.stdout.write(`${JSON.stringify(result)}\n`)
     else printStatusResult(result)
+    return 0
   } catch (error) {
     const payload = {
       command: 'skill.error',
       error: error?.code || 'skill_error',
       message: error instanceof Error ? error.message : String(error),
     }
-    if (wantsJson) process.stdout.write(`${JSON.stringify(payload)}\n`)
+    if (wantsJson && !isolatesStdout) process.stdout.write(`${JSON.stringify(payload)}\n`)
     else process.stderr.write(`Deyo Skill 操作失败：${payload.message}\n`)
     throw new SkillCommandReportedError(1)
   }