odai-dsh-agent 0.2.36 → 0.2.37

package/preset/odai/skills/odai-orchestration/scripts/install-routing.mjs

@@ -2,7 +2,7 @@
 
 import {
   existsSync, lstatSync, mkdirSync, mkdtempSync, readFileSync, renameSync,
-  rmSync, unlinkSync, writeFileSync,
+  rmdirSync, rmSync, unlinkSync, writeFileSync,
 } from "node:fs";
 import { homedir, tmpdir } from "node:os";
 import path from "node:path";
@@ -52,60 +52,70 @@ const previous = loadManifest(manifestPath);
 assertSafeDestination(configRoot, layout, Object.keys(previous?.files || {}));
 assertManagedState(configRoot, layout, previous);
 
-if (args.uninstall) {
-  if (hasMappingArgs(args)) fail("--uninstall 不接受模型、推理档或 policy 参数");
-  if (!previous) returnResult({ status: "not-installed", host: args.host, scope: args.scope, target: targetRoot, configRoot, requiresNewSession: false });
-  const removed = uninstall(configRoot, manifestPath, previous);
-  returnResult({ status: "uninstalled", host: args.host, scope: args.scope, target: targetRoot, configRoot, removed, requiresNewSession: true });
-}
+returnResult(main());
 
-for (const role of requiredRoles) if (!args[`${role}Model`]) fail(`缺少 --${role}-model`);
-if (args.researcherEffort && !args.researcherModel) fail("--researcher-effort 需要同时提供 --researcher-model");
-if (args.frontendEffort && !args.frontendModel) fail("--frontend-effort 需要同时提供 --frontend-model");
-if (!existsSync(builder)) fail(`缺少路由生成器：${builder}`);
-
-const generatedRoot = mkdtempSync(path.join(tmpdir(), `odai-${args.host}-routing-install-`));
-const snapshots = new Map();
-try {
-  const generated = buildAdapter(generatedRoot, configRoot);
-  const files = collectGeneratedFiles(generatedRoot, layout);
-  const originalFiles = prepareOriginalFiles(configRoot, previous, files);
-  const settings = planSettings(configRoot, layout, previous);
-  const candidates = new Set([...layout.managedFiles, ...layout.retiredFiles, ...Object.keys(previous?.files || {}), manifestName]);
-  for (const relative of candidates) snapshot(configRoot, relative, snapshots);
-  if (settings) snapshot(configRoot, settings.file, snapshots);
-  for (const [relative, content] of files) atomicWrite(path.join(configRoot, relative), content);
-  if (settings) atomicWrite(path.join(configRoot, settings.file), Buffer.from(`${JSON.stringify(settings.value, null, 2)}\n`));
-  removeObsolete(configRoot, previous, files);
-  const manifest = {
-    version: 13,
-    id: "odai-routing-installation",
-    host: args.host,
-    scope: args.scope,
-    target: targetRoot,
-    installedAt: new Date().toISOString(),
-    generatedFrom: "skills/odai-orchestration/scripts/install-routing.mjs",
-    governance: generated.governance,
-    orchestration: generated.orchestration,
-    mapping: generated.mapping,
-    routingPolicy: generated.routing_policy,
-    activation: generated.activation,
-    files: Object.fromEntries([...files].map(([relative, content]) => [relative, sha256(content)])),
-    originalFiles,
-    settings: settings?.manifest || null,
-  };
-  atomicWrite(manifestPath, Buffer.from(`${JSON.stringify(manifest, null, 2)}\n`));
-  assertManagedState(configRoot, layout, manifest);
-  returnResult({
-    status: previous ? "updated" : "installed", host: args.host, scope: args.scope,
-    target: targetRoot, configRoot, mapping: generated.mapping, routingPolicy: generated.routing_policy,
-    activation: generated.activation, requiresNewSession: true,
-  });
-} catch (error) {
-  restore(configRoot, snapshots);
-  throw error;
-} finally {
-  rmSync(generatedRoot, { recursive: true, force: true });
+function main() {
+  if (args.uninstall) {
+    if (hasMappingArgs(args)) fail("--uninstall 不接受模型、推理档或 policy 参数");
+    if (!previous) return { status: "not-installed", host: args.host, scope: args.scope, target: targetRoot, configRoot, requiresNewSession: false };
+    const removed = uninstall(configRoot, manifestPath, previous);
+    return { status: "uninstalled", host: args.host, scope: args.scope, target: targetRoot, configRoot, removed, requiresNewSession: true };
+  }
+
+  for (const role of requiredRoles) if (!args[`${role}Model`]) fail(`缺少 --${role}-model`);
+  if (args.researcherEffort && !args.researcherModel) fail("--researcher-effort 需要同时提供 --researcher-model");
+  if (args.frontendEffort && !args.frontendModel) fail("--frontend-effort 需要同时提供 --frontend-model");
+  if (!existsSync(builder)) fail(`缺少路由生成器：${builder}`);
+
+  const generatedRoot = mkdtempSync(path.join(tmpdir(), `odai-${args.host}-routing-install-`));
+  const snapshots = new Map();
+  const newDirectories = [];
+  try {
+    const generated = buildAdapter(generatedRoot, configRoot);
+    const files = collectGeneratedFiles(generatedRoot, layout);
+    const originalFiles = prepareOriginalFiles(configRoot, previous, files);
+    const settings = planSettings(configRoot, layout, previous);
+    for (const relative of directoryAncestors([...files.keys(), manifestName, ...(settings ? [settings.file] : [])])) {
+      if (!existsSync(path.join(configRoot, relative))) newDirectories.push(relative);
+    }
+    const candidates = new Set([...layout.managedFiles, ...layout.retiredFiles, ...Object.keys(previous?.files || {}), manifestName]);
+    for (const relative of candidates) snapshot(configRoot, relative, snapshots);
+    if (settings) snapshot(configRoot, settings.file, snapshots);
+    for (const [relative, content] of files) atomicWrite(path.join(configRoot, relative), content);
+    if (settings) atomicWrite(path.join(configRoot, settings.file), Buffer.from(`${JSON.stringify(settings.value, null, 2)}\n`));
+    removeObsolete(configRoot, previous, files);
+    const manifest = {
+      version: 13,
+      id: "odai-routing-installation",
+      host: args.host,
+      scope: args.scope,
+      target: targetRoot,
+      installedAt: new Date().toISOString(),
+      generatedFrom: "skills/odai-orchestration/scripts/install-routing.mjs",
+      governance: generated.governance,
+      orchestration: generated.orchestration,
+      mapping: generated.mapping,
+      routingPolicy: generated.routing_policy,
+      activation: generated.activation,
+      files: Object.fromEntries([...files].map(([relative, content]) => [relative, sha256(content)])),
+      originalFiles,
+      createdDirectories: [...new Set([...(previous?.createdDirectories || []), ...newDirectories])],
+      settings: settings?.manifest || null,
+    };
+    atomicWrite(manifestPath, Buffer.from(`${JSON.stringify(manifest, null, 2)}\n`));
+    assertManagedState(configRoot, layout, manifest);
+    return {
+      status: previous ? "updated" : "installed", host: args.host, scope: args.scope,
+      target: targetRoot, configRoot, mapping: generated.mapping, routingPolicy: generated.routing_policy,
+      activation: generated.activation, requiresNewSession: true,
+    };
+  } catch (error) {
+    restore(configRoot, snapshots);
+    removeCreatedDirectories(configRoot, newDirectories);
+    throw error;
+  } finally {
+    rmSync(generatedRoot, { recursive: true, force: true });
+  }
 }
 
 function buildAdapter(outputRoot, root) {
@@ -310,6 +320,14 @@ function assertManagedState(root, layoutValue, manifest) {
     fail("旧路由包含当前宿主不支持的设置记录");
   }
   const accepted = new Set([...(layoutValue.knownFiles || layoutValue.managedFiles), ...layoutValue.retiredFiles]);
+  if (manifest.createdDirectories !== undefined) {
+    const allowed = directoryAncestors([...accepted, manifestName, ...(expectedSetting ? [expectedSetting.file] : [])]);
+    if (!Array.isArray(manifest.createdDirectories)
+      || manifest.createdDirectories.some(relative => typeof relative !== "string" || !allowed.has(relative))) {
+      fail("旧路由包含无效的托管目录记录");
+    }
+    assertSafeDestination(root, layoutValue, manifest.createdDirectories);
+  }
   for (const [relative, expected] of Object.entries(manifest.files || {})) {
     if (!accepted.has(relative)) fail(`旧路由包含未知文件：${relative}`);
     const file = path.join(root, relative);
@@ -348,13 +366,16 @@ function uninstall(root, manifestPathValue, manifest) {
   for (const relative of files) snapshot(root, relative, snapshots);
   if (settingPlan) snapshot(root, settingPlan.relative, snapshots);
   snapshot(root, manifestName, snapshots);
+  const removedDirectories = [];
 
   try {
     for (const [relative, content] of plannedFiles) applyFileState(path.join(root, relative), content);
     if (settingPlan) applyFileState(path.join(root, settingPlan.relative), settingPlan.content);
     unlinkSync(manifestPathValue);
+    removeCreatedDirectories(root, manifest.createdDirectories || [], removedDirectories);
   } catch (error) {
     try {
+      for (const relative of [...removedDirectories].reverse()) mkdirSync(path.join(root, relative), { recursive: true });
       restore(root, snapshots);
     } catch (restoreError) {
       throw new AggregateError([error, restoreError], "路由卸载失败且无法完整回滚；请检查现有托管清单与文件状态");
@@ -376,6 +397,30 @@ function planSettingRestore(root, spec) {
   };
 }
 
+function directoryAncestors(files) {
+  const directories = new Set(["."]);
+  for (const relative of files) {
+    let directory = path.dirname(relative);
+    while (directory !== ".") {
+      directories.add(directory);
+      directory = path.dirname(directory);
+    }
+  }
+  return directories;
+}
+
+function removeCreatedDirectories(root, directories, removed = []) {
+  const depth = relative => relative === "." ? 0 : relative.split(/[\\/]/u).length;
+  for (const relative of [...new Set(directories)].sort((a, b) => depth(b) - depth(a))) {
+    try {
+      rmdirSync(path.join(root, relative));
+      removed.push(relative);
+    } catch (error) {
+      if (!["ENOENT", "ENOTEMPTY", "EEXIST"].includes(error?.code)) throw error;
+    }
+  }
+}
+
 function applyFileState(file, content) {
   if (content === null) rmSync(file, { force: true });
   else atomicWrite(file, content);
@@ -447,5 +492,5 @@ Usage:
 安装后用户只需正常使用 odai。总控是唯一持续任务线程并负责实施整合；planner、reviewer 以及可选 researcher、frontend 只在能改变结果时启动。researcher 与 frontend 映射默认不配置。更新会安全移除旧版 advisor、implementer、worker、executor 和 stage runner 托管文件。`);
 }
 
-function returnResult(value) { process.stdout.write(`${JSON.stringify(value, null, 2)}\n`); process.exit(0); }
+function returnResult(value) { process.stdout.write(`${JSON.stringify(value, null, 2)}\n`); }
 function fail(message) { throw new Error(message); }

package/preset/odai/runtime/skill-evolution.d.mts

@@ -1,112 +0,0 @@
-import type { SkillBundle } from "./skill-bundle.mjs";
-import type { DshAgent, RuntimeTool, UnknownRecord } from "./runtime-types.mjs";
-type StateAction = "activate" | "rollback" | "deactivate";
-type AuthorizationLevel = "standard" | "breaking";
-export interface GenerationAuthorization {
-    readonly action: "propose" | "rebase";
-    readonly phrase: string;
-    readonly turn: number;
-    readonly eventSeq: number;
-    readonly messageId: string;
-}
-interface HistoryEvent {
-    readonly revision: number;
-    readonly action: StateAction;
-    readonly from: string | null;
-    readonly to: string | null;
-    readonly at: string;
-    readonly evidence: readonly string[];
-}
-export interface SkillEvolutionState {
-    readonly schemaVersion: 1;
-    readonly revision: number;
-    readonly activeGenerationId?: string;
-    readonly history: readonly HistoryEvent[];
-}
-export interface GenerationSummary extends UnknownRecord {
-    generationId: string;
-    parentGenerationId?: string;
-    createdAt: string;
-    objective: string;
-    baseDigest: string;
-    resultDigest: string;
-    skillVersion: string;
-    runtimeContract: unknown;
-    changedPaths: readonly string[];
-    authorizationLevel: AuthorizationLevel;
-    activationPhrase: string;
-    breakingReasons: readonly string[];
-    creationAuthorization?: GenerationAuthorization;
-}
-export interface RebaseConflict {
-    readonly path: string;
-    readonly replacement: number;
-    readonly reason: string;
-}
-interface SelectionEvolutionState extends UnknownRecord {
-    status?: string;
-    generationId?: string;
-    baseDigest?: string;
-    upstreamDigest?: string;
-    rebaseRequired?: boolean;
-    hostOverride?: boolean;
-}
-export interface EvolutionSelection {
-    readonly mode: string;
-    readonly status: string;
-    readonly reasonCode: string;
-    readonly detail?: string;
-    readonly bundle: SkillBundle;
-    readonly candidate?: SkillBundle;
-    readonly rejections: readonly {
-        readonly source: string;
-        readonly reasonCode: string;
-        readonly detail?: string;
-    }[];
-    readonly upstream?: EvolutionSelection;
-    readonly evolution?: Readonly<SelectionEvolutionState>;
-}
-export interface EvolutionToolArguments extends UnknownRecord {
-    action?: unknown;
-    path?: unknown;
-    generationId?: unknown;
-    objective?: unknown;
-    expectedBundleDigest?: unknown;
-    expectedUpstreamDigest?: unknown;
-    changes?: unknown;
-}
-export interface EvolutionToolResult extends UnknownRecord {
-    action: string;
-    status: string;
-    error?: string;
-    path?: string;
-    bundleDigest?: string;
-    proposalPhrase?: string;
-    attemptId?: string;
-    conflicts?: readonly RebaseConflict[];
-    sha256?: string;
-    content?: string;
-    requiresNextTurn?: boolean;
-    generations?: readonly GenerationSummary[];
-    activeGenerationId?: string;
-    active?: GenerationSummary & {
-        rebaseRequired: boolean;
-    };
-    generation?: GenerationSummary;
-}
-interface CreateEvolutionToolOptions {
-    currentSelectionFor?: (agent: DshAgent) => EvolutionSelection;
-    selection?: EvolutionSelection;
-    onChanged?: (agent: DshAgent, result: EvolutionToolResult) => void;
-    now?: () => string;
-    disabled?: boolean;
-}
-export declare function readSkillEvolutionState(root: string): Readonly<SkillEvolutionState>;
-export declare function resolveSkillEvolutionRoot(configuredPath: unknown, env?: Readonly<Record<string, string | undefined>>): string;
-export declare function skillEvolutionDisabled(env?: Readonly<Record<string, string | undefined>>): boolean;
-export declare function applySkillEvolutionSelection(upstream: EvolutionSelection, root: string, options?: {
-    disabled?: boolean;
-}): EvolutionSelection;
-export declare function createSkillEvolutionTool(root: string, options?: CreateEvolutionToolOptions): RuntimeTool<EvolutionToolArguments, EvolutionToolResult>;
-export {};
-//# sourceMappingURL=skill-evolution.d.mts.map

package/preset/odai/runtime/skill-evolution.d.mts.map

@@ -1 +0,0 @@
-{"version":3,"file":"skill-evolution.d.mts","sourceRoot":"","sources":["../src/skill-evolution.mts"],"names":[],"mappings":"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"}