akm-cli 0.7.4 → 0.8.0-rc.10

package/dist/commands/proposal.js

@@ -1,3 +1,6 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 /**
  * `akm proposal {list,show,accept,reject,diff}` — review surface for the
  * proposal substrate (#225).
@@ -12,7 +15,7 @@ import { resolveStashDir } from "../core/common";
 import { loadConfig } from "../core/config";
 import { UsageError } from "../core/errors";
 import { appendEvent } from "../core/events";
-import { archiveProposal, createProposal, diffProposal, getProposal, listProposals, promoteProposal, validateProposal, } from "../core/proposals";
+import { archiveProposal, createProposal, diffProposal, getProposal, isProposalSkipped, listProposals, promoteProposal, resolveProposalId, revertProposal, validateProposal, } from "../core/proposals";
 // ── Shared helpers ──────────────────────────────────────────────────────────
 function resolveStash(stashDir) {
     if (stashDir)
@@ -21,13 +24,17 @@ function resolveStash(stashDir) {
 }
 export function akmProposalList(options = {}) {
     const stash = resolveStash(options.stashDir);
-    // `--status accepted|rejected` implies archive-inclusion since the live
-    // queue only ever contains pending entries.
-    const includeArchive = options.includeArchive === true || options.status === "accepted" || options.status === "rejected";
+    // `--status accepted|rejected|reverted` implies archive-inclusion since the
+    // live queue only ever contains pending entries.
+    const includeArchive = options.includeArchive === true ||
+        options.status === "accepted" ||
+        options.status === "rejected" ||
+        options.status === "reverted";
     const proposals = listProposals(stash, {
         includeArchive,
         status: options.status,
         ref: options.ref,
+        type: options.type,
     });
     return { schemaVersion: 1, totalCount: proposals.length, proposals };
 }
@@ -43,7 +50,8 @@ export function akmProposalShow(options) {
 export async function akmProposalAccept(options) {
     const stash = resolveStash(options.stashDir);
     const config = options.config ?? loadConfig();
-    const result = await promoteProposal(stash, config, options.id, { target: options.target }, options.ctx);
+    const resolvedId = resolveProposalId(stash, options.id).id;
+    const result = await promoteProposal(stash, config, resolvedId, { target: options.target }, options.ctx);
     // Emit `promoted` to the events stream so observers (audit, dashboards,
     // sync) see the accept happen. Only emit on the happy path — promotion
     // throws on validation failure, so reaching this point means the asset
@@ -69,11 +77,11 @@ export async function akmProposalAccept(options) {
 }
 export function akmProposalReject(options) {
     const stash = resolveStash(options.stashDir);
-    const existing = getProposal(stash, options.id);
+    const existing = resolveProposalId(stash, options.id);
     if (existing.status !== "pending") {
-        throw new UsageError(`Proposal ${options.id} is not pending (current status: ${existing.status}). Only pending proposals can be rejected.`, "INVALID_FLAG_VALUE");
+        throw new UsageError(`Proposal ${existing.id} is not pending (current status: ${existing.status}). Only pending proposals can be rejected.`, "INVALID_FLAG_VALUE");
     }
-    const updated = archiveProposal(stash, options.id, "rejected", options.reason, options.ctx);
+    const updated = archiveProposal(stash, existing.id, "rejected", options.reason, options.ctx);
     appendEvent({
         eventType: "rejected",
         ref: updated.ref,
@@ -96,8 +104,8 @@ export function akmProposalReject(options) {
 export function akmProposalDiff(options) {
     const stash = resolveStash(options.stashDir);
     const config = options.config ?? loadConfig();
-    const proposal = getProposal(stash, options.id);
-    const diff = diffProposal(stash, config, options.id, { target: options.target });
+    const proposal = resolveProposalId(stash, options.id);
+    const diff = diffProposal(stash, config, proposal.id, { target: options.target });
     return {
         schemaVersion: 1,
         id: proposal.id,
@@ -109,11 +117,58 @@ export function akmProposalDiff(options) {
 }
 export function akmProposalCreate(options) {
     const stash = resolveStash(options.stashDir);
-    const proposal = createProposal(stash, {
+    // Manual proposal creation (via `akm proposal create`) always bypasses
+    // dedup/cooldown guards — the operator is explicitly requesting a proposal.
+    const result = createProposal(stash, {
         ref: options.ref,
         source: options.source,
         ...(options.sourceRun !== undefined ? { sourceRun: options.sourceRun } : {}),
         payload: options.payload,
+        force: true,
     }, options.ctx);
-    return { schemaVersion: 1, ok: true, proposal };
+    if (isProposalSkipped(result)) {
+        // Should never happen with force:true — defensive only.
+        throw new Error(`Unexpected proposal skip: ${result.message}`);
+    }
+    return { schemaVersion: 1, ok: true, proposal: result };
+}
+/**
+ * Restore an accepted proposal's prior content from the backup captured at
+ * promotion time (Advantage D6c / Phase 6C).
+ *
+ * Failure modes (all surface as typed errors so the CLI can map exit codes):
+ *   - Proposal id does not resolve → `NotFoundError("FILE_NOT_FOUND")`
+ *     (raised by `resolveProposalId` / `getProposal`).
+ *   - Proposal is not `status === "accepted"` → `UsageError("INVALID_FLAG_VALUE")`
+ *     with message `"only accepted proposals can be reverted ..."`.
+ *   - No `backup` field, or the backup file is missing on disk →
+ *     `UsageError` with message `"no backup available for this proposal ..."`.
+ *
+ * On success, emits a `proposal_reverted` event for observability, mirroring
+ * how `akmProposalAccept` emits `promoted` and `akmProposalReject` emits
+ * `rejected`.
+ */
+export async function akmProposalRevert(options) {
+    const stash = resolveStash(options.stashDir);
+    const config = options.config ?? loadConfig();
+    const resolvedId = resolveProposalId(stash, options.id).id;
+    const result = await revertProposal(stash, config, resolvedId, { target: options.target }, options.ctx);
+    appendEvent({
+        eventType: "proposal_reverted",
+        ref: result.ref,
+        metadata: {
+            proposalId: result.proposal.id,
+            source: result.proposal.source,
+            ...(result.proposal.sourceRun !== undefined ? { sourceRun: result.proposal.sourceRun } : {}),
+            assetPath: result.assetPath,
+        },
+    });
+    return {
+        schemaVersion: 1,
+        ok: true,
+        id: result.proposal.id,
+        ref: result.ref,
+        assetPath: result.assetPath,
+        proposal: result.proposal,
+    };
 }

