@kisev/agentomatic 11.0.0-dev.54.g26e86b0b9fcd → 11.0.0-dev.55.g6d90f51aeff6

package/README.md

@@ -75,8 +75,9 @@ global installs own `~/.config/opencode` and create its `package.json` when
 needed. Offline setups can provision the dependency by hand first:
 `npm install --save-exact @kisev/agentomatic`, then run
 `npx agentomatic install --dry-run` from that project so the executing version
-matches the installed package. Run the exact confirmation command
-printed by the preview. If the selected
+matches the installed package. Apply by rerunning the install command without
+`--dry-run` and confirming the printed plan summary, or by adding `--yes`
+outside a terminal. If the selected
 assets need core integration, connect the package into the user-owned OpenCode
 configuration yourself or through the confirmed `config` command, which merges
 the `plugin` entry while preserving existing entries:

package/README.ru.md

@@ -79,7 +79,8 @@ npx --yes @kisev/agentomatic@latest install --dry-run
 `npm install --save-exact @kisev/agentomatic`, затем запустить
 `npx agentomatic install --dry-run` из этого проекта, чтобы версия исполнения
 совпадала с установленным пакетом.
-Выполните точную команду подтверждения, которую выведет предварительный просмотр.
+Примените изменение, повторив команду установки без `--dry-run` и подтвердив
+напечатанную сводку плана, а вне терминала добавьте `--yes`.
 Если для выбранных файлов нужна основная интеграция, подключите пакет в
 пользовательскую конфигурацию OpenCode вручную или подтвержденной командой
 `config`, которая добавляет запись `plugin` с сохранением существующих записей:

package/dist/agent-profiles.d.ts

@@ -1,4 +1,4 @@
-import { LifecycleError, type SupersededPlan, type FileMutation, type Scope, type TransactionOptions } from "./lifecycle.js";
+import { LifecycleError, type FileMutation, type Scope, type TransactionOptions } from "./lifecycle.js";
 export { type Scope as AgentProfileScope } from "./lifecycle.js";
 export declare const FIXED_AGENT_ROLES: readonly ["manager", "architect", "mapper", "worker", "review", "critic"];
 export type FixedAgentRole = (typeof FIXED_AGENT_ROLES)[number];
