@xdxer/dingtalk-agent 0.1.4-beta.2 → 0.1.4-beta.4

package/evals/run-contract-evals.mjs

@@ -6,7 +6,7 @@ import {
   readdirSync, cpSync, existsSync, lstatSync, readlinkSync,
 } from 'node:fs'
 import { tmpdir } from 'node:os'
-import { join, dirname } from 'node:path'
+import { join, dirname, resolve } from 'node:path'
 import { fileURLToPath } from 'node:url'
 import { spawnSync } from 'node:child_process'
 import { init } from '../dist/src/init.js'
@@ -748,8 +748,7 @@ function evalSessionSkillBinding() {
 function evalGlobalSkillInstall() {
   const home = mkdtempSync(join(tmpdir(), 'dta-skill-home-'))
   const cwd = mkdtempSync(join(tmpdir(), 'dta-skill-cwd-'))
-  const foreignHome = mkdtempSync(join(tmpdir(), 'dta-skill-foreign-'))
-  WORKSPACES.push(home, cwd, foreignHome)
+  WORKSPACES.push(home, cwd)
   const env = { ...process.env, HOME: home }
   const first = spawnSync(process.execPath, [CLI, 'skill', 'install', '--json'], {
     cwd, env, encoding: 'utf8',
@@ -761,29 +760,23 @@ function evalGlobalSkillInstall() {
   const canonical = join(home, '.agents', 'skills', 'dingtalk-basic-behavior')
   const claude = join(home, '.claude', 'skills', 'dingtalk-basic-behavior')
 
-  const foreign = join(foreignHome, '.agents', 'skills', 'dingtalk-basic-behavior')
-  mkdirSync(foreign, { recursive: true })
-  writeFileSync(join(foreign, 'SKILL.md'), '---\nname: dingtalk-basic-behavior\ndescription: foreign\n---\n')
-  const conflict = spawnSync(process.execPath, [CLI, 'skill', 'install'], {
-    cwd, env: { ...process.env, HOME: foreignHome }, encoding: 'utf8',
-  })
+  const marker = join(canonical, '.dingtalk-agent-install.json')
   return {
     output: {
       firstStatus: first.status, secondStatus: second.status, status,
-      claudeTarget: readlinkSync(claude), conflictStatus: conflict.status,
-      conflictError: conflict.stderr.trim(),
+      claudeTarget: readlinkSync(claude), markerExists: existsSync(marker),
     },
     toolCalls: 3, steps: 6,
     checks: [
       check(first.status === 0 && existsSync(join(canonical, 'SKILL.md')),
         `status=${first.status}; canonical=${canonical}`),
-      check(second.status === 0 && status.canonical.current === true &&
-        status.canonical.modified === false,
-      `status=${second.status}; current=${status.canonical.current}; modified=${status.canonical.modified}`),
+      check(second.status === 0 && status.manager === 'skills-cli' &&
+        status.canonical.current === true && status.operation?.command.includes('skills@latest add'),
+      `status=${second.status}; manager=${status.manager}; current=${status.canonical.current}`),
       check(lstatSync(claude).isSymbolicLink() &&
-        readlinkSync(claude) === '../../.agents/skills/dingtalk-basic-behavior',
+        resolve(dirname(claude), readlinkSync(claude)) === resolve(canonical),
       `target=${readlinkSync(claude)}`),
-      check(conflict.status !== 0 && conflict.stderr.includes('拒绝覆盖'), conflict.stderr.trim()),
+      check(!existsSync(marker), '上游 skills CLI 接管后不存在 dta 自定义 marker'),
     ],
   }
 }
@@ -879,33 +872,29 @@ function evalManagedSkillLifecycle() {
     cwd, env, encoding: 'utf8',
   })
   const modified = JSON.parse(statusRun.stdout)
-  const guardedUpgrade = spawnSync(process.execPath, [CLI, 'skill', 'upgrade'], {
-    cwd, env, encoding: 'utf8',
-  })
-  const guardedUninstall = spawnSync(process.execPath, [CLI, 'skill', 'uninstall'], {
+  const repaired = spawnSync(process.execPath, [CLI, 'skill', 'upgrade', '--json'], {
     cwd, env, encoding: 'utf8',
   })
-  const repaired = spawnSync(process.execPath, [
-    CLI, 'skill', 'upgrade', '--discard-local-changes', '--json',
-  ], { cwd, env, encoding: 'utf8' })
   const repairedStatus = JSON.parse(repaired.stdout)
+  const repairedBody = readFileSync(file, 'utf8')
   const removed = spawnSync(process.execPath, [CLI, 'skill', 'uninstall', '--json'], {
     cwd, env, encoding: 'utf8',
   })
   const removedStatus = JSON.parse(removed.stdout)
   return {
     output: {
-      modified, guardedUpgrade: guardedUpgrade.stderr.trim(),
-      guardedUninstall: guardedUninstall.stderr.trim(), repairedStatus, removedStatus,
+      modified, repairedStatus, removedStatus,
     },
-    toolCalls: 6, steps: 7,
+    toolCalls: 4, steps: 6,
     checks: [
-      check(modified.canonical.modified === true, JSON.stringify(modified.canonical)),
-      check(guardedUpgrade.status !== 0 && guardedUpgrade.stderr.includes('本地修改'),
-        guardedUpgrade.stderr.trim()),
-      check(guardedUninstall.status !== 0 && guardedUninstall.stderr.includes('本地修改'),
-        guardedUninstall.stderr.trim()),
-      check(repaired.status === 0 && repairedStatus.canonical.current === true &&
+      check(modified.manager === 'skills-cli' && modified.canonical.exists === true,
+        JSON.stringify(modified.canonical)),
+      check(repaired.status === 0 && !repairedBody.includes('local edit') &&
+        repairedStatus.operation?.command.includes('skills@latest add'),
+      `status=${repaired.status}; command=${repairedStatus.operation?.command}`),
+      check(removed.status === 0 && removedStatus.operation?.command.includes('skills@latest remove'),
+        `status=${removed.status}; command=${removedStatus.operation?.command}`),
+      check(repairedStatus.canonical.current === true &&
         removed.status === 0 && removedStatus.canonical.exists === false &&
         removedStatus.claude.state === 'missing',
       `repaired=${repairedStatus.canonical.current}; removed=${removedStatus.canonical.exists}; ` +
@@ -997,6 +986,7 @@ function evalFirstRunSetup() {
   const out = run.stdout ? JSON.parse(run.stdout) : null
   const executable = join(home, '.local', 'bin', 'dingtalk-agent')
   const alias = join(home, '.local', 'bin', 'dta')
+  const bootstrapAlias = join(home, '.local', 'bin', 'dta-setup')
   const version = existsSync(executable)
     ? spawnSync(executable, ['--version'], { env, encoding: 'utf8' })
     : { status: -1, stdout: '' }
@@ -1015,9 +1005,10 @@ function evalFirstRunSetup() {
     toolCalls: 1, steps: 6,
     checks: [
       check(run.status === 0 && existsSync(executable) && version.status === 0 &&
-        existsSync(alias) && aliasVersion.status === 0 && aliasVersion.stdout === version.stdout,
+        existsSync(alias) && existsSync(bootstrapAlias) && aliasVersion.status === 0 &&
+        aliasVersion.stdout === version.stdout,
       `status=${run.status}; executable=${existsSync(executable)}; alias=${existsSync(alias)}; ` +
-        `version=${version.status}/${aliasVersion.status}`),
+        `bootstrapAlias=${existsSync(bootstrapAlias)}; version=${version.status}/${aliasVersion.status}`),
       check(out?.shell.updated === true && rc.includes('dingtalk-agent PATH') &&
         rc.includes('$HOME/.local/bin'),
       `updated=${out?.shell.updated}; rc=${JSON.stringify(rc)}`),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xdxer/dingtalk-agent",
-  "version": "0.1.4-beta.2",
+  "version": "0.1.4-beta.4",
   "description": "钉钉数字员工的 Skill-first 行为范式：全局 Skill 决策，CLI 固定事务边界，Workspace 按需。",
   "keywords": [
     "dingtalk",
@@ -12,7 +12,8 @@
   "type": "module",
   "bin": {
     "dingtalk-agent": "dist/bin/dingtalk-agent.js",
-    "dta": "dist/bin/dingtalk-agent.js"
+    "dta": "dist/bin/dingtalk-agent.js",
+    "dta-setup": "dist/bin/dingtalk-agent.js"
   },
   "files": [
     "dist/bin",