opencode-immune 1.0.31 → 1.0.33

package/dist/plugin.js

@@ -1284,92 +1284,72 @@ const PRE_COMMIT_MARKER = "0-ULTRAWORK: PRE_COMMIT";
 const CYCLE_COMPLETE_MARKER = "0-ULTRAWORK: CYCLE_COMPLETE";
 const NEXT_TASK_PATTERN = /Next task:\s*(.+)/;
 const ALL_CYCLES_COMPLETE_MARKER = "0-ULTRAWORK: ALL_CYCLES_COMPLETE";
-// Default commit prompt — used when user's /commit command file is not found
-const DEFAULT_COMMIT_PROMPT = `Review the staged changes using \`git diff --cached\` and create a commit.
-
-If there are no staged changes, check \`git status\` for unstaged changes and stage the relevant files first.
-
-The commit message MUST follow this structure:
-1. First line: short description (<50 chars) prefixed with feat:/fix:/refactor:
-2. Second line: empty
-3. Body: concise bullet points describing significant changes
-
-Create the commit using \`git commit -m\` with the properly formatted message.`;
 /**
- * Load the /commit command prompt from user's global config.
- * Falls back to DEFAULT_COMMIT_PROMPT if file doesn't exist.
+ * Archive memory-bank/progress.md before a new cycle starts.
+ * Moves to memory-bank/archive/progress-YYYY-MM-DD-{timestamp}.md.
+ * Skips silently if progress.md doesn't exist or is trivially empty.
  */
