codetrap 0.1.7 → 0.1.9

package/src/commands/workflow.ts

@@ -2,7 +2,6 @@ import { readFileSync } from "node:fs";
 import { TrapStore } from "../lib/store";
 import { formatTrapShort, formatTrapDetails, formatTrapActionCard } from "../lib/format";
 import type { Trap } from "../domain/trap";
-import type { SessionMetadata } from "../domain/session";
 import {
   formatScopeMigrationText,
   runScopeMigration,
@@ -11,16 +10,31 @@ import {
 import { TrapOperations } from "../lib/trap-operations";
 import { buildDoctorReport, formatDoctorText } from "../lib/doctor";
 import { formatEmbedText } from "../lib/embed-output";
+import {
+  formatEmbeddingProfilesText,
+  formatEmbeddingStatusText,
+  formatEmbeddingsUseText,
+  type EmbeddingsUseResult,
+} from "../lib/embedding-management";
 import { searchDefaultsFromConfig } from "../lib/config";
+import { formatCodexSetupText, runCodexSetup } from "../lib/codex-setup";
 import { SessionStore } from "../lib/session-store";
 import { SessionOperations, type SessionConflictResult } from "../lib/session-operations";
 import {
   CANDIDATES_FILE,
   NOTES_FILE,
   RECAP_FILE,
-  sessionRelativeDir,
   sessionRelativeFile,
 } from "../lib/session-codec";
+import {
+  sessionAcceptPayload,
+  sessionCliConflictPayload,
+  sessionCleanupPayload,
+  sessionConflictPayload,
+  sessionConflictText,
+  sessionPayload,
+  sessionRejectPayload,
+} from "../lib/session-review";
 import {
   toCliSearchJson,
   toListJson,
@@ -36,10 +50,12 @@ import {
 import { mutationJsonPayload } from "../lib/trap-mutation-result";
 import {
   embedRequestFromArgs,
+  embeddingsUseRequestFromArgs,
   evidenceRequestFromArgs,
   listRequestFromArgs,
   searchRequestFromArgs,
   sessionAcceptRequestFromArgs,
+  sessionCaptureRequestFromArgs,
   sessionCandidateRequestFromArgs,
   sessionCloseRequestFromArgs,
   sessionIdRequestFromArgs,
@@ -95,18 +111,22 @@ export async function executeCommand(strip: string[], store: TrapStore): Promise
       return cmdStats(args, operations);
     case "doctor":
       return cmdDoctor(args, store, operations);
+    case "setup":
+      return cmdSetup(args);
     case "repair-scope":
       return cmdScopeMigration("repair-scope", args, operations);
     case "migrate-project":
       return cmdScopeMigration("migrate-project", args, operations);
     case "embed":
       return cmdEmbed(args, store);
+    case "embeddings":
+      return cmdEmbeddings(args, store);
     case "session":
       return cmdSession(args, store, operations);
     default:
       return errorResult([
         `Unknown command: ${sub}`,
-        "Commands: init, add, search, list, show, edit, delete, add_trap_evidence, archive_trap, supersede_trap, export, import, stats, doctor, repair-scope, migrate-project, embed, session",
+        "Commands: init, add, search, list, show, edit, delete, add_trap_evidence, archive_trap, supersede_trap, export, import, stats, doctor, setup, repair-scope, migrate-project, embed, embeddings, session",
       ].join("\n"));
   }
 }
@@ -341,14 +361,43 @@ function cmdStats(args: string[], operations: TrapOperations): CommandResult {
     : textResult(formatStatsText(stats));
 }
 
-function cmdDoctor(args: string[], store: TrapStore, operations: TrapOperations): CommandResult {
+async function cmdDoctor(args: string[], store: TrapStore, operations: TrapOperations): Promise<CommandResult> {
   const { opts } = parseArgs(args);
-  const report = buildDoctorReport(store, operations);
+  const projectRoot = store.getProjectRoot();
+  const candidateReview = projectRoot
+    ? new SessionOperations(new SessionStore(projectRoot), operations).candidateReviewSummary()
+    : null;
+  const report = await buildDoctorReport(store, operations, process.cwd(), candidateReview);
   return opts.json !== undefined
     ? jsonResult(report)
     : textResult(formatDoctorText(report));
 }
 
+function cmdSetup(args: string[]): CommandResult {
+  const sub = args[0];
+  const rest = args.slice(1);
+  if (sub !== "codex") {
+    return errorResult("Usage: codetrap setup codex [--mcp] [--no-agents] [--agents-file AGENTS.md] [--codex-home <path>] [--dry-run] [--json]");
+  }
+  const { opts } = parseArgs(rest);
+  try {
+    const result = runCodexSetup({
+      cwd: process.cwd(),
+      codexHome: opts["codex-home"],
+      agentsFile: opts["agents-file"],
+      installMcp: opts.mcp !== undefined,
+      skipAgents: opts["no-agents"] !== undefined,
+      dryRun: opts["dry-run"] !== undefined,
+    });
+    if (opts.json !== undefined) return jsonResult(result, result.success ? 0 : 1);
+    return result.success
+      ? textResult(formatCodexSetupText(result))
+      : errorResult(formatCodexSetupText(result));
+  } catch (error) {
+    return errorFrom(error);
+  }
+}
+
 function cmdScopeMigration(
   command: ScopeMigrationCommand,
   args: string[],
@@ -388,6 +437,59 @@ async function cmdEmbed(args: string[], store: TrapStore): Promise<CommandResult
   }
 }
 
+async function cmdEmbeddings(args: string[], store: TrapStore): Promise<CommandResult> {
+  const sub = args[0] ?? "status";
+  const rest = args.length === 0 ? [] : args.slice(1);
+
+  try {
+    switch (sub) {
+      case "status": {
+        const { opts } = parseArgs(rest);
+        const status = await store.embeddingStatus({ scope: opts.scope });
+        return opts.json !== undefined
+          ? jsonResult(status)
+          : textResult(formatEmbeddingStatusText(status));
+      }
+      case "list":
+      case "profiles": {
+        const { opts } = parseArgs(rest);
+        const profiles = store.embeddingProfiles({ scope: opts.scope });
+        const payload = {
+          active_profile_id: store.embeddingRuntimeStatus().profile_id,
+          ...profiles,
+        };
+        return opts.json !== undefined
+          ? jsonResult(payload)
+          : textResult(formatEmbeddingProfilesText(profiles));
+      }
+      case "use": {
+        const { opts, positionals } = parseArgs(rest);
+        const request = embeddingsUseRequestFromArgs(positionals, opts);
+        const written = store.configureEmbeddings(request.embeddings);
+        const scope = store.hasProject() ? "project" : "global";
+        const result: EmbeddingsUseResult = {
+          ...written,
+          embeddings: written.config.embeddings ?? request.embeddings,
+          next_action: {
+            command: `codetrap embeddings reindex --scope ${scope}`,
+            reason: "Generate embeddings for the selected profile.",
+          },
+        };
+        return opts.json !== undefined
+          ? jsonResult(result)
+          : textResult(formatEmbeddingsUseText(result));
+      }
+      case "reindex":
+      case "embed":
+        return cmdEmbed(rest, store);
+      default:
+        return errorResult("Usage: codetrap embeddings <status|list|profiles|use|reindex> [--json]");
+    }
+  } catch (error) {
+    return errorFrom(error);
+  }
+}
+
 async function cmdSession(args: string[], store: TrapStore, trapOperations: TrapOperations): Promise<CommandResult> {
   const sub = args[0];
   const rest = args.slice(1);
@@ -413,6 +515,8 @@ async function cmdSession(args: string[], store: TrapStore, trapOperations: Trap
         return cmdSessionNotes(rest, sessions);
       case "close":
         return cmdSessionClose(rest, sessions);
+      case "capture":
+        return cmdSessionCapture(rest, sessions);
       case "candidates":
         return cmdSessionCandidates(rest, sessions);
       case "candidate":
@@ -428,7 +532,7 @@ async function cmdSession(args: string[], store: TrapStore, trapOperations: Trap
       case "cleanup":
         return cmdSessionCleanup(rest, sessions);
       default:
-        return errorResult("Usage: codetrap session <start|note|status|list|show|notes|close|candidates|candidate|accept|reject|delete|prune|cleanup>");
+        return errorResult("Usage: codetrap session <start|note|status|list|show|notes|close|capture|candidates|candidate|accept|reject|delete|prune|cleanup>");
     }
   } catch (error) {
     return errorFrom(error);
@@ -472,14 +576,31 @@ function cmdSessionStatus(args: string[], sessions: SessionOperations): CommandR
     return jsonResult({
       active_session_id: status.active_session_id,
       session: status.session ? sessionPayload(status.session) : null,
+      candidate_review: status.candidate_review,
     });
   }
-  if (!status.session) return textResult("No active session.");
-  return textResult([
+  if (!status.session) {
+    const lines = ["No active session."];
+    if (status.candidate_review.pending_count > 0) {
+      lines.push(
+        `Pending candidate review: ${status.candidate_review.pending_count} candidate(s) across ${status.candidate_review.pending_session_count} session(s).`
+      );
+      if (status.candidate_review.next_session_id) {
+        lines.push(`Review: codetrap session candidates ${status.candidate_review.next_session_id}`);
+      }
+      lines.push("Open web review: codetrap web");
+    }
+    return textResult(lines.join("\n"));
+  }
+  const lines = [
     `Active session ${status.session.id}`,
     `Goal: ${status.session.goal}`,
     `Notes: ${sessionRelativeFile(status.session.id, NOTES_FILE)}`,
-  ].join("\n"));
+  ];
+  if (status.candidate_review.pending_count > 0) {
+    lines.push(`Pending candidate review: ${status.candidate_review.pending_count} candidate(s).`);
+  }
+  return textResult(lines.join("\n"));
 }
 
 function cmdSessionList(args: string[], sessions: SessionOperations): CommandResult {
@@ -487,7 +608,9 @@ function cmdSessionList(args: string[], sessions: SessionOperations): CommandRes
   const entries = sessions.listSessions(sessionListRequestFromArgs(opts));
   if (opts.json !== undefined) return jsonResult(entries);
   if (entries.length === 0) return textResult("No sessions found.");
-  return textResult(entries.map((entry) => `${entry.id} [${entry.status}] ${entry.goal}`).join("\n"));
+  return textResult(entries.map((entry) =>
+    `${entry.id} [${entry.status}] ${entry.goal} (${entry.pending_count} pending, ${entry.reviewed_count} reviewed)`
+  ).join("\n"));
 }
 
 function cmdSessionShow(args: string[], sessions: SessionOperations): CommandResult {
@@ -525,7 +648,6 @@ function cmdSessionClose(args: string[], sessions: SessionOperations): CommandRe
     ...sessionPayload(result.session),
     recap_path: result.recap_path,
     candidate_count: result.candidate_count,
-    traps_written: result.traps_written,
   };
   if (opts.json !== undefined) return jsonResult(payload);
   const lines = [
@@ -539,6 +661,39 @@ function cmdSessionClose(args: string[], sessions: SessionOperations): CommandRe
   return textResult(lines.join("\n"));
 }
 
+function cmdSessionCapture(args: string[], sessions: SessionOperations): CommandResult {
+  const { opts } = parseArgs(args);
+  const result = sessions.captureCandidate(sessionCaptureRequestFromArgs(opts, {
+    isTTY: process.stdin.isTTY === true,
+    readStdin: () => readFileSync(0, "utf-8"),
+    readFile: (path) => readFileSync(path, "utf-8"),
+  }));
+  const nextAction = `codetrap session candidate ${result.candidate.id} --session ${result.session.id} --json`;
+  const payload = {
+    success: true,
+    session_id: result.session.id,
+    candidate_id: result.candidate.id,
+    status: result.candidate.status,
+    quality_score: result.candidate.quality_score,
+    candidate_count: result.candidate_count,
+    created_session: result.created_session,
+    closed_session: result.closed_session,
+    duplicate: result.duplicate,
+    candidate_traps_path: sessionRelativeFile(result.session.id, CANDIDATES_FILE),
+    recap_path: result.recap_path,
+    next_action: {
+      command: nextAction,
+    },
+  };
+  if (opts.json !== undefined) return jsonResult(payload);
+  return textResult([
+    `${result.duplicate ? "Reused" : "Captured"} candidate ${result.candidate.id} in session ${result.session.id}.`,
+    result.created_session ? "Created and closed a post-flight session." : "Session remains active.",
+    `Candidate inbox: ${payload.candidate_traps_path}`,
+    `Review: ${nextAction}`,
+  ].join("\n"));
+}
+
 function cmdSessionCandidates(args: string[], sessions: SessionOperations): CommandResult {
   const { opts, positionals } = parseArgs(args);
   const request = sessionIdRequestFromArgs(positionals);
@@ -562,16 +717,7 @@ async function cmdSessionAccept(args: string[], sessions: SessionOperations): Pr
   const { opts, positionals } = parseArgs(args);
   const accepted = await sessions.acceptCandidate(sessionAcceptRequestFromArgs(positionals, opts));
   if (!accepted.success) return possibleConflictResult(accepted, opts.json !== undefined);
-  const payload = {
-    success: true,
-    session_id: accepted.session.id,
-    candidate_id: accepted.candidate.id,
-    status: accepted.candidate.status,
-    trap_id: accepted.trap_id,
-    scope: accepted.scope,
-    evidence_id: accepted.evidence_id,
-    superseded_id: accepted.superseded_id,
-  };
+  const payload = sessionAcceptPayload(accepted);
   if (opts.json !== undefined) return jsonResult(payload);
   const lines = [`Accepted ${accepted.candidate.id}; wrote trap #${accepted.trap_id} to ${accepted.scope} scope.`];
   if (accepted.superseded_id !== null) lines.push(`Superseded trap #${accepted.superseded_id}.`);
@@ -581,13 +727,7 @@ async function cmdSessionAccept(args: string[], sessions: SessionOperations): Pr
 function cmdSessionReject(args: string[], sessions: SessionOperations): CommandResult {
   const { opts, positionals } = parseArgs(args);
   const rejected = sessions.rejectCandidate(sessionRejectRequestFromArgs(positionals, opts));
-  const payload = {
-    success: true,
-    session_id: rejected.session.id,
-    candidate_id: rejected.candidate.id,
-    status: rejected.candidate.status,
-    reason: rejected.candidate.rejection_reason ?? null,
-  };
+  const payload = sessionRejectPayload(rejected);
   if (opts.json !== undefined) return jsonResult(payload);
   return textResult(`Rejected ${rejected.candidate.id}.`);
 }
@@ -621,12 +761,7 @@ function cmdSessionCleanup(args: string[], sessions: SessionOperations): Command
   }
   const request = sessionIdRequestFromArgs(positionals);
   const result = sessions.cleanupDeletedTrapCandidates(request.sessionId);
-  const payload = {
-    success: true,
-    session_id: result.session.id,
-    removed_count: result.removed_count,
-    removed_candidate_ids: result.removed_candidate_ids,
-  };
+  const payload = sessionCleanupPayload(result);
   if (opts.json !== undefined) return jsonResult(payload);
   return textResult(`Removed ${result.removed_count} deleted-trap candidate(s) from session ${result.session.id}.`);
 }
@@ -679,42 +814,11 @@ function errorMessage(error: unknown): string {
   return error instanceof Error ? error.message : String(error);
 }
 
-function sessionPayload(session: SessionMetadata) {
-  return {
-    ...session,
-    session_dir: sessionRelativeDir(session.id),
-    notes_path: sessionRelativeFile(session.id, NOTES_FILE),
-    recap_path: sessionRelativeFile(session.id, RECAP_FILE),
-    candidate_traps_path: sessionRelativeFile(session.id, CANDIDATES_FILE),
-  };
-}
-
 function possibleConflictResult(
   result: SessionConflictResult,
   asJson: boolean
 ): CommandResult {
-  const payload = {
-    success: false,
-    error: "Possible active trap conflict found.",
-    session_id: result.session_id,
-    candidate_id: result.candidate_id,
-    possible_conflicts: result.possible_conflicts,
-    next_actions: [
-      `codetrap session accept ${result.candidate_id} --session ${result.session_id} --accept-anyway`,
-      `codetrap session accept ${result.candidate_id} --session ${result.session_id} --supersedes <trap-id>`,
-      `codetrap session reject ${result.candidate_id} --session ${result.session_id} --reason <reason>`,
-    ],
-  };
-  if (asJson) return jsonResult(payload, 1);
-
-  return errorResult([
-    "Possible active trap conflict found:",
-    ...result.possible_conflicts.map((conflict) => [
-      `#${conflict.trap_id} ${conflict.title}`,
-      `  reason: ${conflict.reason}`,
-      `  fix: ${conflict.fix}`,
-    ].join("\n")),
-    "",
-    `Use --accept-anyway to save as a new trap, or --supersedes <trap-id> to preserve lifecycle history.`,
-  ].join("\n"));
+  const payload = sessionConflictPayload(result);
+  if (asJson) return jsonResult(sessionCliConflictPayload(payload), 1);
+  return errorResult(sessionConflictText(payload));
 }