oh-my-opencode 2.0.3 → 2.0.4

package/README.ko.md

@@ -608,7 +608,7 @@ OmO를 비활성화하고 원래 build/plan 에이전트를 복원하려면:
 }
 ```
 
-사용 가능한 훅: `todo-continuation-enforcer`, `context-window-monitor`, `session-recovery`, `session-notification`, `comment-checker`, `grep-output-truncator`, `tool-output-truncator`, `directory-agents-injector`, `directory-readme-injector`, `empty-task-response-detector`, `think-mode`, `anthropic-auto-compact`, `rules-injector`, `background-notification`, `auto-update-checker`, `startup-toast`, `keyword-detector`, `agent-usage-reminder`
+사용 가능한 훅: `todo-continuation-enforcer`, `context-window-monitor`, `session-recovery`, `session-notification`, `comment-checker`, `grep-output-truncator`, `tool-output-truncator`, `directory-agents-injector`, `directory-readme-injector`, `empty-task-response-detector`, `think-mode`, `anthropic-auto-compact`, `rules-injector`, `background-notification`, `auto-update-checker`, `startup-toast`, `keyword-detector`, `agent-usage-reminder`, `non-interactive-env`
 
 ### MCPs
 

package/README.md

@@ -609,7 +609,7 @@ Disable specific built-in hooks via `disabled_hooks` in `~/.config/opencode/oh-m
 }
 ```
 
-Available hooks: `todo-continuation-enforcer`, `context-window-monitor`, `session-recovery`, `session-notification`, `comment-checker`, `grep-output-truncator`, `tool-output-truncator`, `directory-agents-injector`, `directory-readme-injector`, `empty-task-response-detector`, `think-mode`, `anthropic-auto-compact`, `rules-injector`, `background-notification`, `auto-update-checker`, `startup-toast`, `keyword-detector`, `agent-usage-reminder`
+Available hooks: `todo-continuation-enforcer`, `context-window-monitor`, `session-recovery`, `session-notification`, `comment-checker`, `grep-output-truncator`, `tool-output-truncator`, `directory-agents-injector`, `directory-readme-injector`, `empty-task-response-detector`, `think-mode`, `anthropic-auto-compact`, `rules-injector`, `background-notification`, `auto-update-checker`, `startup-toast`, `keyword-detector`, `agent-usage-reminder`, `non-interactive-env`
 
 ### MCPs
 

package/dist/config/schema.d.ts

@@ -33,6 +33,7 @@ export declare const HookNameSchema: z.ZodEnum<{
     "comment-checker": "comment-checker";
     "rules-injector": "rules-injector";
     "agent-usage-reminder": "agent-usage-reminder";
+    "non-interactive-env": "non-interactive-env";
     "todo-continuation-enforcer": "todo-continuation-enforcer";
     "context-window-monitor": "context-window-monitor";
     "session-recovery": "session-recovery";
@@ -587,6 +588,7 @@ export declare const OhMyOpenCodeConfigSchema: z.ZodObject<{
         "comment-checker": "comment-checker";
         "rules-injector": "rules-injector";
         "agent-usage-reminder": "agent-usage-reminder";
+        "non-interactive-env": "non-interactive-env";
         "todo-continuation-enforcer": "todo-continuation-enforcer";
         "context-window-monitor": "context-window-monitor";
         "session-recovery": "session-recovery";

package/dist/hooks/auto-update-checker/constants.d.ts

@@ -6,3 +6,4 @@ export declare const VERSION_FILE: string;
 export declare const INSTALLED_PACKAGE_JSON: string;
 export declare const USER_CONFIG_DIR: string;
 export declare const USER_OPENCODE_CONFIG: string;
+export declare const USER_OPENCODE_CONFIG_JSONC: string;

package/dist/hooks/index.d.ts

@@ -16,3 +16,4 @@ export { createBackgroundNotificationHook } from "./background-notification";
 export { createAutoUpdateCheckerHook } from "./auto-update-checker";
 export { createAgentUsageReminderHook } from "./agent-usage-reminder";
 export { createKeywordDetectorHook } from "./keyword-detector";
+export { createNonInteractiveEnvHook } from "./non-interactive-env";

package/dist/hooks/non-interactive-env/constants.d.ts

@@ -0,0 +1,2 @@
+export declare const HOOK_NAME = "non-interactive-env";
+export declare const NON_INTERACTIVE_ENV: Record<string, string>;

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

@@ -0,0 +1,12 @@
+import type { PluginInput } from "@opencode-ai/plugin";
+export * from "./constants";
+export * from "./types";
+export declare function createNonInteractiveEnvHook(_ctx: PluginInput): {
+    "tool.execute.before": (input: {
+        tool: string;
+        sessionID: string;
+        callID: string;
+    }, output: {
+        args: Record<string, unknown>;
+    }) => Promise<void>;
+};

package/dist/hooks/non-interactive-env/types.d.ts

@@ -0,0 +1,3 @@
+export interface NonInteractiveEnvConfig {
+    disabled?: boolean;
+}

package/dist/hooks/session-recovery/storage.d.ts

@@ -10,6 +10,7 @@ export declare function findEmptyMessages(sessionID: string): string[];
 export declare function findEmptyMessageByIndex(sessionID: string, targetIndex: number): string | null;
 export declare function findFirstEmptyMessage(sessionID: string): string | null;
 export declare function findMessagesWithThinkingBlocks(sessionID: string): string[];
+export declare function findMessagesWithThinkingOnly(sessionID: string): string[];
 export declare function findMessagesWithOrphanThinking(sessionID: string): string[];
 export declare function prependThinkingPart(sessionID: string, messageID: string): boolean;
 export declare function stripThinkingParts(messageID: string): boolean;

package/dist/index.js

@@ -3879,7 +3879,7 @@ function findEmptyMessages(sessionID) {
 }
 function findEmptyMessageByIndex(sessionID, targetIndex) {
   const messages = readMessages(sessionID);
-  const indicesToTry = [targetIndex, targetIndex - 1];
+  const indicesToTry = [targetIndex, targetIndex - 1, targetIndex - 2];
   for (const idx of indicesToTry) {
     if (idx < 0 || idx >= messages.length)
       continue;
@@ -3904,6 +3904,23 @@ function findMessagesWithThinkingBlocks(sessionID) {
   }
   return result;
 }
+function findMessagesWithThinkingOnly(sessionID) {
+  const messages = readMessages(sessionID);
+  const result = [];
+  for (const msg of messages) {
+    if (msg.role !== "assistant")
+      continue;
+    const parts = readParts(msg.id);
+    if (parts.length === 0)
+      continue;
+    const hasThinking = parts.some((p) => THINKING_TYPES.has(p.type));
+    const hasTextContent = parts.some(hasContent);
+    if (hasThinking && !hasTextContent) {
+      result.push(msg.id);
+    }
+  }
+  return result;
+}
 function findMessagesWithOrphanThinking(sessionID) {
   const messages = readMessages(sessionID);
   const result = [];
@@ -4072,24 +4089,29 @@ async function recoverThinkingDisabledViolation(_client, sessionID, _failedAssis
   }
   return anySuccess;
 }
+var PLACEHOLDER_TEXT = "[user interrupted]";
 async function recoverEmptyContentMessage(_client, sessionID, failedAssistantMsg, _directory, error) {
   const targetIndex = extractMessageIndex(error);
   const failedID = failedAssistantMsg.info?.id;
+  const thinkingOnlyIDs = findMessagesWithThinkingOnly(sessionID);
+  for (const messageID of thinkingOnlyIDs) {
+    injectTextPart(sessionID, messageID, PLACEHOLDER_TEXT);
+  }
   if (targetIndex !== null) {
     const targetMessageID = findEmptyMessageByIndex(sessionID, targetIndex);
     if (targetMessageID) {
-      return injectTextPart(sessionID, targetMessageID, "(interrupted)");
+      return injectTextPart(sessionID, targetMessageID, PLACEHOLDER_TEXT);
     }
   }
   if (failedID) {
-    if (injectTextPart(sessionID, failedID, "(interrupted)")) {
+    if (injectTextPart(sessionID, failedID, PLACEHOLDER_TEXT)) {
       return true;
     }
   }
   const emptyMessageIDs = findEmptyMessages(sessionID);
-  let anySuccess = false;
+  let anySuccess = thinkingOnlyIDs.length > 0;
   for (const messageID of emptyMessageIDs) {
-    if (injectTextPart(sessionID, messageID, "(interrupted)")) {
+    if (injectTextPart(sessionID, messageID, PLACEHOLDER_TEXT)) {
       anySuccess = true;
     }
   }
@@ -6979,17 +7001,25 @@ function getUserConfigDir() {
 }
 var USER_CONFIG_DIR = getUserConfigDir();
 var USER_OPENCODE_CONFIG = path3.join(USER_CONFIG_DIR, "opencode", "opencode.json");
+var USER_OPENCODE_CONFIG_JSONC = path3.join(USER_CONFIG_DIR, "opencode", "opencode.jsonc");
 
 // src/hooks/auto-update-checker/checker.ts
 function isLocalDevMode(directory) {
   return getLocalDevPath(directory) !== null;
 }
 function stripJsonComments(json) {
-  return json.replace(/^\s*\/\/.*$/gm, "").replace(/,(\s*[}\]])/g, "$1");
+  return json.replace(/\\"|"(?:\\"|[^"])*"|(\/\/.*|\/\*[\s\S]*?\*\/)/g, (m, g) => g ? "" : m).replace(/,(\s*[}\]])/g, "$1");
+}
+function getConfigPaths(directory) {
+  return [
+    path4.join(directory, ".opencode", "opencode.json"),
+    path4.join(directory, ".opencode", "opencode.jsonc"),
+    USER_OPENCODE_CONFIG,
+    USER_OPENCODE_CONFIG_JSONC
+  ];
 }
 function getLocalDevPath(directory) {
-  const projectConfig = path4.join(directory, ".opencode", "opencode.json");
-  for (const configPath of [projectConfig, USER_OPENCODE_CONFIG]) {
+  for (const configPath of getConfigPaths(directory)) {
     try {
       if (!fs4.existsSync(configPath))
         continue;
@@ -6998,7 +7028,11 @@ function getLocalDevPath(directory) {
       const plugins = config.plugin ?? [];
       for (const entry of plugins) {
         if (entry.startsWith("file://") && entry.includes(PACKAGE_NAME)) {
-          return entry.replace("file://", "");
+          try {
+            return fileURLToPath(entry);
+          } catch {
+            return entry.replace("file://", "");
+          }
         }
       }
     } catch {
@@ -7045,8 +7079,7 @@ function getLocalDevVersion(directory) {
   }
 }
 function findPluginEntry(directory) {
-  const projectConfig = path4.join(directory, ".opencode", "opencode.json");
-  for (const configPath of [projectConfig, USER_OPENCODE_CONFIG]) {
+  for (const configPath of getConfigPaths(directory)) {
     try {
       if (!fs4.existsSync(configPath))
         continue;
@@ -7508,6 +7541,38 @@ function createKeywordDetectorHook() {
     }
   };
 }
+// src/hooks/non-interactive-env/constants.ts
+var HOOK_NAME = "non-interactive-env";
+var NON_INTERACTIVE_ENV = {
+  CI: "true",
+  DEBIAN_FRONTEND: "noninteractive",
+  GIT_TERMINAL_PROMPT: "0",
+  GCM_INTERACTIVE: "never",
+  HOMEBREW_NO_AUTO_UPDATE: "1"
+};
+
+// src/hooks/non-interactive-env/index.ts
+function createNonInteractiveEnvHook(_ctx) {
+  return {
+    "tool.execute.before": async (input, output) => {
+      if (input.tool.toLowerCase() !== "bash") {
+        return;
+      }
+      const command = output.args.command;
+      if (!command) {
+        return;
+      }
+      output.args.env = {
+        ...output.args.env,
+        ...NON_INTERACTIVE_ENV
+      };
+      log(`[${HOOK_NAME}] Set non-interactive environment variables`, {
+        sessionID: input.sessionID,
+        env: NON_INTERACTIVE_ENV
+      });
+    }
+  };
+}
 // src/auth/antigravity/constants.ts
 var ANTIGRAVITY_CLIENT_ID = "1071006060591-tmhssin2h21lcre235vtolojh4g403ep.apps.googleusercontent.com";
 var ANTIGRAVITY_CLIENT_SECRET = "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";
@@ -9661,7 +9726,7 @@ function loadJsonFile(path6) {
     return null;
   }
 }
-function getConfigPaths() {
+function getConfigPaths2() {
   const cwd = process.cwd();
   return {
     project: join31(cwd, ".opencode", "oh-my-opencode.json"),
@@ -9670,7 +9735,7 @@ function getConfigPaths() {
   };
 }
 function loadAllConfigs() {
-  const paths = getConfigPaths();
+  const paths = getConfigPaths2();
   const configs = new Map;
   const project2 = loadJsonFile(paths.project);
   if (project2)
@@ -20693,10 +20758,10 @@ function _property(property, schema, params) {
     ...normalizeParams(params)
   });
 }
-function _mime(types10, params) {
+function _mime(types11, params) {
   return new $ZodCheckMimeType({
     check: "mime_type",
-    mime: types10,
+    mime: types11,
     ...normalizeParams(params)
   });
 }
@@ -22606,7 +22671,7 @@ var ZodFile = /* @__PURE__ */ $constructor("ZodFile", (inst, def) => {
   ZodType.init(inst, def);
   inst.min = (size, params) => inst.check(_minSize(size, params));
   inst.max = (size, params) => inst.check(_maxSize(size, params));
-  inst.mime = (types10, params) => inst.check(_mime(Array.isArray(types10) ? types10 : [types10], params));
+  inst.mime = (types11, params) => inst.check(_mime(Array.isArray(types11) ? types11 : [types11], params));
 });
 function file(params) {
   return _file(ZodFile, params);
@@ -25599,7 +25664,8 @@ var HookNameSchema = exports_external.enum([
   "auto-update-checker",
   "startup-toast",
   "keyword-detector",
-  "agent-usage-reminder"
+  "agent-usage-reminder",
+  "non-interactive-env"
 ]);
 var AgentOverrideConfigSchema = exports_external.object({
   model: exports_external.string().optional(),
@@ -25765,6 +25831,7 @@ var OhMyOpenCodePlugin = async (ctx) => {
   }) : null;
   const keywordDetector = isHookEnabled("keyword-detector") ? createKeywordDetectorHook() : null;
   const agentUsageReminder = isHookEnabled("agent-usage-reminder") ? createAgentUsageReminderHook(ctx) : null;
+  const nonInteractiveEnv = isHookEnabled("non-interactive-env") ? createNonInteractiveEnvHook(ctx) : null;
   updateTerminalTitle({ sessionId: "main" });
   const backgroundManager = new BackgroundManager(ctx);
   const backgroundNotificationHook = isHookEnabled("background-notification") ? createBackgroundNotificationHook(backgroundManager) : null;
@@ -25957,6 +26024,7 @@ var OhMyOpenCodePlugin = async (ctx) => {
     },
     "tool.execute.before": async (input, output) => {
       await claudeCodeHooks["tool.execute.before"](input, output);
+      await nonInteractiveEnv?.["tool.execute.before"](input, output);
       await commentChecker?.["tool.execute.before"](input, output);
       if (input.sessionID === getMainSessionID()) {
         updateTerminalTitle({

package/package.json

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