M10: cleanup sprint + community parity

CLI/cmux.swift

@@ -9853,7 +9853,7 @@ struct CMUXCLI {
         }
     }
 
-    private static let omoPluginName = "oh-my-opencode"
+    private static let omoPluginName = "oh-my-openagent"
 
     private func resolveExecutableInPath(_ name: String) -> String? {
         let entries = ProcessInfo.processInfo.environment["PATH"]?.split(separator: ":").map(String.init) ?? []
@@ -9895,7 +9895,7 @@ struct CMUXCLI {
 
         // Keep the shadow package isolated from stale/yanked pins in the user's
         // opencode package.json. bun will update this manifest with the resolved
-        // oh-my-opencode version when installation succeeds.
+        // oh-my-openagent version when installation succeeds.
         let packageManifest: [String: Any] = [
             "dependencies": [
                 Self.omoPluginName: "latest"
@@ -10039,7 +10039,7 @@ struct CMUXCLI {
         return "4096"
     }
 
-    /// Creates a shadow config directory that layers oh-my-opencode on top of the user's
+    /// Creates a shadow config directory that layers oh-my-openagent on top of the user's
     /// existing opencode config without modifying the original. Sets OPENCODE_CONFIG_DIR
     /// to point at the shadow directory.
     private func omoEnsurePlugin() throws {
@@ -10064,6 +10064,8 @@ struct CMUXCLI {
         }
 
         var plugins = (config["plugin"] as? [String]) ?? []
+        // Remove legacy oh-my-opencode entries to avoid duplicate plugin registration
+        plugins.removeAll { $0 == "oh-my-opencode" || $0.hasPrefix("oh-my-opencode@") }
         let alreadyPresent = plugins.contains {
             $0 == Self.omoPluginName || $0.hasPrefix("\(Self.omoPluginName)@")
         }
@@ -10089,12 +10091,18 @@ struct CMUXCLI {
             try? fm.removeItem(at: shadowBunLockURL)
         }
 
-        // Copy oh-my-opencode plugin config (jsonc) if the user has one
-        for filename in ["oh-my-opencode.json", "oh-my-opencode.jsonc"] {
-            let userFile = userDir.appendingPathComponent(filename)
-            let shadowFile = shadowDir.appendingPathComponent(filename)
-            if fm.fileExists(atPath: userFile.path) && !fm.fileExists(atPath: shadowFile.path) {
+        // Copy oh-my-openagent plugin config if the user has one (fall back to legacy oh-my-opencode name)
+        for ext in ["json", "jsonc"] {
+            let newName = "oh-my-openagent.\(ext)"
+            let legacyName = "oh-my-opencode.\(ext)"
+            let shadowFile = shadowDir.appendingPathComponent(newName)
+            guard !fm.fileExists(atPath: shadowFile.path) else { continue }
+            let userFile = userDir.appendingPathComponent(newName)
+            let legacyFile = userDir.appendingPathComponent(legacyName)
+            if fm.fileExists(atPath: userFile.path) {
                 try fm.createSymbolicLink(at: shadowFile, withDestinationURL: userFile)
+            } else if fm.fileExists(atPath: legacyFile.path) {
+                try fm.createSymbolicLink(at: shadowFile, withDestinationURL: legacyFile)
             }
         }
 
@@ -10103,15 +10111,15 @@ struct CMUXCLI {
         if !fm.fileExists(atPath: pluginPackageDir.path) {
             let installDir = shadowDir
             if let bunPath = resolveExecutableInPath("bun") {
-                FileHandle.standardError.write("Installing oh-my-opencode plugin (this may take a minute on first run)...\n".data(using: .utf8)!)
+                FileHandle.standardError.write("Installing oh-my-openagent plugin (this may take a minute on first run)...\n".data(using: .utf8)!)
                 let installArguments = ["add", Self.omoPluginName]
                 let firstAttemptStatus = try omoRunPackageInstall(
                     executablePath: bunPath,
                     arguments: installArguments,
                     currentDirectoryURL: installDir
                 )
                 if firstAttemptStatus != 0 {
-                    FileHandle.standardError.write("Retrying oh-my-opencode install with a clean shadow package state...\n".data(using: .utf8)!)
+                    FileHandle.standardError.write("Retrying oh-my-openagent install with a clean shadow package state...\n".data(using: .utf8)!)
                     try? fm.removeItem(at: shadowBunLockURL)
                     try? fm.removeItem(at: shadowNodeModules)
                     try omoEnsureShadowNodeModulesSymlink(shadowNodeModules: shadowNodeModules, userNodeModules: userNodeModules)
@@ -10121,37 +10129,39 @@ struct CMUXCLI {
                         currentDirectoryURL: installDir
                     )
                     if retryStatus != 0 {
-                        throw CLIError(message: "Failed to install oh-my-opencode. Try manually: npm install -g oh-my-opencode")
+                        throw CLIError(message: "Failed to install oh-my-openagent. Try manually: npm install -g oh-my-openagent")
                     }
                 }
             } else if let npmPath = resolveExecutableInPath("npm") {
-                FileHandle.standardError.write("Installing oh-my-opencode plugin (this may take a minute on first run)...\n".data(using: .utf8)!)
+                FileHandle.standardError.write("Installing oh-my-openagent plugin (this may take a minute on first run)...\n".data(using: .utf8)!)
                 let status = try omoRunPackageInstall(
                     executablePath: npmPath,
                     arguments: ["install", Self.omoPluginName],
                     currentDirectoryURL: installDir
                 )
                 if status != 0 {
-                    throw CLIError(message: "Failed to install oh-my-opencode. Try manually: npm install -g oh-my-opencode")
+                    throw CLIError(message: "Failed to install oh-my-openagent. Try manually: npm install -g oh-my-openagent")
                 }
             } else {
-                throw CLIError(message: "Neither bun nor npm found in PATH. Install oh-my-opencode manually: bunx oh-my-opencode install")
+                throw CLIError(message: "Neither bun nor npm found in PATH. Install oh-my-openagent manually: bunx oh-my-openagent install")
             }
-            FileHandle.standardError.write("oh-my-opencode plugin installed\n".data(using: .utf8)!)
+            FileHandle.standardError.write("oh-my-openagent plugin installed\n".data(using: .utf8)!)
         }
 
-        // Ensure tmux mode is enabled in oh-my-opencode config.
+        // Ensure tmux mode is enabled in oh-my-openagent config.
         // Without this, the TmuxSessionManager won't spawn visual panes even though
         // $TMUX is set (tmux.enabled defaults to false).
-        let omoConfigURL = shadowDir.appendingPathComponent("oh-my-opencode.json")
+        let omoConfigURL = shadowDir.appendingPathComponent("oh-my-openagent.json")
         var omoConfig: [String: Any]
         if let data = try? Data(contentsOf: omoConfigURL),
            let existing = try? JSONSerialization.jsonObject(with: data) as? [String: Any] {
             omoConfig = existing
         } else {
-            // Check if user has a config we symlinked, read from source
-            let userOmoConfig = userDir.appendingPathComponent("oh-my-opencode.json")
-            if let data = try? Data(contentsOf: userOmoConfig),
+            // Check if user has a config we symlinked, read from source (new name first, fall back to legacy)
+            let userOmoConfig = userDir.appendingPathComponent("oh-my-openagent.json")
+            let legacyOmoConfig = userDir.appendingPathComponent("oh-my-opencode.json")
+            let userConfigData = (try? Data(contentsOf: userOmoConfig)) ?? (try? Data(contentsOf: legacyOmoConfig))
+            if let data = userConfigData,
                let existing = try? JSONSerialization.jsonObject(with: data) as? [String: Any] {
                 omoConfig = existing
                 // Remove the symlink so we can write our own copy
@@ -10248,7 +10258,7 @@ struct CMUXCLI {
             }
         }
 
-        // Ensure oh-my-opencode plugin is registered and installed
+        // Ensure oh-my-openagent plugin is registered and installed
         try omoEnsurePlugin()
 
         let shimDirectory = try createOMOShimDirectory()

Resources/Localizable.xcstrings

@@ -63173,6 +63173,23 @@
         }
       }
     },
+    "settings.search.placeholder": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Search settings"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "設定を検索"
+          }
+        }
+      }
+    },
     "settings.section.workspaceColors": {
       "extractionState": "manual",
       "localizations": {
@@ -70066,19 +70083,19 @@
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": ":%lld"
+            "value": ":%@"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": ":%lld"
+            "value": ":%@"
           }
         },
         "uk": {
           "stringUnit": {
             "state": "translated",
-            "value": ":%lld"
+            "value": ":%@"
           }
         }
       }
@@ -70089,19 +70106,36 @@
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Open localhost:%lld"
+            "value": "Open localhost:%@"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "localhost:%lldを開く"
+            "value": "localhost:%@を開く"
           }
         },
         "uk": {
           "stringUnit": {
             "state": "translated",
-            "value": "Відкрити localhost:%lld"
+            "value": "Відкрити localhost:%@"
+          }
+        }
+      }
+    },
+    "sidebar.pullRequest.label": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "%1$@ #%2$@"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "%1$@ #%2$@"
           }
         }
       }
