opencode-immune 1.0.28 → 1.0.30

package/dist/plugin.js

@@ -1277,8 +1277,65 @@ 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.`;
 /**
- * Helper: run git commit in the project directory.
+ * Load the /commit command prompt from user's global config.
+ * Falls back to DEFAULT_COMMIT_PROMPT if file doesn't exist.
+ */
+async function loadCommitPrompt() {
+    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;
+    }
+    catch (err) {
+        console.error("[opencode-immune] Smart commit failed:", err);
+        return false;
+    }
+}
+/**
+ * Helper: run git commit in the project directory (fallback).
  * Uses execFile for safety (no shell injection).
  * Returns true if commit succeeded, false otherwise.
  */
@@ -1334,14 +1391,18 @@ 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) {
+            if (!state.commitPending && sessionID) {
                 state.commitPending = true;
-                console.log("[opencode-immune] Multi-Cycle: PRE_COMMIT detected (standalone), running git commit...");
+                console.log("[opencode-immune] Multi-Cycle: PRE_COMMIT detected (standalone), running smart commit...");
                 try {
-                    await runGitCommit(state.input.directory, "chore: ultrawork cycle auto-commit");
+                    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");
+                    }
                 }
                 catch (err) {
-                    console.error("[opencode-immune] Multi-Cycle: git commit failed (standalone):", err);
+                    console.error("[opencode-immune] Multi-Cycle: commit failed (standalone):", err);
                 }
                 finally {
                     state.commitPending = false;
@@ -1351,16 +1412,20 @@ function createTextCompleteHandler(state) {
         }
         // ── CYCLE_COMPLETE: self-contained sequence: commit → new session ──
         if (text.includes(CYCLE_COMPLETE_MARKER)) {
-            // Step 1: Always commit first (CYCLE_COMPLETE implies end of cycle)
-            if (!state.commitPending) {
+            // Step 1: Always commit first in the current session
+            if (!state.commitPending && sessionID) {
                 state.commitPending = true;
-                console.log("[opencode-immune] Multi-Cycle: CYCLE_COMPLETE detected, running git commit first...");
+                console.log("[opencode-immune] Multi-Cycle: CYCLE_COMPLETE detected, running smart commit first...");
                 try {
-                    await runGitCommit(state.input.directory, "chore: ultrawork cycle auto-commit");
-                    console.log("[opencode-immune] Multi-Cycle: git commit completed before new cycle.");
+                    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.");
                 }
                 catch (err) {
-                    console.error("[opencode-immune] Multi-Cycle: git commit failed (continuing anyway):", err);
+                    console.error("[opencode-immune] Multi-Cycle: commit failed (continuing anyway):", err);
                 }
                 finally {
                     state.commitPending = false;

package/package.json

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