opencode-immune 1.0.29 → 1.0.31

package/dist/plugin.js

@@ -615,10 +615,12 @@ async function fetchLatestHarnessRelease(repo, token) {
         const tagName = data.tag_name;
         if (!tagName)
             return null;
-        // Find the harness.tar.gz asset
-        const asset = data.assets?.find((a) => a.name === "harness.tar.gz");
+        // Find the correct harness asset based on OS
+        const isWindows = process.platform === "win32";
+        const assetName = isWindows ? "harness-windows.tar.gz" : "harness.tar.gz";
+        const asset = data.assets?.find((a) => a.name === assetName);
         if (!asset) {
-            console.warn(`[opencode-immune] Harness sync: release ${tagName} has no harness.tar.gz asset`);
+            console.warn(`[opencode-immune] Harness sync: release ${tagName} has no ${assetName} asset`);
             return null;
         }
         return {
@@ -684,17 +686,22 @@ function extractTarGz(archivePath, destDir) {
 /**
  * Recursively copy all files from src to dest, creating directories as needed.
  * Overwrites existing files.
+ * skipRootFiles: file names to skip ONLY when dest === rootDest (top-level copy target).
  */
-async function copyDirRecursive(src, dest, skipFiles) {
+async function copyDirRecursive(src, dest, skipRootFiles, rootDest) {
+    const effectiveRoot = rootDest ?? dest;
     const entries = await (0, promises_1.readdir)(src, { withFileTypes: true });
     await (0, promises_1.mkdir)(dest, { recursive: true });
     for (const entry of entries) {
-        if (skipFiles?.has(entry.name))
+        // Skip files only at the root destination level
+        if (skipRootFiles && dest === effectiveRoot && entry.name === ".gitignore") {
+            console.log(`[opencode-immune] Harness sync: skipping root .gitignore`);
             continue;
+        }
         const srcPath = (0, path_1.join)(src, entry.name);
         const destPath = (0, path_1.join)(dest, entry.name);
         if (entry.isDirectory()) {
-            await copyDirRecursive(srcPath, destPath);
+            await copyDirRecursive(srcPath, destPath, skipRootFiles, effectiveRoot);
         }
         else {
             await (0, promises_1.mkdir)((0, path_1.dirname)(destPath), { recursive: true });
@@ -1306,27 +1313,15 @@ async function loadCommitPrompt() {
     }
 }
 /**
- * Execute a commit by sending the /commit prompt to a new session.
+ * 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) {
+async function runSmartCommit(state, sessionID) {
     try {
         const commitPrompt = await loadCommitPrompt();
-        // Create a dedicated session for the commit
-        const createResult = await state.input.client.session.create({
-            body: {
-                title: "Auto-commit (ultrawork cycle)",
-            },
-        });
-        const sessionData = createResult?.data;
-        const commitSessionID = sessionData?.id;
-        if (!commitSessionID) {
-            console.error("[opencode-immune] Smart commit: failed to create session.");
-            return false;
-        }
-        console.log(`[opencode-immune] Smart commit: session created ${commitSessionID}, sending commit prompt...`);
-        // Send commit prompt and wait for completion (sync prompt, not async)
+        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: [
@@ -1336,7 +1331,7 @@ async function runSmartCommit(state) {
                     },
                 ],
             },
-            path: { id: commitSessionID },
+            path: { id: sessionID },
         });
         console.log("[opencode-immune] Smart commit: completed.");
         return true;
@@ -1403,11 +1398,11 @@ 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 smart commit...");
                 try {
-                    const ok = await runSmartCommit(state);
+                    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");
@@ -1424,12 +1419,12 @@ 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 smart commit first...");
                 try {
-                    const ok = await runSmartCommit(state);
+                    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");

package/package.json

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