@@ -47,7 +47,6 @@ export type AgentInventory = {
     collisions: string[];
     drift: string[];
     requires_restart: false;
-    digest: string;
 };
 export type AgentProfileAction = "install" | "model-set" | "critic-add" | "critic-remove" | "reconcile" | "uninstall";
 export type AgentProfileRequest = {
@@ -70,11 +69,6 @@ export type AgentProfilePlan = {
     root: string;
     operations: AgentProfileOperation[];
     critic_pool: string[];
-    plan_digest: string;
-    confirmation_digest?: string;
-    superseded_plan?: SupersededPlan;
-    digest: string;
-    receipt_expires_at?: string;
     requires_restart: boolean;
 };
 export type AgentProfileResult = {
@@ -101,7 +95,6 @@ export type LegacyAgentOwnership = {
 type BuiltPlan = {
     plan: AgentProfilePlan;
     mutations: FileMutation[];
-    inventoryDigest: string;
     config: AgentProfileConfig;
     manifest?: DeploymentManifest;
     expectedConfig?: Buffer;
@@ -116,7 +109,7 @@ export declare function buildAgentProfilePlan(request: AgentProfileRequest, scop
 export declare function validateBuiltAgentProfilePlan(built: BuiltPlan): Promise<void>;
 export declare function listAgentProfiles(scope: Scope, cwd?: string, home?: string): Promise<AgentInventory>;
 export declare function previewAgentProfileChange(request: AgentProfileRequest, scope: Scope, cwd?: string, home?: string): Promise<AgentProfilePlan>;
-export declare function applyAgentProfileChange(request: AgentProfileRequest, scope: Scope, confirmationDigest: string, cwd?: string, home?: string, options?: TransactionOptions): Promise<AgentProfileResult>;
+export declare function applyAgentProfileChange(request: AgentProfileRequest, scope: Scope, cwd?: string, home?: string, options?: TransactionOptions): Promise<AgentProfileResult>;
 export declare function availableModels(): Promise<string[]>;
 export declare function availableModelVariants(model: string): Promise<string[]>;
 export declare function inspectFileMode(path: string): Promise<number | undefined>;

package/dist/agent-profiles.js

@@ -4,7 +4,7 @@ import { homedir } from "node:os";
 import { dirname, resolve } from "node:path";
 import { promisify } from "node:util";
 import { fileURLToPath } from "node:url";
-import { applyTransaction, consumeReceipt, deploymentRoot, destination, digest, LifecycleError, lifecycleRoot, listDirectRegular, readRegular, recoverTransaction, saveReceipt, sha256, stable, withLifecycleLock, } from "./lifecycle.js";
+import { applyTransaction, deploymentRoot, destination, LifecycleError, lifecycleRoot, listDirectRegular, readRegular, recoverTransaction, sha256, stable, withLifecycleLock, } from "./lifecycle.js";
 import { readPackageVersion } from "./package-metadata.js";
 export const FIXED_AGENT_ROLES = [
     "manager",
@@ -258,7 +258,7 @@ function desiredManifest(scope, config, rendered, canonical, names = desiredName
             kind: NAME_PATTERN.test(name) ? "fixed" : "additional-critic",
             template: role,
             canonical_sha256: sha256(canonical[role]),
-            configuration_sha256: digest(selection),
+            configuration_sha256: sha256(stable(selection)),
             rendered_sha256: sha256(rendered[name]),
         };
     }
@@ -326,9 +326,6 @@ function legacyIsExact(legacy, current) {
             sha256(content) === record.sha256);
     });
 }
-function planDigestBase(plan, inventoryDigest, request) {
-    return digest({ plan, inventory_digest: inventoryDigest, request });
-}
 export async function buildAgentProfilePlan(request, scope, cwd = process.cwd(), home = homedir(), legacy, selectedAgents) {
     const root = deploymentRoot(scope, cwd, home);
     const [state, canonical, agentFiles] = await Promise.all([
@@ -512,19 +509,6 @@ export async function buildAgentProfilePlan(request, scope, cwd = process.cwd(),
             expected: { sha256: sha256(state.manifestRaw) },
         });
     }
-    const inventoryDigest = digest({
-        package_version: packageVersion(),
-        canonical: Object.fromEntries(FIXED_AGENT_ROLES.map((role) => [role, sha256(canonical[role])])),
-        desired_configuration: config,
-        desired_manifest: finalManifest ?? null,
-        config: state.configRaw?.toString("base64") ?? null,
-        manifest: state.manifestRaw?.toString("base64") ?? null,
-        agents: agentFiles.map((item) => ({
-            name: item.name,
-            sha256: sha256(item.content),
-            mode: item.mode,
-        })),
-    });
     const base = {
         schema_version: 1,
         domain: "agent-profiles",
@@ -535,16 +519,12 @@ export async function buildAgentProfilePlan(request, scope, cwd = process.cwd(),
         critic_pool: desired?.critic_pool ?? finalManifest?.critic_pool ?? [],
         requires_restart: mutations.some((item) => item.path.startsWith("agents/")),
     };
-    const planDigest = planDigestBase(base, inventoryDigest, request);
     const plan = {
         ...base,
-        plan_digest: planDigest,
-        digest: planDigest,
     };
     return {
         plan,
         mutations,
-        inventoryDigest,
         config,
         manifest: finalManifest,
         expectedConfig: names.length ? configContent : state.configRaw,
@@ -648,42 +628,23 @@ export async function listAgentProfiles(scope, cwd = process.cwd(), home = homed
         drift,
         requires_restart: false,
     };
-    return { ...base, digest: digest(base) };
+    return { ...base };
 }
 export async function previewAgentProfileChange(request, scope, cwd = process.cwd(), home = homedir()) {
     const stateRoot = lifecycleRoot(scope, cwd, home);
     return withLifecycleLock(stateRoot, async () => {
         if (await recoverTransaction(deploymentRoot(scope, cwd, home), stateRoot))
             throw new AgentProfileError("recovered_transaction", "Recovered an interrupted transaction; request a fresh plan");
-        const built = await buildAgentProfilePlan(request, scope, cwd, home);
-        const receipt = await saveReceipt(stateRoot, `agent:${request.action}`, scope, built.plan.root, { request, plan_digest: built.plan.digest }, Date.now(), built.plan.digest);
-        return {
-            ...built.plan,
-            plan_digest: built.plan.digest,
-            confirmation_digest: receipt.digest,
-            digest: receipt.digest,
-            receipt_expires_at: receipt.expires_at,
-            ...(receipt.superseded_plan ? { superseded_plan: receipt.superseded_plan } : {}),
-        };
+        return (await buildAgentProfilePlan(request, scope, cwd, home)).plan;
     });
 }
-export async function applyAgentProfileChange(request, scope, confirmationDigest, cwd = process.cwd(), home = homedir(), options = {}) {
+export async function applyAgentProfileChange(request, scope, cwd = process.cwd(), home = homedir(), options = {}) {
     const stateRoot = lifecycleRoot(scope, cwd, home);
     const root = deploymentRoot(scope, cwd, home);
     return withLifecycleLock(stateRoot, async () => {
         if (await recoverTransaction(root, stateRoot))
             throw new AgentProfileError("recovered_transaction", "Recovered an interrupted transaction; request a fresh plan");
-        const receipt = (await consumeReceipt(stateRoot, {
-            digest: confirmationDigest,
-            kind: `agent:${request.action}`,
-            scope,
-            root,
-        }));
-        if (stable(receipt.request) !== stable(request))
-            throw new AgentProfileError("confirmation_unknown", "Saved confirmation belongs to a different request");
         const built = await buildAgentProfilePlan(request, scope, cwd, home);
-        if (built.plan.digest !== (receipt.plan_digest ?? receipt.digest))
-            throw new AgentProfileError("stale_plan", "Agent inventory changed after preview");
         if (built.plan.operations.some((item) => item.operation === "conflict" && item.reason.includes("collision")))
             throw new AgentProfileError("collision", "Exact-name user-owned collision blocks apply");
         if (request.action !== "uninstall" &&
@@ -710,7 +671,7 @@ export async function applyAgentProfileChange(request, scope, confirmationDigest
             status: "ok",
             applied: true,
             requires_restart: built.plan.requires_restart,
-            plan: { ...built.plan, digest: confirmationDigest },
+            plan: built.plan,
         };
     });
 }

package/dist/cli-output.d.ts

@@ -8,12 +8,12 @@ type DisplayPlan = InstallerPlan | AgentProfilePlan;
 export declare function terminalSafe(value: string): string;
 export declare function renderPlan(plan: DisplayPlan, options: {
     applied: boolean;
-    confirmationCommand?: string;
+    applyHint?: string;
     hint?: string;
 }): string;
 export declare function renderConfigSetup(plan: ConfigSetupPlan, options: {
     applied: boolean;
-    confirmationCommand?: string;
+    applyHint?: string;
     hint?: string;
 }): string;
 export declare function renderInventory(inventory: AgentInventory): string;
@@ -21,7 +21,7 @@ export declare function shellCommand(arguments_: readonly string[]): string;
 export declare function scopeArguments(scope: Scope): [] | ["--global"];
 export declare function renderReconcile(plan: ReconcilePlan, options: {
     applied: boolean;
-    confirmationCommand?: string;
+    applyHint?: string;
 }): string;
 export declare function renderDoctor(report: DoctorReport): string;
 export {};

package/dist/cli-output.js

@@ -119,20 +119,8 @@ export function renderPlan(plan, options) {
     lines.push(options.applied
         ? `Restart required: ${plan.requires_restart ? "yes" : "no"}`
         : `Restart after apply: ${plan.requires_restart ? "yes" : "no"}`);
-    if (!options.applied) {
-        if (plan.superseded_plan)
-            lines.push("", "Superseded plan:", `  kind: ${terminalSafe(plan.superseded_plan.kind)}`, `  confirmation: ${terminalSafe(plan.superseded_plan.confirmation_digest)}`, `  created: ${terminalSafe(plan.superseded_plan.created_at)}`, `  expires: ${terminalSafe(plan.superseded_plan.expires_at)}`);
-        if (plan.receipt_expires_at)
-            lines.push(`Confirmation expires: ${plan.receipt_expires_at}`);
-        if ("plan_digest" in plan)
-            lines.push(`Plan digest: ${plan.plan_digest}`);
-        if (plan.confirmation_digest ?? plan.digest) {
-            lines.push(`Confirmation digest: ${plan.confirmation_digest ?? plan.digest}`);
-            lines.push(`Digest: ${plan.confirmation_digest ?? plan.digest}`);
-        }
-        if (options.confirmationCommand)
-            lines.push("", "Apply:", `  ${options.confirmationCommand}`);
-    }
+    if (!options.applied && options.applyHint)
+        lines.push("", "Apply:", `  ${options.applyHint}`);
     if (options.applied && options.hint)
         lines.push("", "Next:", `  ${options.hint}`);
     return `${lines.join("\n")}\n`;
@@ -159,20 +147,10 @@ export function renderConfigSetup(plan, options) {
         ? `Restart required: ${plan.requires_restart ? "yes" : "no"}`
         : `Restart after apply: ${plan.requires_restart ? "yes" : "no"}`);
     if (!options.applied) {
-        if (!plan.confirmable) {
+        if (!plan.confirmable)
             lines.push("", "No configuration changes are required.");
-        }
-        else {
-            if (plan.superseded_plan)
-                lines.push("", "Superseded plan:", `  kind: ${terminalSafe(plan.superseded_plan.kind)}`, `  confirmation: ${terminalSafe(plan.superseded_plan.confirmation_digest)}`, `  created: ${terminalSafe(plan.superseded_plan.created_at)}`, `  expires: ${terminalSafe(plan.superseded_plan.expires_at)}`);
-            lines.push("", `Plan digest: ${plan.plan_digest}`);
-            if (plan.receipt_expires_at)
-                lines.push(`Confirmation expires: ${plan.receipt_expires_at}`);
-            if (plan.confirmation_digest ?? plan.digest)
-                lines.push(`Confirmation digest: ${plan.confirmation_digest ?? plan.digest}`, `Digest: ${plan.confirmation_digest ?? plan.digest}`);
-            if (options.confirmationCommand)
-                lines.push("", "Apply:", `  ${options.confirmationCommand}`);
-        }
+        else if (options.applyHint)
+            lines.push("", "Apply:", `  ${options.applyHint}`);
     }
     if (options.applied && options.hint)
         lines.push("", "Next:", `  ${options.hint}`);
@@ -251,22 +229,15 @@ export function renderReconcile(plan, options) {
         if (blocked) {
             lines.push("", "Blocked:");
             if (plan.modified_managed.length)
-                lines.push(`  Update managed assets first: ${shellCommand(["install", ...scopeArguments(plan.scope), "--dry-run"])}`, "  Apply the exact confirmation command from that installer preview, then build a new reconcile preview.");
+                lines.push(`  Update managed assets first: ${shellCommand(["install", ...scopeArguments(plan.scope), "--dry-run"])}`, "  Apply that installer plan, then build a new reconcile preview.");
             if (plan.conflicts.length)
                 lines.push("  Manually resolve every ownership conflict listed above before reconciling.");
         }
         else if (!plan.confirmable) {
             lines.push("", "No reconciliation changes are required.");
         }
-        else if (options.confirmationCommand) {
-            if (plan.superseded_plan)
-                lines.push("", "Superseded plan:", `  kind: ${terminalSafe(plan.superseded_plan.kind)}`, `  confirmation: ${terminalSafe(plan.superseded_plan.confirmation_digest)}`, `  created: ${terminalSafe(plan.superseded_plan.created_at)}`, `  expires: ${terminalSafe(plan.superseded_plan.expires_at)}`);
-            lines.push("", `Plan digest: ${plan.plan_digest}`);
-            if (plan.receipt_expires_at)
-                lines.push(`Confirmation expires: ${plan.receipt_expires_at}`);
-            if (plan.confirmation_digest ?? plan.digest)
-                lines.push(`Confirmation digest: ${plan.confirmation_digest ?? plan.digest}`, `Digest: ${plan.confirmation_digest ?? plan.digest}`);
-            lines.push("", "Apply:", `  ${options.confirmationCommand}`);
+        else if (options.applyHint) {
+            lines.push("", "Apply:", `  ${options.applyHint}`);
         }
     }
     return `${lines.join("\n")}\n`;