-async function loadCommitPrompt() {
+async function archiveProgress(directory) {
+    const progressPath = (0, path_1.join)(directory, "memory-bank", "progress.md");
     try {
-        const home = process.env.HOME ?? process.env.USERPROFILE ?? "";
-        const commandPath = (0, path_1.join)(home, ".config", "opencode", "commands", "commit.md");
-        const content = await (0, promises_1.readFile)(commandPath, "utf-8");
-        // Strip YAML frontmatter (--- ... ---)
-        const stripped = content.replace(/^---[\s\S]*?---\s*/, "").trim();
-        return stripped || DEFAULT_COMMIT_PROMPT;
-    }
-    catch {
-        return DEFAULT_COMMIT_PROMPT;
-    }
-}
-/**
- * Execute a commit by sending the /commit prompt to the current session.
- * The agent will analyze the diff and create a proper commit message.
- * Returns true if the prompt was sent successfully.
- */
-async function runSmartCommit(state, sessionID) {
-    try {
-        const commitPrompt = await loadCommitPrompt();
-        console.log(`[opencode-immune] Smart commit: sending commit prompt to session ${sessionID}...`);
-        // Send commit prompt to the SAME session (ultrawork already finished, session is free)
-        await state.input.client.session.prompt({
-            body: {
-                parts: [
-                    {
-                        type: "text",
-                        text: commitPrompt,
-                    },
-                ],
-            },
-            path: { id: sessionID },
-        });
-        console.log("[opencode-immune] Smart commit: completed.");
-        return true;
+        const content = await (0, promises_1.readFile)(progressPath, "utf-8");
+        // Skip if empty or trivially empty
+        if (!content.trim() || content.trim() === "# Progress") {
+            console.log("[opencode-immune] Archive progress: nothing to archive (empty).");
+            return;
+        }
+        const archiveDir = (0, path_1.join)(directory, "memory-bank", "archive");
+        await (0, promises_1.mkdir)(archiveDir, { recursive: true });
+        const now = new Date();
+        const dateStr = now.toISOString().slice(0, 10); // YYYY-MM-DD
+        const ts = Math.floor(now.getTime() / 1000);
+        const archiveName = `progress-${dateStr}-${ts}.md`;
+        const archivePath = (0, path_1.join)(archiveDir, archiveName);
+        await (0, promises_1.rename)(progressPath, archivePath);
+        console.log(`[opencode-immune] Archive progress: moved to ${archiveName}`);
     }
     catch (err) {
-        console.error("[opencode-immune] Smart commit failed:", err);
-        return false;
+        // File doesn't exist or move failed — not critical
+        const msg = err instanceof Error ? err.message : String(err);
+        if (!msg.includes("ENOENT")) {
+            console.warn("[opencode-immune] Archive progress failed:", msg);
+        }
     }
 }
 /**
- * Helper: run git commit in the project directory (fallback).
- * Uses execFile for safety (no shell injection).
- * Returns true if commit succeeded, false otherwise.
+ * Helper: run git add + diff-stat + commit with descriptive message.
+ * Builds commit body from `git diff --cached --stat` so the commit
+ * is not an opaque "auto-commit" but shows what changed.
+ * Returns true if commit succeeded (or nothing to commit), false on error.
  */
-function runGitCommit(directory, message) {
+function runGitCommit(directory) {
     return new Promise((resolve) => {
-        // Stage all changes first
+        // Stage all changes
         (0, child_process_1.execFile)("git", ["add", "-A"], { cwd: directory }, (addErr) => {
             if (addErr) {
                 console.error("[opencode-immune] git add failed:", addErr.message);
                 resolve(false);
                 return;
             }
-            // Then commit
-            (0, child_process_1.execFile)("git", ["commit", "-m", message], { cwd: directory }, (commitErr, stdout, stderr) => {
-                if (commitErr) {
-                    // "nothing to commit" is not a real error
-                    if (stderr?.includes("nothing to commit") || stdout?.includes("nothing to commit")) {
-                        console.log("[opencode-immune] git commit: nothing to commit (clean tree).");
-                        resolve(true);
+            // Get diff stat for commit body
+            (0, child_process_1.execFile)("git", ["diff", "--cached", "--stat"], { cwd: directory }, (_diffErr, diffOut) => {
+                const stat = (diffOut ?? "").trim();
+                const body = stat ? `\n\n${stat}` : "";
+                const message = `chore: ultrawork cycle auto-commit${body}`;
+                (0, child_process_1.execFile)("git", ["commit", "-m", message], { cwd: directory }, (commitErr, stdout, stderr) => {
+                    if (commitErr) {
+                        if (stderr?.includes("nothing to commit") || stdout?.includes("nothing to commit")) {
+                            console.log("[opencode-immune] git commit: nothing to commit (clean tree).");
+                            resolve(true);
+                            return;
+                        }
+                        console.error("[opencode-immune] git commit failed:", commitErr.message, stderr);
+                        resolve(false);
                         return;
                     }
-                    console.error("[opencode-immune] git commit failed:", commitErr.message, stderr);
-                    resolve(false);
-                    return;
-                }
-                console.log("[opencode-immune] git commit succeeded:", stdout?.trim());
-                resolve(true);
+                    console.log("[opencode-immune] git commit succeeded:", stdout?.trim());
+                    resolve(true);
+                });
             });
         });
     });
@@ -1398,18 +1378,14 @@ function createTextCompleteHandler(state) {
         }
         // ── PRE_COMMIT only (without CYCLE_COMPLETE in same part): run commit ──
         if (text.includes(PRE_COMMIT_MARKER) && !text.includes(CYCLE_COMPLETE_MARKER)) {
-            if (!state.commitPending && sessionID) {
+            if (!state.commitPending) {
                 state.commitPending = true;
-                console.log("[opencode-immune] Multi-Cycle: PRE_COMMIT detected (standalone), running smart commit...");
+                console.log("[opencode-immune] Multi-Cycle: PRE_COMMIT detected (standalone), running git commit...");
                 try {
-                    const ok = await runSmartCommit(state, sessionID);
-                    if (!ok) {
-                        console.log("[opencode-immune] Multi-Cycle: smart commit failed, falling back to git commit...");
-                        await runGitCommit(state.input.directory, "chore: ultrawork cycle auto-commit");
-                    }
+                    await runGitCommit(state.input.directory);
                 }
                 catch (err) {
-                    console.error("[opencode-immune] Multi-Cycle: commit failed (standalone):", err);
+                    console.error("[opencode-immune] Multi-Cycle: git commit failed (standalone):", err);
                 }
                 finally {
                     state.commitPending = false;
@@ -1417,22 +1393,25 @@ function createTextCompleteHandler(state) {
             }
             return;
         }
-        // ── CYCLE_COMPLETE: self-contained sequence: commit → new session ──
+        // ── CYCLE_COMPLETE: self-contained sequence: archive progress → commit → new session ──
         if (text.includes(CYCLE_COMPLETE_MARKER)) {
-            // Step 1: Always commit first in the current session
-            if (!state.commitPending && sessionID) {
+            // Step 0: Archive progress.md before new cycle
+            try {
+                await archiveProgress(state.input.directory);
+            }
+            catch (err) {
+                console.warn("[opencode-immune] Multi-Cycle: archive progress failed:", err);
+            }
+            // Step 1: Always commit first
+            if (!state.commitPending) {
                 state.commitPending = true;
-                console.log("[opencode-immune] Multi-Cycle: CYCLE_COMPLETE detected, running smart commit first...");
+                console.log("[opencode-immune] Multi-Cycle: CYCLE_COMPLETE detected, running git commit first...");
                 try {
-                    const ok = await runSmartCommit(state, sessionID);
-                    if (!ok) {
-                        console.log("[opencode-immune] Multi-Cycle: smart commit failed, falling back to git commit...");
-                        await runGitCommit(state.input.directory, "chore: ultrawork cycle auto-commit");
-                    }
-                    console.log("[opencode-immune] Multi-Cycle: commit completed before new cycle.");
+                    await runGitCommit(state.input.directory);
+                    console.log("[opencode-immune] Multi-Cycle: git commit completed before new cycle.");
                 }
                 catch (err) {
-                    console.error("[opencode-immune] Multi-Cycle: commit failed (continuing anyway):", err);
+                    console.error("[opencode-immune] Multi-Cycle: git commit failed (continuing anyway):", err);
                 }
                 finally {
                     state.commitPending = false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-immune",
-  "version": "1.0.31",
+  "version": "1.0.33",
   "description": "OpenCode plugin: session recovery, auto-retry, multi-cycle automation, context monitoring",
   "exports": {
     "./server": "./dist/plugin.js"