@@ -70112,115 +70146,115 @@
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Open %1$@ #%2$lld"
+            "value": "Open %1$@ #%2$@"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "%1$@ #%2$lldを開く"
+            "value": "%1$@ #%2$@を開く"
           }
         },
         "zh-Hans": {
           "stringUnit": {
             "state": "translated",
-            "value": "打开 %1$@ #%2$lld"
+            "value": "打开 %1$@ #%2$@"
           }
         },
         "zh-Hant": {
           "stringUnit": {
             "state": "translated",
-            "value": "開啟 %1$@ #%2$lld"
+            "value": "開啟 %1$@ #%2$@"
           }
         },
         "ko": {
           "stringUnit": {
             "state": "translated",
-            "value": "%1$@ #%2$lld 열기"
+            "value": "%1$@ #%2$@ 열기"
           }
         },
         "de": {
           "stringUnit": {
             "state": "translated",
-            "value": "%1$@ #%2$lld öffnen"
+            "value": "%1$@ #%2$@ öffnen"
           }
         },
         "es": {
           "stringUnit": {
             "state": "translated",
-            "value": "Abrir %1$@ #%2$lld"
+            "value": "Abrir %1$@ #%2$@"
           }
         },
         "fr": {
           "stringUnit": {
             "state": "translated",
-            "value": "Ouvrir %1$@ #%2$lld"
+            "value": "Ouvrir %1$@ #%2$@"
           }
         },
         "it": {
           "stringUnit": {
             "state": "translated",
-            "value": "Apri %1$@ #%2$lld"
+            "value": "Apri %1$@ #%2$@"
           }
         },
         "da": {
           "stringUnit": {
             "state": "translated",
-            "value": "Åbn %1$@ #%2$lld"
+            "value": "Åbn %1$@ #%2$@"
           }
         },
         "pl": {
           "stringUnit": {
             "state": "translated",
-            "value": "Otwórz %1$@ #%2$lld"
+            "value": "Otwórz %1$@ #%2$@"
           }
         },
         "ru": {
           "stringUnit": {
             "state": "translated",
-            "value": "Открыть %1$@ #%2$lld"
+            "value": "Открыть %1$@ #%2$@"
           }
         },
         "bs": {
           "stringUnit": {
             "state": "translated",
-            "value": "Otvori %1$@ #%2$lld"
+            "value": "Otvori %1$@ #%2$@"
           }
         },
         "ar": {
           "stringUnit": {
             "state": "translated",
-            "value": "فتح %1$@ #%2$lld"
+            "value": "فتح %1$@ #%2$@"
           }
         },
         "nb": {
           "stringUnit": {
             "state": "translated",
-            "value": "Åpne %1$@ #%2$lld"
+            "value": "Åpne %1$@ #%2$@"
           }
         },
         "pt-BR": {
           "stringUnit": {
             "state": "translated",
-            "value": "Abrir %1$@ #%2$lld"
+            "value": "Abrir %1$@ #%2$@"
           }
         },
         "th": {
           "stringUnit": {
             "state": "translated",
-            "value": "เปิด %1$@ #%2$lld"
+            "value": "เปิด %1$@ #%2$@"
           }
         },
         "tr": {
           "stringUnit": {
             "state": "translated",
-            "value": "%1$@ #%2$lld Aç"
+            "value": "%1$@ #%2$@ Aç"
           }
         },
         "uk": {
           "stringUnit": {
             "state": "translated",
-            "value": "Відкрити %1$@ #%2$lld"
+            "value": "Відкрити %1$@ #%2$@"
           }
         }
       }