oh-my-opencode 2.12.0 → 2.12.1

package/dist/cli/index.js

@@ -2657,7 +2657,7 @@ var require_napi = __commonJS((exports, module) => {
 var require_package = __commonJS((exports, module) => {
   module.exports = {
     name: "oh-my-opencode",
-    version: "2.11.0",
+    version: "2.12.0",
     description: "OpenCode plugin - custom agents (oracle, librarian) and enhanced features",
     main: "dist/index.js",
     types: "dist/index.d.ts",
@@ -22575,7 +22575,8 @@ var HookNameSchema = exports_external.enum([
   "preemptive-compaction",
   "compaction-context-injector",
   "claude-code-hooks",
-  "auto-slash-command"
+  "auto-slash-command",
+  "edit-error-recovery"
 ]);
 var BuiltinCommandNameSchema = exports_external.enum([
   "init-deep"

package/dist/config/schema.d.ts

@@ -61,6 +61,7 @@ export declare const HookNameSchema: z.ZodEnum<{
     "compaction-context-injector": "compaction-context-injector";
     "claude-code-hooks": "claude-code-hooks";
     "auto-slash-command": "auto-slash-command";
+    "edit-error-recovery": "edit-error-recovery";
 }>;
 export declare const BuiltinCommandNameSchema: z.ZodEnum<{
     "init-deep": "init-deep";
@@ -816,6 +817,7 @@ export declare const OhMyOpenCodeConfigSchema: z.ZodObject<{
         "compaction-context-injector": "compaction-context-injector";
         "claude-code-hooks": "claude-code-hooks";
         "auto-slash-command": "auto-slash-command";
+        "edit-error-recovery": "edit-error-recovery";
     }>>>;
     disabled_commands: z.ZodOptional<z.ZodArray<z.ZodEnum<{
         "init-deep": "init-deep";

package/dist/features/background-agent/manager.d.ts

@@ -35,6 +35,7 @@ export declare class BackgroundManager {
     private notifyParentSession;
     private formatDuration;
     private hasRunningTasks;
+    private pruneStaleTasksAndNotifications;
     private pollRunningTasks;
 }
 export {};

package/dist/hooks/edit-error-recovery/index.d.ts

@@ -0,0 +1,31 @@
+import type { PluginInput } from "@opencode-ai/plugin";
+/**
+ * Known Edit tool error patterns that indicate the AI made a mistake
+ */
+export declare const EDIT_ERROR_PATTERNS: readonly ["oldString and newString must be different", "oldString not found", "oldString found multiple times"];
+/**
+ * System reminder injected when Edit tool fails due to AI mistake
+ * Short, direct, and commanding - forces immediate corrective action
+ */
+export declare const EDIT_ERROR_REMINDER = "\n[EDIT ERROR - IMMEDIATE ACTION REQUIRED]\n\nYou made an Edit mistake. STOP and do this NOW:\n\n1. READ the file immediately to see its ACTUAL current state\n2. VERIFY what the content really looks like (your assumption was wrong)\n3. APOLOGIZE briefly to the user for the error\n4. CONTINUE with corrected action based on the real file content\n\nDO NOT attempt another edit until you've read and verified the file state.\n";
+/**
+ * Detects Edit tool errors caused by AI mistakes and injects a recovery reminder
+ *
+ * This hook catches common Edit tool failures:
+ * - oldString and newString must be different (trying to "edit" to same content)
+ * - oldString not found (wrong assumption about file content)
+ * - oldString found multiple times (ambiguous match, need more context)
+ *
+ * @see https://github.com/sst/opencode/issues/4718
+ */
+export declare function createEditErrorRecoveryHook(_ctx: PluginInput): {
+    "tool.execute.after": (input: {
+        tool: string;
+        sessionID: string;
+        callID: string;
+    }, output: {
+        title: string;
+        output: string;
+        metadata: unknown;
+    }) => Promise<void>;
+};

package/dist/hooks/edit-error-recovery/index.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/hooks/index.d.ts

@@ -23,3 +23,4 @@ export { createEmptyMessageSanitizerHook } from "./empty-message-sanitizer";
 export { createThinkingBlockValidatorHook } from "./thinking-block-validator";
 export { createRalphLoopHook, type RalphLoopHook } from "./ralph-loop";
 export { createAutoSlashCommandHook } from "./auto-slash-command";
+export { createEditErrorRecoveryHook } from "./edit-error-recovery";

package/dist/hooks/non-interactive-env/index.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/index.js

@@ -8557,6 +8557,7 @@ Incomplete tasks remain in your todo list. Continue working on the next pending
 - Do not stop until all tasks are done`;
 var COUNTDOWN_SECONDS = 2;
 var TOAST_DURATION_MS = 900;
+var COUNTDOWN_GRACE_PERIOD_MS = 500;
 function getMessageDir(sessionID) {
   if (!existsSync2(MESSAGE_STORAGE))
     return null;
@@ -8616,6 +8617,7 @@ function createTodoContinuationEnforcer(ctx, options = {}) {
       clearInterval(state2.countdownInterval);
       state2.countdownInterval = undefined;
     }
+    state2.countdownStartedAt = undefined;
   }
   function cleanup(sessionID) {
     cancelCountdown(sessionID);
@@ -8705,6 +8707,7 @@ function createTodoContinuationEnforcer(ctx, options = {}) {
     cancelCountdown(sessionID);
     let secondsRemaining = COUNTDOWN_SECONDS;
     showCountdownToast(secondsRemaining, incompleteCount);
+    state2.countdownStartedAt = Date.now();
     state2.countdownInterval = setInterval(() => {
       secondsRemaining--;
       if (secondsRemaining > 0) {
@@ -8788,6 +8791,13 @@ function createTodoContinuationEnforcer(ctx, options = {}) {
         state2.lastEventWasAbortError = false;
       }
       if (role === "user") {
+        if (state2?.countdownStartedAt) {
+          const elapsed = Date.now() - state2.countdownStartedAt;
+          if (elapsed < COUNTDOWN_GRACE_PERIOD_MS) {
+            log(`[${HOOK_NAME}] Ignoring user message in grace period`, { sessionID, elapsed });
+            return;
+          }
+        }
         cancelCountdown(sessionID);
         log(`[${HOOK_NAME}] User message: cleared abort state`, { sessionID });
       }
@@ -11844,7 +11854,7 @@ async function executeCompact(sessionID, msg, autoCompactState, client, director
           setTimeout(async () => {
             try {
               await client.session.prompt_async({
-                path: { sessionID },
+                path: { id: sessionID },
                 body: { parts: [{ type: "text", text: "Continue" }] },
                 query: { directory }
               });
@@ -11910,7 +11920,7 @@ async function executeCompact(sessionID, msg, autoCompactState, client, director
           setTimeout(async () => {
             try {
               await client.session.prompt_async({
-                path: { sessionID },
+                path: { id: sessionID },
                 body: { parts: [{ type: "text", text: "Continue" }] },
                 query: { directory }
               });
@@ -19039,6 +19049,17 @@ function detectBannedCommand(command) {
   }
   return;
 }
+function shellEscape(value) {
+  if (value === "")
+    return "''";
+  if (/[^a-zA-Z0-9_\-.:\/]/.test(value)) {
+    return `'${value.replace(/'/g, "'\\''")}'`;
+  }
+  return value;
+}
+function buildEnvPrefix(env) {
+  return Object.entries(env).map(([key, value]) => `${key}=${shellEscape(value)}`).join(" \\\n");
+}
 function createNonInteractiveEnvHook(_ctx) {
   return {
     "tool.execute.before": async (input, output) => {
@@ -19049,18 +19070,19 @@ function createNonInteractiveEnvHook(_ctx) {
       if (!command) {
         return;
       }
-      output.args.env = {
-        ...process.env,
-        ...output.args.env,
-        ...NON_INTERACTIVE_ENV
-      };
       const bannedCmd = detectBannedCommand(command);
       if (bannedCmd) {
         output.message = `\u26A0\uFE0F Warning: '${bannedCmd}' is an interactive command that may hang in non-interactive environments.`;
       }
-      log(`[${HOOK_NAME2}] Set non-interactive environment variables`, {
+      const isGitCommand = /\bgit\b/.test(command);
+      if (!isGitCommand) {
+        return;
+      }
+      const envPrefix = buildEnvPrefix(NON_INTERACTIVE_ENV);
+      output.args.command = `${envPrefix} ${command}`;
+      log(`[${HOOK_NAME2}] Prepended non-interactive env vars to git command`, {
         sessionID: input.sessionID,
-        env: NON_INTERACTIVE_ENV
+        envPrefix
       });
     }
   };
@@ -19828,7 +19850,7 @@ function extractPromptText3(parts) {
 
 // src/hooks/auto-slash-command/executor.ts
 import { existsSync as existsSync35, readdirSync as readdirSync12, readFileSync as readFileSync24 } from "fs";
-import { join as join43, basename as basename2, dirname as dirname9 } from "path";
+import { join as join43, basename as basename2, dirname as dirname8 } from "path";
 import { homedir as homedir13 } from "os";
 // src/features/opencode-skill-loader/loader.ts
 import { existsSync as existsSync33, readdirSync as readdirSync11, readFileSync as readFileSync22 } from "fs";
@@ -20030,7 +20052,7 @@ function discoverOpencodeProjectSkills() {
 }
 // src/features/opencode-skill-loader/merger.ts
 import { readFileSync as readFileSync23, existsSync as existsSync34 } from "fs";
-import { dirname as dirname8, resolve as resolve5, isAbsolute as isAbsolute2 } from "path";
+import { dirname as dirname7, resolve as resolve5, isAbsolute as isAbsolute2 } from "path";
 import { homedir as homedir12 } from "os";
 var SCOPE_PRIORITY = {
   builtin: 1,
@@ -20103,7 +20125,7 @@ function configEntryToLoaded(name, entry, configDir) {
     return null;
   }
   const description = entry.description || fileMetadata.description || "";
-  const resolvedPath = entry.from ? dirname8(resolveFilePath2(entry.from, configDir)) : configDir || process.cwd();
+  const resolvedPath = entry.from ? dirname7(resolveFilePath2(entry.from, configDir)) : configDir || process.cwd();
   const wrappedTemplate = `<skill-instruction>
 Base directory for this skill: ${resolvedPath}/
 File references (@path) in this skill are relative to this directory.
@@ -20333,7 +20355,7 @@ async function formatCommandTemplate(cmd, args) {
 `);
   sections.push(`## Command Instructions
 `);
-  const commandDir = cmd.path ? dirname9(cmd.path) : process.cwd();
+  const commandDir = cmd.path ? dirname8(cmd.path) : process.cwd();
   const withFileRefs = await resolveFileReferencesInText(cmd.content || "", commandDir);
   const resolvedContent = await resolveCommandsInText(withFileRefs);
   sections.push(resolvedContent.trim());
@@ -20424,6 +20446,38 @@ ${AUTO_SLASH_COMMAND_TAG_CLOSE}`;
     }
   };
 }
+// src/hooks/edit-error-recovery/index.ts
+var EDIT_ERROR_PATTERNS = [
+  "oldString and newString must be different",
+  "oldString not found",
+  "oldString found multiple times"
+];
+var EDIT_ERROR_REMINDER = `
+[EDIT ERROR - IMMEDIATE ACTION REQUIRED]
+
+You made an Edit mistake. STOP and do this NOW:
+
+1. READ the file immediately to see its ACTUAL current state
+2. VERIFY what the content really looks like (your assumption was wrong)
+3. APOLOGIZE briefly to the user for the error
+4. CONTINUE with corrected action based on the real file content
+
+DO NOT attempt another edit until you've read and verified the file state.
+`;
+function createEditErrorRecoveryHook(_ctx) {
+  return {
+    "tool.execute.after": async (input, output) => {
+      if (input.tool.toLowerCase() !== "edit")
+        return;
+      const outputLower = output.output.toLowerCase();
+      const hasEditError = EDIT_ERROR_PATTERNS.some((pattern) => outputLower.includes(pattern.toLowerCase()));
+      if (hasEditError) {
+        output.output += `
+${EDIT_ERROR_REMINDER}`;
+      }
+    }
+  };
+}
 // src/auth/antigravity/constants.ts
 var ANTIGRAVITY_CLIENT_ID = "1071006060591-tmhssin2h21lcre235vtolojh4g403ep.apps.googleusercontent.com";
 var ANTIGRAVITY_CLIENT_SECRET = "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";
@@ -36458,7 +36512,7 @@ var lsp_code_action_resolve = tool({
 });
 // src/tools/ast-grep/constants.ts
 import { createRequire as createRequire4 } from "module";
-import { dirname as dirname10, join as join47 } from "path";
+import { dirname as dirname9, join as join47 } from "path";
 import { existsSync as existsSync40, statSync as statSync4 } from "fs";
 
 // src/tools/ast-grep/downloader.ts
@@ -36601,7 +36655,7 @@ function findSgCliPathSync() {
   try {
     const require2 = createRequire4(import.meta.url);
     const cliPkgPath = require2.resolve("@ast-grep/cli/package.json");
-    const cliDir = dirname10(cliPkgPath);
+    const cliDir = dirname9(cliPkgPath);
     const sgPath = join47(cliDir, binaryName);
     if (existsSync40(sgPath) && isValidBinary(sgPath)) {
       return sgPath;
@@ -36612,7 +36666,7 @@ function findSgCliPathSync() {
     try {
       const require2 = createRequire4(import.meta.url);
       const pkgPath = require2.resolve(`${platformPkg}/package.json`);
-      const pkgDir = dirname10(pkgPath);
+      const pkgDir = dirname9(pkgPath);
       const astGrepName = process.platform === "win32" ? "ast-grep.exe" : "ast-grep";
       const binaryPath = join47(pkgDir, astGrepName);
       if (existsSync40(binaryPath) && isValidBinary(binaryPath)) {
@@ -36989,7 +37043,7 @@ var {spawn: spawn9 } = globalThis.Bun;
 
 // src/tools/grep/constants.ts
 import { existsSync as existsSync43 } from "fs";
-import { join as join49, dirname as dirname11 } from "path";
+import { join as join49, dirname as dirname10 } from "path";
 import { spawnSync } from "child_process";
 
 // src/tools/grep/downloader.ts
@@ -37154,7 +37208,7 @@ function findExecutable(name) {
 }
 function getOpenCodeBundledRg() {
   const execPath = process.execPath;
-  const execDir = dirname11(execPath);
+  const execDir = dirname10(execPath);
   const isWindows2 = process.platform === "win32";
   const rgName = isWindows2 ? "rg.exe" : "rg";
   const candidates = [
@@ -37619,7 +37673,7 @@ var glob = tool({
 });
 // src/tools/slashcommand/tools.ts
 import { existsSync as existsSync44, readdirSync as readdirSync14, readFileSync as readFileSync29 } from "fs";
-import { join as join50, basename as basename3, dirname as dirname12 } from "path";
+import { join as join50, basename as basename3, dirname as dirname11 } from "path";
 function discoverCommandsFromDir2(commandsDir, scope) {
   if (!existsSync44(commandsDir)) {
     return [];
@@ -37725,7 +37779,7 @@ async function formatLoadedCommand(cmd) {
 `);
   sections.push(`## Command Instructions
 `);
-  const commandDir = cmd.path ? dirname12(cmd.path) : process.cwd();
+  const commandDir = cmd.path ? dirname11(cmd.path) : process.cwd();
   const withFileRefs = await resolveFileReferencesInText(cmd.content || "", commandDir);
   const resolvedContent = await resolveCommandsInText(withFileRefs);
   sections.push(resolvedContent.trim());
@@ -38511,7 +38565,7 @@ var TOOL_DESCRIPTION_PREFIX = `Load a skill to get detailed instructions for a s
 Skills provide specialized knowledge and step-by-step guidance.
 Use this when a task matches an available skill's description.`;
 // src/tools/skill/tools.ts
-import { dirname as dirname13 } from "path";
+import { dirname as dirname12 } from "path";
 import { readFileSync as readFileSync30 } from "fs";
 function loadedSkillToInfo(skill) {
   return {
@@ -38633,7 +38687,7 @@ function createSkillTool(options = {}) {
         throw new Error(`Skill "${args.name}" not found. Available skills: ${available || "none"}`);
       }
       const body = extractSkillBody(skill);
-      const dir = skill.path ? dirname13(skill.path) : skill.resolvedPath || process.cwd();
+      const dir = skill.path ? dirname12(skill.path) : skill.resolvedPath || process.cwd();
       const output = [
         `## Skill: ${skill.name}`,
         "",
@@ -39405,6 +39459,7 @@ var builtinTools = {
 // src/features/background-agent/manager.ts
 import { existsSync as existsSync47, readdirSync as readdirSync17 } from "fs";
 import { join as join54 } from "path";
+var TASK_TTL_MS = 30 * 60 * 1000;
 function getMessageDir11(sessionID) {
   if (!existsSync47(MESSAGE_STORAGE))
     return null;
@@ -39670,11 +39725,11 @@ class BackgroundManager {
           },
           query: { directory: this.directory }
         });
-        this.clearNotificationsForTask(taskId);
         log("[background-agent] Successfully sent prompt to parent session:", { parentSessionID: task.parentSessionID });
       } catch (error45) {
         log("[background-agent] prompt failed:", String(error45));
       } finally {
+        this.clearNotificationsForTask(taskId);
         this.tasks.delete(taskId);
         log("[background-agent] Removed completed task from memory:", taskId);
       }
@@ -39699,7 +39754,38 @@ class BackgroundManager {
     }
     return false;
   }
+  pruneStaleTasksAndNotifications() {
+    const now = Date.now();
+    for (const [taskId, task] of this.tasks.entries()) {
+      const age = now - task.startedAt.getTime();
+      if (age > TASK_TTL_MS) {
+        log("[background-agent] Pruning stale task:", { taskId, age: Math.round(age / 1000) + "s" });
+        task.status = "error";
+        task.error = "Task timed out after 30 minutes";
+        task.completedAt = new Date;
+        this.clearNotificationsForTask(taskId);
+        this.tasks.delete(taskId);
+        subagentSessions.delete(task.sessionID);
+      }
+    }
+    for (const [sessionID, notifications] of this.notifications.entries()) {
+      if (notifications.length === 0) {
+        this.notifications.delete(sessionID);
+        continue;
+      }
+      const validNotifications = notifications.filter((task) => {
+        const age = now - task.startedAt.getTime();
+        return age <= TASK_TTL_MS;
+      });
+      if (validNotifications.length === 0) {
+        this.notifications.delete(sessionID);
+      } else if (validNotifications.length !== notifications.length) {
+        this.notifications.set(sessionID, validNotifications);
+      }
+    }
+  }
   async pollRunningTasks() {
+    this.pruneStaleTasksAndNotifications();
     const statusResult = await this.client.session.status();
     const allStatuses = statusResult.data ?? {};
     for (const task of this.tasks.values()) {
@@ -42511,7 +42597,8 @@ var HookNameSchema = exports_external.enum([
   "preemptive-compaction",
   "compaction-context-injector",
   "claude-code-hooks",
-  "auto-slash-command"
+  "auto-slash-command",
+  "edit-error-recovery"
 ]);
 var BuiltinCommandNameSchema = exports_external.enum([
   "init-deep"
@@ -45646,6 +45733,7 @@ var OhMyOpenCodePlugin = async (ctx) => {
   const thinkingBlockValidator = isHookEnabled("thinking-block-validator") ? createThinkingBlockValidatorHook() : null;
   const ralphLoop = isHookEnabled("ralph-loop") ? createRalphLoopHook(ctx, { config: pluginConfig.ralph_loop }) : null;
   const autoSlashCommand = isHookEnabled("auto-slash-command") ? createAutoSlashCommandHook() : null;
+  const editErrorRecovery = isHookEnabled("edit-error-recovery") ? createEditErrorRecoveryHook(ctx) : null;
   const backgroundManager = new BackgroundManager(ctx);
   const todoContinuationEnforcer = isHookEnabled("todo-continuation-enforcer") ? createTodoContinuationEnforcer(ctx, { backgroundManager }) : null;
   if (sessionRecovery && todoContinuationEnforcer) {
@@ -45840,6 +45928,7 @@ var OhMyOpenCodePlugin = async (ctx) => {
       await emptyTaskResponseDetector?.["tool.execute.after"](input, output);
       await agentUsageReminder?.["tool.execute.after"](input, output);
       await interactiveBashSession?.["tool.execute.after"](input, output);
+      await editErrorRecovery?.["tool.execute.after"](input, output);
     }
   };
 };

package/dist/tools/ast-grep/utils.d.ts

@@ -2,4 +2,4 @@ import type { AnalyzeResult, SgResult } from "./types";
 export declare function formatSearchResult(result: SgResult): string;
 export declare function formatReplaceResult(result: SgResult, isDryRun: boolean): string;
 export declare function formatAnalyzeResult(results: AnalyzeResult[], extractedMetaVars: boolean): string;
-export declare function formatTransformResult(original: string, transformed: string, editCount: number): string;
+export declare function formatTransformResult(_original: string, transformed: string, editCount: number): string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oh-my-opencode",
-  "version": "2.12.0",
+  "version": "2.12.1",
   "description": "OpenCode plugin - custom agents (oracle, librarian) and enhanced features",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",