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

package/dist/bin/dingtalk-agent.js

@@ -33,9 +33,10 @@ import { runStorageEvaluation } from '../src/storage-evals.js';
 import { runPersonalEventEvaluation } from '../src/personal-event-evals.js';
 import { doctor } from '../src/doctor.js';
 import { doctorDevelopmentWorkspace, inspectAgentProject, showDevelopmentWorkspace, } from '../src/development-workspace.js';
+import { buildScheduleShow, buildSchedulePlan } from '../src/schedule-plan.js';
 import { applyOpenCodeWorkspace, evalOpenCodeWorkspace, planOpenCodeWorkspace, runOpenCodeWorkspace, useOpenCodeWorkspace, } from '../src/opencode-provider.js';
-import { inspectMulticaWorkspace, listMulticaWorkspaceResources, planMulticaWorkspace, statusMulticaWorkspace, } from '../src/multica-provider.js';
-import { applyMulticaDeployment, listMulticaDeployments, planMulticaDeployment, runMulticaWorkspaceIssue, statusMulticaDeployment, } from '../src/multica-deploy.js';
+import { inspectMulticaWorkspace, listMulticaWorkspaceResources, planMulticaWorkspace, scaffoldMulticaWorkspace, statusMulticaWorkspace, } from '../src/multica-provider.js';
+import { applyMulticaDeployment, listMulticaDeployments, planMulticaDeployment, runMulticaWorkspaceIssue, statusMulticaDeployment, statusMulticaWorkspaceRun, } from '../src/multica-deploy.js';
 import { applyObservation, applyPromotion, listPromotions, planObservation, planPromotion, statusPromotion, } from '../src/promotion.js';
 import { setup } from '../src/setup.js';
 import { upgradeAgent } from '../src/upgrade.js';
@@ -65,6 +66,7 @@ dta —— 给 Agent 安装钉钉员工的基础行为和工作环境
   dta bootstrap --json  为当前 Agent 会话加载工作区
   dta agent enhance / audit  安全增强已有仓库，再审计定义、存储与 Skill 真加载
   dta info / dta workspace doctor <name>  查看 Project 并只读诊断 Workspace
+  dta schedule show / plan --workspace <name>  查看声明的常驻节律并生成 provider 部署计划
   dta agent-platform use <platform> → dta deploy / dta promote  声明平台归属并装平台技能包，再受控部署与晋级
 
 维护环境：
@@ -155,7 +157,7 @@ const DEPLOY_HELP = `
 dingtalk-agent Multica 受控部署
 
   deploy --workspace <name> --dry-run [--json]
-  deploy --workspace <name> --plan-id <id> --yes [--no-wait] [--json]
+  deploy --workspace <name> --plan-id <id> --yes [--wait | --no-wait] [--json]
   deploy --workspace <name> --status [--operation-id <id>] [--json]
   deploy --workspace <name> --status --operation-id <id> --execute --yes [--json]
   deploy --workspace <name> --list [--json]
@@ -163,6 +165,9 @@ dingtalk-agent Multica 受控部署
   deploy --workspace <name> --retire --plan-id <id> --yes [--json]
 
 dry-run 不启动 Multica。apply/retire 必须携带当前 planId；scope 或源码漂移会在写入前拒绝。
+apply 默认在同一条命令内等 load smoke 到 ~30 秒；云端 runtime 冷启常超 30 秒会返回 verifying，
+再用 --status --operation-id 独立 reconcile。加 --wait 把等待预算放宽到 4 分钟，一条命令直接到 ready；
+--no-wait 立即返回 verifying（异步/CI）。--smoke-timeout <ms> 精确覆盖等待预算（上限 5 分钟）。
 status 默认只验本地脱敏 operation/Receipt；--execute --yes 才做远端独立回读。
 deploy 只管理 Agent、完整 Skill tree、assignment 和 load smoke，不创建机器人、Webhook、Autopilot 或定时 Trigger。
 `;