package/dist/commands/propose.js

@@ -1,3 +1,6 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 /**
  * `akm propose <type> <name> --task ...` — proposal-producing agent
  * command (#226).
@@ -9,37 +12,23 @@
  * Failures use the same {@link AgentFailureReason} discriminants as
  * `akm reflect`. `propose_invoked` is emitted at command entry.
  */
+import fs from "node:fs";
 import { parseAssetRef } from "../core/asset-ref";
 import { TYPE_DIRS } from "../core/asset-spec";
 import { resolveStashDir } from "../core/common";
-import { loadConfig } from "../core/config";
 import { ConfigError, UsageError } from "../core/errors";
 import { appendEvent } from "../core/events";
-import { createProposal } from "../core/proposals";
-import { parseAgentConfig, requireAgentProfile, runAgent, } from "../integrations/agent";
+import { createProposal, isProposalSkipped, } from "../core/proposals";
+import { runAgent, } from "../integrations/agent";
+import { resolveProcessAgentProfile } from "../integrations/agent/config";
 import { buildProposePrompt, parseAgentProposalPayload } from "../integrations/agent/prompts";
-function loadAgentConfigFromDisk() {
-    const config = loadConfig();
-    return parseAgentConfig(config.agent);
-}
-function resolveProfile(options) {
-    if (options.agentProfile)
-        return options.agentProfile;
-    const agent = options.agentConfig ?? loadAgentConfigFromDisk();
-    return requireAgentProfile(agent, options.profile);
-}
+import { runAgentSdk } from "../integrations/agent/sdk-runner";
+import { baseFailureFields, enoentHintMessage, isEnoentFailure, loadAgentConfigFromDisk, resolveAgentProfile, } from "./agent-support";
 function failureEnvelope(result, type, name, fallbackReason = "non_zero_exit") {
-    const reason = result.reason ?? fallbackReason;
     return {
-        schemaVersion: 1,
-        ok: false,
-        reason,
-        error: result.error ?? `agent failure (${reason})`,
+        ...baseFailureFields(result, fallbackReason),
         type,
         name,
-        exitCode: result.exitCode,
-        ...(result.stdout ? { stdout: result.stdout } : {}),
-        ...(result.stderr ? { stderr: result.stderr } : {}),
     };
 }
 export async function akmPropose(options) {
@@ -68,9 +57,31 @@ export async function akmPropose(options) {
         },
     });
     // 2. Resolve profile.
