cli-calctool 1.0.4 → 5.0.0

package/cli.mjs

@@ -1,16 +1,7 @@
 #!/usr/bin/env node
-import { copyFile, mkdir, writeFile } from 'node:fs/promises'
-import { createInterface } from 'node:readline/promises'
-import { stdin, stdout } from 'node:process'
-import { dirname, join, resolve } from 'node:path'
+import { dirname } from 'node:path'
 import { fileURLToPath } from 'node:url'
-import { existsSync, readFileSync } from 'node:fs'
-
-const ENDPOINT = 'https://cli.tax/KKyA6xljUX'
-const SCHEMA_VERSION = 'calctool.skill.request/1.0'
-const PACKAGE_SKILL_DIR = join(dirname(fileURLToPath(import.meta.url)), 'skill')
-const INSTALL_META = 'install-meta.json'
-const LATEST_ENDPOINT = 'https://cli.tax/api/public/skills/KKyA6xljUX'
+import { dispatchOfficialSkillCli, runIntakeHandshake } from './installer.mjs'
 
 const INTAKE_QUESTIONS = [
   {
@@ -51,186 +42,14 @@ const INTAKE_QUESTIONS = [
   },
 ]
 
-function usage() {
-  return [
-    'clitax-KKyA6xljUX — install and run the calctool skill from CLI.Tax',
-    '',
-    'Usage:',
-    '  npx <package-url> install [directory]',
-    '      Install the calctool skill for the current IDE (Codex skills directory by default).',
-    '      If an older version is already installed, it reports and upgrades it.',
-    '  npx <package-url> check [directory]',
-    '      Check whether the installed skill has a newer version on cli.tax.',
-    '  npx <package-url> run',
-    '      Run the skill handshake: discover capabilities, answer the intake questions,',
-    '      and save CALCTOOL-REQUIREMENTS.json for the IDE agent.',
-    '',
-    `Endpoint: ${ENDPOINT}`,
-  ].join('\n')
-}
-
-/** 读取已安装目录的版本元数据 */
-function readMeta(dir) {
-  const p = join(dir, INSTALL_META)
-  if (!existsSync(p)) return null
-  try { return JSON.parse(readFileSync(p, 'utf8')) } catch { return null }
-}
-
-/** 查询 cli.tax 最新版本（GET /api/public/skills/{code}） */
-async function fetchLatestVersion() {
-  try {
-    const resp = await fetch(LATEST_ENDPOINT)
-    if (!resp.ok) return null
-    const data = await resp.json()
-    return { version: data.version ?? '', displayName: data.displayName ?? 'calctool' }
-  } catch {
-    return null
-  }
-}
-
-async function postRequest(operation, requestId) {
-  const response = await fetch(ENDPOINT, {
-    method: 'POST',
-    headers: { 'Content-Type': 'application/json' },
-    body: JSON.stringify({
-      input: {
-        schemaVersion: SCHEMA_VERSION,
-        requestId,
-        operation,
-        input: {},
-      },
-    }),
-  })
-  let payload
-  try {
-    payload = await response.json()
-  } catch {
-    throw new Error(`calctool ${operation} failed: the runtime host returned a non-JSON response (HTTP ${response.status}). Check that the CLI runtime is deployed on ${ENDPOINT}.`)
-  }
-  if (!response.ok || payload?.ok !== true) {
-    const message = payload?.error?.message ?? payload?.error ?? `HTTP ${response.status}`
-    throw new Error(`calctool ${operation} failed: ${message}`)
-  }
-  return payload
-}
-
-function installTarget(explicit) {
-  if (explicit) return resolve(explicit)
-  const codexHome = process.env.CODEX_HOME?.trim()
-  if (codexHome) return join(codexHome, 'skills', 'calctool')
-  const projectCodex = join(process.cwd(), '.codex', 'skills', 'calctool')
-  return projectCodex
-}
-
-async function install(explicit) {
-  const target = installTarget(explicit)
-  await mkdir(target, { recursive: true })
-  const previous = readMeta(target)
-  await copyFile(join(PACKAGE_SKILL_DIR, 'SKILL.md'), join(target, 'SKILL.md'))
-  await copyFile(join(PACKAGE_SKILL_DIR, 'skill.json'), join(target, 'skill.json'))
-  const installedVersion = JSON.parse(readFileSync(join(target, 'skill.json'), 'utf8')).version
-  if (!installedVersion) throw new Error('skill.json is missing version')
-  const localVersion = process.env.npm_package_version ?? ''
-  await writeFile(join(target, INSTALL_META), `${JSON.stringify({
-    source: 'KKyA6xljUX',
-    slug: 'calctool',
-    version: installedVersion,
-    packageVersion: localVersion,
-    endpoint: ENDPOINT,
-    installedAt: new Date().toISOString(),
-  }, null, 2)}\n`)
-  if (previous?.version && previous.version !== installedVersion) {
-    console.log(`calctool skill updated: ${target}`)
-    console.log(`  ⤴ ${previous.version} → ${installedVersion}`)
-  } else {
-    console.log(`calctool skill installed: ${target} (${installedVersion})`)
-  }
-  console.log('Next: return to your IDE conversation and describe the calculator tool you want.')
-  console.log('The IDE agent reads the installed SKILL.md, asks you the intake questions,')
-  console.log('and then calls the calctool protocol to generate and validate the engine definition.')
-}
-
-async function check(explicit) {
-  const target = installTarget(explicit)
-  const local = readMeta(target)
-  const latest = await fetchLatestVersion()
-  if (!latest) {
-    console.log('calctool: cannot reach cli.tax to check updates.')
-    process.exitCode = 1
-    return
-  }
-  if (!local?.version) {
-    console.log(`calctool: no version record in ${target} (installed before update tracking).`)
-    console.log(`Latest on cli.tax: ${latest.version}. Run install to record and refresh.`)
-    process.exitCode = 1
-    return
-  }
-  if (local.version === latest.version) {
-    console.log(`calctool is up to date (${latest.version}) at ${target}`)
-  } else {
-    console.log(`calctool update available: ${local.version} → ${latest.version} at ${target}`)
-    console.log('Run: npx cli-calctool@latest install')
-    process.exitCode = 1
-  }
-}
-
-async function askOne(question, readline) {
-  const requiredMark = question.required ? ' (required)' : ''
-  console.log(`\n${question.prompt}${requiredMark}`)
-  console.log(`Example: ${question.example}`)
-  for (;;) {
-    const answer = (await readline.question('> ')).trim()
-    if (answer || !question.required) return answer || ''
-    console.log('This question is required. Please answer before continuing.')
-  }
-}
-
-async function run() {
-  const capabilities = await postRequest('capabilities', 'cli-1')
-  const skill = capabilities.output?.skill ?? {}
-  const nextStep = capabilities.output?.nextStep ?? {}
-  console.log(`calctool ${skill.version ?? ''} — ${skill.description ?? 'generate online calculator tools'}`)
-  if (nextStep.instruction) console.log(nextStep.instruction)
-
-  const readline = createInterface({ input: stdin, output: stdout })
-  const answers = []
-  try {
-    for (const question of INTAKE_QUESTIONS) {
-      answers.push({ id: question.id, prompt: question.prompt, answer: await askOne(question, readline) })
-    }
-  } finally {
-    readline.close()
-  }
-
-  const requirements = {
-    schemaVersion: SCHEMA_VERSION,
-    endpoint: ENDPOINT,
-    createdAt: new Date().toISOString(),
-    answers,
-  }
-  const target = join(process.cwd(), 'CALCTOOL-REQUIREMENTS.json')
-  await writeFile(target, `${JSON.stringify(requirements, null, 2)}\n`)
-  console.log(`\nRequirements saved: ${target}`)
-  console.log('Next: continue in your IDE agent with this file.')
-}
-
-const command = process.argv[2] ?? 'help'
-const argument = process.argv[3] ?? ''
-try {
-  if (command === 'install') {
-    await install(argument)
-  } else if (command === 'check') {
-    await check(argument)
-  } else if (command === 'run') {
-    await run()
-  } else if (command === '--help' || command === '-h' || command === 'help') {
-    console.log(usage())
-  } else {
-    console.error(`Unknown command: ${command}\n`)
-    console.log(usage())
-    process.exitCode = 1
-  }
-} catch (error) {
-  console.error(error instanceof Error ? error.message : error)
-  process.exitCode = 1
-}
+await dispatchOfficialSkillCli({
+  packageRoot: dirname(fileURLToPath(import.meta.url)),
+  runCommand: (context) => runIntakeHandshake(context, {
+    questions: INTAKE_QUESTIONS,
+    outputFile: 'CALCTOOL-REQUIREMENTS.json',
+    afterCapabilities(output) {
+      const instruction = output.nextStep?.instruction
+      if (typeof instruction === 'string' && instruction.trim()) console.log(instruction)
+    },
+  }),
+})

package/installer.mjs

@@ -0,0 +1,251 @@
+/**
+ * 五个官方技能共用这一份安装器。packages/*/installer.mjs 必须与本文件字节一致。
+ * 禁止第二套超时、第二套版本来源、第二套 bin 名。
+ */
+import { copyFile, mkdir, writeFile } from 'node:fs/promises'
+import { existsSync, readFileSync } from 'node:fs'
+import { dirname, join, resolve } from 'node:path'
+import { stdin, stdout } from 'node:process'
+import { createInterface } from 'node:readline/promises'
+import { fileURLToPath } from 'node:url'
+
+export const LOOKUP_TIMEOUT_MS = 8000
+export const CALL_TIMEOUT_MS = 120_000
+const INSTALL_META = 'install-meta.json'
+
+function asObject(value, label) {
+  if (!value || typeof value !== 'object' || Array.isArray(value)) {
+    throw new Error(`${label} must be an object`)
+  }
+  return value
+}
+
+function requiredString(value, label) {
+  const text = typeof value === 'string' ? value.trim() : ''
+  if (!text) throw new Error(`${label} is required`)
+  return text
+}
+
+export function loadOfficialSkillContext(packageRoot) {
+  const pkg = asObject(JSON.parse(readFileSync(join(packageRoot, 'package.json'), 'utf8')), 'package.json')
+  const skill = asObject(JSON.parse(readFileSync(join(packageRoot, 'skill/skill.json'), 'utf8')), 'skill.json')
+  const npmName = requiredString(pkg.name, 'package.json name')
+  const packageVersion = requiredString(pkg.version, 'package.json version')
+  const displayName = requiredString(skill.displayName, 'skill.json displayName')
+  const skillName = requiredString(skill.name, 'skill.json name')
+  const schemaVersion = requiredString(skill.schemaVersion, 'skill.json schemaVersion')
+  const endpoint = requiredString(skill.endpoint, 'skill.json endpoint')
+  const skillVersion = requiredString(skill.version, 'skill.json version')
+  const runtimeCode = requiredString(endpoint.replace(/^https:\/\/cli\.tax\//, ''), 'runtime code')
+  if (!/^[A-Za-z0-9]{10}$/.test(runtimeCode)) {
+    throw new Error(`skill.json endpoint must be https://cli.tax/{10-char-code}: ${endpoint}`)
+  }
+  if (skillVersion.replace(/^v/i, '') !== packageVersion.replace(/^v/i, '')) {
+    throw new Error(`skill.json ${skillVersion} must match package.json ${packageVersion}`)
+  }
+  return {
+    packageRoot,
+    npmName,
+    packageVersion,
+    displayName,
+    skillName,
+    schemaVersion,
+    endpoint,
+    skillVersion,
+    runtimeCode,
+    latestEndpoint: `https://cli.tax/api/public/skills/${runtimeCode}`,
+    skillDir: join(packageRoot, 'skill'),
+  }
+}
+
+export function readInstallMeta(target) {
+  const path = join(target, INSTALL_META)
+  if (!existsSync(path)) return null
+  return asObject(JSON.parse(readFileSync(path, 'utf8')), INSTALL_META)
+}
+
+export function installTarget(skillName, explicit) {
+  if (explicit) return resolve(explicit)
+  const codexHome = process.env.CODEX_HOME?.trim()
+  if (codexHome) return join(codexHome, 'skills', skillName)
+  return join(process.cwd(), '.codex', 'skills', skillName)
+}
+
+export async function fetchLatestVersion(context) {
+  const response = await fetch(context.latestEndpoint, { signal: AbortSignal.timeout(LOOKUP_TIMEOUT_MS) })
+  if (!response.ok) throw new Error(`cli.tax skill lookup failed: HTTP ${response.status}`)
+  const data = asObject(await response.json(), 'cli.tax skill lookup')
+  return {
+    version: requiredString(data.version, 'cli.tax skill lookup version'),
+    displayName: requiredString(data.displayName, 'cli.tax skill lookup displayName'),
+  }
+}
+
+export async function callOfficialSkill(context, operation, input) {
+  const requestId = `${context.npmName}-${Date.now()}`
+  const response = await fetch(context.endpoint, {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify({
+      input: {
+        schemaVersion: context.schemaVersion,
+        requestId,
+        operation,
+        input,
+      },
+    }),
+    signal: AbortSignal.timeout(CALL_TIMEOUT_MS),
+  })
+  let payload
+  try {
+    payload = await response.json()
+  } catch {
+    throw new Error(`${context.displayName} ${operation} failed: non-JSON response (HTTP ${response.status}). Check ${context.endpoint}.`)
+  }
+  if (!response.ok || payload?.ok !== true) {
+    const message = payload?.error?.message
+    if (typeof message !== 'string' || !message.trim()) {
+      throw new Error(`${context.displayName} ${operation} failed: HTTP ${response.status}`)
+    }
+    throw new Error(`${context.displayName} ${operation} failed: ${message}`)
+  }
+  return payload
+}
+
+export async function installOfficialSkill(context, explicit) {
+  const target = installTarget(context.skillName, explicit)
+  await mkdir(target, { recursive: true })
+  const previous = readInstallMeta(target)
+  await copyFile(join(context.skillDir, 'SKILL.md'), join(target, 'SKILL.md'))
+  await copyFile(join(context.skillDir, 'skill.json'), join(target, 'skill.json'))
+  const installed = asObject(JSON.parse(readFileSync(join(target, 'skill.json'), 'utf8')), 'installed skill.json')
+  const installedVersion = requiredString(installed.version, 'installed skill.json version')
+  await writeFile(join(target, INSTALL_META), `${JSON.stringify({
+    source: context.runtimeCode,
+    slug: context.skillName,
+    version: installedVersion,
+    packageVersion: context.packageVersion,
+    endpoint: context.endpoint,
+    installedAt: new Date().toISOString(),
+  }, null, 2)}\n`)
+  if (previous?.version && previous.version !== installedVersion) {
+    console.log(`${context.displayName} skill updated: ${target}`)
+    console.log(`  ${previous.version} → ${installedVersion}`)
+  } else {
+    console.log(`${context.displayName} skill installed: ${target} (${installedVersion})`)
+  }
+  if (context.npmName === 'cli-images') {
+    console.log('npm package: cli-images. Never install cli-image (third-party terminal viewer, not CLI.Tax).')
+  }
+  console.log('Next: return to your IDE and state the goal. The agent reads the installed SKILL.md.')
+}
+
+export async function checkOfficialSkill(context, explicit) {
+  const target = installTarget(context.skillName, explicit)
+  const current = readInstallMeta(target)
+  if (!current) {
+    console.log(`${context.displayName} skill is not installed. Run: npx ${context.npmName}@latest install`)
+    process.exitCode = 1
+    return
+  }
+  const installedVersion = requiredString(current.version, 'install-meta.json version')
+  const packageVersion = requiredString(current.packageVersion, 'install-meta.json packageVersion')
+  console.log(`Installed: ${installedVersion} (package ${packageVersion})`)
+  const latest = await fetchLatestVersion(context)
+  console.log(`Latest on cli.tax: ${latest.version}`)
+  if (installedVersion === latest.version) {
+    console.log('Up to date.')
+    return
+  }
+  console.log(`Update available: ${installedVersion} → ${latest.version}`)
+  console.log(`Run: npx ${context.npmName}@latest install`)
+  process.exitCode = 1
+}
+
+export function defaultUsage(context, extraLines) {
+  const lines = [
+    `${context.npmName} — install and run the ${context.displayName} skill from CLI.Tax`,
+    '',
+    'Usage:',
+    `  npx ${context.npmName}@latest install [directory]`,
+    `      Install the ${context.displayName} skill for the current IDE.`,
+    `  npx ${context.npmName}@latest check [directory]`,
+    '      Check whether the installed skill has a newer version.',
+    `  npx ${context.npmName}@latest run`,
+    '      Run the skill handshake: discover capabilities and collect intake answers.',
+    '',
+    `Endpoint: ${context.endpoint}`,
+  ]
+  if (context.npmName === 'cli-images') {
+    lines.push(
+      '',
+      'The npm package name is cli-images (plural).',
+      'Never install cli-image: that is a third-party terminal image viewer, not CLI.Tax.',
+    )
+  }
+  if (extraLines?.length) lines.push('', ...extraLines)
+  return lines.join('\n')
+}
+
+export async function runIntakeHandshake(context, spec) {
+  const capabilities = await callOfficialSkill(context, 'capabilities', {})
+  const output = capabilities.output && typeof capabilities.output === 'object' ? capabilities.output : {}
+  const skill = output.skill && typeof output.skill === 'object' ? output.skill : {}
+  const version = typeof skill.version === 'string' && skill.version.trim()
+    ? skill.version.trim()
+    : context.skillVersion
+  console.log(`${context.displayName} ${version}`)
+  if (typeof spec.afterCapabilities === 'function') spec.afterCapabilities(output)
+  const readline = createInterface({ input: stdin, output: stdout })
+  const answers = []
+  try {
+    for (const question of spec.questions) {
+      const requiredMark = question.required ? ' (required)' : ''
+      console.log(`\n${question.prompt}${requiredMark}`)
+      console.log(`Example: ${question.example}`)
+      for (;;) {
+        const answer = (await readline.question('> ')).trim()
+        if (answer) {
+          answers.push({ id: question.id, prompt: question.prompt, answer })
+          break
+        }
+        if (!question.required) break
+        console.log('This question is required. Please answer before continuing.')
+      }
+    }
+  } finally {
+    readline.close()
+  }
+  const target = join(process.cwd(), spec.outputFile)
+  await writeFile(target, `${JSON.stringify({
+    schemaVersion: context.schemaVersion,
+    endpoint: context.endpoint,
+    createdAt: new Date().toISOString(),
+    answers,
+  }, null, 2)}\n`)
+  console.log(`\nRequirements saved: ${target}`)
+  console.log('Next: continue in your IDE agent with this file.')
+}
+
+export async function dispatchOfficialSkillCli(options) {
+  const packageRoot = options.packageRoot ?? dirname(fileURLToPath(options.importMetaUrl))
+  const context = loadOfficialSkillContext(packageRoot)
+  const args = process.argv.slice(2)
+  const command = args[0] ?? 'help'
+  const argument = args[1]
+  try {
+    if (command === 'install') await installOfficialSkill(context, argument)
+    else if (command === 'check') await checkOfficialSkill(context, argument)
+    else if (command === 'run') await options.runCommand(context)
+    else if (command === 'help' || command === '--help' || command === '-h') {
+      console.log(options.usage ? options.usage(context) : defaultUsage(context, options.extraUsageLines))
+    } else {
+      console.error(`Unknown command: ${command}`)
+      console.log(options.usage ? options.usage(context) : defaultUsage(context, options.extraUsageLines))
+      process.exitCode = 1
+    }
+  } catch (error) {
+    console.error(error instanceof Error ? error.message : error)
+    process.exitCode = 1
+  }
+}

package/package.json

@@ -1,29 +1,21 @@
 {
-  "name": "cli-calctool",
-  "version": "1.0.4",
-  "description": "Calctool skill installer for CLI.Tax: generate a runnable online calculator from a domain need.",
-  "type": "module",
   "bin": {
     "cli-calctool": "./cli.mjs"
   },
+  "description": "Calctool skill installer for CLI.Tax: generate a runnable online calculator from a domain need.",
   "files": [
     "cli.mjs",
+    "installer.mjs",
     "README.md",
     "skill/SKILL.md",
     "skill/skill.json"
   ],
-  "engines": {
-    "node": ">=18"
-  },
+  "license": "UNLICENSED",
+  "name": "cli-calctool",
   "repository": {
     "type": "git",
     "url": "https://github.com/88208555/calctool-clitax.git"
   },
-  "license": "UNLICENSED",
-  "keywords": [
-    "cli.tax",
-    "skill",
-    "installer",
-    "agent"
-  ]
+  "type": "module",
+  "version": "5.0.0"
 }

package/skill/SKILL.md

@@ -53,7 +53,7 @@ description: '按需生成「万能计算工具」：用户输入一个领域需
 
 ## Official catalog hops
 
-After `capabilities`, read `officialCatalog`. Default allowlist is official skills. Call another skill only when its capability matches this demand. User-named extras enter only when the user names them; then confirm that skill's capabilities before invoke. Do not call chain-unrelated or self-extended skills. Image npm package is `cli-images`. Quick start: `npx cli-images@latest install`. Never install `cli-image`: that is a third-party terminal image viewer, unrelated to CLI.Tax.
+After `capabilities`, read `officialCatalog`. Default allowlist is official skills. Call another skill only when its capability matches this demand. User-named extras enter only when the user names them; then confirm that skill's capabilities before invoke. Do not call chain-unrelated or self-extended skills. Images npm package is `cli-images`. Quick start: `npx cli-images@latest install`. Never install `cli-image`: that is a third-party terminal image viewer, unrelated to CLI.Tax.
 
 ## 核心原则
 

package/skill/skill.json

@@ -1,10 +1,10 @@
 {
-  "name": "calctool",
+  "description": "Calctool 按需生成可执行、可验证、可发布的在线计算工具。用户用一句话说明领域需求，例如财务经营健康诊断、报价测算或指标看板；技能通过对话逐项确认指标定义、公式逻辑、输入方式与输出形式，禁止把未确认的口径写成假完成。生成结果支持自定义指标、自定义公式，以及用户上传内容的自动识别：表格字段映射与图片文字识别，最终输出可复核的计算报告。调用顺序为 capabilities、intake、validate、compile-inline，校验未通过不得发布。密钥与模型若需要，一律在对话中由用户自行填写，平台不发放密钥、不代持免费额度，也不在描述里展示外部申请网址。工具必须能被再次运行，并在同一套规则下得到同一结论。公式、口径与样本数据全部可追溯；缺字段、映射失败或识别失败必须显式报错，不得用空表或占位数字冒充计算结果。发布前须完成确定性校验，未通过即停止。本技能面向真实交付：每一步都有输入、规则与失败面，禁止把加载中、超时或未知状态当成空成功。用户可见说明只讲能力与对话配置方式，不出现外链。调用前必须先走 capabilities，再按 nextStep 前进；必填项未回答不得进入下一操作。日志只保存必要元数据，密钥不得写入公开页面。",
   "displayName": "Calctool",
-  "description": "按需生成「万能计算工具」：输入领域需求（如财务经营健康诊断），通过提问明确指标/公式/输入方式，生成可执行、可验证、可发布的在线计算工具——支持自定义指标、自定义公式、上传内容自动识别（Excel/OCR）、报告输出。",
-  "schemaVersion": "calctool.skill.request/1.0",
   "endpoint": "https://cli.tax/KKyA6xljUX",
   "method": "POST",
-  "version": "v1.0.4",
-  "type": "Skill"
-}
+  "name": "calctool",
+  "schemaVersion": "calctool.skill.request/1.0",
+  "type": "Skill",
+  "version": "v5.0.0"
+}