@@ -245,6 +250,7 @@ async function main() {
                 workspace: { type: 'string' }, json: { type: 'boolean' },
                 'dry-run': { type: 'boolean' }, yes: { type: 'boolean' },
                 'plan-id': { type: 'string' }, 'no-wait': { type: 'boolean' },
+                wait: { type: 'boolean' },
                 status: { type: 'boolean' }, list: { type: 'boolean' },
                 execute: { type: 'boolean' }, 'operation-id': { type: 'string' },
                 timeout: { type: 'string' }, 'smoke-timeout': { type: 'string' },
@@ -265,16 +271,18 @@ async function main() {
         const timeoutMs = parseOptionalTimeout(o.timeout, '--timeout');
         const smokeTimeoutMs = parseOptionalTimeout(o['smoke-timeout'], '--smoke-timeout');
         let out;
+        if (o.wait && o['no-wait'])
+            fail('deploy --wait 与 --no-wait 互斥');
         if (o.list) {
-            if (o.execute || o['operation-id'] || o.retire || o['plan-id'] || o['no-wait'] ||
+            if (o.execute || o['operation-id'] || o.retire || o['plan-id'] || o['no-wait'] || o.wait ||
                 o.timeout || o['smoke-timeout']) {
                 fail('deploy --list 只接受 --workspace 和 --json');
             }
             out = listMulticaDeployments(PROJECT_START, o.workspace, PACKAGE_JSON.version);
         }
         else if (o.status) {
-            if (o.retire || o['plan-id'] || o['no-wait'] || o['dry-run'] || o['smoke-timeout']) {
-                fail('deploy --status 不接受 retire/plan-id/no-wait/dry-run/smoke-timeout');
+            if (o.retire || o['plan-id'] || o['no-wait'] || o.wait || o['dry-run'] || o['smoke-timeout']) {
+                fail('deploy --status 不接受 retire/plan-id/no-wait/wait/dry-run/smoke-timeout');
             }
             if (Boolean(o.execute) !== Boolean(o.yes)) {
                 fail('deploy --status 远端 reconcile 必须同时传 --execute --yes');
@@ -285,9 +293,9 @@ async function main() {
             });
         }
         else if (o['dry-run']) {
-            if (o.execute || o['operation-id'] || o['plan-id'] || o['no-wait'] ||
+            if (o.execute || o['operation-id'] || o['plan-id'] || o['no-wait'] || o.wait ||
                 o.timeout || o['smoke-timeout']) {
-                fail('deploy --dry-run 不接受 execute/operation-id/plan-id/no-wait/timeout/smoke-timeout');
+                fail('deploy --dry-run 不接受 execute/operation-id/plan-id/no-wait/wait/timeout/smoke-timeout');
             }
             out = planMulticaDeployment(PROJECT_START, o.workspace, {
                 action: o.retire ? 'retire' : 'apply', cliVersion: PACKAGE_JSON.version,
@@ -297,12 +305,16 @@ async function main() {
             if (o.execute || o['operation-id'] || o.status || o.list || o['dry-run']) {
                 fail('deploy apply 不接受 execute/operation-id/status/list/dry-run');
             }
-            if (o.retire && (o['no-wait'] || o['smoke-timeout'])) {
-                fail('deploy --retire 不接受 no-wait/smoke-timeout');
+            if (o.retire && (o['no-wait'] || o.wait || o['smoke-timeout'])) {
+                fail('deploy --retire 不接受 no-wait/wait/smoke-timeout');
             }
+            // --wait widens the in-band smoke-wait budget so one command reaches ready across a
+            // cold-start runtime; an explicit --smoke-timeout still wins. Default stays ~30s.
+            const effectiveSmokeTimeoutMs = smokeTimeoutMs !== undefined
+                ? smokeTimeoutMs : o.wait ? 240_000 : undefined;
             out = applyMulticaDeployment(PROJECT_START, o.workspace, {
                 yes: o.yes, planId: o['plan-id'], noWait: o['no-wait'],
-                timeoutMs, smokeTimeoutMs, cliVersion: PACKAGE_JSON.version,
+                timeoutMs, smokeTimeoutMs: effectiveSmokeTimeoutMs, cliVersion: PACKAGE_JSON.version,
             }, o.retire ? 'retire' : 'apply');
         }
         if (o.json)
@@ -413,6 +425,65 @@ async function main() {
             printProjectInfo(out);
         return;
     }
+    if (cmd === 'schedule') {
+        const sub = argv[1];
+        const { values: o, positionals } = parseArgs({
+            args: argv.slice(2), allowPositionals: true,
+            options: { json: { type: 'boolean' }, workspace: { type: 'string' } },
+        });
+        if (sub === 'show') {
+            const out = buildScheduleShow(PROJECT_START, PACKAGE_JSON.version);
+            if (o.json) {
+                console.log(JSON.stringify(out, null, 2));
+                return;
+            }
+            if (out.count === 0) {
+                console.log('本 Project 未声明任何常驻节律（schedules）。');
+                return;
+            }
+            console.log(`声明的常驻节律（internalized cron） · ${out.count} 条`);
+            for (const s of out.schedules) {
+                console.log(`\n  ${s.name}  ${s.cron}  ${s.timezone}  [${s.mode}]`);
+                if (s.wake)
+                    console.log(`    唤醒 ${s.wake}`);
+                if (s.completion)
+                    console.log(`    ②判据 ${s.completion}`);
+            }
+            if (!out.minutesDistinct) {
+                console.log(`\n⚠️ 分钟位冲突: ${out.collidingMinutes.join(', ')} —— 外发类同分钟并发会重复送，请错开`);
+                process.exitCode = 2;
+            }
+            else {
+                console.log('\n✓ 各节律分钟位互不相同（外发防重复的静态前提满足）');
+            }
+            return;
+        }
+        if (sub === 'plan') {
+            const workspaceName = o.workspace || positionals[0];
+            if (!workspaceName)
+                fail('schedule plan 需要 --workspace <name>');
+            const info = inspectAgentProject(PROJECT_START, PACKAGE_JSON.version);
+            const plan = buildSchedulePlan(info, workspaceName);
+            if (o.json) {
+                console.log(JSON.stringify(plan, null, 2));
+                return;
+            }
+            console.log(`schedule 部署计划 · workspace=${plan.workspace} · provider=${plan.provider}`);
+            if (!plan.supported) {
+                console.log(`\n✗ 不支持: ${plan.reason}`);
+                console.log(`  ${plan.reconcile}`);
+                process.exitCode = 2;
+                return;
+            }
+            console.log(`  ${plan.count} 条声明 → provider ops:\n`);
+            for (const s of plan.schedules)
+                console.log(`  # ${s.name}\n  ${s.applyCommand}\n`);
+            console.log(`执行: ${plan.reconcile}`);
+            return;
+        }
+        fail(`可用: dta schedule show | plan --workspace <name>${suggest(sub || '', ['show', 'plan'], 'dta schedule')}`);
+        return;
+    }
     if (cmd === 'workspace') {
         const { values: o, positionals } = parseArgs({
             args: argv.slice(2), allowPositionals: true,
@@ -423,6 +494,8 @@ async function main() {
                 cases: { type: 'string' }, lanes: { type: 'string' }, runs: { type: 'string' },
                 out: { type: 'string' }, timeout: { type: 'string' },
                 'previous-skill': { type: 'string' },
+                status: { type: 'boolean' }, 'run-id': { type: 'string' },
+                provider: { type: 'string' }, stage: { type: 'string' }, profile: { type: 'string' },
             },
         });
         if (sub === 'list') {
@@ -544,16 +617,46 @@ async function main() {
             return;
         }
         if (sub === 'create') {
-            rejectWorkspaceOptions(o, ['json', 'yes', 'dry-run'], 'workspace create');
             if (positionals.length !== 1)
                 fail('workspace create 需要且只接受一个 Workspace name');
             if (o.yes && o['dry-run'])
                 fail('workspace create 的 --dry-run 与 --yes 不能同时使用');
+            const wsName = positionals[0];
+            // Resolve the provider kind to scaffold/build: explicit --provider wins, else an already
+            // declared Workspace keeps its kind, else the attributed platform's provider (registry-
+            // driven so deap inherits it), else opencode. multica has no local host — create authors
+            // its config entry; opencode keeps building the managed host.
+            if (o.provider && !['opencode', 'multica'].includes(String(o.provider))) {
+                fail('workspace create --provider 只支持 opencode 或 multica');
+            }
+            const declaredWs = inspectAgentProject(PROJECT_START, PACKAGE_JSON.version)
+                .workspaces.find((item) => item.name === wsName);
+            const platformProvider = resolveAgentPlatform(PROJECT_START).definition?.provider;
+            const kind = String(o.provider || declaredWs?.provider.kind || platformProvider || 'opencode');
+            if (declaredWs && o.provider && declaredWs.provider.kind !== kind) {
+                fail(`Workspace ${wsName} 已声明为 ${declaredWs.provider.kind}，与 --provider ${kind} 冲突`);
+            }
+            if (kind === 'multica') {
+                rejectWorkspaceOptions(o, ['json', 'yes', 'dry-run', 'provider', 'stage', 'profile'], 'workspace create');
+                const out = scaffoldMulticaWorkspace(PROJECT_START, wsName, {
+                    stage: o.stage, profile: o.profile, apply: o.yes, cliVersion: PACKAGE_JSON.version,
+                });
+                if (o.json)
+                    console.log(JSON.stringify(out, null, 2));
+                else {
+                    const tag = out.alreadyDeclared ? '已存在' : out.applied ? '已写入' : 'DRY-RUN';
+                    console.log(`${tag} workspace ${out.workspace} · provider=multica · profile=${out.profile}`);
+                    for (const step of out.nextSteps)
+                        console.log(`   ${step}`);
+                }
+                return;
+            }
+            rejectWorkspaceOptions(o, ['json', 'yes', 'dry-run', 'provider'], 'workspace create');
             const out = o.yes
-                ? applyOpenCodeWorkspace(PROJECT_START, positionals[0], {
+                ? applyOpenCodeWorkspace(PROJECT_START, wsName, {
                     yes: true, cliVersion: PACKAGE_JSON.version,
                 })
-                : planOpenCodeWorkspace(PROJECT_START, positionals[0], PACKAGE_JSON.version);
+                : planOpenCodeWorkspace(PROJECT_START, wsName, PACKAGE_JSON.version);
             if (o.json)
                 console.log(JSON.stringify(out, null, 2));
             else
@@ -572,11 +675,35 @@ async function main() {
             return;
         }
         if (sub === 'run') {
+            const timeoutMs = o.timeout === undefined ? undefined : Number(o.timeout);
+            if (o.status) {
+                // Resume a timed-out multica run by re-reading the SAME Issue; no new Issue is created.
+                rejectWorkspaceOptions(o, ['json', 'yes', 'execute', 'out', 'timeout', 'status', 'run-id'], 'workspace run --status');
+                if (positionals.length !== 1)
+                    fail('workspace run --status 需要一个 Workspace name');
+                if (o['prompt-file'])
+                    fail('workspace run --status 不接受 --prompt-file；用 --run-id 续读');
+                if (!o['run-id'])
+                    fail('workspace run --status 需要 --run-id <上次 run 的 runId>');
+                const out = statusMulticaWorkspaceRun(PROJECT_START, positionals[0], {
+                    runId: o['run-id'], execute: o.execute, yes: o.yes, timeoutMs, out: o.out,
+                    cliVersion: PACKAGE_JSON.version,
+                });
+                if (o.json)
+                    console.log(JSON.stringify(out, null, 2));
+                else {
+                    console.log(`${out.passed ? '✅' : '❌'} workspace run ${out.runId} (resumed)`);
+                    if (out.answer)
+                        console.log(out.answer);
+                }
+                if (!out.passed)
+                    process.exitCode = 2;
+                return;
+            }
             rejectWorkspaceOptions(o, ['json', 'yes', 'execute', 'prompt-file', 'out', 'timeout'], 'workspace run');
             if (positionals.length !== 1 || !o['prompt-file']) {
                 fail('workspace run 需要一个 Workspace name 和 --prompt-file <file>');
             }
-            const timeoutMs = o.timeout === undefined ? undefined : Number(o.timeout);
             const prompt = readProjectText(PROJECT_START, o['prompt-file'], 'workspace run prompt');
             const workspace = showDevelopmentWorkspace(PROJECT_START, positionals[0], PACKAGE_JSON.version);
             const out = workspace.provider.kind === 'multica'