+    // When an explicit --profile flag is given, honour it directly (existing
+    // behaviour). Otherwise use resolveProcessAgentProfile so that per-process
+    // agent config (agent.processes["propose"]) is picked up automatically.
     let profile;
+    let resolvedTimeoutMs = options.timeoutMs;
     try {
-        profile = resolveProfile(options);
+        if (options.agentProfile) {
+            // Test seam: injected profile bypasses all config.
+            profile = options.agentProfile;
+        }
+        else if (options.profile) {
+            // Explicit --profile flag wins over process config.
+            profile = resolveAgentProfile(options);
+        }
+        else {
+            // Use per-process config resolution (falls back to agent.default).
+            const agent = options.agentConfig ?? loadAgentConfigFromDisk();
+            const processName = options.agentProcess ?? "propose";
+            const resolved = resolveProcessAgentProfile(processName, agent);
+            profile = resolved.profile;
+            // Only apply process-resolved timeoutMs when caller didn't supply one.
+            if (resolvedTimeoutMs === undefined) {
+                resolvedTimeoutMs = resolved.timeoutMs;
+            }
+        }
     }
     catch (err) {
         if (err instanceof ConfigError || err instanceof UsageError)
@@ -78,40 +89,95 @@ export async function akmPropose(options) {
         throw err;
     }
     // 3. Build prompt.
+    // Synthesize a temp draft path so opencode can write the asset content
+    // directly using its file tools rather than returning JSON via stdout.
+    const draftFilePath = import("node:os").then((os) => import("node:path").then((path) => path.join(os.tmpdir(), `akm-propose-${options.type}-${options.name.replace(/[^a-z0-9_-]/gi, "_")}-${Date.now()}.md`)));
+    const resolvedDraftPath = await draftFilePath;
     const prompt = buildProposePrompt({
         type: options.type,
         name: options.name,
         task: options.task,
+        draftFilePath: resolvedDraftPath,
     });
     // 4. Spawn the agent.
-    const runOptions = {
-        stdio: "captured",
-        parseOutput: "text",
-        ...(options.timeoutMs !== undefined ? { timeoutMs: options.timeoutMs } : {}),
-        ...(options.runAgentOptions ?? {}),
-    };
-    const result = await runAgent(profile, prompt, runOptions);
+    // Real agent runs use interactive mode so file tools can write the draft.
+    // Injected/custom spawns still need captured stdout for JSON payload tests.
+    // Use callAi for the unified AI dispatch path (agent CLI preferred, LLM HTTP fallback).
+    const useCustomSpawn = Boolean(options.runAgentOptions?.spawn);
+    let result;
+    if (useCustomSpawn) {
+        // Test seam: use raw runAgent with injected spawn so tests remain deterministic.
+        const runOptions = {
+            stdio: "captured",
+            parseOutput: "text",
+            ...(resolvedTimeoutMs !== undefined ? { timeoutMs: resolvedTimeoutMs } : {}),
+            ...(options.runAgentOptions ?? {}),
+        };
+        result = await runAgent(profile, prompt, runOptions);
+    }
+    else {
+        // Production path: dispatch directly to the appropriate runner.
+        const runOptions = {
+            stdio: resolvedDraftPath ? "interactive" : "captured",
+            parseOutput: "text",
+            ...(resolvedTimeoutMs !== undefined ? { timeoutMs: resolvedTimeoutMs } : {}),
+        };
+        result = profile.sdkMode
+            ? await runAgentSdk(profile, prompt ?? "", runOptions)
+            : await runAgent(profile, prompt, runOptions);
+    }
     if (!result.ok) {
+        // B3: ENOENT / not-found gives an actionable hint.
+        if (isEnoentFailure(result)) {
+            return { ...failureEnvelope(result, options.type, options.name), error: enoentHintMessage(profile.bin) };
+        }
         return failureEnvelope(result, options.type, options.name);
     }
-    // 5. Parse the structured response.
+    // 5. Resolve the proposal content.
+    // Path A: opencode wrote the draft file — read it directly (no stdout parse).
+    // Path B: fallback to stdout JSON parse for non-file-writing agents.
     let payload;
-    try {
-        payload = parseAgentProposalPayload(result.stdout);
-    }
-    catch (err) {
-        return {
-            schemaVersion: 1,
-            ok: false,
-            reason: "parse_error",
-            error: err instanceof Error ? err.message : String(err),
-            type: options.type,
-            name: options.name,
-            exitCode: result.exitCode,
-            stdout: result.stdout,
-            ...(result.stderr ? { stderr: result.stderr } : {}),
+    if (fs.existsSync(resolvedDraftPath)) {
+        const draftContent = fs.readFileSync(resolvedDraftPath, "utf8");
+        fs.unlinkSync(resolvedDraftPath);
+        payload = {
+            ref: `${options.type}:${options.name}`,
+            content: draftContent,
         };
     }
+    else {
+        // B1: When interactive mode was used and stdout is empty, the agent did not
+        // write the draft file and stdout was not captured — surface an actionable error.
+        const stdioWasInteractive = !useCustomSpawn;
+        if (stdioWasInteractive && (result.stdout ?? "") === "") {
+            return {
+                schemaVersion: 1,
+                ok: false,
+                reason: "parse_error",
+                error: "Agent did not write draft file and stdout was not captured (interactive mode). Check that the agent CLI understood the file-write instruction, or configure a headless profile with stdio: 'captured'.",
+                type: options.type,
+                name: options.name,
+                exitCode: result.exitCode,
+                ...(result.stderr ? { stderr: result.stderr } : {}),
+            };
+        }
+        try {
+            payload = parseAgentProposalPayload(result.stdout ?? "");
+        }
+        catch (err) {
+            return {
+                schemaVersion: 1,
+                ok: false,
+                reason: "parse_error",
+                error: err instanceof Error ? err.message : String(err),
+                type: options.type,
+                name: options.name,
+                exitCode: result.exitCode,
+                stdout: result.stdout,
+                ...(result.stderr ? { stderr: result.stderr } : {}),
+            };
+        }
+    }
     // 6. Insert the proposal. Note: we allow the agent's `ref` to normalise the
     // asset name (e.g. path-cleanup), but only after validating that the ref is
     // well-formed and the type still matches the requested type.
@@ -154,12 +220,21 @@ export async function akmPropose(options) {
         ref,
         source: "propose",
         sourceRun: `propose-${Date.now()}`,
+        // User-initiated proposals always bypass dedup/cooldown guards — the
+        // operator is explicitly asking for a new proposal.
+        force: true,
         payload: {
             content: payload.content,
             ...(payload.frontmatter ? { frontmatter: payload.frontmatter } : {}),
         },
     };
-    const proposal = createProposal(stash, createInput, options.ctx);
+    const proposalResult = createProposal(stash, createInput, options.ctx);
+    // With force:true, the result is always a Proposal (never skipped).
+    if (isProposalSkipped(proposalResult)) {
+        // Should never happen when force:true, but be defensive.
+        throw new Error(`Unexpected skip in propose command: ${proposalResult.message}`);
+    }
+    const proposal = proposalResult;
     return {
         schemaVersion: 1,
         ok: true,