From b92251bdf5b8d5f4c8ea7a578d737152db47b0ac Mon Sep 17 00:00:00 2001
From: arzafran <franco@darkroom.engineering>
Date: Mon, 28 Sep 2026 10:58:34 -0300
Subject: [PATCH 01/19] fix: build palette command indexes without trapping on
 duplicate ids

---
 Sources/ContentView.swift | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Sources/ContentView.swift b/Sources/ContentView.swift
index 3a682aa6d..84fa93db8 100644
--- a/Sources/ContentView.swift
+++ b/Sources/ContentView.swift
@@ -3069,7 +3069,10 @@ struct ContentView: View {
             includeSurfaces: includeSurfaces,
             commandsContext: commandsContext
         )
-        commandPaletteController.commandPaletteSearchCommandsByID = Dictionary(uniqueKeysWithValues: entries.map { ($0.id, $0) })
+        // `uniquingKeysWith` (not `uniqueKeysWithValues:`) guards against a crash if two entries
+        // ever share an id -- e.g. Unicode-normalization-equal saved-layout filenames on a
+        // non-APFS mount -- rather than trapping the whole palette.
+        commandPaletteController.commandPaletteSearchCommandsByID = Dictionary(entries.map { ($0.id, $0) }, uniquingKeysWith: { first, _ in first })
         let searchCorpus = entries.map { entry in
             CommandPaletteSearchCorpusEntry(
                 payload: entry.id,
@@ -3079,7 +3082,7 @@ struct ContentView: View {
             )
         }
         commandPaletteController.commandPaletteSearchCorpus = searchCorpus
-        commandPaletteController.commandPaletteSearchCorpusByID = Dictionary(uniqueKeysWithValues: searchCorpus.map { ($0.payload, $0) })
+        commandPaletteController.commandPaletteSearchCorpusByID = Dictionary(searchCorpus.map { ($0.payload, $0) }, uniquingKeysWith: { first, _ in first })
         commandPaletteController.cachedCommandPaletteScope = scope
         commandPaletteController.cachedCommandPaletteFingerprint = fingerprint
     }

From 456ca2399e08a8c14988135c6073bc7ebc6b1c26 Mon Sep 17 00:00:00 2001
From: arzafran <franco@darkroom.engineering>
Date: Mon, 28 Sep 2026 10:58:50 -0300
Subject: [PATCH 02/19] test: cover session reliability regressions

---
 .../TabManagerSessionSnapshotTests.swift      | 133 ++++++++++++++++++
 1 file changed, 133 insertions(+)

diff --git a/programaTests/TabManagerSessionSnapshotTests.swift b/programaTests/TabManagerSessionSnapshotTests.swift
index ace002624..3615994a5 100644
--- a/programaTests/TabManagerSessionSnapshotTests.swift
+++ b/programaTests/TabManagerSessionSnapshotTests.swift
@@ -105,6 +105,139 @@ final class TabManagerSessionSnapshotTests: XCTestCase {
         XCTAssertEqual(restored.worktreeChildren(of: restoredParent).map(\.id), [restoredChild.id])
     }
 
+    /// Regression for M9 duplicate-repository parent targeting: two workspaces open the same
+    /// repo path, and the worktree child's recorded owner is the *second* one (not the first
+    /// in `tabs`, and not whichever one a directory-based re-derivation would prefer). Pre-#336
+    /// restore rebuilt worktree parents only from folder membership (`worktreeFolderId`); an
+    /// ordinary, non-folder parent like `second` here was never restored at all, so this would
+    /// have failed by leaving `restoredChild.worktreeParentWorkspaceId` nil. The current restore
+    /// (`TabManager+SessionPersistence.swift`) must instead honor the persisted
+    /// `worktreeParentWorkspaceId` by workspace identity, landing the child under `second`.
+    func testWorktreeChildRestoresUnderRecordedParentAmongDuplicateRepoPathWorkspaces() throws {
+        let manager = TabManager()
+        let first = try XCTUnwrap(manager.selectedWorkspace)
+        first.currentDirectory = "/tmp/project"
+        first.setCustomTitle("First")
+        let second = manager.addWorkspace(workingDirectory: "/tmp/project", select: true)
+        second.setCustomTitle("Second")
+        XCTAssertEqual(manager.tabs.count, 2, "both workspaces share the same repo path")
+
+        let child = manager.addWorktreeWorkspace(
+            path: "/tmp/worktrees/feature", branch: "feature", repoRoot: "/tmp/project",
+            parentWorkspaceId: second.id, select: true
+        )
+        child.setCustomTitle("Child")
+        XCTAssertEqual(child.worktreeParentWorkspaceId, second.id)
+
+        let encoded = try JSONEncoder().encode(manager.sessionSnapshot(includeScrollback: false))
+        let snapshot = try JSONDecoder().decode(SessionTabManagerSnapshot.self, from: encoded)
+        let restored = TabManager()
+        restored.restoreSessionSnapshot(snapshot)
+
+        let restoredFirst = try XCTUnwrap(restored.tabs.first { $0.customTitle == "First" })
+        let restoredSecond = try XCTUnwrap(restored.tabs.first { $0.customTitle == "Second" })
+        let restoredChild = try XCTUnwrap(restored.tabs.first { $0.customTitle == "Child" })
+
+        XCTAssertEqual(
+            restoredChild.worktreeParentWorkspaceId, restoredSecond.id,
+            "the child must attach to the specific workspace recorded as its owner"
+        )
+        XCTAssertNotEqual(
+            restoredChild.worktreeParentWorkspaceId, restoredFirst.id,
+            "a same-path sibling that is not the recorded owner must never be substituted"
+        )
+        XCTAssertTrue(restored.worktreeChildren(of: restoredFirst).isEmpty)
+        XCTAssertEqual(restored.worktreeChildren(of: restoredSecond).map(\.id), [restoredChild.id])
+    }
+
+    /// Regression for M9 hierarchy restoration: a folder with two children plus an independent
+    /// ordinary parent/child/grandchild chain must all survive encode -> decode -> restore
+    /// together, without cross-linking. `testOrdinaryWorktreeParentSurvivesEncodedSessionRoundTrip`
+    /// only exercises a single flat parent/child pair, which a restore that merges every worktree
+    /// under one bucket (or only rebuilds folder membership, the pre-#336 behavior) could still
+    /// pass. This adds a second, disjoint hierarchy and a selection assertion
+    /// (`TabManager+SessionPersistence.swift`'s collapsed-parent selection remap) that only holds
+    /// if the folder/child links were actually rebuilt, not merely present as flat rows.
+    func testWorkspaceHierarchySurvivesEncodedSessionRoundTrip() throws {
+        let manager = TabManager()
+        let folder = try XCTUnwrap(manager.selectedWorkspace)
+        folder.currentDirectory = "/tmp/folder-repo"
+        folder.setCustomTitle("Folder")
+        manager.enableWorktreeFolder(folder, repoRoot: "/tmp/folder-repo")
+        let folderChildA = manager.addWorktreeWorkspace(
+            path: "/tmp/worktrees/folder-a", branch: "folder-a", repoRoot: "/tmp/folder-repo",
+            parentWorkspaceId: folder.id, select: true
+        )
+        folderChildA.setCustomTitle("FolderChildA")
+        let folderChildB = manager.addWorktreeWorkspace(
+            path: "/tmp/worktrees/folder-b", branch: "folder-b", repoRoot: "/tmp/folder-repo",
+            parentWorkspaceId: folder.id, select: true
+        )
+        folderChildB.setCustomTitle("FolderChildB")
+        manager.setWorktreeFolderCollapsed(folder, collapsed: true)
+
+        let ordinaryParent = manager.addWorkspace(workingDirectory: "/tmp/other-repo", select: true)
+        ordinaryParent.setCustomTitle("OrdinaryParent")
+        let ordinaryChild = manager.addWorktreeWorkspace(
+            path: "/tmp/worktrees/other-child", branch: "other-child", repoRoot: "/tmp/other-repo",
+            parentWorkspaceId: ordinaryParent.id, select: true
+        )
+        ordinaryChild.setCustomTitle("OrdinaryChild")
+        let grandchild = manager.addWorktreeWorkspace(
+            path: "/tmp/worktrees/other-grandchild", branch: "other-grandchild", repoRoot: "/tmp/other-repo",
+            parentWorkspaceId: ordinaryChild.id, select: true
+        )
+        grandchild.setCustomTitle("Grandchild")
+
+        // Select a folder child so the collapsed-parent selection remap has something to prove.
+        manager.selectWorkspace(folderChildA)
+
+        let encoded = try JSONEncoder().encode(manager.sessionSnapshot(includeScrollback: false))
+        let snapshot = try JSONDecoder().decode(SessionTabManagerSnapshot.self, from: encoded)
+        let restored = TabManager()
+        restored.restoreSessionSnapshot(snapshot)
+
+        func tab(_ title: String) throws -> Workspace {
+            try XCTUnwrap(restored.tabs.first { $0.customTitle == title })
+        }
+        let restoredFolder = try tab("Folder")
+        let restoredFolderChildA = try tab("FolderChildA")
+        let restoredFolderChildB = try tab("FolderChildB")
+        let restoredOrdinaryParent = try tab("OrdinaryParent")
+        let restoredOrdinaryChild = try tab("OrdinaryChild")
+        let restoredGrandchild = try tab("Grandchild")
+
+        XCTAssertTrue(restoredFolder.isWorktreeFolder)
+        XCTAssertTrue(restoredFolder.isWorktreeFolderCollapsed, "collapsed state must survive the round trip")
+        XCTAssertEqual(
+            Set(restored.worktreeChildren(of: restoredFolder).map(\.id)),
+            Set([restoredFolderChildA.id, restoredFolderChildB.id]),
+            "both folder children must reattach to the folder, and only to the folder"
+        )
+        XCTAssertEqual(restoredFolderChildA.worktreeFolderId, restoredFolder.worktreeFolderId)
+        XCTAssertEqual(restoredFolderChildB.worktreeFolderId, restoredFolder.worktreeFolderId)
+
+        XCTAssertEqual(
+            restored.worktreeChildren(of: restoredOrdinaryParent).map(\.id), [restoredOrdinaryChild.id],
+            "the ordinary (non-folder) hierarchy must stay disjoint from the folder hierarchy"
+        )
+        XCTAssertEqual(
+            restored.worktreeChildren(of: restoredOrdinaryChild).map(\.id), [restoredGrandchild.id],
+            "a two-level ordinary chain must preserve both links, not just the first level"
+        )
+        XCTAssertNil(
+            restoredGrandchild.worktreeFolderId,
+            "a grandchild under a non-folder parent must never inherit folder membership"
+        )
+
+        // The pre-selected folder child's selection remaps to its collapsed folder only if the
+        // folder/child link the remap depends on was actually rebuilt during restore.
+        XCTAssertEqual(
+            restored.selectedTabId, restoredFolder.id,
+            "selecting a child of a still-collapsed folder must remap to the folder after restore"
+        )
+    }
+
     func testLegacyFolderMembershipRestoresWithoutSavedWorkspaceIds() throws {
         let manager = TabManager()
         let folder = try XCTUnwrap(manager.selectedWorkspace)

From 18717248d6dee394b15efc5db766d62d241f672d Mon Sep 17 00:00:00 2001
From: arzafran <franco@darkroom.engineering>
Date: Mon, 28 Sep 2026 10:59:53 -0300
Subject: [PATCH 03/19] fix: stop notification popover menu and layout churn

---
 Sources/Update/UpdateTitlebarAccessory.swift | 103 +++++++++++++++++--
 1 file changed, 92 insertions(+), 11 deletions(-)

diff --git a/Sources/Update/UpdateTitlebarAccessory.swift b/Sources/Update/UpdateTitlebarAccessory.swift
index 58373f5ff..deae936b6 100644
--- a/Sources/Update/UpdateTitlebarAccessory.swift
+++ b/Sources/Update/UpdateTitlebarAccessory.swift
@@ -1056,6 +1056,11 @@ final class TitlebarControlsAccessoryViewController: NSTitlebarAccessoryViewCont
                 }
             )
         )
+        // Popover content must not observe safe-area changes: SwiftUI's observation
+        // recurses through invalidateSafeAreaInsets on ambient display events until
+        // AppKit's layout-loop guard kills the app (issue #307/#308 — the opt-out does
+        // not cascade to sibling hosts, so every new hosting controller needs its own).
+        hostingController.safeAreaRegions = []
         hostingController.view.wantsLayer = true
         hostingController.view.layer?.backgroundColor = .clear
         notificationsPopover.contentViewController = hostingController
@@ -1295,17 +1300,18 @@ private struct NotificationPopoverRow: View {
             // XCUITest's `.click()` is not always reliable for SwiftUI `Button`s hosted in an `NSPopover`.
             // Provide an explicit accessibility action so AXPress always routes to `onOpen`.
             .accessibilityAction { onOpen() }
-            .contextMenu {
-                if notification.isRead {
-                    Button(String(localized: "notificationsPopover.markUnread", defaultValue: "Mark as Unread")) {
-                        onMarkUnread()
-                    }
-                } else {
-                    Button(String(localized: "notificationsPopover.markRead", defaultValue: "Mark as Read")) {
-                        onMarkRead()
-                    }
-                }
-            }
+            // A SwiftUI `.contextMenu` here hangs off `isRowHovering`/`isRowFocused`
+            // state: `onHover(false)` fires as the pointer moves from the row onto the
+            // open menu, re-evaluating this view's body and rebuilding the menu, which
+            // macOS then closes out from under the click. A native NSMenu shown from a
+            // right-mouse-down/ctrl-click catcher is immune to that re-evaluation.
+            .background(
+                NotificationRowContextMenuCatcher(
+                    isRead: notification.isRead,
+                    onMarkRead: onMarkRead,
+                    onMarkUnread: onMarkUnread
+                )
+            )
 
             Button(action: onClear) {
                 Image(systemName: "xmark.circle.fill")
@@ -1333,6 +1339,81 @@ private struct NotificationPopoverRow: View {
     }
 }
 
+/// Right-click catcher backing `NotificationPopoverRow`'s context menu. Sized to match
+/// the row via `.background(...)`; only intercepts right-click / ctrl-click — every
+/// other event falls through to the SwiftUI button/hover handling underneath.
+private struct NotificationRowContextMenuCatcher: NSViewRepresentable {
+    let isRead: Bool
+    let onMarkRead: () -> Void
+    let onMarkUnread: () -> Void
+
+    func makeNSView(context: Context) -> NotificationRowContextMenuNSView {
+        NotificationRowContextMenuNSView()
+    }
+
+    func updateNSView(_ nsView: NotificationRowContextMenuNSView, context: Context) {
+        nsView.isRead = isRead
+        nsView.onMarkRead = onMarkRead
+        nsView.onMarkUnread = onMarkUnread
+    }
+}
+
+private final class NotificationRowContextMenuNSView: NSView {
+    var isRead = false
+    var onMarkRead: (() -> Void)?
+    var onMarkUnread: (() -> Void)?
+
+    override var mouseDownCanMoveWindow: Bool { false }
+
+    override func hitTest(_ point: NSPoint) -> NSView? {
+        // Only intercept right-click and ctrl-click (left-click with the control key
+        // held, which AppKit does not always redirect to rightMouseDown on its own) so
+        // plain left-click, hover, and keyboard focus continue to hit-test through to
+        // the SwiftUI button underneath.
+        guard let event = NSApp.currentEvent else { return nil }
+        let isCtrlClick = event.type == .leftMouseDown && event.modifierFlags.contains(.control)
+        guard event.type == .rightMouseDown || isCtrlClick else { return nil }
+        return super.hitTest(point)
+    }
+
+    override func mouseDown(with event: NSEvent) {
+        guard event.modifierFlags.contains(.control) else {
+            super.mouseDown(with: event)
+            return
+        }
+        showContextMenu(for: event)
+    }
+
+    override func rightMouseDown(with event: NSEvent) {
+        showContextMenu(for: event)
+    }
+
+    private func showContextMenu(for event: NSEvent) {
+        let menu = NSMenu()
+        if isRead {
+            let item = NSMenuItem(
+                title: String(localized: "notificationsPopover.markUnread", defaultValue: "Mark as Unread"),
+                action: #selector(markUnreadAction),
+                keyEquivalent: ""
+            )
+            item.target = self
+            menu.addItem(item)
+        } else {
+            let item = NSMenuItem(
+                title: String(localized: "notificationsPopover.markRead", defaultValue: "Mark as Read"),
+                action: #selector(markReadAction),
+                keyEquivalent: ""
+            )
+            item.target = self
+            menu.addItem(item)
+        }
+        NSMenu.popUpContextMenu(menu, with: event, for: self)
+    }
+
+    @objc private func markReadAction() { onMarkRead?() }
+    @objc private func markUnreadAction() { onMarkUnread?() }
+}
+
 @MainActor
 final class UpdateTitlebarAccessoryController {
     private weak var updateViewModel: UpdateViewModel?

From fdb79b15d7b7534b868bdefec820db95b99e0ceb Mon Sep 17 00:00:00 2001
From: arzafran <franco@darkroom.engineering>
Date: Mon, 28 Sep 2026 11:01:32 -0300
Subject: [PATCH 04/19] fix: send the caller surface with programa notify

---
 CLI/programa.swift | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/CLI/programa.swift b/CLI/programa.swift
index 8626c2101..c1563e8ad 100644
--- a/CLI/programa.swift
+++ b/CLI/programa.swift
@@ -3243,7 +3243,11 @@ struct ProgramaCLI {
                         : (ctx.windowId == nil ? ProcessInfo.processInfo.environment["PROGRAMA_WORKSPACE_ID"] : nil)
                     let workspaceArg = explicitWorkspaceArg ?? callerWorkspaceArg
                     let explicitSurfaceArg = self.optionValue(ctx.commandArgs, name: "--surface")
-                    let callerSurfaceArg = explicitSurfaceArg == nil && workspaceArg == nil && preferTTYFallback == false && ctx.windowId == nil
+                    let envWorkspaceArg = ProcessInfo.processInfo.environment["PROGRAMA_WORKSPACE_ID"]
+                    let callerSurfaceArg = explicitSurfaceArg == nil
+                        && preferTTYFallback == false
+                        && ctx.windowId == nil
+                        && (explicitWorkspaceArg == nil || explicitWorkspaceArg == envWorkspaceArg)
                         ? ProcessInfo.processInfo.environment["PROGRAMA_SURFACE_ID"]
                         : nil
                     let surfaceArg = explicitSurfaceArg ?? callerSurfaceArg

From a5a1a1e3f860fc76ae1f04de4f6ff82559dfd494 Mon Sep 17 00:00:00 2001
From: arzafran <franco@darkroom.engineering>
Date: Mon, 28 Sep 2026 11:01:36 -0300
Subject: [PATCH 05/19] refactor: use generated v2 method names in browser
 commands

---
 CLI/CLI+Browser.swift | 106 ++++++++++++++++++++++++------------------
 1 file changed, 62 insertions(+), 44 deletions(-)

diff --git a/CLI/CLI+Browser.swift b/CLI/CLI+Browser.swift
index cd40fb796..9c00a2fd7 100644
--- a/CLI/CLI+Browser.swift
+++ b/CLI/CLI+Browser.swift
@@ -290,9 +290,9 @@ extension ProgramaCLI {
         if subcommand == "back" || subcommand == "forward" || subcommand == "reload" {
             let sid = try requireSurface()
             let methodMap: [String: String] = [
-                "back": "browser.back",
-                "forward": "browser.forward",
-                "reload": "browser.reload",
+                "back": V2MethodNames.browserBack,
+                "forward": V2MethodNames.browserForward,
+                "reload": V2MethodNames.browserReload,
             ]
             var params: [String: Any] = ["surface_id": sid]
             if hasFlag(subArgs, name: "--snapshot-after") {
@@ -437,15 +437,15 @@ extension ProgramaCLI {
                 throw CLIError(message: "browser \(subcommand) requires a selector")
             }
             let methodMap: [String: String] = [
-                "click": "browser.click",
-                "dblclick": "browser.dblclick",
-                "hover": "browser.hover",
-                "focus": "browser.focus",
-                "check": "browser.check",
-                "uncheck": "browser.uncheck",
-                "scrollintoview": "browser.scroll_into_view",
-                "scrollinto": "browser.scroll_into_view",
-                "scroll-into-view": "browser.scroll_into_view",
+                "click": V2MethodNames.browserClick,
+                "dblclick": V2MethodNames.browserDblclick,
+                "hover": V2MethodNames.browserHover,
+                "focus": V2MethodNames.browserFocus,
+                "check": V2MethodNames.browserCheck,
+                "uncheck": V2MethodNames.browserUncheck,
+                "scrollintoview": V2MethodNames.browserScrollIntoView,
+                "scrollinto": V2MethodNames.browserScrollIntoView,
+                "scroll-into-view": V2MethodNames.browserScrollIntoView,
             ]
             var params: [String: Any] = ["surface_id": sid, "selector": selector]
             if hasFlag(subArgs, name: "--snapshot-after") {
@@ -504,7 +504,7 @@ extension ProgramaCLI {
                 }
             }
 
-            let method = (subcommand == "type") ? "browser.type" : "browser.fill"
+            let method = (subcommand == "type") ? V2MethodNames.browserType : V2MethodNames.browserFill
             var params: [String: Any] = ["surface_id": sid, "selector": selector, "text": text]
             if snapshotAfter {
                 params["snapshot_after"] = true
@@ -522,10 +522,10 @@ extension ProgramaCLI {
                 throw CLIError(message: "browser \(subcommand) requires a key")
             }
             let methodMap: [String: String] = [
-                "press": "browser.press",
-                "key": "browser.press",
-                "keydown": "browser.keydown",
-                "keyup": "browser.keyup",
+                "press": V2MethodNames.browserPress,
+                "key": V2MethodNames.browserPress,
+                "keydown": V2MethodNames.browserKeydown,
+                "keyup": V2MethodNames.browserKeyup,
             ]
             var params: [String: Any] = ["surface_id": sid, "key": key]
             if hasFlag(subArgs, name: "--snapshot-after") {
@@ -775,13 +775,13 @@ extension ProgramaCLI {
                 }
 
                 let methodMap: [String: String] = [
-                    "text": "browser.get.text",
-                    "html": "browser.get.html",
-                    "value": "browser.get.value",
-                    "attr": "browser.get.attr",
-                    "count": "browser.get.count",
-                    "box": "browser.get.box",
-                    "styles": "browser.get.styles",
+                    "text": V2MethodNames.browserGetText,
+                    "html": V2MethodNames.browserGetHtml,
+                    "value": V2MethodNames.browserGetValue,
+                    "attr": V2MethodNames.browserGetAttr,
+                    "count": V2MethodNames.browserGetCount,
+                    "box": V2MethodNames.browserGetBox,
+                    "styles": V2MethodNames.browserGetStyles,
                 ]
                 let payload = try client.sendV2(method: methodMap[getVerb]!, params: params)
                 if effectiveJSONOutput {
@@ -816,9 +816,9 @@ extension ProgramaCLI {
             }
 
             let methodMap: [String: String] = [
-                "visible": "browser.is.visible",
-                "enabled": "browser.is.enabled",
-                "checked": "browser.is.checked",
+                "visible": V2MethodNames.browserIsVisible,
+                "enabled": V2MethodNames.browserIsEnabled,
+                "checked": V2MethodNames.browserIsChecked,
             ]
             guard let method = methodMap[isVerb] else {
                 throw CLIError(message: "Unsupported browser is subcommand: \(isVerb)")
@@ -859,7 +859,7 @@ extension ProgramaCLI {
                 if hasFlag(locatorArgs, name: "--exact") {
                     params["exact"] = true
                 }
-                method = "browser.find.role"
+                method = V2MethodNames.browserFindRole
             case "text", "label", "placeholder", "alt", "title", "testid":
                 let keyMap: [String: String] = [
                     "text": "text",
@@ -869,6 +869,14 @@ extension ProgramaCLI {
                     "title": "title",
                     "testid": "testid",
                 ]
+                let findMethodMap: [String: String] = [
+                    "text": V2MethodNames.browserFindText,
+                    "label": V2MethodNames.browserFindLabel,
+                    "placeholder": V2MethodNames.browserFindPlaceholder,
+                    "alt": V2MethodNames.browserFindAlt,
+                    "title": V2MethodNames.browserFindTitle,
+                    "testid": V2MethodNames.browserFindTestid,
+                ]
                 let candidates = nonFlagArgs(locatorArgs)
                 guard let value = candidates.first else {
                     throw CLIError(message: "browser find \(locator) requires a value")
@@ -877,7 +885,7 @@ extension ProgramaCLI {
                 if hasFlag(locatorArgs, name: "--exact") {
                     params["exact"] = true
                 }
-                method = "browser.find.\(locator)"
+                method = findMethodMap[locator]!
             case "first", "last":
                 let (selectorOpt, rem1) = parseOption(locatorArgs, name: "--selector")
                 let candidates = nonFlagArgs(rem1)
@@ -885,7 +893,7 @@ extension ProgramaCLI {
                     throw CLIError(message: "browser find \(locator) requires a selector")
                 }
                 params["selector"] = selector
-                method = "browser.find.\(locator)"
+                method = (locator == "first") ? V2MethodNames.browserFindFirst : V2MethodNames.browserFindLast
             case "nth":
                 let (indexOpt, rem1) = parseOption(locatorArgs, name: "--index")
                 let (selectorOpt, rem2) = parseOption(rem1, name: "--selector")
@@ -901,7 +909,7 @@ extension ProgramaCLI {
                 }
                 params["index"] = index
                 params["selector"] = selector
-                method = "browser.find.nth"
+                method = V2MethodNames.browserFindNth
             default:
                 throw CLIError(message: "Unsupported browser find locator: \(locator)")
             }
@@ -1114,7 +1122,7 @@ extension ProgramaCLI {
                 let payload = try client.sendV2(method: V2MethodNames.browserTabNew, params: params)
                 output(payload, fallback: "OK")
             case "switch", "close":
-                let method = (tabVerb == "switch") ? "browser.tab.switch" : "browser.tab.close"
+                let method = (tabVerb == "switch") ? V2MethodNames.browserTabSwitch : V2MethodNames.browserTabClose
                 var params: [String: Any] = ["surface_id": sid]
                 let target = tabArgs.first
                 if let target {
@@ -1135,7 +1143,7 @@ extension ProgramaCLI {
         if subcommand == "console" {
             let sid = try requireSurface()
             let consoleVerb = subArgs.first?.lowercased() ?? "list"
-            let method = (consoleVerb == "clear") ? "browser.console.clear" : "browser.console.list"
+            let method = (consoleVerb == "clear") ? V2MethodNames.browserConsoleClear : V2MethodNames.browserConsoleList
             if consoleVerb != "list" && consoleVerb != "clear" {
                 throw CLIError(message: "Unsupported browser console subcommand: \(consoleVerb)")
             }
@@ -1190,9 +1198,9 @@ extension ProgramaCLI {
             let method: String
             switch stateVerb {
             case "save":
-                method = "browser.state.save"
+                method = V2MethodNames.browserStateSave
             case "load":
-                method = "browser.state.load"
+                method = V2MethodNames.browserStateLoad
             default:
                 throw CLIError(message: "Unsupported browser state subcommand: \(stateVerb)")
             }
@@ -1210,7 +1218,12 @@ extension ProgramaCLI {
             guard !content.isEmpty else {
                 throw CLIError(message: "browser \(subcommand) requires content")
             }
-            let payload = try client.sendV2(method: "browser.\(subcommand)", params: ["surface_id": sid, field: content])
+            let addMethodMap: [String: String] = [
+                "addinitscript": V2MethodNames.browserAddinitscript,
+                "addscript": V2MethodNames.browserAddscript,
+                "addstyle": V2MethodNames.browserAddstyle,
+            ]
+            let payload = try client.sendV2(method: addMethodMap[subcommand]!, params: ["surface_id": sid, field: content])
             output(payload, fallback: "OK")
             return
         }
@@ -1258,9 +1271,9 @@ extension ProgramaCLI {
             let method: String
             switch traceVerb {
             case "start":
-                method = "browser.trace.start"
+                method = V2MethodNames.browserTraceStart
             case "stop":
-                method = "browser.trace.stop"
+                method = V2MethodNames.browserTraceStop
             default:
                 throw CLIError(message: "Unsupported browser trace subcommand: \(traceVerb)")
             }
@@ -1317,9 +1330,9 @@ extension ProgramaCLI {
             let method: String
             switch castVerb {
             case "start":
-                method = "browser.screencast.start"
+                method = V2MethodNames.browserScreencastStart
             case "stop":
-                method = "browser.screencast.stop"
+                method = V2MethodNames.browserScreencastStop
             default:
                 throw CLIError(message: "Unsupported browser screencast subcommand: \(castVerb)")
             }
@@ -1337,11 +1350,11 @@ extension ProgramaCLI {
             let method: String
             switch inputVerb {
             case "mouse":
-                method = "browser.input_mouse"
+                method = V2MethodNames.browserInputMouse
             case "keyboard":
-                method = "browser.input_keyboard"
+                method = V2MethodNames.browserInputKeyboard
             case "touch":
-                method = "browser.input_touch"
+                method = V2MethodNames.browserInputTouch
             default:
                 throw CLIError(message: "Unsupported browser input subcommand: \(inputVerb)")
             }
@@ -1356,7 +1369,12 @@ extension ProgramaCLI {
 
         if ["input_mouse", "input_keyboard", "input_touch"].contains(subcommand) {
             let sid = try requireSurface()
-            let payload = try client.sendV2(method: "browser.\(subcommand)", params: ["surface_id": sid])
+            let legacyInputMethodMap: [String: String] = [
+                "input_mouse": V2MethodNames.browserInputMouse,
+                "input_keyboard": V2MethodNames.browserInputKeyboard,
+                "input_touch": V2MethodNames.browserInputTouch,
+            ]
+            let payload = try client.sendV2(method: legacyInputMethodMap[subcommand]!, params: ["surface_id": sid])
             output(payload, fallback: "OK")
             return
         }

From 008e1b38de20cdefd5785ad7654f7d57ebeb883c Mon Sep 17 00:00:00 2001
From: arzafran <franco@darkroom.engineering>
Date: Mon, 28 Sep 2026 11:01:43 -0300
Subject: [PATCH 06/19] test(programad): add regression test for session.close
 SIGKILL escalation

Covers M5 from docs/audits/codebase-audit-2026-09-28.md: a session whose
child ignores SIGHUP must still be reaped by session.close(kill: true)
instead of returning Timeout and leaving the process running. Currently
red against the unfixed close path (no SIGKILL escalation).
---
 core/crates/programad/tests/integration.rs | 81 ++++++++++++++++++++++
 1 file changed, 81 insertions(+)

diff --git a/core/crates/programad/tests/integration.rs b/core/crates/programad/tests/integration.rs
index 1fac30f10..6cdf5e430 100644
--- a/core/crates/programad/tests/integration.rs
+++ b/core/crates/programad/tests/integration.rs
@@ -515,3 +515,84 @@ async fn workspace_dispatch_links_domain_surfaces_to_sessions_and_reconciles_on_
     let _ = shutdown_tx.send(());
     let _ = tokio::time::timeout(Duration::from_secs(5), daemon_handle).await;
 }
+
+/// `session.close(kill: true)` against a child that ignores SIGHUP must
+/// still escalate to SIGKILL and reap it, rather than returning `Timeout`
+/// and leaving the process running (M5, `docs/audits/codebase-audit-2026-09-28.md`).
+/// The whole round trip — SIGHUP grace period, SIGKILL escalation, reap —
+/// happens off the async worker (`spawn_blocking` in `server.rs`), so this
+/// also proves that path doesn't hang or error on a stubborn child.
+#[tokio::test]
+async fn session_close_escalates_to_sigkill_when_child_ignores_sighup() {
+    let _env_guard = ENV_LOCK.lock().unwrap();
+    let dir = tempfile::tempdir().unwrap();
+    let socket_path = dir.path().join("programad.sock");
+    std::env::set_var("XDG_STATE_HOME", dir.path());
+
+    let (daemon_handle, shutdown_tx) = spawn_daemon(socket_path.clone());
+    let mut client = Client::connect(&socket_path).await;
+    client.call("auth.login", json!({})).await;
+
+    let opened = client
+        .call(
+            "session.open",
+            json!({
+                "argv": ["/bin/sh", "-c", "trap '' HUP; echo READY; sleep 60"],
+                "cols": 80,
+                "rows": 24,
+            }),
+        )
+        .await;
+    let session_id = opened["id"].as_str().unwrap().to_string();
+    let pid = opened["pid"].as_i64().unwrap() as i32;
+
+    // Wait for the shell to actually install the trap and print READY (via
+    // the WAL, same synchronization pattern as the MARK_ wait above) before
+    // closing. Without this, SIGHUP could land before `trap` runs and reap
+    // the child the "easy" way, which wouldn't exercise the escalation path
+    // this test exists to cover.
+    let mut saw_ready = false;
+    for _ in 0..100 {
+        let read = client
+            .call("session.read", json!({"id": session_id, "offset": 0}))
+            .await;
+        let chunk = B64.decode(read["data"].as_str().unwrap()).unwrap();
+        if chunk.windows(5).any(|w| w == b"READY") {
+            saw_ready = true;
+            break;
+        }
+        tokio::time::sleep(Duration::from_millis(50)).await;
+    }
+    assert!(saw_ready, "shell never printed READY after installing its SIGHUP trap");
+
+    // Expected cost is ~500ms SIGHUP grace + ~500ms SIGKILL grace plus reap/
+    // join/flush overhead; give real headroom above that rather than a tight
+    // bound, since the two assertions below (closed: true, then ESRCH) are
+    // what actually discriminate pass/fail, not this timeout.
+    let closed = tokio::time::timeout(
+        Duration::from_secs(3),
+        client.call("session.close", json!({"id": session_id, "kill": true})),
+    )
+    .await
+    .expect("session.close should not hang past its own SIGHUP+SIGKILL grace periods");
+    assert_eq!(closed, json!({"closed": true}));
+
+    // The process must actually be gone (not just marked closed
+    // server-side): `kill(pid, 0)` on a reaped pid returns ESRCH.
+    for _ in 0..50 {
+        if nix::sys::signal::kill(nix::unistd::Pid::from_raw(pid), None)
+            == Err(nix::errno::Errno::ESRCH)
+        {
+            break;
+        }
+        tokio::time::sleep(Duration::from_millis(20)).await;
+    }
+    assert_eq!(
+        nix::sys::signal::kill(nix::unistd::Pid::from_raw(pid), None),
+        Err(nix::errno::Errno::ESRCH),
+        "child that ignores SIGHUP must be SIGKILLed and reaped by session.close"
+    );
+
+    let _ = shutdown_tx.send(());
+    let _ = tokio::time::timeout(Duration::from_secs(5), daemon_handle).await;
+}

From 93b6a8b3960a9492988a579dfc1338e1556354fc Mon Sep 17 00:00:00 2001
From: arzafran <franco@darkroom.engineering>
Date: Mon, 28 Sep 2026 11:01:51 -0300
Subject: [PATCH 07/19] fix(programad): reap closed sessions off the async
 worker and escalate to SIGKILL

---
 core/crates/programad/src/server.rs  | 40 +++++++++++-------
 core/crates/programad/src/session.rs | 61 +++++++++++++++++++++++-----
 2 files changed, 76 insertions(+), 25 deletions(-)

diff --git a/core/crates/programad/src/server.rs b/core/crates/programad/src/server.rs
index 4882fd584..1ac78cdf0 100644
--- a/core/crates/programad/src/server.rs
+++ b/core/crates/programad/src/server.rs
@@ -153,7 +153,7 @@ pub async fn handle_connection(stream: UnixStream, state: Arc<AppState>) {
             continue;
         }
 
-        let outcome = dispatch(&request, &state, &mut authenticated, &mut my_attachments);
+        let outcome = dispatch(&request, &state, &mut authenticated, &mut my_attachments).await;
 
         let (resp_line, fd_to_send, pending_attachment) = match outcome {
             Ok(Dispatched {
@@ -202,7 +202,7 @@ fn rollback_attachment(state: &AppState, attachment: Option<(String, Uuid)>) {
     }
 }
 
-fn dispatch(
+async fn dispatch(
     req: &Request,
     state: &Arc<AppState>,
     authenticated: &mut bool,
@@ -221,7 +221,7 @@ fn dispatch(
         "session.list" => session_list(state).map(Into::into),
         "session.status" => session_status(req, state).map(Into::into),
         "session.resize" => session_resize(req, state, attachments).map(Into::into),
-        "session.close" => session_close(req, state).map(Into::into),
+        "session.close" => session_close(req, state).await.map(Into::into),
         "session.write" => session_write(req, state).map(Into::into),
         "session.read" => session_read(req, state).map(Into::into),
         "session.detach" => session_detach(req, state, attachments).map(Into::into),
@@ -447,8 +447,13 @@ fn session_resize(
     Ok(json!({"cols": eff_cols, "rows": eff_rows}))
 }
 
-fn session_close(req: &Request, state: &Arc<AppState>) -> Result<Value, ErrorBody> {
-    let id = require_str(&req.params, "id")?;
+// `Session::close` blocks on SIGHUP/SIGKILL grace-period polling (up to ~1s,
+// see session.rs), so it runs on a blocking-pool thread via `spawn_blocking`
+// rather than inline on this async connection's tokio worker — otherwise
+// closing one session would stall every other connection sharing the
+// runtime for the duration of that wait.
+async fn session_close(req: &Request, state: &Arc<AppState>) -> Result<Value, ErrorBody> {
+    let id = require_str(&req.params, "id")?.to_string();
     let kill = req
         .params
         .get("kill")
@@ -460,18 +465,25 @@ fn session_close(req: &Request, state: &Arc<AppState>) -> Result<Value, ErrorBod
             "session.close with kill=false cannot preserve a PTY after daemon ownership ends",
         ));
     }
-    let closed = state.sessions.close(id, kill).map_err(|error| {
-        let code = if error.kind() == std::io::ErrorKind::TimedOut {
-            ErrorCode::Timeout
-        } else {
-            ErrorCode::InternalError
-        };
-        ErrorBody::new(code, format!("close failed: {error}"))
-    })?;
+    let close_state = state.clone();
+    let close_id = id.clone();
+    let closed = tokio::task::spawn_blocking(move || close_state.sessions.close(&close_id, kill))
+        .await
+        .map_err(|error| {
+            ErrorBody::new(ErrorCode::InternalError, format!("close task panicked: {error}"))
+        })?
+        .map_err(|error| {
+            let code = if error.kind() == std::io::ErrorKind::TimedOut {
+                ErrorCode::Timeout
+            } else {
+                ErrorCode::InternalError
+            };
+            ErrorBody::new(code, format!("close failed: {error}"))
+        })?;
     if !closed {
         return Err(ErrorBody::new(ErrorCode::NotFound, "session not found"));
     }
-    reconcile_closed_session(state, id);
+    reconcile_closed_session(state, &id);
     Ok(json!({"closed": true}))
 }
 
diff --git a/core/crates/programad/src/session.rs b/core/crates/programad/src/session.rs
index dc8050582..1a82b1f7c 100644
--- a/core/crates/programad/src/session.rs
+++ b/core/crates/programad/src/session.rs
@@ -14,7 +14,7 @@ use std::io;
 use std::os::fd::{AsRawFd, OwnedFd, RawFd};
 use std::path::PathBuf;
 use std::sync::{Arc, Mutex};
-use std::time::{Duration, SystemTime, UNIX_EPOCH};
+use std::time::{Duration, Instant, SystemTime, UNIX_EPOCH};
 
 use nix::poll::{poll, PollFd, PollFlags, PollTimeout};
 use nix::unistd::Pid;
@@ -268,18 +268,21 @@ impl Session {
             ));
         }
         if kill && exit.is_none() {
-            exit = signal_child(&self.inner, nix::sys::signal::Signal::SIGHUP)?;
-            for _ in 0..20 {
-                if exit.is_some() {
-                    break;
-                }
-                std::thread::sleep(Duration::from_millis(25));
-                exit = try_reap(&self.inner)?;
+            exit = signal_child(&self.inner, nix::sys::signal::Signal::SIGHUP, false)?;
+            exit = wait_for_exit(&self.inner, exit, Duration::from_millis(500))?;
+            if exit.is_none() {
+                // The child ignored SIGHUP (or a descendant it spawned is
+                // still alive). Escalate to an unblockable SIGKILL sent to
+                // the whole process group: the child called setsid() at
+                // spawn (pty.rs), so its pgid equals its own pid and this
+                // can never reach the daemon's own group.
+                exit = signal_child(&self.inner, nix::sys::signal::Signal::SIGKILL, true)?;
+                exit = wait_for_exit(&self.inner, exit, Duration::from_millis(500))?;
             }
             if exit.is_none() {
                 return Err(io::Error::new(
                     io::ErrorKind::TimedOut,
-                    "child did not exit within 500ms of SIGHUP",
+                    "child did not exit within 500ms of SIGKILL",
                 ));
             }
         }
@@ -561,7 +564,7 @@ fn finish_on_exit(inner: &Arc<Inner>, wake_raw: RawFd) {
 
 fn fail_session(inner: &Arc<Inner>, error: String) {
     *inner.status.lock().unwrap() = SessionStatus::Failed { error };
-    let _ = signal_child(inner, nix::sys::signal::Signal::SIGHUP);
+    let _ = signal_child(inner, nix::sys::signal::Signal::SIGHUP, false);
 }
 
 fn try_reap(inner: &Inner) -> io::Result<Option<(Option<i32>, Option<i32>)>> {
@@ -579,9 +582,33 @@ fn try_reap(inner: &Inner) -> io::Result<Option<(Option<i32>, Option<i32>)>> {
     }
 }
 
+/// Poll `try_reap` at a fixed interval until the child exits or `timeout`
+/// elapses. Runs on whatever thread calls `Session::close`; callers on an
+/// async runtime must offload that call (e.g. `spawn_blocking`) so this
+/// sleep never blocks a tokio worker.
+fn wait_for_exit(
+    inner: &Inner,
+    mut exit: Option<(Option<i32>, Option<i32>)>,
+    timeout: Duration,
+) -> io::Result<Option<(Option<i32>, Option<i32>)>> {
+    let deadline = Instant::now() + timeout;
+    while exit.is_none() && Instant::now() < deadline {
+        std::thread::sleep(Duration::from_millis(25));
+        exit = try_reap(inner)?;
+    }
+    Ok(exit)
+}
+
+/// Signal the child, or (for the SIGKILL escalation once a plain SIGHUP has
+/// been given a grace period and ignored) its whole process group —
+/// `whole_group: true` uses `killpg` instead of `kill`. Signaling the group
+/// is safe because the child calls `setsid()` at spawn (see `pty.rs`), so
+/// its pgid equals its own pid and this can never reach the daemon's own
+/// process group.
 fn signal_child(
     inner: &Inner,
     signal: nix::sys::signal::Signal,
+    whole_group: bool,
 ) -> io::Result<Option<(Option<i32>, Option<i32>)>> {
     let mut child = inner.child.lock().unwrap();
     if let Some(exit) = child.exit {
@@ -596,7 +623,19 @@ fn signal_child(
     // The child lock stays held across the liveness check and signal. No
     // reader can reap it in between, so its PID cannot be recycled here.
     let pid = Pid::from_raw(child.child.id() as i32);
-    match nix::sys::signal::kill(pid, signal) {
+    let result = if whole_group {
+        nix::sys::signal::killpg(pid, signal)
+    } else {
+        nix::sys::signal::kill(pid, signal)
+    };
+    let result = match result {
+        // The child already left its own group (e.g. called setpgid), so
+        // the group no longer exists even though the pid might still be
+        // alive. Fall back to signaling the pid directly before giving up.
+        Err(nix::errno::Errno::ESRCH) if whole_group => nix::sys::signal::kill(pid, signal),
+        other => other,
+    };
+    match result {
         Ok(()) => Ok(None),
         Err(nix::errno::Errno::ESRCH) => {
             if let Some(status) = child.child.try_wait()? {

From dc5b8e14e8d18f03ca3d404b37c94e0cc6adf639 Mon Sep 17 00:00:00 2001
From: arzafran <franco@darkroom.engineering>
Date: Mon, 28 Sep 2026 11:06:55 -0300
Subject: [PATCH 08/19] fix: make socket client handling nonisolated

---
 Sources/TerminalController.swift | 34 +++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/Sources/TerminalController.swift b/Sources/TerminalController.swift
index 61daa2b5f..1a843a4c1 100644
--- a/Sources/TerminalController.swift
+++ b/Sources/TerminalController.swift
@@ -157,7 +157,7 @@ class TerminalController {
         case failure(path: String, stage: String, errnoCode: Int32)
     }
 
-    private static let focusIntentV2Methods: Set<String> = [
+    private nonisolated static let focusIntentV2Methods: Set<String> = [
         "window.focus",
         "workspace.select",
         "review.open",
@@ -578,7 +578,7 @@ class TerminalController {
         }
     }
 
-    private static func socketCommandAllowsInAppFocusMutations(commandKey: String, isV2: Bool) -> Bool {
+    private nonisolated static func socketCommandAllowsInAppFocusMutations(commandKey: String, isV2: Bool) -> Bool {
         // The v1 line protocol is gone; only v2 JSON-RPC methods can carry focus intent.
         guard isV2 else { return false }
         return focusIntentV2Methods.contains(commandKey)
@@ -601,7 +601,7 @@ class TerminalController {
         return body()
     }
 
-    private func withSocketCommandPolicy<T>(commandKey: String, isV2: Bool, _ body: () -> T) -> T {
+    private nonisolated func withSocketCommandPolicy<T>(commandKey: String, isV2: Bool, _ body: () -> T) -> T {
         let allowsFocusMutation = Self.socketCommandAllowsInAppFocusMutations(commandKey: commandKey, isV2: isV2)
         Self.socketCommandPolicyLock.lock()
         Self.socketCommandPolicyDepth += 1
@@ -940,7 +940,7 @@ class TerminalController {
     }
 
     /// Check if `pid` is a descendant of this process by walking the process tree.
-    func isDescendant(_ pid: pid_t) -> Bool {
+    nonisolated func isDescendant(_ pid: pid_t) -> Bool {
         var current = pid
         // Walk up to 128 levels to avoid infinite loops from kernel bugs
         for _ in 0..<128 {
@@ -960,7 +960,7 @@ class TerminalController {
     }
 
     /// Get the parent PID of a process using sysctl.
-    private func parentPid(of pid: pid_t) -> pid_t {
+    private nonisolated func parentPid(of pid: pid_t) -> pid_t {
         var info = kinfo_proc()
         var size = MemoryLayout<kinfo_proc>.size
         var mib: [Int32] = [CTL_KERN, KERN_PROC, KERN_PROC_PID, pid]
@@ -1489,7 +1489,7 @@ class TerminalController {
     }
 
 
-    private func passwordAuthRequiredResponse(for command: String) -> String {
+    private nonisolated func passwordAuthRequiredResponse(for command: String) -> String {
         let message = "Authentication required. Send auth <password> first."
         guard command.hasPrefix("{"),
               let data = command.data(using: .utf8),
@@ -1500,7 +1500,7 @@ class TerminalController {
         return v2Error(id: id, code: "auth_required", message: message)
     }
 
-    private func passwordLoginV2ResponseIfNeeded(for command: String, authenticated: inout Bool) -> String? {
+    private nonisolated func passwordLoginV2ResponseIfNeeded(for command: String, authenticated: inout Bool) -> String? {
         guard command.hasPrefix("{"),
               let data = command.data(using: .utf8),
               let dict = (try? JSONSerialization.jsonObject(with: data, options: [])) as? [String: Any] else {
@@ -1536,7 +1536,7 @@ class TerminalController {
         return v2Ok(id: id, result: ["authenticated": true])
     }
 
-    private func authResponseIfNeeded(
+    private nonisolated func authResponseIfNeeded(
         for command: String,
         authenticated: inout Bool,
         requestPolicy: SocketRequestPolicy
@@ -1760,7 +1760,7 @@ class TerminalController {
 
     /// Unix clients carry the listener policy captured when they were accepted.
     /// Mobile Bridge sessions are admitted independently by pairing and its method allow-list.
-    func handleClient(_ socket: Int32, peerPid: pid_t? = nil, source: SocketConnectionSource) {
+    nonisolated func handleClient(_ socket: Int32, peerPid: pid_t? = nil, source: SocketConnectionSource) {
         // Owns this connection's writes (both ordinary v2 responses and any #167 subscription
         // event pushes) and its subscription lifecycle. `teardown()` (which tears down any
         // attached subscription) must run before the fd is closed -- defers unwind LIFO, so the
@@ -1889,7 +1889,7 @@ class TerminalController {
         }
     }
 
-    private func processCommand(
+    private nonisolated func processCommand(
         _ command: String,
         connection: SocketConnection,
         requestPolicy: SocketRequestPolicy
@@ -1913,7 +1913,7 @@ class TerminalController {
 
     // MARK: - V2 JSON Socket Protocol
 
-    private func processV2Command(
+    private nonisolated func processV2Command(
         _ jsonLine: String,
         connection: SocketConnection,
         requestPolicy: SocketRequestPolicy
@@ -1953,7 +1953,7 @@ class TerminalController {
         }
 
         return withSocketCommandPolicy(commandKey: method, isV2: true) {
-            if let result = browserRPCDispatcher.dispatch(method: method, params: params, controller: self) ?? AgentRPCDispatcher.dispatch(method: method, params: params, controller: self) {
+            if let result = AgentRPCDispatcher.dispatch(method: method, params: params, controller: self) {
                 return v2Result(id: id, result)
             }
             switch method {
@@ -2195,7 +2195,8 @@ class TerminalController {
 
         // Markdown
         case "markdown.open":
-            return v2Result(id: id, self.v2MarkdownOpen(params: params))
+            // `v2MarkdownOpen` is main actor-isolated; hop explicitly.
+            return v2Result(id: id, v2MainSync { self.v2MarkdownOpen(params: params) })
 
         // Review (agent diff review panel)
         case "review.open":
@@ -2297,12 +2298,17 @@ class TerminalController {
 #endif
 
             default:
+                // BrowserRPCDispatcher is @MainActor; only methods that missed every
+                // nonisolated case above pay this hop, keeping telemetry off main.
+                if let result = v2MainSync({ browserRPCDispatcher.dispatch(method: method, params: params, controller: self) }) {
+                    return v2Result(id: id, result)
+                }
                 return v2Error(id: id, code: "method_not_found", message: "Unknown method")
             }
         }
     }
 
-    private func v2Capabilities(requestPolicy: SocketRequestPolicy) -> [String: Any] {
+    private nonisolated func v2Capabilities(requestPolicy: SocketRequestPolicy) -> [String: Any] {
         return [
             "protocol": "cmux-socket",
             "version": 2,

From e275fb35c9496075509a2f62239c0920a863820b Mon Sep 17 00:00:00 2001
From: arzafran <franco@darkroom.engineering>
Date: Mon, 28 Sep 2026 11:06:55 -0300
Subject: [PATCH 09/19] fix: let replay release the terminal surface

---
 Sources/TerminalSurface.swift | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/Sources/TerminalSurface.swift b/Sources/TerminalSurface.swift
index 45f2e3870..4f729fcf2 100644
--- a/Sources/TerminalSurface.swift
+++ b/Sources/TerminalSurface.swift
@@ -2154,7 +2154,19 @@ final class TerminalSurface: Identifiable, ObservableObject {
         pendingReviveWinchPGID = nil
         pendingReviveWinchChildPID = nil
 
-        reviveReplayQueue.async { [reviveReplayCanceled] in
+        // Read into locals up front so the closure below has no reason to reach `self` other
+        // than the `[weak self]` capture it needs for the main-queue hop at the end -- a `Self.`
+        // static reference inside the closure would also capture `self` (strongly, to resolve
+        // the dynamic type), which is a second, redundant path to the same capture.
+        let reviveReplayChunkBytes = Self.reviveReplayChunkBytes
+#if DEBUG
+        let reviveReplayChunkObserverForTesting = Self.reviveReplayChunkObserverForTesting
+#endif
+
+        // `weak self` here (not just on the inner hop) is what actually lets the surface
+        // deallocate mid-replay: without it the compiler captures `self` strongly by default
+        // to make it available to the inner closure's own `[weak self]`.
+        reviveReplayQueue.async { [reviveReplayCanceled, weak self] in
             // The chunk loop runs to completion here rather than yielding the
             // run loop between chunks. Releasing the mutex is what breaks the
             // deadlock; yielding as well would additionally let live output
@@ -2165,7 +2177,7 @@ final class TerminalSurface: Identifiable, ObservableObject {
             var offset = 0
             while offset < bytes.count {
                 if reviveReplayCanceled.withLock({ $0 }) { break }
-                let end = min(offset + Self.reviveReplayChunkBytes, bytes.count)
+                let end = min(offset + reviveReplayChunkBytes, bytes.count)
                 bytes.withUnsafeBufferPointer { buffer in
                     guard let baseAddress = buffer.baseAddress else { return }
                     UnsafeRawPointer(baseAddress + offset)
@@ -2175,7 +2187,7 @@ final class TerminalSurface: Identifiable, ObservableObject {
                 }
                 offset = end
 #if DEBUG
-                Self.reviveReplayChunkObserverForTesting?(Thread.isMainThread)
+                reviveReplayChunkObserverForTesting?(Thread.isMainThread)
 #endif
             }
 

From 19a7e2c6d7406dfd1b502f49b4aa7b7bebb06223 Mon Sep 17 00:00:00 2001
From: arzafran <franco@darkroom.engineering>
Date: Mon, 28 Sep 2026 11:03:17 -0300
Subject: [PATCH 10/19] fix: host the sidebar workspace menu in a native NSMenu

---
 CLAUDE.md                 |   2 +-
 Sources/TabItemView.swift | 539 ++++++++++++++++++++++----------------
 2 files changed, 318 insertions(+), 223 deletions(-)

diff --git a/CLAUDE.md b/CLAUDE.md
index 9a1db421e..9b48d3316 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -159,7 +159,7 @@ The app has a **Debug** menu in the macOS menu bar (only in DEBUG builds). Use i
 - **Typing-latency-sensitive paths** (read carefully before touching these areas):
   - `WindowTerminalHostView.hitTest()` in `Sources/WindowTerminalHostView.swift`: called on every event including keyboard. Keyboard events (`.keyDown`/`.keyUp`/`.flagsChanged`) take an early `switch currentEvent?.type` fast path; everything else — all pointer events, and an ambiguous/nil `currentEvent` — must fall through to the full divider/sidebar/drag routing below it. Do not add work to that keyboard fast path.
   - `NSWindow.programa_sendEvent` in `Sources/WindowSwizzles.swift`: runs for every event. The hit-view context it caches is only ever read for pointer-down events, so it is computed only for those — do not restore an unconditional hit-test here (#183).
-  - `TabItemView` in `ContentView.swift`: uses `Equatable` conformance + `.equatable()` to skip body re-evaluation during typing. Do not add `@EnvironmentObject`, `@ObservedObject` (besides `tab`), or `@Binding` properties without updating the `==` function. Do not remove `.equatable()` from the ForEach call site. Do not read `tabManager` or `notificationStore` in the body; use the precomputed `let` parameters instead.
+  - `TabItemView` in `Sources/TabItemView.swift`: uses `Equatable` conformance + `.equatable()` to skip body re-evaluation during typing. Do not add `@EnvironmentObject`, `@ObservedObject` (besides `tab`), or `@Binding` properties without updating the `==` function. Do not remove `.equatable()` from the ForEach call site. Do not read `tabManager` or `notificationStore` in the body; use the precomputed `let` parameters instead.
   - `TerminalSurface.forceRefresh()` in `GhosttyTerminalView.swift`: called on every keystroke. Do not add allocations, file I/O, or formatting here.
 - **Terminal find layering contract:** `SurfaceSearchOverlay` must be mounted from `GhosttySurfaceScrollView` in `Sources/GhosttyTerminalView.swift` (AppKit portal layer), not from SwiftUI panel containers such as `Sources/Panels/TerminalPanelView.swift`. Portal-hosted terminal views can sit above SwiftUI during split/workspace churn.
 - **Submodule safety:** When modifying a submodule (ghostty), always push the submodule commit to its remote `main` branch BEFORE committing the updated pointer in the parent repo. Never commit on a detached HEAD or temporary branch — the commit will be orphaned and lost. Verify with: `cd <submodule> && git merge-base --is-ancestor HEAD origin/main`. Note: `vendor/bonsplit` is NOT a submodule — it is vendored in-tree (MIT, from the manaflow-ai fork); edit and commit it like any other source directory.
diff --git a/Sources/TabItemView.swift b/Sources/TabItemView.swift
index b83b69fe1..c166a61ac 100644
--- a/Sources/TabItemView.swift
+++ b/Sources/TabItemView.swift
@@ -1,11 +1,10 @@
-// TabItemView + its exclusive helper-view cluster, extracted from ContentView.swift (nuclear-review #94.2).
-// Pure move — behavior-identical relocation. Do NOT touch TabItemView's Equatable
-// conformance, its precomputed let parameters, or the .equatable() call site in
-// VerticalTabsSidebar (ContentView.swift) — see CLAUDE.md typing-latency-sensitive paths.
+// TabItemView + its exclusive helper-view cluster. Do NOT touch TabItemView's
+// Equatable conformance, its precomputed let parameters, or the .equatable() call
+// site in VerticalTabsSidebar (Sources/VerticalTabsSidebar.swift) — see CLAUDE.md
+// typing-latency-sensitive paths.
 //
-// Access-level widening: TabItemView was `private struct` (file-private to the old
-// ContentView.swift); widened to internal (default) so VerticalTabsSidebar, which stays
-// in ContentView.swift, can still construct it. No other behavior change.
+// TabItemView is internal (not private) so VerticalTabsSidebar, defined in
+// Sources/VerticalTabsSidebar.swift, can construct it.
 
 import AppKit
 import Bonsplit
@@ -746,6 +745,23 @@ struct TabItemView: View, Equatable {
                 tabManager.closeWorkspaceWithConfirmation(tab)
             }
         }
+        .overlay {
+            // Native AppKit context menu, built fresh from live state at click time,
+            // instead of SwiftUI's `.contextMenu`. `.contextMenu`'s content closure
+            // hangs off this row's body, which re-evaluates as often as every 40ms
+            // from the onReceive handlers above (`workspaceObservationGeneration`),
+            // on hover changes, and on any ==-compared param change. SwiftUI rebuilds
+            // an already-open `.contextMenu` on every one of those re-evaluations,
+            // and macOS reads that rebuild as the menu (and any open submenu, e.g.
+            // Workspace Color) repeatedly closing and reopening. Building the NSMenu
+            // only once, at the moment of the click, sidesteps the churn entirely.
+            SidebarRowContextMenuCapture {
+                #if DEBUG
+                dlog("sidebar.contextMenu.open workspace=\(tab.id.uuidString.prefix(5)) targets=\(contextMenuWorkspaceIds.count)")
+                #endif
+                return buildWorkspaceContextMenu(colorScheme: colorScheme)
+            }
+        }
         .overlay(alignment: .top) {
             if showsCenteredTopDropIndicator {
                 Rectangle()
@@ -865,90 +881,34 @@ struct TabItemView: View, Equatable {
             // Toggling branch/PR columns changes which data we need to cache.
             recomputeSidebarDetailCache()
         }
-        .contextMenu { workspaceContextMenu }
     }
 
     private func contextMenuLabel(multi: String, single: String, isMulti: Bool) -> String {
         isMulti ? multi : single
     }
 
-    // Isolates the workspace-color submenu from the churning per-row
-    // observation tick (`workspaceObservationGeneration`, bumped as often as
-    // every 40ms while workspace telemetry is updating -- see the
-    // `let _ = workspaceObservationGeneration` line at the top of `body`).
-    // `.contextMenu`'s content closure is re-invoked on every TabItemView.body
-    // re-evaluation; without `.equatable()` gating this subtree, AppKit tears
-    // down and rebuilds the color submenu's NSMenu on each tick, which -- while
-    // the submenu is open under mouse hover -- reads as the submenu repeatedly
-    // closing and reopening. Wrapping the submenu in its own Equatable view and
-    // applying `.equatable()` at the call site lets SwiftUI skip rebuilding it
-    // when none of its own (non-churning) inputs changed, mirroring the
-    // TabItemView Equatable contract in CLAUDE.md "Typing-latency-sensitive paths".
-    private struct WorkspaceColorMenu: View, Equatable {
-        let hasCustomColor: Bool
-        let palette: [WorkspaceTabColorEntry]
-        let targetIds: [UUID]
-        let colorScheme: ColorScheme
-        let activeTabIndicatorStyle: SidebarActiveTabIndicatorStyle
-        let onApplyColor: (String?, [UUID]) -> Void
-        let onPromptCustomColor: ([UUID]) -> Void
-
-        nonisolated static func == (lhs: Self, rhs: Self) -> Bool {
-            lhs.hasCustomColor == rhs.hasCustomColor &&
-            lhs.palette == rhs.palette &&
-            lhs.targetIds == rhs.targetIds &&
-            lhs.colorScheme == rhs.colorScheme &&
-            lhs.activeTabIndicatorStyle == rhs.activeTabIndicatorStyle
-        }
-
-        private func swatchColor(for hex: String) -> NSColor {
-            WorkspaceTabColorSettings.displayNSColor(
-                hex: hex,
-                colorScheme: colorScheme,
-                forceBright: activeTabIndicatorStyle == .leftRail
-            ) ?? NSColor(hex: hex) ?? .gray
-        }
-
-        var body: some View {
-            Menu(String(localized: "contextMenu.workspaceColor", defaultValue: "Workspace Color")) {
-                if hasCustomColor {
-                    Button {
-                        onApplyColor(nil, targetIds)
-                    } label: {
-                        Label(String(localized: "contextMenu.clearColor", defaultValue: "Clear Color"), systemImage: "xmark.circle")
-                    }
-                }
-
-                Button {
-                    onPromptCustomColor(targetIds)
-                } label: {
-                    Label(String(localized: "contextMenu.chooseCustomColor", defaultValue: "Choose Custom Color…"), systemImage: "paintpalette")
-                }
-
-                if !palette.isEmpty {
-                    Divider()
-                }
-
-                ForEach(palette, id: \.id) { entry in
-                    Button {
-                        onApplyColor(entry.hex, targetIds)
-                    } label: {
-                        Label {
-                            Text(entry.name)
-                        } icon: {
-                            Image(nsImage: coloredCircleImage(color: swatchColor(for: entry.hex)))
-                        }
-                    }
-                }
-            }
-        }
+    /// Applies a `StoredShortcut`'s key equivalent to an `NSMenuItem`, mirroring the
+    /// `if let key = shortcut.keyEquivalent { .keyboardShortcut(key, modifiers:) }`
+    /// pattern the SwiftUI menu used to use. `menuItemKeyEquivalent`/`modifierFlags`
+    /// are the AppKit-side counterparts of `keyEquivalent`/`eventModifiers` and are
+    /// `nil`/empty under the same conditions (chorded shortcuts have no single
+    /// menu-item key equivalent).
+    private func applyShortcut(_ shortcut: StoredShortcut, to item: NSMenuItem) {
+        guard let key = shortcut.menuItemKeyEquivalent else { return }
+        item.keyEquivalent = key
+        item.keyEquivalentModifierMask = shortcut.modifierFlags
     }
 
-    @ViewBuilder
-    private var workspaceContextMenu: some View {
+    /// Builds the sidebar row's context menu fresh from live state at click time,
+    /// replacing the SwiftUI `.contextMenu` this row used to carry. Every item here
+    /// ports the SwiftUI menu 1:1 (same strings/keys, order, dividers, conditional
+    /// visibility, disabled states, and shortcut display).
+    private func buildWorkspaceContextMenu(colorScheme: ColorScheme) -> NSMenu {
         let targetIds = contextMenuWorkspaceIds
         let isMulti = targetIds.count > 1
-        let tabColorPalette = WorkspaceTabColorSettings.palette()
+        let menu = NSMenu()
+        menu.autoenablesItems = false
+
         let shouldPin = !tab.isPinned
         let pinLabel = shouldPin
             ? contextMenuLabel(
@@ -978,190 +938,210 @@ struct TabItemView: View, Equatable {
         let renameWorkspaceShortcut = KeyboardShortcutSettings.shortcut(for: .renameWorkspace)
         let editWorkspaceDescriptionShortcut = KeyboardShortcutSettings.shortcut(for: .editWorkspaceDescription)
         let closeWorkspaceShortcut = KeyboardShortcutSettings.shortcut(for: .closeWorkspace)
-        Button(pinLabel) {
+
+        menu.addItem(SidebarMenuItem(title: pinLabel) { [self] in
             for id in targetIds {
                 if let tab = tabManager.tabs.first(where: { $0.id == id }) {
                     tabManager.setPinned(tab, pinned: shouldPin)
                 }
             }
             syncSelectionAfterMutation()
-        }
+        })
 
-        if let key = renameWorkspaceShortcut.keyEquivalent {
-            Button(String(localized: "contextMenu.renameWorkspace", defaultValue: "Rename Workspace…")) {
-                promptRename()
-            }
-            .keyboardShortcut(key, modifiers: renameWorkspaceShortcut.eventModifiers)
-        } else {
-            Button(String(localized: "contextMenu.renameWorkspace", defaultValue: "Rename Workspace…")) {
-                promptRename()
-            }
-        }
+        let renameItem = SidebarMenuItem(
+            title: String(localized: "contextMenu.renameWorkspace", defaultValue: "Rename Workspace…")
+        ) { [self] in promptRename() }
+        applyShortcut(renameWorkspaceShortcut, to: renameItem)
+        menu.addItem(renameItem)
 
         if tab.hasCustomTitle {
-            Button(String(localized: "contextMenu.removeCustomWorkspaceName", defaultValue: "Remove Custom Workspace Name")) {
-                tabManager.clearCustomTitle(tabId: tab.id)
-            }
+            menu.addItem(SidebarMenuItem(
+                title: String(localized: "contextMenu.removeCustomWorkspaceName", defaultValue: "Remove Custom Workspace Name")
+            ) { [self] in tabManager.clearCustomTitle(tabId: tab.id) })
         }
 
         if !isMulti {
-            if let key = editWorkspaceDescriptionShortcut.keyEquivalent {
-                Button(String(localized: "contextMenu.editWorkspaceDescription", defaultValue: "Edit Workspace Description…")) {
-                    beginWorkspaceDescriptionEditFromContextMenu()
-                }
-                .keyboardShortcut(key, modifiers: editWorkspaceDescriptionShortcut.eventModifiers)
-            } else {
-                Button(String(localized: "contextMenu.editWorkspaceDescription", defaultValue: "Edit Workspace Description…")) {
-                    beginWorkspaceDescriptionEditFromContextMenu()
-                }
-            }
+            let editDescriptionItem = SidebarMenuItem(
+                title: String(localized: "contextMenu.editWorkspaceDescription", defaultValue: "Edit Workspace Description…")
+            ) { [self] in beginWorkspaceDescriptionEditFromContextMenu() }
+            applyShortcut(editWorkspaceDescriptionShortcut, to: editDescriptionItem)
+            menu.addItem(editDescriptionItem)
 
             if tab.hasCustomDescription {
-                Button(String(localized: "contextMenu.clearWorkspaceDescription", defaultValue: "Clear Workspace Description")) {
-                    tabManager.clearCustomDescription(tabId: tab.id)
-                }
+                menu.addItem(SidebarMenuItem(
+                    title: String(localized: "contextMenu.clearWorkspaceDescription", defaultValue: "Clear Workspace Description")
+                ) { [self] in tabManager.clearCustomDescription(tabId: tab.id) })
             }
 
-            Divider()
+            menu.addItem(.separator())
 
-            Button(String(localized: "contextMenu.openAgentOverview", defaultValue: "Open Agent Overview")) {
-                AgentOverviewWindowController.shared.show(
-                    tabManager: tabManager,
-                    workspaceId: tab.id
-                )
-            }
+            menu.addItem(SidebarMenuItem(
+                title: String(localized: "contextMenu.openAgentOverview", defaultValue: "Open Agent Overview")
+            ) { [self] in
+                AgentOverviewWindowController.shared.show(tabManager: tabManager, workspaceId: tab.id)
+            })
         }
 
         if !isMulti, !showsWorktreeBadge {
-            Divider()
+            menu.addItem(.separator())
 
             if isWorktreeFolder {
-                Button(String(localized: "contextMenu.newWorktreeWorkspace", defaultValue: "New Worktree Workspace…")) {
-                    promptNewWorktreeWorkspace()
-                }
+                menu.addItem(SidebarMenuItem(
+                    title: String(localized: "contextMenu.newWorktreeWorkspace", defaultValue: "New Worktree Workspace…")
+                ) { [self] in promptNewWorktreeWorkspace() })
 
                 if worktreeChildCount > 0 {
-                    Button(
-                        isWorktreeFolderCollapsed
-                            ? String(localized: "contextMenu.expandWorktreeFolder", defaultValue: "Expand Worktree Folder")
-                            : String(localized: "contextMenu.collapseWorktreeFolder", defaultValue: "Collapse Worktree Folder")
-                    ) {
-                        tabManager.setWorktreeFolderCollapsed(
-                            tab,
-                            collapsed: !isWorktreeFolderCollapsed
-                        )
-                    }
+                    let title = isWorktreeFolderCollapsed
+                        ? String(localized: "contextMenu.expandWorktreeFolder", defaultValue: "Expand Worktree Folder")
+                        : String(localized: "contextMenu.collapseWorktreeFolder", defaultValue: "Collapse Worktree Folder")
+                    menu.addItem(SidebarMenuItem(title: title) { [self] in
+                        tabManager.setWorktreeFolderCollapsed(tab, collapsed: !isWorktreeFolderCollapsed)
+                    })
                 }
 
-                Button(String(localized: "contextMenu.stopUsingAsWorktreeFolder", defaultValue: "Stop Using as Worktree Folder")) {
-                    tabManager.disableWorktreeFolder(tab)
-                }
+                menu.addItem(SidebarMenuItem(
+                    title: String(localized: "contextMenu.stopUsingAsWorktreeFolder", defaultValue: "Stop Using as Worktree Folder")
+                ) { [self] in tabManager.disableWorktreeFolder(tab) })
             } else {
-                Button(String(localized: "contextMenu.useAsWorktreeFolder", defaultValue: "Use as Worktree Folder")) {
-                    enableWorktreeFolder()
-                }
+                menu.addItem(SidebarMenuItem(
+                    title: String(localized: "contextMenu.useAsWorktreeFolder", defaultValue: "Use as Worktree Folder")
+                ) { [self] in enableWorktreeFolder() })
             }
         }
 
-        WorkspaceColorMenu(
-            hasCustomColor: tab.customColor != nil,
-            palette: tabColorPalette,
-            targetIds: targetIds,
-            colorScheme: colorScheme,
-            activeTabIndicatorStyle: activeTabIndicatorStyle,
-            onApplyColor: { hex, ids in applyTabColor(hex, targetIds: ids) },
-            onPromptCustomColor: { ids in promptCustomColor(targetIds: ids) }
+        let colorItem = NSMenuItem(
+            title: String(localized: "contextMenu.workspaceColor", defaultValue: "Workspace Color"),
+            action: nil,
+            keyEquivalent: ""
         )
-        .equatable()
+        colorItem.submenu = buildWorkspaceColorMenu(targetIds: targetIds, colorScheme: colorScheme)
+        menu.addItem(colorItem)
 
-        Divider()
+        menu.addItem(.separator())
 
-        Button(String(localized: "contextMenu.moveUp", defaultValue: "Move Up")) {
-            moveBy(-1)
-        }
-        .disabled(index == 0)
+        menu.addItem(SidebarMenuItem(
+            title: String(localized: "contextMenu.moveUp", defaultValue: "Move Up"),
+            isEnabled: index != 0
+        ) { [self] in moveBy(-1) })
 
-        Button(String(localized: "contextMenu.moveDown", defaultValue: "Move Down")) {
-            moveBy(1)
-        }
-        .disabled(index >= tabManager.tabs.count - 1)
+        menu.addItem(SidebarMenuItem(
+            title: String(localized: "contextMenu.moveDown", defaultValue: "Move Down"),
+            isEnabled: index < tabManager.tabs.count - 1
+        ) { [self] in moveBy(1) })
 
-        Button(String(localized: "contextMenu.moveToTop", defaultValue: "Move to Top")) {
+        menu.addItem(SidebarMenuItem(
+            title: String(localized: "contextMenu.moveToTop", defaultValue: "Move to Top"),
+            isEnabled: !targetIds.isEmpty
+        ) { [self] in
             tabManager.moveTabsToTop(Set(targetIds))
             syncSelectionAfterMutation()
-        }
-        .disabled(targetIds.isEmpty)
+        })
 
         let referenceWindowId = AppDelegate.shared?.windowId(for: tabManager)
         let windowMoveTargets = AppDelegate.shared?.windowMoveTargets(referenceWindowId: referenceWindowId) ?? []
-        let moveMenuTitle = targetIds.count > 1
+        let moveMenuTitle = isMulti
             ? String(localized: "contextMenu.moveWorkspacesToWindow", defaultValue: "Move Workspaces to Window")
             : String(localized: "contextMenu.moveWorkspaceToWindow", defaultValue: "Move Workspace to Window")
-        Menu(moveMenuTitle) {
-            Button(String(localized: "contextMenu.newWindow", defaultValue: "New Window")) {
-                moveWorkspacesToNewWindow(targetIds)
-            }
-            .disabled(targetIds.isEmpty)
-
-            if !windowMoveTargets.isEmpty {
-                Divider()
-            }
-
-            ForEach(windowMoveTargets) { target in
-                Button(target.label) {
-                    moveWorkspaces(targetIds, toWindow: target.windowId)
-                }
-                .disabled(target.isCurrentWindow || targetIds.isEmpty)
-            }
-        }
-        .disabled(targetIds.isEmpty)
-
-        Divider()
-
-        if let key = closeWorkspaceShortcut.keyEquivalent {
-            Button(closeLabel) {
-                closeTabs(targetIds, allowPinned: true)
-            }
-            .keyboardShortcut(key, modifiers: closeWorkspaceShortcut.eventModifiers)
-            .disabled(targetIds.isEmpty)
-        } else {
-            Button(closeLabel) {
-                closeTabs(targetIds, allowPinned: true)
+        let moveMenuItem = NSMenuItem(title: moveMenuTitle, action: nil, keyEquivalent: "")
+        moveMenuItem.isEnabled = !targetIds.isEmpty
+        let moveSubmenu = NSMenu()
+        moveSubmenu.autoenablesItems = false
+        moveSubmenu.addItem(SidebarMenuItem(
+            title: String(localized: "contextMenu.newWindow", defaultValue: "New Window"),
+            isEnabled: !targetIds.isEmpty
+        ) { [self] in moveWorkspacesToNewWindow(targetIds) })
+        if !windowMoveTargets.isEmpty {
+            moveSubmenu.addItem(.separator())
+        }
+        for target in windowMoveTargets {
+            moveSubmenu.addItem(SidebarMenuItem(
+                title: target.label,
+                isEnabled: !target.isCurrentWindow && !targetIds.isEmpty
+            ) { [self] in moveWorkspaces(targetIds, toWindow: target.windowId) })
+        }
+        moveMenuItem.submenu = moveSubmenu
+        menu.addItem(moveMenuItem)
+
+        menu.addItem(.separator())
+
+        let closeItem = SidebarMenuItem(title: closeLabel, isEnabled: !targetIds.isEmpty) { [self] in
+            closeTabs(targetIds, allowPinned: true)
+        }
+        applyShortcut(closeWorkspaceShortcut, to: closeItem)
+        menu.addItem(closeItem)
+
+        menu.addItem(SidebarMenuItem(
+            title: String(localized: "contextMenu.closeOtherWorkspaces", defaultValue: "Close Other Workspaces"),
+            isEnabled: tabManager.tabs.count > 1 && targetIds.count != tabManager.tabs.count
+        ) { [self] in closeOtherTabs(targetIds) })
+
+        menu.addItem(SidebarMenuItem(
+            title: String(localized: "contextMenu.closeWorkspacesBelow", defaultValue: "Close Workspaces Below"),
+            isEnabled: index < tabManager.tabs.count - 1
+        ) { [self] in closeTabsBelow(tabId: tab.id) })
+
+        menu.addItem(SidebarMenuItem(
+            title: String(localized: "contextMenu.closeWorkspacesAbove", defaultValue: "Close Workspaces Above"),
+            isEnabled: index != 0
+        ) { [self] in closeTabsAbove(tabId: tab.id) })
+
+        menu.addItem(.separator())
+
+        menu.addItem(SidebarMenuItem(
+            title: markReadLabel,
+            isEnabled: hasUnreadNotifications(in: targetIds)
+        ) { [self] in markTabsRead(targetIds) })
+
+        menu.addItem(SidebarMenuItem(
+            title: markUnreadLabel,
+            isEnabled: hasReadNotifications(in: targetIds)
+        ) { [self] in markTabsUnread(targetIds) })
+
+        menu.addItem(SidebarMenuItem(
+            title: clearLatestNotificationLabel,
+            isEnabled: hasLatestNotifications(in: targetIds)
+        ) { [self] in clearLatestNotifications(targetIds) })
+
+        return menu
+    }
+
+    private func buildWorkspaceColorMenu(targetIds: [UUID], colorScheme: ColorScheme) -> NSMenu {
+        let submenu = NSMenu()
+        submenu.autoenablesItems = false
+
+        if tab.customColor != nil {
+            let clearItem = SidebarMenuItem(
+                title: String(localized: "contextMenu.clearColor", defaultValue: "Clear Color")
+            ) { [self] in applyTabColor(nil, targetIds: targetIds) }
+            clearItem.image = NSImage(systemSymbolName: "xmark.circle", accessibilityDescription: nil)
+            submenu.addItem(clearItem)
+        }
+
+        let chooseCustomItem = SidebarMenuItem(
+            title: String(localized: "contextMenu.chooseCustomColor", defaultValue: "Choose Custom Color…")
+        ) { [self] in promptCustomColor(targetIds: targetIds) }
+        chooseCustomItem.image = NSImage(systemSymbolName: "paintpalette", accessibilityDescription: nil)
+        submenu.addItem(chooseCustomItem)
+
+        let palette = WorkspaceTabColorSettings.palette()
+        if !palette.isEmpty {
+            submenu.addItem(.separator())
+        }
+
+        for entry in palette {
+            let swatchColor = WorkspaceTabColorSettings.displayNSColor(
+                hex: entry.hex,
+                colorScheme: colorScheme,
+                forceBright: activeTabIndicatorStyle == .leftRail
+            ) ?? NSColor(hex: entry.hex) ?? .gray
+            let item = SidebarMenuItem(title: entry.name) { [self] in
+                applyTabColor(entry.hex, targetIds: targetIds)
             }
-            .disabled(targetIds.isEmpty)
-        }
-
-        Button(String(localized: "contextMenu.closeOtherWorkspaces", defaultValue: "Close Other Workspaces")) {
-            closeOtherTabs(targetIds)
+            item.image = coloredCircleImage(color: swatchColor)
+            submenu.addItem(item)
         }
-        .disabled(tabManager.tabs.count <= 1 || targetIds.count == tabManager.tabs.count)
 
-        Button(String(localized: "contextMenu.closeWorkspacesBelow", defaultValue: "Close Workspaces Below")) {
-            closeTabsBelow(tabId: tab.id)
-        }
-        .disabled(index >= tabManager.tabs.count - 1)
-
-        Button(String(localized: "contextMenu.closeWorkspacesAbove", defaultValue: "Close Workspaces Above")) {
-            closeTabsAbove(tabId: tab.id)
-        }
-        .disabled(index == 0)
-
-        Divider()
-
-        Button(markReadLabel) {
-            markTabsRead(targetIds)
-        }
-        .disabled(!hasUnreadNotifications(in: targetIds))
-
-        Button(markUnreadLabel) {
-            markTabsUnread(targetIds)
-        }
-        .disabled(!hasReadNotifications(in: targetIds))
-
-        Button(clearLatestNotificationLabel) {
-            clearLatestNotifications(targetIds)
-        }
-        .disabled(!hasLatestNotifications(in: targetIds))
+        return submenu
     }
 
     private var selectionBackgroundColor: NSColor {
@@ -1180,11 +1160,16 @@ struct TabItemView: View, Equatable {
             if isMultiSelected { return programaAccentColor().opacity(0.25) }
             return Color.clear
         case .solidFill:
-            if isActive { return Color(nsColor: selectionBackgroundColor) }
+            // A custom color takes precedence over the plain selection wash so an
+            // active row keeps showing its color (the active state still reads via
+            // the border overlay below) instead of the custom color disappearing
+            // behind a flat selection fill.
             if let custom = resolvedCustomTabColor {
+                if isActive { return custom.opacity(0.85) }
                 if isMultiSelected { return custom.opacity(0.35) }
                 return custom.opacity(0.7)
             }
+            if isActive { return Color(nsColor: selectionBackgroundColor) }
             if isMultiSelected { return programaAccentColor().opacity(0.25) }
             return Color.clear
         }
@@ -1195,7 +1180,12 @@ struct TabItemView: View, Equatable {
     }
 
     private var explicitRailColor: Color? {
-        guard activeTabIndicatorStyle == .leftRail || isActive,
+        // .leftRail always shows the custom color as an edge stripe (active or not) —
+        // it has no other way to carry a custom color while active. .solidFill instead
+        // carries the custom color directly in the row's background fill (see
+        // `backgroundColor` below), so it doesn't also need the rail; showing both
+        // would be a redundant triple indicator alongside the active border.
+        guard activeTabIndicatorStyle == .leftRail,
               let custom = resolvedCustomTabColor else {
             return nil
         }
@@ -1890,6 +1880,111 @@ struct TabItemView: View, Equatable {
     }
 }
 
+// MARK: - Native sidebar row context menu
+
+/// Runs `run` when its owning `NSMenuItem` is selected. Retained by the item via
+/// `representedObject`, and the item is retained by its `NSMenu`, so the closure
+/// lives exactly as long as the menu that owns it -- nothing to clean up between
+/// context-menu presentations.
+private final class SidebarMenuItemAction {
+    let run: () -> Void
+    init(_ run: @escaping () -> Void) { self.run = run }
+}
+
+/// One statically-shared target for every closure-backed item `SidebarMenuItem`
+/// builds, so building a context menu never needs its own retained NSObject target.
+private final class SidebarMenuItemTarget: NSObject {
+    static let shared = SidebarMenuItemTarget()
+
+    @objc func invoke(_ sender: NSMenuItem) {
+        (sender.representedObject as? SidebarMenuItemAction)?.run()
+    }
+}
+
+/// Builds a closure-backed `NSMenuItem`, the AppKit equivalent of a SwiftUI
+/// `Button { handler() } label: { Text(title) }.disabled(!isEnabled)` inside a
+/// `.contextMenu`.
+private func SidebarMenuItem(
+    title: String,
+    isEnabled: Bool = true,
+    handler: @escaping () -> Void
+) -> NSMenuItem {
+    let item = NSMenuItem(title: title, action: #selector(SidebarMenuItemTarget.invoke(_:)), keyEquivalent: "")
+    item.target = SidebarMenuItemTarget.shared
+    item.representedObject = SidebarMenuItemAction(handler)
+    item.isEnabled = isEnabled
+    return item
+}
+
+/// Native right-click/ctrl-click catcher for the sidebar row's context menu, built
+/// fresh at click time instead of hanging a SwiftUI `.contextMenu` off the row's
+/// body (see the `.overlay` call site in `TabItemView.body` for why). Mirrors
+/// `MiddleClickCapture` (Sources/SidebarVisuals.swift): `hitTest` only claims the
+/// view for the button/modifier combo it cares about, so left-click selection,
+/// hover, and drag continue to hit-test through to SwiftUI/AppKit normally.
+private struct SidebarRowContextMenuCapture: NSViewRepresentable {
+    let buildMenu: () -> NSMenu
+
+    func makeNSView(context: Context) -> SidebarRowContextMenuCaptureView {
+        let view = SidebarRowContextMenuCaptureView()
+        view.buildMenu = buildMenu
+        return view
+    }
+
+    func updateNSView(_ nsView: SidebarRowContextMenuCaptureView, context: Context) {
+        nsView.buildMenu = buildMenu
+    }
+}
+
+private final class SidebarRowContextMenuCaptureView: NSView {
+    var buildMenu: (() -> NSMenu)?
+
+    override func hitTest(_ point: NSPoint) -> NSView? {
+        // Intercept right-mouse-down, and control-click too: unlike a plain
+        // right-click, control-click arrives here as a genuine .leftMouseDown
+        // event with the .control modifier set -- AppKit only redirects it to
+        // rightMouseDown(with:) dispatch for whichever view hit-testing already
+        // picked, so hitTest itself must recognize the control-click case or
+        // this view is never chosen and the click falls through to plain
+        // left-click selection underneath. Every other click (plain left-click
+        // selection, hover, drag-reorder) continues to hit-test through to
+        // SwiftUI/AppKit normally.
+        guard let event = NSApp.currentEvent else { return nil }
+        if event.type == .rightMouseDown {
+            return self
+        }
+        if event.type == .leftMouseDown, event.modifierFlags.contains(.control) {
+            return self
+        }
+        return nil
+    }
+
+    override func mouseDown(with event: NSEvent) {
+        guard event.modifierFlags.contains(.control) else {
+            super.mouseDown(with: event)
+            return
+        }
+        rightMouseDown(with: event)
+    }
+
+    override func rightMouseDown(with event: NSEvent) {
+        guard let menu = buildMenu?() else {
+            super.rightMouseDown(with: event)
+            return
+        }
+        NSMenu.popUpContextMenu(menu, with: event, for: self)
+    }
+
+    // VoiceOver's "Show menu" action relied on SwiftUI's `.contextMenu` before this
+    // change; best-effort parity for a plain NSView. Not exercised by this change
+    // (no VoiceOver pass was run) -- report a regression here if one surfaces.
+    override func accessibilityPerformShowMenu() -> Bool {
+        guard let menu = buildMenu?() else { return false }
+        menu.popUp(positioning: nil, at: NSPoint(x: bounds.midX, y: bounds.midY), in: self)
+        return true
+    }
+}
+
 private struct SidebarWorkspaceDescriptionText: View {
     let markdown: String
     let isActive: Bool

From 07c2a487176a76a688e2a91bfb9aed1e1b7e8842 Mon Sep 17 00:00:00 2001
From: arzafran <franco@darkroom.engineering>
Date: Mon, 28 Sep 2026 11:08:44 -0300
Subject: [PATCH 11/19] chore: scope workflow tokens to read and document the
 zig skip

---
 .github/workflows/build-ghosttykit.yml | 3 +++
 .github/workflows/ci-macos-compat.yml  | 3 +++
 .github/workflows/ci.yml               | 3 +++
 .github/workflows/test-depot.yml       | 3 +++
 .github/workflows/test-e2e.yml         | 3 +++
 CONTRIBUTING.md                        | 9 +++++++++
 6 files changed, 24 insertions(+)

diff --git a/.github/workflows/build-ghosttykit.yml b/.github/workflows/build-ghosttykit.yml
index 682a26b52..c4c38601a 100644
--- a/.github/workflows/build-ghosttykit.yml
+++ b/.github/workflows/build-ghosttykit.yml
@@ -32,6 +32,9 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
+permissions:
+  contents: read
+
 jobs:
   build-ghosttykit:
     runs-on: macos-15
diff --git a/.github/workflows/ci-macos-compat.yml b/.github/workflows/ci-macos-compat.yml
index ec6d55343..6f2b17e5a 100644
--- a/.github/workflows/ci-macos-compat.yml
+++ b/.github/workflows/ci-macos-compat.yml
@@ -21,6 +21,9 @@ on:
 
   workflow_dispatch:
 
+permissions:
+  contents: read
+
 jobs:
   change-detection:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3792c468b..0bfa77bcd 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -68,6 +68,9 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
+permissions:
+  contents: read
+
 jobs:
   change-detection:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/test-depot.yml b/.github/workflows/test-depot.yml
index dfba74b84..6ad413933 100644
--- a/.github/workflows/test-depot.yml
+++ b/.github/workflows/test-depot.yml
@@ -26,6 +26,9 @@ on:
         required: false
         default: "120"
 
+permissions:
+  contents: read
+
 jobs:
   tests:
     runs-on: macos-15
diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index 9933e6471..ff4442a0b 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -29,6 +29,9 @@ on:
           - macos-15
           - macos-14
 
+permissions:
+  contents: read
+
 jobs:
   e2e:
     runs-on: ${{ inputs.runner || 'macos-15' }}
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e8f846ea3..968dc99c7 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -38,6 +38,15 @@ in [docs/windows-testing.md](docs/windows-testing.md).
    ```
    The script prints the `.app` path. Cmd-click to open, or pass `--launch` to open automatically.
 
+   If your local Zig doesn't match the version the ghostty submodule needs
+   (`scripts/required-zig-version.sh`), skip the Zig steps and build against the
+   existing GhosttyKit.xcframework:
+   ```bash
+   PROGRAMA_SKIP_ZIG_BUILD=1 ./scripts/reload.sh --tag my-feature
+   ```
+   If the xcframework is missing, `./scripts/download-prebuilt-ghosttykit.sh`
+   fetches a prebuilt copy.
+
 ## Development Scripts
 
 | Script | Description |

From e83b19b5d35955575260deb208d16b47ed7cf5cc Mon Sep 17 00:00:00 2001
From: arzafran <franco@darkroom.engineering>
Date: Mon, 28 Sep 2026 11:11:16 -0300
Subject: [PATCH 12/19] refactor: tighten sidebar menu hit-testing and comments

---
 Sources/TabItemView.swift | 35 ++++++++++++-----------------------
 1 file changed, 12 insertions(+), 23 deletions(-)

diff --git a/Sources/TabItemView.swift b/Sources/TabItemView.swift
index c166a61ac..bf571c194 100644
--- a/Sources/TabItemView.swift
+++ b/Sources/TabItemView.swift
@@ -746,15 +746,11 @@ struct TabItemView: View, Equatable {
             }
         }
         .overlay {
-            // Native AppKit context menu, built fresh from live state at click time,
-            // instead of SwiftUI's `.contextMenu`. `.contextMenu`'s content closure
-            // hangs off this row's body, which re-evaluates as often as every 40ms
-            // from the onReceive handlers above (`workspaceObservationGeneration`),
-            // on hover changes, and on any ==-compared param change. SwiftUI rebuilds
-            // an already-open `.contextMenu` on every one of those re-evaluations,
-            // and macOS reads that rebuild as the menu (and any open submenu, e.g.
-            // Workspace Color) repeatedly closing and reopening. Building the NSMenu
-            // only once, at the moment of the click, sidesteps the churn entirely.
+            // Native AppKit context menu, built from live state at click time. Do not
+            // use SwiftUI's `.contextMenu` here: this row's body re-evaluates as often
+            // as every 40ms (`workspaceObservationGeneration`, hover, param changes),
+            // SwiftUI rebuilds an open `.contextMenu` on each re-evaluation, and macOS
+            // closes the menu and any open submenu (e.g. Workspace Color) when it does.
             SidebarRowContextMenuCapture {
                 #if DEBUG
                 dlog("sidebar.contextMenu.open workspace=\(tab.id.uuidString.prefix(5)) targets=\(contextMenuWorkspaceIds.count)")
@@ -887,22 +883,15 @@ struct TabItemView: View, Equatable {
         isMulti ? multi : single
     }
 
-    /// Applies a `StoredShortcut`'s key equivalent to an `NSMenuItem`, mirroring the
-    /// `if let key = shortcut.keyEquivalent { .keyboardShortcut(key, modifiers:) }`
-    /// pattern the SwiftUI menu used to use. `menuItemKeyEquivalent`/`modifierFlags`
-    /// are the AppKit-side counterparts of `keyEquivalent`/`eventModifiers` and are
-    /// `nil`/empty under the same conditions (chorded shortcuts have no single
-    /// menu-item key equivalent).
+    /// Shows a `StoredShortcut` on an `NSMenuItem`. Chorded shortcuts have no single
+    /// menu-item key equivalent, so they show none.
     private func applyShortcut(_ shortcut: StoredShortcut, to item: NSMenuItem) {
         guard let key = shortcut.menuItemKeyEquivalent else { return }
         item.keyEquivalent = key
         item.keyEquivalentModifierMask = shortcut.modifierFlags
     }
 
-    /// Builds the sidebar row's context menu fresh from live state at click time,
-    /// replacing the SwiftUI `.contextMenu` this row used to carry. Every item here
-    /// ports the SwiftUI menu 1:1 (same strings/keys, order, dividers, conditional
-    /// visibility, disabled states, and shortcut display).
+    /// Builds the sidebar row's context menu from live state at click time.
     private func buildWorkspaceContextMenu(colorScheme: ColorScheme) -> NSMenu {
         let targetIds = contextMenuWorkspaceIds
         let isMulti = targetIds.count > 1
@@ -1949,7 +1938,9 @@ private final class SidebarRowContextMenuCaptureView: NSView {
         // left-click selection underneath. Every other click (plain left-click
         // selection, hover, drag-reorder) continues to hit-test through to
         // SwiftUI/AppKit normally.
-        guard let event = NSApp.currentEvent else { return nil }
+        guard let event = NSApp.currentEvent,
+              let superview,
+              bounds.contains(convert(point, from: superview)) else { return nil }
         if event.type == .rightMouseDown {
             return self
         }
@@ -1975,9 +1966,7 @@ private final class SidebarRowContextMenuCaptureView: NSView {
         NSMenu.popUpContextMenu(menu, with: event, for: self)
     }
 
-    // VoiceOver's "Show menu" action relied on SwiftUI's `.contextMenu` before this
-    // change; best-effort parity for a plain NSView. Not exercised by this change
-    // (no VoiceOver pass was run) -- report a regression here if one surfaces.
+    // VoiceOver "Show menu" support for this view.
     override func accessibilityPerformShowMenu() -> Bool {
         guard let menu = buildMenu?() else { return false }
         menu.popUp(positioning: nil, at: NSPoint(x: bounds.midX, y: bounds.midY), in: self)

From 6b7dbfac1dd28898eecc77fb1cbe6720681976b3 Mon Sep 17 00:00:00 2001
From: arzafran <franco@darkroom.engineering>
Date: Mon, 28 Sep 2026 11:11:16 -0300
Subject: [PATCH 13/19] feat: color-code pane tabs with a tinted background

---
 Resources/Localizable.xcstrings               |  17 +
 Sources/SessionPersistence.swift              |   1 +
 Sources/TabManager.swift                      |  11 +
 Sources/Workspace+Bonsplit.swift              |  11 +
 Sources/Workspace+Persistence.swift           |   3 +
 Sources/Workspace+SidebarTelemetry.swift      |   3 +
 Sources/Workspace.swift                       |  80 +++-
 programaTests/WorkspaceUnitTests.swift        |  43 ++
 .../Bonsplit/Internal/Models/TabItem.swift    |   8 +-
 .../Bonsplit/Internal/Views/TabBarView.swift  |   9 +-
 .../Bonsplit/Internal/Views/TabItemView.swift | 419 +++++++++++++-----
 .../Bonsplit/Public/BonsplitController.swift  |  25 +-
 .../Bonsplit/Public/BonsplitDelegate.swift    |   4 +
 .../Sources/Bonsplit/Public/Types/Tab.swift   |   7 +-
 .../Public/Types/TabContextAction.swift       |  16 +
 .../Resources/en.lproj/Localizable.strings    |   3 +
 .../Resources/ja.lproj/Localizable.strings    |   3 +
 17 files changed, 552 insertions(+), 111 deletions(-)

diff --git a/Resources/Localizable.xcstrings b/Resources/Localizable.xcstrings
index 1d615249d..9c7160076 100644
--- a/Resources/Localizable.xcstrings
+++ b/Resources/Localizable.xcstrings
@@ -2842,6 +2842,23 @@
         }
       }
     },
+    "alert.customTabColor.title": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Custom Tab Color"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "タブのカスタムカラー"
+          }
+        }
+      }
+    },
     "alert.invalidColor.emptyMessage": {
       "extractionState": "manual",
       "localizations": {
diff --git a/Sources/SessionPersistence.swift b/Sources/SessionPersistence.swift
index 051f0462c..6044731da 100644
--- a/Sources/SessionPersistence.swift
+++ b/Sources/SessionPersistence.swift
@@ -292,6 +292,7 @@ struct SessionPanelSnapshot: Codable, Sendable {
     var customTitle: String?
     var directory: String?
     var isPinned: Bool
+    var customColorHex: String?
     var isManuallyUnread: Bool
     var gitBranch: SessionGitBranchSnapshot?
     var listeningPorts: [Int]
diff --git a/Sources/TabManager.swift b/Sources/TabManager.swift
index 15563587d..d2c9efd17 100644
--- a/Sources/TabManager.swift
+++ b/Sources/TabManager.swift
@@ -336,6 +336,17 @@ enum WorkspaceTabColorSettings {
         return Color(nsColor: color)
     }
 
+    /// Palette entries for bonsplit's native tab-color context menu, resolved for the app's
+    /// current effective appearance. Bonsplit cannot import app types, so this maps the
+    /// shared palette into its own `TabColorSwatch` value type at call time.
+    static func tabColorSwatches(defaults: UserDefaults = .standard) -> [TabColorSwatch] {
+        let colorScheme: ColorScheme = NSApp.effectiveAppearance.bestMatch(from: [.darkAqua, .aqua]) == .darkAqua ? .dark : .light
+        return palette(defaults: defaults).compactMap { entry in
+            guard let color = displayNSColor(hex: entry.hex, colorScheme: colorScheme) else { return nil }
+            return TabColorSwatch(name: entry.name, hex: entry.hex, swatchColor: color)
+        }
+    }
+
     static func displayNSColor(
         hex: String,
         colorScheme: ColorScheme,
diff --git a/Sources/Workspace+Bonsplit.swift b/Sources/Workspace+Bonsplit.swift
index 5d84ceec4..3ea48ef33 100644
--- a/Sources/Workspace+Bonsplit.swift
+++ b/Sources/Workspace+Bonsplit.swift
@@ -596,6 +596,7 @@ extension Workspace: @preconcurrency BonsplitDelegate {
                 kind: surfaceKind(for: panel),
                 isLoading: browserPanel?.isLoading ?? false,
                 isPinned: pinnedPanelIds.contains(panelId),
+                customColorHex: panelColorHexes[panelId],
                 directory: panelDirectories[panelId],
                 ttyName: surfaceTTYNames[panelId],
                 cachedTitle: cachedTitle,
@@ -1078,11 +1079,21 @@ extension Workspace: @preconcurrency BonsplitDelegate {
         case .toggleZoom:
             guard let panelId = panelIdFromSurfaceId(tab.id) else { return }
             toggleSplitZoom(panelId: panelId)
+        case .clearTabColor:
+            guard let panelId = panelIdFromSurfaceId(tab.id) else { return }
+            setPanelColor(panelId: panelId, hex: nil)
+        case .chooseCustomTabColor:
+            promptCustomTabColor(tabId: tab.id)
         @unknown default:
             break
         }
     }
 
+    func splitTabBar(_ controller: BonsplitController, didRequestTabColor hex: String, for tab: Bonsplit.Tab, inPane pane: PaneID) {
+        guard let panelId = panelIdFromSurfaceId(tab.id) else { return }
+        setPanelColor(panelId: panelId, hex: hex)
+    }
+
     func splitTabBar(_ controller: BonsplitController, didChangeGeometry snapshot: LayoutSnapshot) {
         tmuxLayoutSnapshot = snapshot
         scheduleTerminalGeometryReconcile()
diff --git a/Sources/Workspace+Persistence.swift b/Sources/Workspace+Persistence.swift
index cc17fa9a8..13124b86b 100644
--- a/Sources/Workspace+Persistence.swift
+++ b/Sources/Workspace+Persistence.swift
@@ -282,6 +282,7 @@ extension Workspace {
         let customTitle = panelCustomTitles[panelId]
         let directory = panelDirectories[panelId]
         let isPinned = pinnedPanelIds.contains(panelId)
+        let customColorHex = panelColorHexes[panelId]
         let isManuallyUnread = manualUnreadPanelIds.contains(panelId)
         let branchSnapshot = panelGitBranches[panelId].map {
             SessionGitBranchSnapshot(branch: $0.branch, isDirty: $0.isDirty)
@@ -359,6 +360,7 @@ extension Workspace {
             customTitle: customTitle,
             directory: directory,
             isPinned: isPinned,
+            customColorHex: customColorHex,
             isManuallyUnread: isManuallyUnread,
             gitBranch: branchSnapshot,
             listeningPorts: listeningPorts,
@@ -766,6 +768,7 @@ extension Workspace {
 
         setPanelCustomTitle(panelId: panelId, title: snapshot.customTitle)
         setPanelPinned(panelId: panelId, pinned: snapshot.isPinned)
+        setPanelColor(panelId: panelId, hex: snapshot.customColorHex)
 
         if snapshot.isManuallyUnread {
             markPanelUnread(panelId)
diff --git a/Sources/Workspace+SidebarTelemetry.swift b/Sources/Workspace+SidebarTelemetry.swift
index 01eaa5fa8..2984b8474 100644
--- a/Sources/Workspace+SidebarTelemetry.swift
+++ b/Sources/Workspace+SidebarTelemetry.swift
@@ -447,6 +447,9 @@ extension Workspace {
         if pinnedPanelIds.contains(where: { !validSurfaceIds.contains($0) }) {
             pinnedPanelIds = pinnedPanelIds.filter { validSurfaceIds.contains($0) }
         }
+        if panelColorHexes.keys.contains(where: { !validSurfaceIds.contains($0) }) {
+            panelColorHexes = panelColorHexes.filter { validSurfaceIds.contains($0.key) }
+        }
         if manualUnreadPanelIds.contains(where: { !validSurfaceIds.contains($0) }) {
             manualUnreadPanelIds = manualUnreadPanelIds.filter { validSurfaceIds.contains($0) }
         }
diff --git a/Sources/Workspace.swift b/Sources/Workspace.swift
index a43dd332b..f152171d0 100644
--- a/Sources/Workspace.swift
+++ b/Sources/Workspace.swift
@@ -142,6 +142,9 @@ final class Workspace: Identifiable, ObservableObject {
     var panelsWithLiveTitle: Set<UUID> = []
     @Published var panelCustomTitles: [UUID: String] = [:]
     @Published var pinnedPanelIds: Set<UUID> = []
+    /// Per-tab color tint (pane tab bar), keyed by panel id. Distinct from `customColor`,
+    /// which is the sidebar's per-workspace color.
+    @Published var panelColorHexes: [UUID: String] = [:]
     @Published var manualUnreadPanelIds: Set<UUID> = []
     @Published var tmuxLayoutSnapshot: LayoutSnapshot?
     @Published private(set) var tmuxWorkspaceFlashPanelId: UUID?
@@ -400,6 +403,7 @@ final class Workspace: Identifiable, ObservableObject {
 
         // Set ourselves as delegate
         bonsplitController.delegate = self
+        bonsplitController.tabColorPaletteProvider = { WorkspaceTabColorSettings.tabColorSwatches() }
         connectSharedTabOrdering()
 
         // Ensure bonsplit has a focused pane and our didSelectTab handler runs for the
@@ -497,6 +501,7 @@ final class Workspace: Identifiable, ObservableObject {
         }
 
         bonsplitController.delegate = self
+        bonsplitController.tabColorPaletteProvider = { WorkspaceTabColorSettings.tabColorSwatches() }
         connectSharedTabOrdering()
 
         if let initialTabId {
@@ -612,6 +617,7 @@ final class Workspace: Identifiable, ObservableObject {
         let kind: String?
         let isLoading: Bool
         let isPinned: Bool
+        let customColorHex: String?
         let directory: String?
         let ttyName: String?
         let cachedTitle: String?
@@ -628,6 +634,7 @@ final class Workspace: Identifiable, ObservableObject {
             kind: String?,
             isLoading: Bool,
             isPinned: Bool,
+            customColorHex: String?,
             directory: String?,
             ttyName: String?,
             cachedTitle: String?,
@@ -642,6 +649,7 @@ final class Workspace: Identifiable, ObservableObject {
             self.kind = kind
             self.isLoading = isLoading
             self.isPinned = isPinned
+            self.customColorHex = customColorHex
             self.directory = directory
             self.ttyName = ttyName
             self.cachedTitle = cachedTitle
@@ -976,14 +984,16 @@ final class Workspace: Identifiable, ObservableObject {
 
     func syncPinnedStateForTab(_ tabId: TabID, panelId: UUID) {
         let isPinned = pinnedPanelIds.contains(panelId)
+        let colorHex = panelColorHexes[panelId]
         if let panel = panels[panelId] {
             bonsplitController.updateTab(
                 tabId,
                 kind: .some(surfaceKind(for: panel)),
-                isPinned: isPinned
+                isPinned: isPinned,
+                customColorHex: .some(colorHex)
             )
         } else {
-            bonsplitController.updateTab(tabId, isPinned: isPinned)
+            bonsplitController.updateTab(tabId, isPinned: isPinned, customColorHex: .some(colorHex))
         }
     }
 
@@ -1152,6 +1162,20 @@ final class Workspace: Identifiable, ObservableObject {
         normalizePinnedTabs(in: paneId)
     }
 
+    func setPanelColor(panelId: UUID, hex: String?) {
+        guard panels[panelId] != nil else { return }
+        let normalized = hex.flatMap { WorkspaceTabColorSettings.normalizedHex($0) }
+        guard panelColorHexes[panelId] != normalized else { return }
+        if let normalized {
+            panelColorHexes[panelId] = normalized
+        } else {
+            panelColorHexes.removeValue(forKey: panelId)
+        }
+
+        guard let tabId = surfaceIdFromPanelId(panelId) else { return }
+        bonsplitController.updateTab(tabId, customColorHex: .some(normalized))
+    }
+
     func markPanelUnread(_ panelId: UUID) {
         guard panels[panelId] != nil else { return }
         guard manualUnreadPanelIds.insert(panelId).inserted else { return }
@@ -1778,6 +1802,11 @@ final class Workspace: Identifiable, ObservableObject {
         } else {
             pinnedPanelIds.remove(detached.panelId)
         }
+        if let customColorHex = detached.customColorHex {
+            panelColorHexes[detached.panelId] = customColorHex
+        } else {
+            panelColorHexes.removeValue(forKey: detached.panelId)
+        }
         if detached.manuallyUnread {
             manualUnreadPanelIds.insert(detached.panelId)
             manualUnreadMarkedAt[detached.panelId] = .distantPast
@@ -1795,6 +1824,7 @@ final class Workspace: Identifiable, ObservableObject {
             isDirty: detached.panel.isDirty,
             isLoading: detached.isLoading,
             isPinned: detached.isPinned,
+            customColorHex: detached.customColorHex,
             inPane: paneId
         ) else {
             panels.removeValue(forKey: detached.panelId)
@@ -1803,6 +1833,7 @@ final class Workspace: Identifiable, ObservableObject {
             panelTitles.removeValue(forKey: detached.panelId)
             panelCustomTitles.removeValue(forKey: detached.panelId)
             pinnedPanelIds.remove(detached.panelId)
+            panelColorHexes.removeValue(forKey: detached.panelId)
             manualUnreadPanelIds.remove(detached.panelId)
             manualUnreadMarkedAt.removeValue(forKey: detached.panelId)
             panelSubscriptions.removeValue(forKey: detached.panelId)
@@ -2123,6 +2154,51 @@ final class Workspace: Identifiable, ObservableObject {
         setPanelCustomTitle(panelId: panelId, title: input.stringValue)
     }
 
+    func promptCustomTabColor(tabId: TabID) {
+        guard let panelId = panelIdFromSurfaceId(tabId) else { return }
+
+        let alert = NSAlert()
+        alert.messageText = String(localized: "alert.customTabColor.title", defaultValue: "Custom Tab Color")
+        alert.informativeText = String(localized: "alert.customColor.message", defaultValue: "Enter a hex color in the format #RRGGBB.")
+
+        let seed = panelColorHexes[panelId] ?? WorkspaceTabColorSettings.customPaletteEntries().first?.hex ?? ""
+        let input = NSTextField(string: seed)
+        input.placeholderString = "#1565C0"
+        input.frame = NSRect(x: 0, y: 0, width: 240, height: 22)
+        alert.accessoryView = input
+        alert.addButton(withTitle: String(localized: "alert.customColor.apply", defaultValue: "Apply"))
+        alert.addButton(withTitle: String(localized: "alert.customColor.cancel", defaultValue: "Cancel"))
+
+        let alertWindow = alert.window
+        alertWindow.initialFirstResponder = input
+        DispatchQueue.main.async {
+            alertWindow.makeFirstResponder(input)
+            input.selectText(nil)
+        }
+
+        let response = alert.runModal()
+        guard response == .alertFirstButtonReturn else { return }
+        guard let normalized = WorkspaceTabColorSettings.addCustomColor(input.stringValue) else {
+            showInvalidTabColorAlert(input.stringValue)
+            return
+        }
+        setPanelColor(panelId: panelId, hex: normalized)
+    }
+
+    private func showInvalidTabColorAlert(_ value: String) {
+        let alert = NSAlert()
+        alert.alertStyle = .warning
+        alert.messageText = String(localized: "alert.invalidColor.title", defaultValue: "Invalid Color")
+        let trimmed = value.trimmingCharacters(in: .whitespacesAndNewlines)
+        if trimmed.isEmpty {
+            alert.informativeText = String(localized: "alert.invalidColor.emptyMessage", defaultValue: "Enter a hex color in the format #RRGGBB.")
+        } else {
+            alert.informativeText = String(localized: "alert.invalidColor.invalidMessage", defaultValue: "\"\(trimmed)\" is not a valid hex color. Use #RRGGBB.")
+        }
+        alert.addButton(withTitle: String(localized: "alert.invalidColor.ok", defaultValue: "OK"))
+        _ = alert.runModal()
+    }
+
     enum PanelMoveDestination {
         case newWorkspaceInCurrentWindow
         case selectedWorkspaceInNewWindow
diff --git a/programaTests/WorkspaceUnitTests.swift b/programaTests/WorkspaceUnitTests.swift
index 39bc630f0..a48ac4865 100644
--- a/programaTests/WorkspaceUnitTests.swift
+++ b/programaTests/WorkspaceUnitTests.swift
@@ -5342,3 +5342,46 @@ final class FocusTransitionCoordinatorTests: XCTestCase {
         )
     }
 }
+
+final class SessionPanelSnapshotTabColorTests: XCTestCase {
+    private func makeSnapshot(customColorHex: String?) -> SessionPanelSnapshot {
+        SessionPanelSnapshot(
+            id: UUID(),
+            type: .terminal,
+            title: "Terminal",
+            customTitle: nil,
+            directory: nil,
+            isPinned: false,
+            customColorHex: customColorHex,
+            isManuallyUnread: false,
+            gitBranch: nil,
+            listeningPorts: [],
+            ttyName: nil,
+            terminal: SessionTerminalPanelSnapshot(workingDirectory: nil, scrollback: nil),
+            browser: nil,
+            markdown: nil,
+            review: nil
+        )
+    }
+
+    func testCustomColorHexRoundTripsThroughEncodeDecode() throws {
+        let original = makeSnapshot(customColorHex: "#1565C0")
+        let data = try JSONEncoder().encode(original)
+        let decoded = try JSONDecoder().decode(SessionPanelSnapshot.self, from: data)
+        XCTAssertEqual(decoded.customColorHex, "#1565C0")
+        XCTAssertEqual(decoded.id, original.id)
+    }
+
+    func testMissingCustomColorHexKeyDecodesToNil() throws {
+        // Simulates a pre-tab-color session snapshot written before this field existed.
+        let legacySnapshot = makeSnapshot(customColorHex: nil)
+        var data = try JSONEncoder().encode(legacySnapshot)
+        var object = try JSONSerialization.jsonObject(with: data) as! [String: Any]
+        XCTAssertNil(object["customColorHex"], "legacy fixture must not already contain the key")
+        object.removeValue(forKey: "customColorHex")
+        data = try JSONSerialization.data(withJSONObject: object)
+
+        let decoded = try JSONDecoder().decode(SessionPanelSnapshot.self, from: data)
+        XCTAssertNil(decoded.customColorHex)
+    }
+}
diff --git a/vendor/bonsplit/Sources/Bonsplit/Internal/Models/TabItem.swift b/vendor/bonsplit/Sources/Bonsplit/Internal/Models/TabItem.swift
index 4436760f0..df5603b3a 100644
--- a/vendor/bonsplit/Sources/Bonsplit/Internal/Models/TabItem.swift
+++ b/vendor/bonsplit/Sources/Bonsplit/Internal/Models/TabItem.swift
@@ -25,6 +25,7 @@ struct TabItem: Identifiable, Hashable, Codable {
     var showsNotificationBadge: Bool
     var isLoading: Bool
     var isPinned: Bool
+    var customColorHex: String?
 
     init(
         id: UUID = UUID(),
@@ -36,7 +37,8 @@ struct TabItem: Identifiable, Hashable, Codable {
         isDirty: Bool = false,
         showsNotificationBadge: Bool = false,
         isLoading: Bool = false,
-        isPinned: Bool = false
+        isPinned: Bool = false,
+        customColorHex: String? = nil
     ) {
         self.id = id
         self.title = title
@@ -48,6 +50,7 @@ struct TabItem: Identifiable, Hashable, Codable {
         self.showsNotificationBadge = showsNotificationBadge
         self.isLoading = isLoading
         self.isPinned = isPinned
+        self.customColorHex = customColorHex
     }
 
     func hash(into hasher: inout Hasher) {
@@ -69,6 +72,7 @@ struct TabItem: Identifiable, Hashable, Codable {
         case showsNotificationBadge
         case isLoading
         case isPinned
+        case customColorHex
     }
 
     init(from decoder: Decoder) throws {
@@ -83,6 +87,7 @@ struct TabItem: Identifiable, Hashable, Codable {
         self.showsNotificationBadge = try c.decodeIfPresent(Bool.self, forKey: .showsNotificationBadge) ?? false
         self.isLoading = try c.decodeIfPresent(Bool.self, forKey: .isLoading) ?? false
         self.isPinned = try c.decodeIfPresent(Bool.self, forKey: .isPinned) ?? false
+        self.customColorHex = try c.decodeIfPresent(String.self, forKey: .customColorHex)
     }
 
     func encode(to encoder: Encoder) throws {
@@ -97,6 +102,7 @@ struct TabItem: Identifiable, Hashable, Codable {
         try c.encode(showsNotificationBadge, forKey: .showsNotificationBadge)
         try c.encode(isLoading, forKey: .isLoading)
         try c.encode(isPinned, forKey: .isPinned)
+        try c.encodeIfPresent(customColorHex, forKey: .customColorHex)
     }
 }
 
diff --git a/vendor/bonsplit/Sources/Bonsplit/Internal/Views/TabBarView.swift b/vendor/bonsplit/Sources/Bonsplit/Internal/Views/TabBarView.swift
index aa7768feb..3c596b76d 100644
--- a/vendor/bonsplit/Sources/Bonsplit/Internal/Views/TabBarView.swift
+++ b/vendor/bonsplit/Sources/Bonsplit/Internal/Views/TabBarView.swift
@@ -46,6 +46,8 @@ struct TabContextMenuState {
     let isZoomed: Bool
     let hasSplits: Bool
     let shortcuts: [TabContextAction: KeyboardShortcut]
+    let hasCustomColor: Bool
+    let colorPalette: [TabColorSwatch]
 
     var canMarkAsUnread: Bool {
         !isUnread
@@ -310,6 +312,9 @@ struct TabBarView: View {
             },
             onContextAction: { action in
                 controller.requestTabContextAction(action, for: TabID(id: tab.id), inPane: pane.id)
+            },
+            onApplyTabColor: { hex in
+                controller.requestTabColor(hex, for: TabID(id: tab.id), inPane: pane.id)
             }
         )
         .background(
@@ -368,7 +373,9 @@ struct TabBarView: View {
             canMoveToRightPane: controller.adjacentPane(to: pane.id, direction: .right) != nil,
             isZoomed: splitViewController.zoomedPaneId == pane.id,
             hasSplits: splitViewController.rootNode.allPaneIds.count > 1,
-            shortcuts: controller.contextMenuShortcuts
+            shortcuts: controller.contextMenuShortcuts,
+            hasCustomColor: tab.customColorHex != nil,
+            colorPalette: controller.tabColorPaletteProvider?() ?? []
         )
     }
 
diff --git a/vendor/bonsplit/Sources/Bonsplit/Internal/Views/TabItemView.swift b/vendor/bonsplit/Sources/Bonsplit/Internal/Views/TabItemView.swift
index 1b18d233d..4f56cfa16 100644
--- a/vendor/bonsplit/Sources/Bonsplit/Internal/Views/TabItemView.swift
+++ b/vendor/bonsplit/Sources/Bonsplit/Internal/Views/TabItemView.swift
@@ -33,6 +33,18 @@ enum TabItemStyling {
         }
         return existing
     }
+
+    /// Parses a "#RRGGBB" hex string into a Color. Bonsplit is host-app-agnostic, so it
+    /// cannot reuse the app's own NSColor(hex:) extension.
+    static func color(fromHex hex: String) -> Color? {
+        var body = hex.trimmingCharacters(in: .whitespacesAndNewlines)
+        if body.hasPrefix("#") { body.removeFirst() }
+        guard body.count == 6, let value = UInt64(body, radix: 16) else { return nil }
+        let r = Double((value >> 16) & 0xFF) / 255.0
+        let g = Double((value >> 8) & 0xFF) / 255.0
+        let b = Double(value & 0xFF) / 255.0
+        return Color(red: r, green: g, blue: b)
+    }
 }
 
 /// Individual tab view with icon, title, close button, and dirty indicator
@@ -50,6 +62,7 @@ struct TabItemView: View {
     let onClose: () -> Void
     let onZoomToggle: () -> Void
     let onContextAction: (TabContextAction) -> Void
+    let onApplyTabColor: (String) -> Void
 
     @State private var isHovered = false
     @State private var isCloseHovered = false
@@ -197,9 +210,17 @@ struct TabItemView: View {
             // Keep icon rendering stable while hovering; only accessory/background elements animate.
             isHovered = hovering
         }
-        .contextMenu {
-            contextMenuContent
-        }
+        // Right-click / ctrl-click context menu, built natively with NSMenu at click time.
+        // A SwiftUI `.contextMenu` here gets closed by macOS the instant this view re-renders
+        // while the menu is open (constant re-eval from closure props, hover state changes when
+        // the pointer crosses onto the open menu, etc.) -- AppKit's own tracking loop is immune
+        // to that since it owns the run loop for the popup, not SwiftUI's diffing.
+        .background(TabContextMenuHostView(
+            tab: tab,
+            contextMenuState: contextMenuState,
+            onContextAction: onContextAction,
+            onApplyTabColor: onApplyTabColor
+        ))
         .accessibilityElement(children: .combine)
         .accessibilityLabel(tab.title)
         .accessibilityValue(accessibilityValue)
@@ -349,111 +370,17 @@ struct TabItemView: View {
         return parts.joined(separator: ", ")
     }
 
-    @ViewBuilder
-    private var contextMenuContent: some View {
-        contextButton("Rename Tab…", action: .rename)
-
-        if contextMenuState.hasCustomTitle {
-            contextButton("Remove Custom Tab Name", action: .clearName)
-        }
-
-        Divider()
-
-        contextButton("Close Tabs to Left", action: .closeToLeft)
-            .disabled(!contextMenuState.canCloseToLeft)
-
-        contextButton("Close Tabs to Right", action: .closeToRight)
-            .disabled(!contextMenuState.canCloseToRight)
-
-        contextButton("Close Other Tabs", action: .closeOthers)
-            .disabled(!contextMenuState.canCloseOthers)
-
-        contextButton("Move Tab…", action: .move)
-
-        if contextMenuState.isTerminal {
-            localizedContextButton(
-                "command.moveTabToLeftPane.title",
-                defaultValue: "Move to Left Pane",
-                action: .moveToLeftPane
-            )
-                .disabled(!contextMenuState.canMoveToLeftPane)
-
-            localizedContextButton(
-                "command.moveTabToRightPane.title",
-                defaultValue: "Move to Right Pane",
-                action: .moveToRightPane
-            )
-                .disabled(!contextMenuState.canMoveToRightPane)
-        }
-
-        Divider()
-
-        contextButton("New Terminal Tab to Right", action: .newTerminalToRight)
-
-        contextButton("New Browser Tab to Right", action: .newBrowserToRight)
-
-        if contextMenuState.isBrowser {
-            Divider()
-
-            contextButton("Reload Tab", action: .reload)
-
-            contextButton("Duplicate Tab", action: .duplicate)
-        }
-
-        Divider()
-
-        if contextMenuState.hasSplits {
-            contextButton(
-                contextMenuState.isZoomed ? "Exit Zoom" : "Zoom Pane",
-                action: .toggleZoom
-            )
-        }
-
-        contextButton(
-            contextMenuState.isPinned ? "Unpin Tab" : "Pin Tab",
-            action: .togglePin
-        )
-
-        if contextMenuState.isUnread {
-            contextButton("Mark Tab as Read", action: .markAsRead)
-                .disabled(!contextMenuState.canMarkAsRead)
-        } else {
-            contextButton("Mark Tab as Unread", action: .markAsUnread)
-                .disabled(!contextMenuState.canMarkAsUnread)
-        }
-    }
-
-    @ViewBuilder
-    private func contextButton(_ title: String, action: TabContextAction) -> some View {
-        if let shortcut = contextMenuState.shortcuts[action] {
-            Button(title) {
-                onContextAction(action)
-            }
-            .keyboardShortcut(shortcut)
-        } else {
-            Button(title) {
-                onContextAction(action)
-            }
-        }
-    }
-
-    @ViewBuilder
-    private func localizedContextButton(
-        _ titleKey: String,
-        defaultValue: String,
-        action: TabContextAction
-    ) -> some View {
-        contextButton(
-            Bundle.module.localizedString(forKey: titleKey, value: defaultValue, table: nil),
-            action: action
-        )
-    }
-
     // MARK: - Tab Background
 
     @ViewBuilder
     private var tabBackground: some View {
         ZStack(alignment: .top) {
+            // Custom tab color tint (bottom-most layer, low-opacity wash across the whole tab).
+            if let hex = tab.customColorHex, let tintColor = TabItemStyling.color(fromHex: hex) {
+                Rectangle()
+                    .fill(tintColor.opacity(0.2))
+            }
+
             // Background fill (hover)
             if TabItemStyling.shouldShowHoverBackground(isHovered: isHovered, isSelected: isSelected) {
                 Rectangle()
@@ -663,3 +590,289 @@ private struct MiddleClickMonitorView: NSViewRepresentable {
         context.coordinator.onMiddleClick = onMiddleClick
     }
 }
+
+/// Retains a single closure as an NSMenuItem target. `NSMenuItem.target` is weak, so each
+/// item's target must be kept alive independently until the menu is dismissed.
+private final class ClosureMenuItemTarget: NSObject {
+    let handler: () -> Void
+
+    init(_ handler: @escaping () -> Void) {
+        self.handler = handler
+    }
+
+    @objc func invoke() {
+        handler()
+    }
+}
+
+/// Right-click / ctrl-click hook that builds and pops a native NSMenu at click time from the
+/// tab's current context-menu state. AppKit owns the menu's tracking run loop, so SwiftUI
+/// re-renders of the tab row (which happen constantly -- see the comment at the `.contextMenu`
+/// replacement call site) can never close it out from under the user, unlike SwiftUI's own
+/// `.contextMenu` modifier.
+private struct TabContextMenuHostView: NSViewRepresentable {
+    let tab: TabItem
+    let contextMenuState: TabContextMenuState
+    let onContextAction: (TabContextAction) -> Void
+    let onApplyTabColor: (String) -> Void
+
+    final class Coordinator {
+        var tab: TabItem?
+        var contextMenuState: TabContextMenuState?
+        var onContextAction: ((TabContextAction) -> Void)?
+        var onApplyTabColor: ((String) -> Void)?
+        weak var view: NSView?
+        var monitor: Any?
+        // Keeps this popup's NSMenuItem targets alive for the duration of the menu; replaced
+        // (and the previous batch released) on every new popup.
+        var retainedTargets: [ClosureMenuItemTarget] = []
+
+        deinit {
+            if let monitor {
+                NSEvent.removeMonitor(monitor)
+            }
+        }
+
+        func popUpMenu(for event: NSEvent, in view: NSView) {
+            guard let tab, let contextMenuState else { return }
+            var targets: [ClosureMenuItemTarget] = []
+            let menu = Self.buildMenu(
+                tab: tab,
+                state: contextMenuState,
+                onContextAction: { [weak self] action in self?.onContextAction?(action) },
+                onApplyTabColor: { [weak self] hex in self?.onApplyTabColor?(hex) },
+                retaining: &targets
+            )
+            retainedTargets = targets
+            NSMenu.popUpContextMenu(menu, with: event, for: view)
+        }
+
+        private static func addItem(
+            to menu: NSMenu,
+            title: String,
+            action: TabContextAction,
+            enabled: Bool,
+            shortcut: KeyboardShortcut?,
+            onContextAction: @escaping (TabContextAction) -> Void,
+            retaining targets: inout [ClosureMenuItemTarget]
+        ) {
+            let target = ClosureMenuItemTarget { onContextAction(action) }
+            targets.append(target)
+            let item = NSMenuItem(title: title, action: #selector(ClosureMenuItemTarget.invoke), keyEquivalent: "")
+            item.target = target
+            item.isEnabled = enabled
+            if let shortcut {
+                item.keyEquivalent = String(shortcut.key.character)
+                item.keyEquivalentModifierMask = nsModifierFlags(from: shortcut.modifiers)
+            }
+            menu.addItem(item)
+        }
+
+        private static func nsModifierFlags(from modifiers: EventModifiers) -> NSEvent.ModifierFlags {
+            var flags: NSEvent.ModifierFlags = []
+            if modifiers.contains(.command) { flags.insert(.command) }
+            if modifiers.contains(.shift) { flags.insert(.shift) }
+            if modifiers.contains(.option) { flags.insert(.option) }
+            if modifiers.contains(.control) { flags.insert(.control) }
+            if modifiers.contains(.capsLock) { flags.insert(.capsLock) }
+            if modifiers.contains(.numericPad) { flags.insert(.numericPad) }
+            // .function is reserved for system applications (macOS 12+ deprecation); menu
+            // shortcuts never use it in practice, so it's intentionally left unmapped.
+            return flags
+        }
+
+        private static func localized(_ key: String, defaultValue: String) -> String {
+            Bundle.module.localizedString(forKey: key, value: defaultValue, table: nil)
+        }
+
+        private static func buildMenu(
+            tab: TabItem,
+            state: TabContextMenuState,
+            onContextAction: @escaping (TabContextAction) -> Void,
+            onApplyTabColor: @escaping (String) -> Void,
+            retaining targets: inout [ClosureMenuItemTarget]
+        ) -> NSMenu {
+            let menu = NSMenu()
+            menu.autoenablesItems = false
+
+            func add(_ title: String, _ action: TabContextAction, enabled: Bool = true) {
+                addItem(
+                    to: menu,
+                    title: title,
+                    action: action,
+                    enabled: enabled,
+                    shortcut: state.shortcuts[action],
+                    onContextAction: onContextAction,
+                    retaining: &targets
+                )
+            }
+
+            add("Rename Tab…", .rename)
+
+            if state.hasCustomTitle {
+                add("Remove Custom Tab Name", .clearName)
+            }
+
+            menu.addItem(.separator())
+
+            add("Close Tabs to Left", .closeToLeft, enabled: state.canCloseToLeft)
+            add("Close Tabs to Right", .closeToRight, enabled: state.canCloseToRight)
+            add("Close Other Tabs", .closeOthers, enabled: state.canCloseOthers)
+            add("Move Tab…", .move)
+
+            if state.isTerminal {
+                add(
+                    localized("command.moveTabToLeftPane.title", defaultValue: "Move to Left Pane"),
+                    .moveToLeftPane,
+                    enabled: state.canMoveToLeftPane
+                )
+                add(
+                    localized("command.moveTabToRightPane.title", defaultValue: "Move to Right Pane"),
+                    .moveToRightPane,
+                    enabled: state.canMoveToRightPane
+                )
+            }
+
+            menu.addItem(.separator())
+
+            add("New Terminal Tab to Right", .newTerminalToRight)
+            add("New Browser Tab to Right", .newBrowserToRight)
+
+            if state.isBrowser {
+                menu.addItem(.separator())
+                add("Reload Tab", .reload)
+                add("Duplicate Tab", .duplicate)
+            }
+
+            menu.addItem(.separator())
+
+            if state.hasSplits {
+                add(state.isZoomed ? "Exit Zoom" : "Zoom Pane", .toggleZoom)
+            }
+
+            add(state.isPinned ? "Unpin Tab" : "Pin Tab", .togglePin)
+
+            if state.isUnread {
+                add("Mark Tab as Read", .markAsRead, enabled: state.canMarkAsRead)
+            } else {
+                add("Mark Tab as Unread", .markAsUnread, enabled: state.canMarkAsUnread)
+            }
+
+            menu.addItem(.separator())
+            menu.addItem(buildTabColorSubmenu(
+                state: state,
+                onContextAction: onContextAction,
+                onApplyTabColor: onApplyTabColor,
+                retaining: &targets
+            ))
+
+            return menu
+        }
+
+        private static func buildTabColorSubmenu(
+            state: TabContextMenuState,
+            onContextAction: @escaping (TabContextAction) -> Void,
+            onApplyTabColor: @escaping (String) -> Void,
+            retaining targets: inout [ClosureMenuItemTarget]
+        ) -> NSMenuItem {
+            let submenuItem = NSMenuItem(
+                title: localized("contextMenu.tabColor", defaultValue: "Tab Color"),
+                action: nil,
+                keyEquivalent: ""
+            )
+            let submenu = NSMenu()
+            submenu.autoenablesItems = false
+
+            if state.hasCustomColor {
+                addItem(
+                    to: submenu,
+                    title: localized("contextMenu.clearColor", defaultValue: "Clear Color"),
+                    action: .clearTabColor,
+                    enabled: true,
+                    shortcut: nil,
+                    onContextAction: onContextAction,
+                    retaining: &targets
+                )
+            }
+
+            addItem(
+                to: submenu,
+                title: localized("contextMenu.chooseCustomColor", defaultValue: "Choose Custom Color…"),
+                action: .chooseCustomTabColor,
+                enabled: true,
+                shortcut: nil,
+                onContextAction: onContextAction,
+                retaining: &targets
+            )
+
+            if !state.colorPalette.isEmpty {
+                submenu.addItem(.separator())
+            }
+
+            for swatch in state.colorPalette {
+                let target = ClosureMenuItemTarget { onApplyTabColor(swatch.hex) }
+                targets.append(target)
+                let item = NSMenuItem(title: swatch.name, action: #selector(ClosureMenuItemTarget.invoke), keyEquivalent: "")
+                item.target = target
+                item.isEnabled = true
+                item.image = swatchImage(color: swatch.swatchColor)
+                submenu.addItem(item)
+            }
+
+            submenuItem.submenu = submenu
+            return submenuItem
+        }
+
+        private static func swatchImage(color: NSColor, diameter: CGFloat = 12) -> NSImage {
+            NSImage(size: NSSize(width: diameter, height: diameter), flipped: false) { rect in
+                color.setFill()
+                NSBezierPath(ovalIn: rect.insetBy(dx: 0.5, dy: 0.5)).fill()
+                return true
+            }
+        }
+    }
+
+    func makeCoordinator() -> Coordinator { Coordinator() }
+
+    func makeNSView(context: Context) -> NSView {
+        let view = NSView(frame: .zero)
+        view.wantsLayer = true
+        view.layer?.backgroundColor = NSColor.clear.cgColor
+
+        context.coordinator.view = view
+        context.coordinator.tab = tab
+        context.coordinator.contextMenuState = contextMenuState
+        context.coordinator.onContextAction = onContextAction
+        context.coordinator.onApplyTabColor = onApplyTabColor
+
+        // Only intercept right-mouse-down and ctrl-left-mouse-down so left click selection,
+        // middle click close, and drag/reorder all keep working unmodified.
+        let coordinator = context.coordinator
+        coordinator.monitor = NSEvent.addLocalMonitorForEvents(matching: [.rightMouseDown, .leftMouseDown]) { [weak coordinator] event in
+            guard let coordinator, let v = coordinator.view, let w = v.window else { return event }
+            guard event.window === w else { return event }
+
+            let isRightClick = event.type == .rightMouseDown
+            let isCtrlClick = event.type == .leftMouseDown && event.modifierFlags.contains(.control)
+            guard isRightClick || isCtrlClick else { return event }
+
+            let p = v.convert(event.locationInWindow, from: nil)
+            guard v.bounds.contains(p) else { return event }
+
+            coordinator.popUpMenu(for: event, in: v)
+            return nil // swallow so it doesn't also select the tab or start a drag
+        }
+
+        return view
+    }
+
+    func updateNSView(_ nsView: NSView, context: Context) {
+        // Refresh on every render so a stale enabled/disabled state or pinned/unread flag
+        // from a previous render can never be shown in a freshly popped menu.
+        context.coordinator.view = nsView
+        context.coordinator.tab = tab
+        context.coordinator.contextMenuState = contextMenuState
+        context.coordinator.onContextAction = onContextAction
+        context.coordinator.onApplyTabColor = onApplyTabColor
+    }
+}
diff --git a/vendor/bonsplit/Sources/Bonsplit/Public/BonsplitController.swift b/vendor/bonsplit/Sources/Bonsplit/Public/BonsplitController.swift
index a2e2b9215..25e8e0a4e 100644
--- a/vendor/bonsplit/Sources/Bonsplit/Public/BonsplitController.swift
+++ b/vendor/bonsplit/Sources/Bonsplit/Public/BonsplitController.swift
@@ -116,6 +116,7 @@ public final class BonsplitController {
         showsNotificationBadge: Bool = false,
         isLoading: Bool = false,
         isPinned: Bool = false,
+        customColorHex: String? = nil,
         inPane pane: PaneID? = nil
     ) -> TabID? {
         let tabId = TabID()
@@ -129,7 +130,8 @@ public final class BonsplitController {
             isDirty: isDirty,
             showsNotificationBadge: showsNotificationBadge,
             isLoading: isLoading,
-            isPinned: isPinned
+            isPinned: isPinned,
+            customColorHex: customColorHex
         )
         let targetPane = pane ?? focusedPaneId ?? PaneID(id: internalController.rootNode.allPaneIds.first!.id)
 
@@ -166,7 +168,8 @@ public final class BonsplitController {
             isDirty: isDirty,
             showsNotificationBadge: showsNotificationBadge,
             isLoading: isLoading,
-            isPinned: isPinned
+            isPinned: isPinned,
+            customColorHex: customColorHex
         )
         internalController.addTab(tabItem, toPane: PaneID(id: targetPane.id), atIndex: insertIndex)
 
@@ -188,6 +191,12 @@ public final class BonsplitController {
         delegate?.splitTabBar(self, didRequestTabContextAction: action, for: tab, inPane: pane)
     }
 
+    /// Request the delegate to apply a palette color to a tab.
+    public func requestTabColor(_ hex: String, for tabId: TabID, inPane pane: PaneID) {
+        guard let tab = tab(tabId) else { return }
+        delegate?.splitTabBar(self, didRequestTabColor: hex, for: tab, inPane: pane)
+    }
+
     /// Update an existing tab's metadata
     /// - Parameters:
     ///   - tabId: The tab to update
@@ -210,7 +219,8 @@ public final class BonsplitController {
         isDirty: Bool? = nil,
         showsNotificationBadge: Bool? = nil,
         isLoading: Bool? = nil,
-        isPinned: Bool? = nil
+        isPinned: Bool? = nil,
+        customColorHex: String?? = nil
     ) {
         guard let (pane, tabIndex) = findTabInternal(tabId) else { return }
 
@@ -241,6 +251,9 @@ public final class BonsplitController {
         if let isPinned = isPinned {
             pane.tabs[tabIndex].isPinned = isPinned
         }
+        if let customColorHex = customColorHex {
+            pane.tabs[tabIndex].customColorHex = customColorHex
+        }
     }
 
     /// Close a tab by ID
@@ -652,6 +665,12 @@ public final class BonsplitController {
     /// Set by the host app to sync with its customizable keyboard shortcut settings.
     public var contextMenuShortcuts: [TabContextAction: KeyboardShortcut] = [:]
 
+    // MARK: - Tab Color Palette
+
+    /// Host-provided palette entries for the tab-color context menu. Resolved at menu-build
+    /// time (not cached) so it always reflects the host's current colors and appearance.
+    @ObservationIgnored public var tabColorPaletteProvider: (() -> [TabColorSwatch])?
+
     // MARK: - Query Methods
 
     /// Get all tab IDs
diff --git a/vendor/bonsplit/Sources/Bonsplit/Public/BonsplitDelegate.swift b/vendor/bonsplit/Sources/Bonsplit/Public/BonsplitDelegate.swift
index 95ef1f1ac..0bd03fbf1 100644
--- a/vendor/bonsplit/Sources/Bonsplit/Public/BonsplitDelegate.swift
+++ b/vendor/bonsplit/Sources/Bonsplit/Public/BonsplitDelegate.swift
@@ -58,6 +58,9 @@ public protocol BonsplitDelegate: AnyObject {
     /// Called when the user triggers an action from a tab's context menu.
     func splitTabBar(_ controller: BonsplitController, didRequestTabContextAction action: TabContextAction, for tab: Tab, inPane pane: PaneID)
 
+    /// Called when the user picks a palette color for a tab from its context menu.
+    func splitTabBar(_ controller: BonsplitController, didRequestTabColor hex: String, for tab: Tab, inPane pane: PaneID)
+
     // MARK: - Geometry
 
     /// Called when any pane geometry changes (resize, split, close)
@@ -83,6 +86,7 @@ public extension BonsplitDelegate {
     func splitTabBar(_ controller: BonsplitController, didFocusPane pane: PaneID) {}
     func splitTabBar(_ controller: BonsplitController, didRequestNewTab kind: String, inPane pane: PaneID) {}
     func splitTabBar(_ controller: BonsplitController, didRequestTabContextAction action: TabContextAction, for tab: Tab, inPane pane: PaneID) {}
+    func splitTabBar(_ controller: BonsplitController, didRequestTabColor hex: String, for tab: Tab, inPane pane: PaneID) {}
     func splitTabBar(_ controller: BonsplitController, didChangeGeometry snapshot: LayoutSnapshot) {}
     func splitTabBar(_ controller: BonsplitController, shouldNotifyDuringDrag: Bool) -> Bool { false }
 }
diff --git a/vendor/bonsplit/Sources/Bonsplit/Public/Types/Tab.swift b/vendor/bonsplit/Sources/Bonsplit/Public/Types/Tab.swift
index 70fadf40f..94cedd359 100644
--- a/vendor/bonsplit/Sources/Bonsplit/Public/Types/Tab.swift
+++ b/vendor/bonsplit/Sources/Bonsplit/Public/Types/Tab.swift
@@ -17,6 +17,8 @@ public struct Tab: Identifiable, Hashable, Sendable {
     public let isLoading: Bool
     /// Whether the tab is pinned in its pane.
     public let isPinned: Bool
+    /// Optional hex color (e.g. "#1565C0") tinting this tab's background.
+    public let customColorHex: String?
 
     public init(
         id: TabID = TabID(),
@@ -28,7 +30,8 @@ public struct Tab: Identifiable, Hashable, Sendable {
         isDirty: Bool = false,
         showsNotificationBadge: Bool = false,
         isLoading: Bool = false,
-        isPinned: Bool = false
+        isPinned: Bool = false,
+        customColorHex: String? = nil
     ) {
         self.id = id
         self.title = title
@@ -40,6 +43,7 @@ public struct Tab: Identifiable, Hashable, Sendable {
         self.showsNotificationBadge = showsNotificationBadge
         self.isLoading = isLoading
         self.isPinned = isPinned
+        self.customColorHex = customColorHex
     }
 
     internal init(from tabItem: TabItem) {
@@ -53,5 +57,6 @@ public struct Tab: Identifiable, Hashable, Sendable {
         self.showsNotificationBadge = tabItem.showsNotificationBadge
         self.isLoading = tabItem.isLoading
         self.isPinned = tabItem.isPinned
+        self.customColorHex = tabItem.customColorHex
     }
 }
diff --git a/vendor/bonsplit/Sources/Bonsplit/Public/Types/TabContextAction.swift b/vendor/bonsplit/Sources/Bonsplit/Public/Types/TabContextAction.swift
index 47ec09d32..4bdf13a78 100644
--- a/vendor/bonsplit/Sources/Bonsplit/Public/Types/TabContextAction.swift
+++ b/vendor/bonsplit/Sources/Bonsplit/Public/Types/TabContextAction.swift
@@ -1,4 +1,18 @@
 import Foundation
+import AppKit
+
+/// A single swatch entry for the tab-color context menu, supplied by the host app.
+public struct TabColorSwatch {
+    public let name: String
+    public let hex: String
+    public let swatchColor: NSColor
+
+    public init(name: String, hex: String, swatchColor: NSColor) {
+        self.name = name
+        self.hex = hex
+        self.swatchColor = swatchColor
+    }
+}
 
 /// Context menu actions that can be triggered from a tab item.
 public enum TabContextAction: String, CaseIterable, Sendable {
@@ -18,4 +32,6 @@ public enum TabContextAction: String, CaseIterable, Sendable {
     case markAsRead
     case markAsUnread
     case toggleZoom
+    case clearTabColor
+    case chooseCustomTabColor
 }
diff --git a/vendor/bonsplit/Sources/Bonsplit/Resources/en.lproj/Localizable.strings b/vendor/bonsplit/Sources/Bonsplit/Resources/en.lproj/Localizable.strings
index 89fcf28af..fbe1639b1 100644
--- a/vendor/bonsplit/Sources/Bonsplit/Resources/en.lproj/Localizable.strings
+++ b/vendor/bonsplit/Sources/Bonsplit/Resources/en.lproj/Localizable.strings
@@ -1,2 +1,5 @@
 "command.moveTabToLeftPane.title" = "Move to Left Pane";
 "command.moveTabToRightPane.title" = "Move to Right Pane";
+"contextMenu.tabColor" = "Tab Color";
+"contextMenu.clearColor" = "Clear Color";
+"contextMenu.chooseCustomColor" = "Choose Custom Color…";
diff --git a/vendor/bonsplit/Sources/Bonsplit/Resources/ja.lproj/Localizable.strings b/vendor/bonsplit/Sources/Bonsplit/Resources/ja.lproj/Localizable.strings
index d272f84f4..eb9a47bc7 100644
--- a/vendor/bonsplit/Sources/Bonsplit/Resources/ja.lproj/Localizable.strings
+++ b/vendor/bonsplit/Sources/Bonsplit/Resources/ja.lproj/Localizable.strings
@@ -1,2 +1,5 @@
 "command.moveTabToLeftPane.title" = "左のペインへ移動";
 "command.moveTabToRightPane.title" = "右のペインへ移動";
+"contextMenu.tabColor" = "タブの色";
+"contextMenu.clearColor" = "色をクリア";
+"contextMenu.chooseCustomColor" = "カスタムカラーを選択…";

From 2f2dcaa1d68e3bd33433f6ffbcc99b6e00528d2c Mon Sep 17 00:00:00 2001
From: arzafran <franco@darkroom.engineering>
Date: Mon, 28 Sep 2026 11:17:24 -0300
Subject: [PATCH 14/19] refactor: use generated v2 method names in the MCP
 server

---
 CLI-MCP/MCPSocketBridge.swift               |   8 +-
 CLI-MCP/Resources/SurfaceTextResource.swift |   2 +-
 CLI-MCP/Resources/TreeResource.swift        |   2 +-
 CLI-MCP/Tools/BrowserTools.swift            | 164 ++++++++++----------
 CLI-MCP/Tools/FocusTools.swift              |  26 ++--
 CLI-MCP/Tools/LayoutTools.swift             |   6 +-
 CLI-MCP/Tools/NotificationTools.swift       |  10 +-
 CLI-MCP/Tools/PaneTools.swift               |  14 +-
 CLI-MCP/Tools/ReviewTools.swift             |  10 +-
 CLI-MCP/Tools/SnapshotTools.swift           |   4 +-
 CLI-MCP/Tools/SurfaceTools.swift            |  58 +++----
 CLI-MCP/Tools/SystemTools.swift             |   8 +-
 CLI-MCP/Tools/WindowTools.swift             |   8 +-
 CLI-MCP/Tools/WorkspaceTools.swift          |  60 +++----
 CLI-MCP/Tools/WorktreeTools.swift           |   6 +-
 GhosttyTabs.xcodeproj/project.pbxproj       |   2 +
 16 files changed, 195 insertions(+), 193 deletions(-)

diff --git a/CLI-MCP/MCPSocketBridge.swift b/CLI-MCP/MCPSocketBridge.swift
index 7e9fd1b04..52e70c2c5 100644
--- a/CLI-MCP/MCPSocketBridge.swift
+++ b/CLI-MCP/MCPSocketBridge.swift
@@ -113,7 +113,7 @@ struct MCPSocketBridge {
 
         if let socketPassword {
             _ = try Self.sendRequest(
-                method: "auth.login",
+                method: V2MethodNames.authLogin,
                 params: ["password": socketPassword],
                 socketFD: socketFD
             )
@@ -169,11 +169,11 @@ struct MCPSocketBridge {
     static func responseTimeout(method: String, params: [String: Any]) -> TimeInterval {
         let timeoutMs: Int
         switch method {
-        case "surface.wait":
+        case V2MethodNames.surfaceWait:
             timeoutMs = timeoutInteger(params["timeout_ms"]) ?? timeoutInteger(params["timeout"]) ?? 30_000
-        case "browser.wait":
+        case V2MethodNames.browserWait:
             timeoutMs = timeoutInteger(params["timeout_ms"]) ?? 5_000
-        case "browser.download.wait":
+        case V2MethodNames.browserDownloadWait:
             timeoutMs = timeoutInteger(params["timeout_ms"]) ?? timeoutInteger(params["timeout"]) ?? 10_000
         default:
             return defaultResponseTimeoutSeconds
diff --git a/CLI-MCP/Resources/SurfaceTextResource.swift b/CLI-MCP/Resources/SurfaceTextResource.swift
index 7e7fd30e9..6b662b3f5 100644
--- a/CLI-MCP/Resources/SurfaceTextResource.swift
+++ b/CLI-MCP/Resources/SurfaceTextResource.swift
@@ -30,7 +30,7 @@ enum SurfaceTextResource {
 
         let bridge = MCPSocketBridge()
         do {
-            let result = try bridge.send(method: "surface.read_text", params: params)
+            let result = try bridge.send(method: V2MethodNames.surfaceReadText, params: params)
             let text = (result["text"] as? String) ?? ""
             return [.text(text, uri: "programa://surface/\(surfaceId)/text", mimeType: "text/plain")]
         } catch {
diff --git a/CLI-MCP/Resources/TreeResource.swift b/CLI-MCP/Resources/TreeResource.swift
index ba2c14c67..3b2e76c6d 100644
--- a/CLI-MCP/Resources/TreeResource.swift
+++ b/CLI-MCP/Resources/TreeResource.swift
@@ -30,7 +30,7 @@ enum TreeResource {
 
         let bridge = MCPSocketBridge()
         do {
-            let result = try bridge.send(method: "system.tree", params: params)
+            let result = try bridge.send(method: V2MethodNames.systemTree, params: params)
             return [try ResourceCatalog.jsonContent(for: result, uri: uri)]
         } catch {
             throw MCPErrorMapping.mcpError(for: error)
diff --git a/CLI-MCP/Tools/BrowserTools.swift b/CLI-MCP/Tools/BrowserTools.swift
index fa48dc6ea..0850252fd 100644
--- a/CLI-MCP/Tools/BrowserTools.swift
+++ b/CLI-MCP/Tools/BrowserTools.swift
@@ -47,7 +47,7 @@ enum BrowserTools {
     static let tools: [ProgramaTool] = [
         ProgramaTool(
             name: "browser_open_split",
-            socketMethod: "browser.open_split",
+            socketMethod: V2MethodNames.browserOpenSplit,
             description: "Opens a new browser surface as a split next to a source surface (or reuses an existing sibling browser pane when one is already positioned to the right). Never raises/activates the Programa window or switches the selected workspace; inside the target workspace the new tab becomes that workspace's focused surface, so the user only sees a change if they are already looking at that workspace. Returns the new surface_id.",
             inputSchema: ProgramaToolSchema.object(properties: [
                 "url": ProgramaToolSchema.string("Initial URL to load. Opens a blank browser tab if omitted."),
@@ -59,7 +59,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_navigate",
-            socketMethod: "browser.navigate",
+            socketMethod: V2MethodNames.browserNavigate,
             description: "Navigates an existing browser surface to a URL.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -73,7 +73,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_back",
-            socketMethod: "browser.back",
+            socketMethod: V2MethodNames.browserBack,
             description: "Navigates a browser surface back one entry in its history.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -86,7 +86,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_forward",
-            socketMethod: "browser.forward",
+            socketMethod: V2MethodNames.browserForward,
             description: "Navigates a browser surface forward one entry in its history.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -99,7 +99,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_reload",
-            socketMethod: "browser.reload",
+            socketMethod: V2MethodNames.browserReload,
             description: "Reloads a browser surface's current page.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -112,7 +112,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_url_get",
-            socketMethod: "browser.url.get",
+            socketMethod: V2MethodNames.browserUrlGet,
             description: "Returns a browser surface's current URL.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -125,7 +125,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_is_webview_focused",
-            socketMethod: "browser.is_webview_focused",
+            socketMethod: V2MethodNames.browserIsWebviewFocused,
             description: "Reports whether keyboard focus is currently inside a browser surface's web view. Read-only; does not move focus.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -138,7 +138,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_snapshot",
-            socketMethod: "browser.snapshot",
+            socketMethod: V2MethodNames.browserSnapshot,
             description: "Returns an accessibility-tree-style snapshot of the page (roles, names, and element refs usable by selector-based tools), plus title/url/ready_state and the page text/HTML.",
             inputSchema: ProgramaToolSchema.object(properties: [
                 "interactive": ProgramaToolSchema.boolean("If true, include only interactive elements (links, buttons, inputs, etc). Defaults to false (include the full tree)."),
@@ -153,7 +153,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_eval",
-            socketMethod: "browser.eval",
+            socketMethod: V2MethodNames.browserEval,
             description: "Runs arbitrary JavaScript in the browser surface's page context and returns its result (JSON-normalized).",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -167,7 +167,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_wait",
-            socketMethod: "browser.wait",
+            socketMethod: V2MethodNames.browserWait,
             description: "Waits (up to a timeout) for a condition to become true: a selector to appear, the URL to contain a substring, the page text to contain a substring, a document.readyState value, or a custom JS boolean expression. Provide at most one condition; defaults to waiting for document.readyState === 'complete'.",
             inputSchema: ProgramaToolSchema.object(properties: [
                 "timeout_ms": ProgramaToolSchema.integer("Maximum time to wait, in milliseconds. Defaults to 5000."),
@@ -183,7 +183,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_click",
-            socketMethod: "browser.click",
+            socketMethod: V2MethodNames.browserClick,
             description: "Clicks the element matched by a selector (scrolls it into view first, dispatches a real click event or calls .click()).",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -198,7 +198,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_dblclick",
-            socketMethod: "browser.dblclick",
+            socketMethod: V2MethodNames.browserDblclick,
             description: "Double-clicks the element matched by a selector.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -213,7 +213,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_hover",
-            socketMethod: "browser.hover",
+            socketMethod: V2MethodNames.browserHover,
             description: "Hovers the element matched by a selector (dispatches mouseover/mouseenter events).",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -228,7 +228,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_type",
-            socketMethod: "browser.type",
+            socketMethod: V2MethodNames.browserType,
             description: "Appends text to the element matched by a selector (focuses it, then appends to its value/textContent and fires input/change events). Use browser_fill to replace the value instead of appending.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -244,7 +244,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_fill",
-            socketMethod: "browser.fill",
+            socketMethod: V2MethodNames.browserFill,
             description: "Sets the element matched by a selector to an exact value (replacing any existing value) and fires input/change events. Accepts an empty string to clear the field.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -261,7 +261,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_press",
-            socketMethod: "browser.press",
+            socketMethod: V2MethodNames.browserPress,
             description: "Dispatches a keydown, keypress, and keyup for a key to the page's currently focused element (or body if none).",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -275,7 +275,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_keydown",
-            socketMethod: "browser.keydown",
+            socketMethod: V2MethodNames.browserKeydown,
             description: "Dispatches only a keydown event for a key to the page's currently focused element (or body if none). Use browser_press for a full keydown/keypress/keyup sequence.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -289,7 +289,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_keyup",
-            socketMethod: "browser.keyup",
+            socketMethod: V2MethodNames.browserKeyup,
             description: "Dispatches only a keyup event for a key to the page's currently focused element (or body if none).",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -303,7 +303,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_check",
-            socketMethod: "browser.check",
+            socketMethod: V2MethodNames.browserCheck,
             description: "Sets a checkbox/radio element matched by a selector to checked, firing input/change events. Fails if the element has no 'checked' property.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -318,7 +318,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_uncheck",
-            socketMethod: "browser.uncheck",
+            socketMethod: V2MethodNames.browserUncheck,
             description: "Sets a checkbox/radio element matched by a selector to unchecked, firing input/change events. Fails if the element has no 'checked' property.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -333,7 +333,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_select",
-            socketMethod: "browser.select",
+            socketMethod: V2MethodNames.browserSelect,
             description: "Sets a <select> (or other element with a 'value' property) matched by a selector to a given option value, firing input/change events.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -350,7 +350,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_scroll",
-            socketMethod: "browser.scroll",
+            socketMethod: V2MethodNames.browserScroll,
             description: "Scrolls the page (or, if selector is given, a specific scrollable element) by a relative pixel offset.",
             inputSchema: ProgramaToolSchema.object(properties: [
                 "dx": ProgramaToolSchema.integer("Horizontal scroll delta in pixels. Defaults to 0."),
@@ -363,7 +363,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_scroll_into_view",
-            socketMethod: "browser.scroll_into_view",
+            socketMethod: V2MethodNames.browserScrollIntoView,
             description: "Scrolls the element matched by a selector into the center of the viewport.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -378,7 +378,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_screenshot",
-            socketMethod: "browser.screenshot",
+            socketMethod: V2MethodNames.browserScreenshot,
             description: "Captures a PNG screenshot of a browser surface's current content. Returns png_base64 (the image, base64-encoded) always, plus a best-effort path/url to a temp-file copy written to disk when the write succeeds.",
             inputSchema: ProgramaToolSchema.object(properties: [
                 "surface_id": surfaceIdProperty(),
@@ -388,7 +388,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_get_text",
-            socketMethod: "browser.get.text",
+            socketMethod: V2MethodNames.browserGetText,
             description: "Returns the innerText (falling back to textContent) of the element matched by a selector.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -403,7 +403,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_get_html",
-            socketMethod: "browser.get.html",
+            socketMethod: V2MethodNames.browserGetHtml,
             description: "Returns the outerHTML of the element matched by a selector.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -418,7 +418,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_get_value",
-            socketMethod: "browser.get.value",
+            socketMethod: V2MethodNames.browserGetValue,
             description: "Returns the 'value' property (falling back to textContent) of the element matched by a selector.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -433,7 +433,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_get_attr",
-            socketMethod: "browser.get.attr",
+            socketMethod: V2MethodNames.browserGetAttr,
             description: "Returns the value of a named attribute on the element matched by a selector (null if the attribute is not present).",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -450,7 +450,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_get_title",
-            socketMethod: "browser.get.title",
+            socketMethod: V2MethodNames.browserGetTitle,
             description: "Returns a browser surface's current page title.",
             inputSchema: ProgramaToolSchema.object(properties: [
                 "surface_id": surfaceIdProperty(),
@@ -460,7 +460,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_get_count",
-            socketMethod: "browser.get.count",
+            socketMethod: V2MethodNames.browserGetCount,
             description: "Returns the number of elements matching a selector (document.querySelectorAll(selector).length).",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -474,7 +474,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_get_box",
-            socketMethod: "browser.get.box",
+            socketMethod: V2MethodNames.browserGetBox,
             description: "Returns the bounding client rect (x, y, width, height, top, left, right, bottom) of the element matched by a selector.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -489,7 +489,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_get_styles",
-            socketMethod: "browser.get.styles",
+            socketMethod: V2MethodNames.browserGetStyles,
             description: "Returns computed styles for the element matched by a selector: a single property's value when property is given, otherwise a fixed summary (display, visibility, opacity, color, background, width, height).",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -505,7 +505,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_is_visible",
-            socketMethod: "browser.is.visible",
+            socketMethod: V2MethodNames.browserIsVisible,
             description: "Returns whether the element matched by a selector is visible (not display:none/visibility:hidden/opacity:0, and has a non-zero bounding box).",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -520,7 +520,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_is_enabled",
-            socketMethod: "browser.is.enabled",
+            socketMethod: V2MethodNames.browserIsEnabled,
             description: "Returns whether the element matched by a selector is enabled (the inverse of its .disabled property).",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -535,7 +535,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_is_checked",
-            socketMethod: "browser.is.checked",
+            socketMethod: V2MethodNames.browserIsChecked,
             description: "Returns whether the element matched by a selector is checked (false if it has no 'checked' property).",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -550,7 +550,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_find_role",
-            socketMethod: "browser.find.role",
+            socketMethod: V2MethodNames.browserFindRole,
             description: "Finds the first element with a given ARIA (explicit or implicit) role, optionally filtered by its accessible name. Returns a selector plus an element_ref usable by other tools.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -567,7 +567,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_find_text",
-            socketMethod: "browser.find.text",
+            socketMethod: V2MethodNames.browserFindText,
             description: "Finds the first element under <body> whose text content matches (contains, or equals if exact) the given text. Returns a selector plus an element_ref usable by other tools.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -583,7 +583,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_find_label",
-            socketMethod: "browser.find.label",
+            socketMethod: V2MethodNames.browserFindLabel,
             description: "Finds the form control associated with a <label> whose text matches the given label (via the label's 'for' attribute, or the first control nested inside it). Returns a selector plus an element_ref usable by other tools.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -600,7 +600,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_find_placeholder",
-            socketMethod: "browser.find.placeholder",
+            socketMethod: V2MethodNames.browserFindPlaceholder,
             description: "Finds the first element whose placeholder attribute matches the given text. Returns a selector plus an element_ref usable by other tools.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -617,7 +617,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_find_alt",
-            socketMethod: "browser.find.alt",
+            socketMethod: V2MethodNames.browserFindAlt,
             description: "Finds the first element whose alt attribute matches the given text. Returns a selector plus an element_ref usable by other tools.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -634,7 +634,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_find_title",
-            socketMethod: "browser.find.title",
+            socketMethod: V2MethodNames.browserFindTitle,
             description: "Finds the first element whose title attribute matches the given text. Returns a selector plus an element_ref usable by other tools.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -651,7 +651,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_find_testid",
-            socketMethod: "browser.find.testid",
+            socketMethod: V2MethodNames.browserFindTestid,
             description: "Finds the first element whose data-testid (or data-test-id/data-test) attribute exactly equals the given value. Returns a selector plus an element_ref usable by other tools.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -667,7 +667,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_find_first",
-            socketMethod: "browser.find.first",
+            socketMethod: V2MethodNames.browserFindFirst,
             description: "Resolves a CSS selector to its first matching element and returns its selector, text, plus an element_ref usable by other tools.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -681,7 +681,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_find_last",
-            socketMethod: "browser.find.last",
+            socketMethod: V2MethodNames.browserFindLast,
             description: "Resolves a CSS selector to its last matching element and returns a specific :nth-of-type selector, text, and an element_ref usable by other tools.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -695,7 +695,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_find_nth",
-            socketMethod: "browser.find.nth",
+            socketMethod: V2MethodNames.browserFindNth,
             description: "Resolves a CSS selector to its Nth matching element (0-based; negative counts from the end) and returns a specific :nth-of-type selector, text, and an element_ref usable by other tools.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -711,7 +711,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_frame_select",
-            socketMethod: "browser.frame.select",
+            socketMethod: V2MethodNames.browserFrameSelect,
             description: "Scopes subsequent selector-based calls on this surface to a same-origin iframe matched by a selector. Fails for cross-origin iframes (WKWebView cannot reach into them). Cleared by browser_frame_main.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -725,7 +725,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_frame_main",
-            socketMethod: "browser.frame.main",
+            socketMethod: V2MethodNames.browserFrameMain,
             description: "Clears any frame scoping set by browser_frame_select, returning subsequent selector-based calls on this surface to the top-level document.",
             inputSchema: ProgramaToolSchema.object(properties: [
                 "surface_id": surfaceIdProperty(),
@@ -735,7 +735,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_dialog_accept",
-            socketMethod: "browser.dialog.accept",
+            socketMethod: V2MethodNames.browserDialogAccept,
             description: "Answers the currently pending native JavaScript dialog (alert/confirm/prompt) on this surface by accepting it. For a prompt(), an optional text sets the answer verbatim, including an empty string; if text is omitted, the page's default prompt text is used. Returns a not_found error if no dialog is pending.",
             inputSchema: ProgramaToolSchema.object(properties: [
                 "text": ProgramaToolSchema.string("Text to enter for a prompt() dialog. Also accepts prompt_text as an alias. Ignored for alert/confirm."),
@@ -747,7 +747,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_dialog_dismiss",
-            socketMethod: "browser.dialog.dismiss",
+            socketMethod: V2MethodNames.browserDialogDismiss,
             description: "Answers the currently pending native JavaScript dialog (alert/confirm/prompt) on this surface by canceling it: confirm() resolves to false, prompt() resolves to null. Returns a not_found error if no dialog is pending.",
             inputSchema: ProgramaToolSchema.object(properties: [
                 "surface_id": surfaceIdProperty(),
@@ -757,7 +757,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_download_wait",
-            socketMethod: "browser.download.wait",
+            socketMethod: V2MethodNames.browserDownloadWait,
             description: "Waits for a download to complete. With path given, polls that exact file path until it exists and is non-empty. Without path, waits for the next download-completed event on this surface and returns its metadata.",
             inputSchema: ProgramaToolSchema.object(properties: [
                 "path": ProgramaToolSchema.string("Exact file path to wait for. If omitted, waits for the next download event on the surface instead."),
@@ -770,7 +770,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_cookies_get",
-            socketMethod: "browser.cookies.get",
+            socketMethod: V2MethodNames.browserCookiesGet,
             description: "Returns cookies from the surface's cookie store, optionally filtered by name, domain (substring match), or exact path.",
             inputSchema: ProgramaToolSchema.object(properties: [
                 "name": ProgramaToolSchema.string("Filter to cookies with this exact name."),
@@ -783,7 +783,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_cookies_set",
-            socketMethod: "browser.cookies.set",
+            socketMethod: V2MethodNames.browserCookiesSet,
             description: "Sets one or more cookies on the surface's cookie store. Provide either a cookies array of cookie objects, or the single-cookie fields (name/value/url/domain/path/secure/expires) directly. domain/url default to the surface's current page when omitted.",
             inputSchema: ProgramaToolSchema.object(properties: [
                 "cookies": ["type": "array", "items": ["type": "object"], "description": .string("Array of cookie objects, each with name/value and optionally url/domain/path/secure/expires.")],
@@ -801,7 +801,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_cookies_clear",
-            socketMethod: "browser.cookies.clear",
+            socketMethod: V2MethodNames.browserCookiesClear,
             description: "Removes cookies from the surface's cookie store, optionally filtered by name or domain (substring match). Clears every cookie when no filter and no 'all' flag is given.",
             inputSchema: ProgramaToolSchema.object(properties: [
                 "name": ProgramaToolSchema.string("Only clear cookies with this exact name."),
@@ -814,7 +814,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_storage_get",
-            socketMethod: "browser.storage.get",
+            socketMethod: V2MethodNames.browserStorageGet,
             description: "Reads from the page's localStorage or sessionStorage. Returns a single value when key is given, or every key/value pair when key is omitted.",
             inputSchema: ProgramaToolSchema.object(properties: [
                 "storage": ProgramaToolSchema.stringEnum("Which storage to read. Also accepts type as an alias. Defaults to local.", ["local", "session"]),
@@ -827,7 +827,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_storage_set",
-            socketMethod: "browser.storage.set",
+            socketMethod: V2MethodNames.browserStorageSet,
             description: "Writes a key/value pair into the page's localStorage or sessionStorage (value is stringified if not already a string).",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -844,7 +844,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_storage_clear",
-            socketMethod: "browser.storage.clear",
+            socketMethod: V2MethodNames.browserStorageClear,
             description: "Clears every key from the page's localStorage or sessionStorage.",
             inputSchema: ProgramaToolSchema.object(properties: [
                 "storage": ProgramaToolSchema.stringEnum("Which storage to clear. Also accepts type as an alias. Defaults to local.", ["local", "session"]),
@@ -856,7 +856,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_tab_new",
-            socketMethod: "browser.tab.new",
+            socketMethod: V2MethodNames.browserTabNew,
             description: "Creates a new browser tab (surface) in an existing pane. Never raises/activates the Programa window or switches the selected workspace; inside the target workspace the new tab becomes that pane's focused surface. Returns the new surface_id.",
             inputSchema: ProgramaToolSchema.object(properties: [
                 "url": ProgramaToolSchema.string("Initial URL to load. Opens a blank browser tab if omitted."),
@@ -869,7 +869,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_tab_list",
-            socketMethod: "browser.tab.list",
+            socketMethod: V2MethodNames.browserTabList,
             description: "Lists every browser tab (surface) in a workspace, in display order, with id/title/url/pane/focused state.",
             inputSchema: ProgramaToolSchema.object(properties: [
                 "window_id": ProgramaToolSchema.windowIdProperty,
@@ -879,7 +879,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_tab_close",
-            socketMethod: "browser.tab.close",
+            socketMethod: V2MethodNames.browserTabClose,
             description: "Closes a browser tab (surface). Fails if it would close the workspace's last surface. Target resolves from target_surface_id/tab_id, then index into the workspace's browser tabs, then surface_id, then the workspace's focused surface. Pass workspace_id when the target lives in a workspace other than the selected one; target_surface_id alone does not route the call.",
             inputSchema: ProgramaToolSchema.object(properties: [
                 "target_surface_id": ProgramaToolSchema.string("Browser surface UUID or short ref to close. Also accepts tab_id as an alias."),
@@ -892,7 +892,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_console_list",
-            socketMethod: "browser.console.list",
+            socketMethod: V2MethodNames.browserConsoleList,
             description: "Returns console.* messages captured for a browser surface since the page loaded (or since the log was last cleared).",
             inputSchema: ProgramaToolSchema.object(properties: [
                 "clear": ProgramaToolSchema.boolean("If true, clear the captured log after reading it. Defaults to false."),
@@ -903,7 +903,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_console_clear",
-            socketMethod: "browser.console.clear",
+            socketMethod: V2MethodNames.browserConsoleClear,
             description: "Clears the captured console.* log for a browser surface and returns the entries that were captured up to that point (same response shape as browser_console_list with clear true).",
             inputSchema: ProgramaToolSchema.object(properties: [
                 "surface_id": surfaceIdProperty(),
@@ -913,7 +913,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_errors_list",
-            socketMethod: "browser.errors.list",
+            socketMethod: V2MethodNames.browserErrorsList,
             description: "Returns uncaught JS errors captured for a browser surface since the page loaded (or since the log was last cleared).",
             inputSchema: ProgramaToolSchema.object(properties: [
                 "clear": ProgramaToolSchema.boolean("If true, clear the captured error log after reading it. Defaults to false."),
@@ -924,7 +924,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_highlight",
-            socketMethod: "browser.highlight",
+            socketMethod: V2MethodNames.browserHighlight,
             description: "Briefly (about 1.2s) draws an orange outline around the element matched by a selector, for visually pointing it out. Purely visual; does not click or focus it.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -939,7 +939,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_state_save",
-            socketMethod: "browser.state.save",
+            socketMethod: V2MethodNames.browserStateSave,
             description: "Saves a browser surface's cookies and localStorage/sessionStorage to a JSON file on disk, for later restoring with browser_state_load.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -953,7 +953,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_state_load",
-            socketMethod: "browser.state.load",
+            socketMethod: V2MethodNames.browserStateLoad,
             description: "Restores cookies and localStorage/sessionStorage onto a browser surface from a JSON file previously written by browser_state_save. Fails if another restore is already in progress on the same underlying data store.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -967,7 +967,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_addinitscript",
-            socketMethod: "browser.addinitscript",
+            socketMethod: V2MethodNames.browserAddinitscript,
             description: "Registers a JavaScript source to run at the start of every future document load on this surface (survives navigations), and runs it immediately in the current page too.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -982,7 +982,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_addscript",
-            socketMethod: "browser.addscript",
+            socketMethod: V2MethodNames.browserAddscript,
             description: "Runs a JavaScript source once in the current page immediately (does not persist across navigations; use browser_addinitscript for that). Returns its result, JSON-normalized.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -997,7 +997,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_addstyle",
-            socketMethod: "browser.addstyle",
+            socketMethod: V2MethodNames.browserAddstyle,
             description: "Injects a <style> element with the given CSS into the current page immediately, and registers it to be re-injected at the start of every future document load on this surface (survives navigations).",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -1013,37 +1013,37 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_viewport_set",
-            socketMethod: "browser.viewport.set",
+            socketMethod: V2MethodNames.browserViewportSet,
             description: "Always returns a not_supported error: WKWebView does not provide a per-tab programmable viewport emulation API equivalent to CDP.",
             inputSchema: ProgramaToolSchema.empty
         ),
         ProgramaTool(
             name: "browser_geolocation_set",
-            socketMethod: "browser.geolocation.set",
+            socketMethod: V2MethodNames.browserGeolocationSet,
             description: "Always returns a not_supported error: WKWebView does not expose per-tab geolocation spoofing hooks equivalent to Playwright/CDP.",
             inputSchema: ProgramaToolSchema.empty
         ),
         ProgramaTool(
             name: "browser_offline_set",
-            socketMethod: "browser.offline.set",
+            socketMethod: V2MethodNames.browserOfflineSet,
             description: "Always returns a not_supported error: WKWebView does not expose reliable per-tab offline emulation.",
             inputSchema: ProgramaToolSchema.empty
         ),
         ProgramaTool(
             name: "browser_trace_start",
-            socketMethod: "browser.trace.start",
+            socketMethod: V2MethodNames.browserTraceStart,
             description: "Always returns a not_supported error: Playwright trace artifacts are not available on WKWebView.",
             inputSchema: ProgramaToolSchema.empty
         ),
         ProgramaTool(
             name: "browser_trace_stop",
-            socketMethod: "browser.trace.stop",
+            socketMethod: V2MethodNames.browserTraceStop,
             description: "Always returns a not_supported error: Playwright trace artifacts are not available on WKWebView.",
             inputSchema: ProgramaToolSchema.empty
         ),
         ProgramaTool(
             name: "browser_network_route",
-            socketMethod: "browser.network.route",
+            socketMethod: V2MethodNames.browserNetworkRoute,
             description: "Always returns a not_supported error: WKWebView does not provide CDP-style request interception/mocking. The attempted route is still recorded and shows up in browser_network_requests.",
             inputSchema: ProgramaToolSchema.object(properties: [
                 "url": ProgramaToolSchema.string("URL or pattern the route would have matched."),
@@ -1056,7 +1056,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_network_unroute",
-            socketMethod: "browser.network.unroute",
+            socketMethod: V2MethodNames.browserNetworkUnroute,
             description: "Always returns a not_supported error: WKWebView does not provide CDP-style request interception/mocking. The attempted unroute is still recorded and shows up in browser_network_requests.",
             inputSchema: ProgramaToolSchema.object(properties: [
                 "url": ProgramaToolSchema.string("URL or pattern the unroute would have matched."),
@@ -1067,7 +1067,7 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_network_requests",
-            socketMethod: "browser.network.requests",
+            socketMethod: V2MethodNames.browserNetworkRequests,
             description: "Always returns a not_supported error, along with recorded_requests: the browser_network_route/browser_network_unroute attempts recorded for this surface (WKWebView cannot supply real request logs).",
             inputSchema: ProgramaToolSchema.object(properties: [
                 "surface_id": surfaceIdProperty(),
@@ -1077,37 +1077,37 @@ enum BrowserTools {
         ),
         ProgramaTool(
             name: "browser_screencast_start",
-            socketMethod: "browser.screencast.start",
+            socketMethod: V2MethodNames.browserScreencastStart,
             description: "Always returns a not_supported error: WKWebView does not expose CDP screencast streaming. Use browser_screenshot for point-in-time captures.",
             inputSchema: ProgramaToolSchema.empty
         ),
         ProgramaTool(
             name: "browser_screencast_stop",
-            socketMethod: "browser.screencast.stop",
+            socketMethod: V2MethodNames.browserScreencastStop,
             description: "Always returns a not_supported error: WKWebView does not expose CDP screencast streaming.",
             inputSchema: ProgramaToolSchema.empty
         ),
         ProgramaTool(
             name: "browser_input_mouse",
-            socketMethod: "browser.input_mouse",
+            socketMethod: V2MethodNames.browserInputMouse,
             description: "Always returns a not_supported error: raw CDP mouse injection is unavailable. Use browser_click/browser_hover/browser_scroll instead.",
             inputSchema: ProgramaToolSchema.empty
         ),
         ProgramaTool(
             name: "browser_input_keyboard",
-            socketMethod: "browser.input_keyboard",
+            socketMethod: V2MethodNames.browserInputKeyboard,
             description: "Always returns a not_supported error: raw CDP keyboard injection is unavailable. Use browser_press/browser_keydown/browser_keyup instead.",
             inputSchema: ProgramaToolSchema.empty
         ),
         ProgramaTool(
             name: "browser_input_touch",
-            socketMethod: "browser.input_touch",
+            socketMethod: V2MethodNames.browserInputTouch,
             description: "Always returns a not_supported error: raw CDP touch injection is unavailable on WKWebView.",
             inputSchema: ProgramaToolSchema.empty
         ),
         ProgramaTool(
             name: "browser_design_mode_toggle",
-            socketMethod: "browser.design_mode.toggle",
+            socketMethod: V2MethodNames.browserDesignModeToggle,
             description: "Toggles Design Mode on the workspace's focused browser panel (or its single browser panel, when a terminal is focused). Inside that workspace it focuses the browser panel and its web view; it never raises/activates the Programa window or switches the selected workspace. No surface_id needed.",
             inputSchema: ProgramaToolSchema.object(properties: [
                 "window_id": ProgramaToolSchema.windowIdProperty,
diff --git a/CLI-MCP/Tools/FocusTools.swift b/CLI-MCP/Tools/FocusTools.swift
index 764429849..66b9acbcb 100644
--- a/CLI-MCP/Tools/FocusTools.swift
+++ b/CLI-MCP/Tools/FocusTools.swift
@@ -15,7 +15,7 @@ enum FocusTools {
     static let tools: [ProgramaTool] = [
         ProgramaTool(
             name: "focus_window",
-            socketMethod: "window.focus",
+            socketMethod: V2MethodNames.windowFocus,
             description: "Brings a window to the front and makes it key. This tool may raise/activate the Programa window.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -26,7 +26,7 @@ enum FocusTools {
         ),
         ProgramaTool(
             name: "focus_workspace_select",
-            socketMethod: "workspace.select",
+            socketMethod: V2MethodNames.workspaceSelect,
             description: "Selects a workspace (sidebar tab) and brings its window forward. This tool may raise/activate the Programa window.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -38,7 +38,7 @@ enum FocusTools {
         ),
         ProgramaTool(
             name: "focus_workspace_next",
-            socketMethod: "workspace.next",
+            socketMethod: V2MethodNames.workspaceNext,
             description: "Selects the next workspace (sidebar tab) and brings its window forward. This tool may raise/activate the Programa window.",
             inputSchema: ProgramaToolSchema.object(properties: [
                 "window_id": ProgramaToolSchema.windowIdProperty,
@@ -48,7 +48,7 @@ enum FocusTools {
         ),
         ProgramaTool(
             name: "focus_workspace_previous",
-            socketMethod: "workspace.previous",
+            socketMethod: V2MethodNames.workspacePrevious,
             description: "Selects the previous workspace (sidebar tab) and brings its window forward. This tool may raise/activate the Programa window.",
             inputSchema: ProgramaToolSchema.object(properties: [
                 "window_id": ProgramaToolSchema.windowIdProperty,
@@ -58,7 +58,7 @@ enum FocusTools {
         ),
         ProgramaTool(
             name: "focus_workspace_last",
-            socketMethod: "workspace.last",
+            socketMethod: V2MethodNames.workspaceLast,
             description: "Navigates back to the previously selected workspace and brings its window forward. This tool may raise/activate the Programa window.",
             inputSchema: ProgramaToolSchema.object(properties: [
                 "window_id": ProgramaToolSchema.windowIdProperty,
@@ -68,7 +68,7 @@ enum FocusTools {
         ),
         ProgramaTool(
             name: "focus_surface",
-            socketMethod: "surface.focus",
+            socketMethod: V2MethodNames.surfaceFocus,
             description: "Focuses a specific surface (terminal or browser pane content), selecting its workspace and bringing its window forward. This tool may raise/activate the Programa window.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -81,7 +81,7 @@ enum FocusTools {
         ),
         ProgramaTool(
             name: "focus_pane",
-            socketMethod: "pane.focus",
+            socketMethod: V2MethodNames.paneFocus,
             description: "Focuses a specific pane, selecting its workspace and bringing its window forward. This tool may raise/activate the Programa window.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -94,7 +94,7 @@ enum FocusTools {
         ),
         ProgramaTool(
             name: "focus_pane_last",
-            socketMethod: "pane.last",
+            socketMethod: V2MethodNames.paneLast,
             description: "Focuses the workspace's alternate (non-focused) pane. This tool may raise/activate the Programa window.",
             inputSchema: ProgramaToolSchema.object(properties: [
                 "window_id": ProgramaToolSchema.windowIdProperty,
@@ -104,7 +104,7 @@ enum FocusTools {
         ),
         ProgramaTool(
             name: "focus_review_open",
-            socketMethod: "review.open",
+            socketMethod: V2MethodNames.reviewOpen,
             description: "Opens a diff review panel as a new split next to a surface. This tool may raise/activate the Programa window only if focus is set to true (defaults to false).",
             inputSchema: ProgramaToolSchema.object(properties: [
                 "mode": ProgramaToolSchema.stringEnum("What to diff. Defaults to uncommitted.", ["uncommitted", "branch"]),
@@ -118,7 +118,7 @@ enum FocusTools {
         ),
         ProgramaTool(
             name: "focus_worktree_open",
-            socketMethod: "worktree.open",
+            socketMethod: V2MethodNames.worktreeOpen,
             description: "Opens an existing git worktree as a workspace (creating one if it doesn't exist yet, matching worktree_create's defaults). This tool may raise/activate the Programa window only if focus is set to true (defaults to false).",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -135,7 +135,7 @@ enum FocusTools {
         ),
         ProgramaTool(
             name: "focus_browser_webview",
-            socketMethod: "browser.focus_webview",
+            socketMethod: V2MethodNames.browserFocusWebview,
             description: "Moves keyboard focus into a browser surface's web view (making first responder), bringing its window forward. This tool may raise/activate the Programa window.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -148,7 +148,7 @@ enum FocusTools {
         ),
         ProgramaTool(
             name: "focus_browser_element",
-            socketMethod: "browser.focus",
+            socketMethod: V2MethodNames.browserFocus,
             description: "Calls .focus() on the DOM element matched by a selector inside a browser surface's page. It does not select the workspace or raise the window itself, but it runs with focus intent, so the page may end up owning keyboard focus. This tool may raise/activate the Programa window.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -163,7 +163,7 @@ enum FocusTools {
         ),
         ProgramaTool(
             name: "focus_browser_tab_switch",
-            socketMethod: "browser.tab.switch",
+            socketMethod: V2MethodNames.browserTabSwitch,
             description: "Switches which browser tab (surface) is focused within a workspace and moves keyboard focus to it. It does not select the workspace or raise the window; pass workspace_id when the target lives in a workspace other than the selected one. This tool may raise/activate the Programa window.",
             inputSchema: ProgramaToolSchema.object(properties: [
                 "target_surface_id": ProgramaToolSchema.string("Browser surface UUID or short ref to switch to. Also accepts tab_id as an alias."),
diff --git a/CLI-MCP/Tools/LayoutTools.swift b/CLI-MCP/Tools/LayoutTools.swift
index 252f6c83b..f7643d50d 100644
--- a/CLI-MCP/Tools/LayoutTools.swift
+++ b/CLI-MCP/Tools/LayoutTools.swift
@@ -6,7 +6,7 @@ enum LayoutTools {
     static let tools: [ProgramaTool] = [
         ProgramaTool(
             name: "layout_save",
-            socketMethod: "layout.save",
+            socketMethod: V2MethodNames.layoutSave,
             description: "Saves the current workspace's pane/split layout under a name for later reuse with layout_apply.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -21,7 +21,7 @@ enum LayoutTools {
         ),
         ProgramaTool(
             name: "layout_apply",
-            socketMethod: "layout.apply",
+            socketMethod: V2MethodNames.layoutApply,
             description: "Applies a previously saved named layout, either to an existing workspace or by creating a new one.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -36,7 +36,7 @@ enum LayoutTools {
         ),
         ProgramaTool(
             name: "layout_list",
-            socketMethod: "layout.list",
+            socketMethod: V2MethodNames.layoutList,
             description: "Lists all saved named layouts with their save timestamps.",
             inputSchema: ProgramaToolSchema.empty
         ),
diff --git a/CLI-MCP/Tools/NotificationTools.swift b/CLI-MCP/Tools/NotificationTools.swift
index 066da9478..ca2d4fd69 100644
--- a/CLI-MCP/Tools/NotificationTools.swift
+++ b/CLI-MCP/Tools/NotificationTools.swift
@@ -7,7 +7,7 @@ enum NotificationTools {
     static let tools: [ProgramaTool] = [
         ProgramaTool(
             name: "notification_create",
-            socketMethod: "notification.create",
+            socketMethod: V2MethodNames.notificationCreate,
             description: "Creates a notification for a workspace, targeting an explicit surface or the workspace's focused surface.",
             inputSchema: ProgramaToolSchema.object(properties: [
                 "title": ProgramaToolSchema.string("Notification title. Defaults to \"Notification\"."),
@@ -20,7 +20,7 @@ enum NotificationTools {
         ),
         ProgramaTool(
             name: "notification_create_for_surface",
-            socketMethod: "notification.create_for_surface",
+            socketMethod: V2MethodNames.notificationCreateForSurface,
             description: "Creates a notification for a specific surface within a workspace (surface_id is required, unlike notification_create).",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -36,7 +36,7 @@ enum NotificationTools {
         ),
         ProgramaTool(
             name: "notification_create_for_target",
-            socketMethod: "notification.create_for_target",
+            socketMethod: V2MethodNames.notificationCreateForTarget,
             description: "Creates a notification for an exact workspace + surface pair (both required), without any fallback resolution.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -52,13 +52,13 @@ enum NotificationTools {
         ),
         ProgramaTool(
             name: "notification_list",
-            socketMethod: "notification.list",
+            socketMethod: V2MethodNames.notificationList,
             description: "Lists every in-app notification currently in the notification bell, across all workspaces.",
             inputSchema: ProgramaToolSchema.empty
         ),
         ProgramaTool(
             name: "notification_clear",
-            socketMethod: "notification.clear",
+            socketMethod: V2MethodNames.notificationClear,
             description: "Clears notifications. Scoped to one workspace if workspace_id is given, otherwise clears every notification globally.",
             inputSchema: ProgramaToolSchema.object(properties: [
                 "workspace_id": ProgramaToolSchema.string("Workspace UUID or short ref to clear notifications for. Omit to clear all notifications."),
diff --git a/CLI-MCP/Tools/PaneTools.swift b/CLI-MCP/Tools/PaneTools.swift
index 3c918980e..03f1ae3e1 100644
--- a/CLI-MCP/Tools/PaneTools.swift
+++ b/CLI-MCP/Tools/PaneTools.swift
@@ -7,7 +7,7 @@ enum PaneTools {
     static let tools: [ProgramaTool] = [
         ProgramaTool(
             name: "pane_list",
-            socketMethod: "pane.list",
+            socketMethod: V2MethodNames.paneList,
             description: "Lists every pane in a workspace's split tree, with pixel geometry and terminal grid size.",
             inputSchema: ProgramaToolSchema.object(properties: [
                 "window_id": ProgramaToolSchema.windowIdProperty,
@@ -17,7 +17,7 @@ enum PaneTools {
         ),
         ProgramaTool(
             name: "pane_surfaces",
-            socketMethod: "pane.surfaces",
+            socketMethod: V2MethodNames.paneSurfaces,
             description: "Lists the surfaces (tabs) inside one pane, in display order.",
             inputSchema: ProgramaToolSchema.object(properties: [
                 "pane_id": ProgramaToolSchema.string("Pane UUID or short ref. Defaults to the workspace's focused pane."),
@@ -27,7 +27,7 @@ enum PaneTools {
         ),
         ProgramaTool(
             name: "pane_create",
-            socketMethod: "pane.create",
+            socketMethod: V2MethodNames.paneCreate,
             description: "Splits the workspace's focused surface's pane in the given direction, creating a new pane with a new surface in it.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -42,7 +42,7 @@ enum PaneTools {
         ),
         ProgramaTool(
             name: "pane_resize",
-            socketMethod: "pane.resize",
+            socketMethod: V2MethodNames.paneResize,
             description: "Nudges a pane's split divider in one direction by an amount (in split-tree fractional units, clamped 0.1-0.9). Fails if the pane has no split ancestor of the matching orientation.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -57,7 +57,7 @@ enum PaneTools {
         ),
         ProgramaTool(
             name: "pane_swap",
-            socketMethod: "pane.swap",
+            socketMethod: V2MethodNames.paneSwap,
             description: "Swaps the selected surfaces of two panes (searches all windows/workspaces for pane_id, so no routing context is needed).",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -70,7 +70,7 @@ enum PaneTools {
         ),
         ProgramaTool(
             name: "pane_break",
-            socketMethod: "pane.break",
+            socketMethod: V2MethodNames.paneBreak,
             description: "Detaches a surface from its current pane and moves it into a brand-new workspace.",
             inputSchema: ProgramaToolSchema.object(properties: [
                 "pane_id": ProgramaToolSchema.string("Source pane UUID or short ref. Defaults to the workspace's focused pane."),
@@ -82,7 +82,7 @@ enum PaneTools {
         ),
         ProgramaTool(
             name: "pane_join",
-            socketMethod: "pane.join",
+            socketMethod: V2MethodNames.paneJoin,
             description: "Moves a surface into an existing target pane. Provide surface_id directly, or pane_id to use that pane's currently selected surface.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
diff --git a/CLI-MCP/Tools/ReviewTools.swift b/CLI-MCP/Tools/ReviewTools.swift
index 9ebc47e2d..5e4850a9f 100644
--- a/CLI-MCP/Tools/ReviewTools.swift
+++ b/CLI-MCP/Tools/ReviewTools.swift
@@ -7,7 +7,7 @@ enum ReviewTools {
     static let tools: [ProgramaTool] = [
         ProgramaTool(
             name: "review_refresh",
-            socketMethod: "review.refresh",
+            socketMethod: V2MethodNames.reviewRefresh,
             description: "Re-computes the diff snapshot shown in an open review panel (e.g. after new commits).",
             inputSchema: ProgramaToolSchema.object(properties: [
                 "surface_id": ProgramaToolSchema.string("Review panel's surface UUID or short ref. If omitted, uses the workspace's focused review panel, or its only review panel."),
@@ -17,7 +17,7 @@ enum ReviewTools {
         ),
         ProgramaTool(
             name: "review_comment_add",
-            socketMethod: "review.comment.add",
+            socketMethod: V2MethodNames.reviewCommentAdd,
             description: "Adds an inline review comment on a line range of a file shown in an open review panel.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -34,7 +34,7 @@ enum ReviewTools {
         ),
         ProgramaTool(
             name: "review_comment_remove",
-            socketMethod: "review.comment.remove",
+            socketMethod: V2MethodNames.reviewCommentRemove,
             description: "Removes a review comment by id.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -48,7 +48,7 @@ enum ReviewTools {
         ),
         ProgramaTool(
             name: "review_comment_list",
-            socketMethod: "review.comment.list",
+            socketMethod: V2MethodNames.reviewCommentList,
             description: "Lists all comments currently on an open review panel.",
             inputSchema: ProgramaToolSchema.object(properties: [
                 "surface_id": ProgramaToolSchema.string("Review panel's surface UUID or short ref. If omitted, uses the workspace's focused review panel, or its only review panel."),
@@ -58,7 +58,7 @@ enum ReviewTools {
         ),
         ProgramaTool(
             name: "review_send_comments",
-            socketMethod: "review.send_comments",
+            socketMethod: V2MethodNames.reviewSendComments,
             description: "Sends all pending review comments to the review panel's source surface (e.g. as text into the terminal that started the review), then clears them. Sending zero comments is a no-op, not an error.",
             inputSchema: ProgramaToolSchema.object(properties: [
                 "preamble": ProgramaToolSchema.string("Optional text to prepend before the formatted comments."),
diff --git a/CLI-MCP/Tools/SnapshotTools.swift b/CLI-MCP/Tools/SnapshotTools.swift
index 00edcae2b..8d0721c44 100644
--- a/CLI-MCP/Tools/SnapshotTools.swift
+++ b/CLI-MCP/Tools/SnapshotTools.swift
@@ -6,13 +6,13 @@ enum SnapshotTools {
     static let tools: [ProgramaTool] = [
         ProgramaTool(
             name: "snapshot_list",
-            socketMethod: "snapshot.list",
+            socketMethod: V2MethodNames.snapshotList,
             description: "Lists archived session snapshots (past app sessions) with window/workspace/panel counts and save timestamps.",
             inputSchema: ProgramaToolSchema.empty
         ),
         ProgramaTool(
             name: "snapshot_restore",
-            socketMethod: "snapshot.restore",
+            socketMethod: V2MethodNames.snapshotRestore,
             description: "Restores an archived session snapshot by recreating its windows/workspaces/panels. Creates new windows; does not replace the current session.",
             inputSchema: ProgramaToolSchema.object(properties: [
                 "id": ProgramaToolSchema.string("Snapshot id to restore, or \"latest\" for the most recent archived snapshot. Defaults to latest if omitted."),
diff --git a/CLI-MCP/Tools/SurfaceTools.swift b/CLI-MCP/Tools/SurfaceTools.swift
index dc9726d51..3f8a122f4 100644
--- a/CLI-MCP/Tools/SurfaceTools.swift
+++ b/CLI-MCP/Tools/SurfaceTools.swift
@@ -33,7 +33,7 @@ enum SurfaceTools {
     static let tools: [ProgramaTool] = [
         ProgramaTool(
             name: "surface_list",
-            socketMethod: "surface.list",
+            socketMethod: V2MethodNames.surfaceList,
             description: "Lists every surface (terminal or browser pane content) in a workspace, in display order, with type/title/pane/agent-state.",
             inputSchema: ProgramaToolSchema.object(properties: [
                 "window_id": ProgramaToolSchema.windowIdProperty,
@@ -43,7 +43,7 @@ enum SurfaceTools {
         ),
         ProgramaTool(
             name: "surface_current",
-            socketMethod: "surface.current",
+            socketMethod: V2MethodNames.surfaceCurrent,
             description: "Returns the currently focused surface in a workspace (falls back to the first surface if none is focused).",
             inputSchema: ProgramaToolSchema.object(properties: [
                 "window_id": ProgramaToolSchema.windowIdProperty,
@@ -53,7 +53,7 @@ enum SurfaceTools {
         ),
         ProgramaTool(
             name: "surface_split",
-            socketMethod: "surface.split",
+            socketMethod: V2MethodNames.surfaceSplit,
             description: "Splits a surface's pane in the given direction, creating a new terminal surface.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -68,7 +68,7 @@ enum SurfaceTools {
         ),
         ProgramaTool(
             name: "surface_create",
-            socketMethod: "surface.create",
+            socketMethod: V2MethodNames.surfaceCreate,
             description: "Creates a new surface (terminal or browser tab) in an existing pane.",
             inputSchema: ProgramaToolSchema.object(properties: [
                 "type": ProgramaToolSchema.stringEnum("Surface type to create. Defaults to terminal.", ["terminal", "browser"]),
@@ -81,7 +81,7 @@ enum SurfaceTools {
         ),
         ProgramaTool(
             name: "surface_close",
-            socketMethod: "surface.close",
+            socketMethod: V2MethodNames.surfaceClose,
             description: "Closes a surface. Terminal surfaces get a brief undo window; fails if it would close the workspace's last surface.",
             inputSchema: ProgramaToolSchema.object(properties: [
                 "surface_id": ProgramaToolSchema.string("Surface UUID or short ref to close. Defaults to the workspace's focused surface."),
@@ -91,7 +91,7 @@ enum SurfaceTools {
         ),
         ProgramaTool(
             name: "surface_move",
-            socketMethod: "surface.move",
+            socketMethod: V2MethodNames.surfaceMove,
             description: "Moves a surface to a different pane, workspace, or window. Provide at most one destination selector: pane_id, workspace_id, window_id, before_surface_id, or after_surface_id (before/after also implies the pane and workspace of the anchor surface).",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -109,7 +109,7 @@ enum SurfaceTools {
         ),
         ProgramaTool(
             name: "surface_reorder",
-            socketMethod: "surface.reorder",
+            socketMethod: V2MethodNames.surfaceReorder,
             description: "Reorders a surface within its current pane. Specify exactly one of index, before_surface_id, or after_surface_id (anchors must be in the same pane).",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -123,19 +123,19 @@ enum SurfaceTools {
         ),
         ProgramaTool(
             name: "surface_action",
-            socketMethod: "surface.action",
+            socketMethod: V2MethodNames.surfaceAction,
             description: "Runs one of a fixed set of tab-level actions on a surface (rename, close siblings, duplicate, reload, pin, mark read/unread, open a new tab beside it).",
             inputSchema: tabActionSchema()
         ),
         ProgramaTool(
             name: "tab_action",
-            socketMethod: "tab.action",
+            socketMethod: V2MethodNames.tabAction,
             description: "Alias of surface_action -- runs the same fixed set of tab-level actions on a surface (rename, close siblings, duplicate, reload, pin, mark read/unread, open a new tab beside it).",
             inputSchema: tabActionSchema()
         ),
         ProgramaTool(
             name: "surface_refresh",
-            socketMethod: "surface.refresh",
+            socketMethod: V2MethodNames.surfaceRefresh,
             description: "Forces every terminal surface in a workspace to redraw. Rarely needed; a diagnostic/recovery tool, not a normal read/write path.",
             inputSchema: ProgramaToolSchema.object(properties: [
                 "window_id": ProgramaToolSchema.windowIdProperty,
@@ -145,7 +145,7 @@ enum SurfaceTools {
         ),
         ProgramaTool(
             name: "surface_health",
-            socketMethod: "surface.health",
+            socketMethod: V2MethodNames.surfaceHealth,
             description: "Reports whether each surface in a workspace is actually attached to a live window (diagnostic).",
             inputSchema: ProgramaToolSchema.object(properties: [
                 "window_id": ProgramaToolSchema.windowIdProperty,
@@ -155,7 +155,7 @@ enum SurfaceTools {
         ),
         ProgramaTool(
             name: "surface_send_text",
-            socketMethod: "surface.send_text",
+            socketMethod: V2MethodNames.surfaceSendText,
             description: "Types text into a terminal surface, as if typed at the keyboard (no Enter is sent automatically -- include \\n in text if you want to submit a command).",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -169,7 +169,7 @@ enum SurfaceTools {
         ),
         ProgramaTool(
             name: "surface_send_key",
-            socketMethod: "surface.send_key",
+            socketMethod: V2MethodNames.surfaceSendKey,
             description: "Sends a single named key (e.g. enter, escape, ctrl+c, up, tab) to a terminal surface.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -183,7 +183,7 @@ enum SurfaceTools {
         ),
         ProgramaTool(
             name: "surface_report_tty",
-            socketMethod: "surface.report_tty",
+            socketMethod: V2MethodNames.surfaceReportTty,
             description: "Telemetry write: records a surface's TTY device name (used for shell-integration correlation). Not typically called directly by an agent.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -196,7 +196,7 @@ enum SurfaceTools {
         ),
         ProgramaTool(
             name: "surface_ports_kick",
-            socketMethod: "surface.ports_kick",
+            socketMethod: V2MethodNames.surfacePortsKick,
             description: "Telemetry write: requests an immediate re-scan of listening ports for a surface, instead of waiting for the next periodic scan.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -209,7 +209,7 @@ enum SurfaceTools {
         ),
         ProgramaTool(
             name: "surface_clear_history",
-            socketMethod: "surface.clear_history",
+            socketMethod: V2MethodNames.surfaceClearHistory,
             description: "Clears a terminal surface's scrollback (equivalent to the clear_screen binding action).",
             inputSchema: ProgramaToolSchema.object(properties: [
                 "surface_id": ProgramaToolSchema.string("Target terminal surface UUID or short ref. Defaults to the workspace's focused surface."),
@@ -219,7 +219,7 @@ enum SurfaceTools {
         ),
         ProgramaTool(
             name: "surface_trigger_flash",
-            socketMethod: "surface.trigger_flash",
+            socketMethod: V2MethodNames.surfaceTriggerFlash,
             description: "Triggers a brief visual flash highlight on a surface, useful for drawing a human's attention to it.",
             inputSchema: ProgramaToolSchema.object(properties: [
                 "surface_id": ProgramaToolSchema.string("Surface UUID or short ref to flash. Defaults to the workspace's focused surface."),
@@ -229,7 +229,7 @@ enum SurfaceTools {
         ),
         ProgramaTool(
             name: "surface_report_pwd",
-            socketMethod: "surface.report_pwd",
+            socketMethod: V2MethodNames.surfaceReportPwd,
             description: "Telemetry write: records a surface's current working directory (used by shell-integration hooks).",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -242,7 +242,7 @@ enum SurfaceTools {
         ),
         ProgramaTool(
             name: "surface_report_shell_state",
-            socketMethod: "surface.report_shell_state",
+            socketMethod: V2MethodNames.surfaceReportShellState,
             description: "Telemetry write: records whether a surface's shell is at a prompt or running a command (used by shell-integration hooks).",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -255,7 +255,7 @@ enum SurfaceTools {
         ),
         ProgramaTool(
             name: "surface_report_git_branch",
-            socketMethod: "surface.report_git_branch",
+            socketMethod: V2MethodNames.surfaceReportGitBranch,
             description: "Telemetry write: records a surface's current git branch and dirty state (used by shell-integration hooks).",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -269,7 +269,7 @@ enum SurfaceTools {
         ),
         ProgramaTool(
             name: "surface_clear_git_branch",
-            socketMethod: "surface.clear_git_branch",
+            socketMethod: V2MethodNames.surfaceClearGitBranch,
             description: "Clears a surface's reported git branch state.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -281,7 +281,7 @@ enum SurfaceTools {
         ),
         ProgramaTool(
             name: "surface_report_pr",
-            socketMethod: "surface.report_pr",
+            socketMethod: V2MethodNames.surfaceReportPr,
             description: "Telemetry write: attaches a pull request badge to a surface.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -299,7 +299,7 @@ enum SurfaceTools {
         ),
         ProgramaTool(
             name: "surface_clear_pr",
-            socketMethod: "surface.clear_pr",
+            socketMethod: V2MethodNames.surfaceClearPr,
             description: "Clears a surface's pull request badge.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -311,7 +311,7 @@ enum SurfaceTools {
         ),
         ProgramaTool(
             name: "surface_report_ports",
-            socketMethod: "surface.report_ports",
+            socketMethod: V2MethodNames.surfaceReportPorts,
             description: "Telemetry write: records the listening TCP ports for a surface's process.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -324,7 +324,7 @@ enum SurfaceTools {
         ),
         ProgramaTool(
             name: "surface_clear_ports",
-            socketMethod: "surface.clear_ports",
+            socketMethod: V2MethodNames.surfaceClearPorts,
             description: "Clears reported listening ports for a surface, or for every surface in the workspace if surface_id is omitted.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -336,7 +336,7 @@ enum SurfaceTools {
         ),
         ProgramaTool(
             name: "surface_report_agent_state",
-            socketMethod: "surface.report_agent_state",
+            socketMethod: V2MethodNames.surfaceReportAgentState,
             description: "Telemetry write: records a surface's agent activity state (working/blocked/idle), as reported by an installed lifecycle hook.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -350,7 +350,7 @@ enum SurfaceTools {
         ),
         ProgramaTool(
             name: "surface_clear_agent_state",
-            socketMethod: "surface.clear_agent_state",
+            socketMethod: V2MethodNames.surfaceClearAgentState,
             description: "Clears a surface's reported agent activity state.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -362,7 +362,7 @@ enum SurfaceTools {
         ),
         ProgramaTool(
             name: "surface_read_text",
-            socketMethod: "surface.read_text",
+            socketMethod: V2MethodNames.surfaceReadText,
             description: "Reads a terminal surface's visible screen text, optionally including scrollback history. The primary tool for observing sibling-pane output.",
             inputSchema: ProgramaToolSchema.object(properties: [
                 "scrollback": ProgramaToolSchema.boolean("If true, include scrollback history, not just the visible screen. Defaults to false. Forced true if lines is set."),
@@ -374,7 +374,7 @@ enum SurfaceTools {
         ),
         ProgramaTool(
             name: "surface_wait",
-            socketMethod: "surface.wait",
+            socketMethod: V2MethodNames.surfaceWait,
             description: "Blocks (up to timeout_ms) until a terminal surface hits a condition, then returns in one round trip -- avoids polling surface_read_text in a loop. Provide exactly one of pattern, exit, or agent_state.",
             inputSchema: ProgramaToolSchema.object(properties: [
                 "pattern": ProgramaToolSchema.string("Regex pattern to wait for in the surface's output (screen + scrollback)."),
diff --git a/CLI-MCP/Tools/SystemTools.swift b/CLI-MCP/Tools/SystemTools.swift
index 4fe6a4a6d..c8ed138ea 100644
--- a/CLI-MCP/Tools/SystemTools.swift
+++ b/CLI-MCP/Tools/SystemTools.swift
@@ -7,19 +7,19 @@ enum SystemTools {
     static let tools: [ProgramaTool] = [
         ProgramaTool(
             name: "system_ping",
-            socketMethod: "system.ping",
+            socketMethod: V2MethodNames.systemPing,
             description: "Health check against the running Programa app over its control socket; returns pong.",
             inputSchema: ProgramaToolSchema.empty
         ),
         ProgramaTool(
             name: "system_capabilities",
-            socketMethod: "system.capabilities",
+            socketMethod: V2MethodNames.systemCapabilities,
             description: "Reports the running Programa app's socket protocol capabilities (supported command families and limits).",
             inputSchema: ProgramaToolSchema.empty
         ),
         ProgramaTool(
             name: "system_identify",
-            socketMethod: "system.identify",
+            socketMethod: V2MethodNames.systemIdentify,
             description: "Resolves the socket's own identity: the currently focused window/workspace/pane/surface, and (optionally) validates a caller-supplied location.",
             inputSchema: ProgramaToolSchema.object(properties: [
                 "caller": ["type": "object", "description": .string("Optional caller location to validate, e.g. { \"workspace_id\": \"...\", \"surface_id\": \"...\" }.")],
@@ -27,7 +27,7 @@ enum SystemTools {
         ),
         ProgramaTool(
             name: "system_tree",
-            socketMethod: "system.tree",
+            socketMethod: V2MethodNames.systemTree,
             description: "Returns the full window -> workspace -> pane -> surface tree (optionally scoped to one workspace or all windows). The primary read tool for understanding current app layout.",
             inputSchema: ProgramaToolSchema.object(properties: [
                 "workspace_id": ProgramaToolSchema.string("Optional workspace UUID or short ref to scope the tree to a single workspace (returns just that workspace's window/pane/surface subtree)."),
diff --git a/CLI-MCP/Tools/WindowTools.swift b/CLI-MCP/Tools/WindowTools.swift
index dc40ed74a..62d4aa649 100644
--- a/CLI-MCP/Tools/WindowTools.swift
+++ b/CLI-MCP/Tools/WindowTools.swift
@@ -6,25 +6,25 @@ enum WindowTools {
     static let tools: [ProgramaTool] = [
         ProgramaTool(
             name: "window_list",
-            socketMethod: "window.list",
+            socketMethod: V2MethodNames.windowList,
             description: "Lists every open Programa main window with its key/visible state and selected workspace.",
             inputSchema: ProgramaToolSchema.empty
         ),
         ProgramaTool(
             name: "window_current",
-            socketMethod: "window.current",
+            socketMethod: V2MethodNames.windowCurrent,
             description: "Returns the currently active Programa window's id.",
             inputSchema: ProgramaToolSchema.empty
         ),
         ProgramaTool(
             name: "window_create",
-            socketMethod: "window.create",
+            socketMethod: V2MethodNames.windowCreate,
             description: "Creates a new, empty Programa main window.",
             inputSchema: ProgramaToolSchema.empty
         ),
         ProgramaTool(
             name: "window_close",
-            socketMethod: "window.close",
+            socketMethod: V2MethodNames.windowClose,
             description: "Closes a Programa main window.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
diff --git a/CLI-MCP/Tools/WorkspaceTools.swift b/CLI-MCP/Tools/WorkspaceTools.swift
index 1d906a501..6359ebee6 100644
--- a/CLI-MCP/Tools/WorkspaceTools.swift
+++ b/CLI-MCP/Tools/WorkspaceTools.swift
@@ -17,7 +17,7 @@ enum WorkspaceTools {
     static let tools: [ProgramaTool] = [
         ProgramaTool(
             name: "workspace_list",
-            socketMethod: "workspace.list",
+            socketMethod: V2MethodNames.workspaceList,
             description: "Lists every workspace (sidebar tab) in a window, in display order, with pin/selection/remote status.",
             inputSchema: ProgramaToolSchema.object(properties: [
                 "window_id": ProgramaToolSchema.windowIdProperty,
@@ -27,7 +27,7 @@ enum WorkspaceTools {
         ),
         ProgramaTool(
             name: "workspace_create",
-            socketMethod: "workspace.create",
+            socketMethod: V2MethodNames.workspaceCreate,
             description: "Creates a new workspace (sidebar tab) with its own terminal.",
             inputSchema: ProgramaToolSchema.object(properties: [
                 "working_directory": ProgramaToolSchema.string("Starting directory for the new workspace's terminal. Takes priority over cwd if both are set."),
@@ -43,7 +43,7 @@ enum WorkspaceTools {
         ),
         ProgramaTool(
             name: "agent_spawn",
-            socketMethod: "agent.spawn",
+            socketMethod: V2MethodNames.agentSpawn,
             description: "Starts a helper in a nested workspace that shares the parent folder. Set needs_isolation only when the helper needs its own git worktree.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -66,7 +66,7 @@ enum WorkspaceTools {
         ),
         ProgramaTool(
             name: "agent_task_start",
-            socketMethod: "agent.task.start",
+            socketMethod: V2MethodNames.agentTaskStart,
             description: "Reports a helper that is already running, including helpers that run inside their parent and share its output.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -86,7 +86,7 @@ enum WorkspaceTools {
         ),
         ProgramaTool(
             name: "agent_task_update",
-            socketMethod: "agent.task.update",
+            socketMethod: V2MethodNames.agentTaskUpdate,
             description: "Updates a running helper's state or description.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -103,7 +103,7 @@ enum WorkspaceTools {
         ),
         ProgramaTool(
             name: "agent_task_finish",
-            socketMethod: "agent.task.finish",
+            socketMethod: V2MethodNames.agentTaskFinish,
             description: "Marks a helper as done, failed, or stopped.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -115,7 +115,7 @@ enum WorkspaceTools {
         ),
         ProgramaTool(
             name: "agent_task_finish_session",
-            socketMethod: "agent.task.finish_session",
+            socketMethod: V2MethodNames.agentTaskFinishSession,
             description: "Stops any helpers that are still active when their host session ends.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -128,7 +128,7 @@ enum WorkspaceTools {
         ),
         ProgramaTool(
             name: "agent_task_list",
-            socketMethod: "agent.task.list",
+            socketMethod: V2MethodNames.agentTaskList,
             description: "Lists helpers and where they run, including whether output is separate or shared with the parent.",
             inputSchema: ProgramaToolSchema.object(properties: [
                 "workspace_id": ProgramaToolSchema.string("Optional workspace UUID or short ref to filter by."),
@@ -138,7 +138,7 @@ enum WorkspaceTools {
         ),
         ProgramaTool(
             name: "workspace_current",
-            socketMethod: "workspace.current",
+            socketMethod: V2MethodNames.workspaceCurrent,
             description: "Returns the currently selected workspace in a window, with its full summary.",
             inputSchema: ProgramaToolSchema.object(properties: [
                 "window_id": ProgramaToolSchema.windowIdProperty,
@@ -148,7 +148,7 @@ enum WorkspaceTools {
         ),
         ProgramaTool(
             name: "workspace_close",
-            socketMethod: "workspace.close",
+            socketMethod: V2MethodNames.workspaceClose,
             description: "Closes a workspace (sidebar tab). Fails if the workspace is pinned.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -160,7 +160,7 @@ enum WorkspaceTools {
         ),
         ProgramaTool(
             name: "workspace_move_to_window",
-            socketMethod: "workspace.move_to_window",
+            socketMethod: V2MethodNames.workspaceMoveToWindow,
             description: "Moves a workspace from its current window into a different window.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -173,7 +173,7 @@ enum WorkspaceTools {
         ),
         ProgramaTool(
             name: "workspace_reorder",
-            socketMethod: "workspace.reorder",
+            socketMethod: V2MethodNames.workspaceReorder,
             description: "Reorders a workspace within its window's sidebar. Specify exactly one of index, before_workspace_id, or after_workspace_id.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -188,7 +188,7 @@ enum WorkspaceTools {
         ),
         ProgramaTool(
             name: "workspace_rename",
-            socketMethod: "workspace.rename",
+            socketMethod: V2MethodNames.workspaceRename,
             description: "Sets a workspace's custom display title.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -201,7 +201,7 @@ enum WorkspaceTools {
         ),
         ProgramaTool(
             name: "workspace_action",
-            socketMethod: "workspace.action",
+            socketMethod: V2MethodNames.workspaceAction,
             description: "Runs one of a fixed set of workspace-level actions (pin, rename, reorder, close siblings, recolor, mark read/unread, etc). Some actions require extra params: rename needs title, set_description needs description, set_color needs color.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -218,7 +218,7 @@ enum WorkspaceTools {
         ),
         ProgramaTool(
             name: "workspace_equalize_splits",
-            socketMethod: "workspace.equalize_splits",
+            socketMethod: V2MethodNames.workspaceEqualizeSplits,
             description: "Proportionally equalizes pane split dividers in a workspace so leaf panes get equal space, optionally scoped to one split orientation.",
             inputSchema: ProgramaToolSchema.object(properties: [
                 "orientation": ProgramaToolSchema.stringEnum("Only equalize splits of this orientation. If omitted, equalizes every split.", ["horizontal", "vertical"]),
@@ -229,7 +229,7 @@ enum WorkspaceTools {
         ),
         ProgramaTool(
             name: "workspace_set_status",
-            socketMethod: "workspace.set_status",
+            socketMethod: V2MethodNames.workspaceSetStatus,
             description: "Sets (or replaces) a single-line key/value status entry shown in a workspace's sidebar.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -248,7 +248,7 @@ enum WorkspaceTools {
         ),
         ProgramaTool(
             name: "workspace_clear_status",
-            socketMethod: "workspace.clear_status",
+            socketMethod: V2MethodNames.workspaceClearStatus,
             description: "Removes a single sidebar status entry by key.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -260,7 +260,7 @@ enum WorkspaceTools {
         ),
         ProgramaTool(
             name: "workspace_list_status",
-            socketMethod: "workspace.list_status",
+            socketMethod: V2MethodNames.workspaceListStatus,
             description: "Lists all sidebar status entries for a workspace, in display order.",
             inputSchema: ProgramaToolSchema.object(properties: [
                 "window_id": ProgramaToolSchema.windowIdProperty,
@@ -270,7 +270,7 @@ enum WorkspaceTools {
         ),
         ProgramaTool(
             name: "workspace_log",
-            socketMethod: "workspace.log",
+            socketMethod: V2MethodNames.workspaceLog,
             description: "Appends one entry to a workspace's sidebar activity log.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -284,7 +284,7 @@ enum WorkspaceTools {
         ),
         ProgramaTool(
             name: "workspace_clear_log",
-            socketMethod: "workspace.clear_log",
+            socketMethod: V2MethodNames.workspaceClearLog,
             description: "Clears a workspace's entire sidebar activity log.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -295,7 +295,7 @@ enum WorkspaceTools {
         ),
         ProgramaTool(
             name: "workspace_list_log",
-            socketMethod: "workspace.list_log",
+            socketMethod: V2MethodNames.workspaceListLog,
             description: "Lists a workspace's sidebar activity log entries, optionally limited to the most recent N.",
             inputSchema: ProgramaToolSchema.object(properties: [
                 "limit": ProgramaToolSchema.integer("Maximum number of most-recent entries to return. Omit for all entries."),
@@ -306,7 +306,7 @@ enum WorkspaceTools {
         ),
         ProgramaTool(
             name: "workspace_set_progress",
-            socketMethod: "workspace.set_progress",
+            socketMethod: V2MethodNames.workspaceSetProgress,
             description: "Sets a workspace's sidebar progress indicator.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -319,7 +319,7 @@ enum WorkspaceTools {
         ),
         ProgramaTool(
             name: "workspace_clear_progress",
-            socketMethod: "workspace.clear_progress",
+            socketMethod: V2MethodNames.workspaceClearProgress,
             description: "Clears a workspace's sidebar progress indicator.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -330,7 +330,7 @@ enum WorkspaceTools {
         ),
         ProgramaTool(
             name: "workspace_sidebar_state",
-            socketMethod: "workspace.sidebar_state",
+            socketMethod: V2MethodNames.workspaceSidebarState,
             description: "Returns a workspace's full sidebar state in one call: color, cwd, git branch, pull request, progress, status entries, metadata blocks, and recent log entries.",
             inputSchema: ProgramaToolSchema.object(properties: [
                 "window_id": ProgramaToolSchema.windowIdProperty,
@@ -340,7 +340,7 @@ enum WorkspaceTools {
         ),
         ProgramaTool(
             name: "workspace_clear_agent_pid",
-            socketMethod: "workspace.clear_agent_pid",
+            socketMethod: V2MethodNames.workspaceClearAgentPid,
             description: "Removes a tracked agent process id from a workspace (used for stale-session detection).",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -352,7 +352,7 @@ enum WorkspaceTools {
         ),
         ProgramaTool(
             name: "workspace_set_agent_pid",
-            socketMethod: "workspace.set_agent_pid",
+            socketMethod: V2MethodNames.workspaceSetAgentPid,
             description: "Registers an agent process id under a key for a workspace (used for stale-session detection and OSC suppression); does not set a visible status entry.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -365,7 +365,7 @@ enum WorkspaceTools {
         ),
         ProgramaTool(
             name: "workspace_report_meta_block",
-            socketMethod: "workspace.report_meta_block",
+            socketMethod: V2MethodNames.workspaceReportMetaBlock,
             description: "Sets (or replaces) a freeform markdown metadata block in a workspace's sidebar, distinct from the single-line status entries set by workspace_set_status.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -379,7 +379,7 @@ enum WorkspaceTools {
         ),
         ProgramaTool(
             name: "workspace_clear_meta_block",
-            socketMethod: "workspace.clear_meta_block",
+            socketMethod: V2MethodNames.workspaceClearMetaBlock,
             description: "Removes a sidebar metadata block by key.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -393,7 +393,7 @@ enum WorkspaceTools {
         ),
         ProgramaTool(
             name: "workspace_list_meta_blocks",
-            socketMethod: "workspace.list_meta_blocks",
+            socketMethod: V2MethodNames.workspaceListMetaBlocks,
             description: "Lists all sidebar metadata blocks for a workspace, in display order.",
             inputSchema: ProgramaToolSchema.object(properties: [
                 "window_id": ProgramaToolSchema.windowIdProperty,
@@ -403,7 +403,7 @@ enum WorkspaceTools {
         ),
         ProgramaTool(
             name: "workspace_reset_sidebar",
-            socketMethod: "workspace.reset_sidebar",
+            socketMethod: V2MethodNames.workspaceResetSidebar,
             description: "Clears all sidebar context for a workspace: status entries, log, progress, metadata blocks, and agent state.",
             inputSchema: ProgramaToolSchema.object(properties: [
                 "window_id": ProgramaToolSchema.windowIdProperty,
diff --git a/CLI-MCP/Tools/WorktreeTools.swift b/CLI-MCP/Tools/WorktreeTools.swift
index baf6dd9ea..b594c95fe 100644
--- a/CLI-MCP/Tools/WorktreeTools.swift
+++ b/CLI-MCP/Tools/WorktreeTools.swift
@@ -6,7 +6,7 @@ enum WorktreeTools {
     static let tools: [ProgramaTool] = [
         ProgramaTool(
             name: "worktree_create",
-            socketMethod: "worktree.create",
+            socketMethod: V2MethodNames.worktreeCreate,
             description: "Creates a new git worktree for a branch and opens it as a new workspace. Never focuses the app -- worktree.create's underlying `focus` param is intentionally not exposed here, so this tool can never raise/activate the Programa window even if asked; use focus_worktree_open afterward if you need the window brought forward.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -38,7 +38,7 @@ enum WorktreeTools {
         ),
         ProgramaTool(
             name: "worktree_remove",
-            socketMethod: "worktree.remove",
+            socketMethod: V2MethodNames.worktreeRemove,
             description: "Removes a git worktree by path or branch, closing its workspace if open. Fails if the worktree has uncommitted changes unless force is set.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
@@ -52,7 +52,7 @@ enum WorktreeTools {
         ),
         ProgramaTool(
             name: "worktree_list",
-            socketMethod: "worktree.list",
+            socketMethod: V2MethodNames.worktreeList,
             description: "Lists all git worktrees for a repository, with which ones are currently open as workspaces.",
             inputSchema: ProgramaToolSchema.object(
                 properties: [
diff --git a/GhosttyTabs.xcodeproj/project.pbxproj b/GhosttyTabs.xcodeproj/project.pbxproj
index 168edade3..e01a1fd3a 100644
--- a/GhosttyTabs.xcodeproj/project.pbxproj
+++ b/GhosttyTabs.xcodeproj/project.pbxproj
@@ -338,6 +338,7 @@
 					C1A2B3C4D5E6F70800000001 /* ProgramaConfigTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1A2B3C4D5E6F70800000002 /* ProgramaConfigTests.swift */; };
 					9EAF4699346282F2171FCDB7 /* ProgramaDirectoryTrustTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3CA3597273B50CC0592C0164 /* ProgramaDirectoryTrustTests.swift */; };
 		C7A10002 /* V2MethodNames.swift in Sources */ = {isa = PBXBuildFile; fileRef = C7A10001 /* V2MethodNames.swift */; };
+		B0F65D90C522CCE8ECCBE4AF /* V2MethodNames.swift in Sources */ = {isa = PBXBuildFile; fileRef = C7A10001 /* V2MethodNames.swift */; };
 		C7A20002 /* V2CommandCatalogContractTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C7A20001 /* V2CommandCatalogContractTests.swift */; };
 		/* End PBXBuildFile section */
 
@@ -1786,6 +1787,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				BA930A082EE6778208DFF1D5 /* programa-mcp.swift in Sources */,
+				B0F65D90C522CCE8ECCBE4AF /* V2MethodNames.swift in Sources */,
 				21C3DEC154B0CB6666377FEC /* MCPServer+Capabilities.swift in Sources */,
 				FC26678DC2FE51F6815CFB85 /* SocketPathResolution.swift in Sources */,
 				35911EB4D71E31E20BE3DACA /* MCPSocketBridge.swift in Sources */,

From bdef4470b0cd0ceb21f5ed94a0a4e70f949a9ef9 Mon Sep 17 00:00:00 2001
From: arzafran <franco@darkroom.engineering>
Date: Mon, 28 Sep 2026 11:17:56 -0300
Subject: [PATCH 15/19] fix: put the notification row menu catcher above the
 row button

---
 Sources/Update/UpdateTitlebarAccessory.swift | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Sources/Update/UpdateTitlebarAccessory.swift b/Sources/Update/UpdateTitlebarAccessory.swift
index deae936b6..4e78a55e3 100644
--- a/Sources/Update/UpdateTitlebarAccessory.swift
+++ b/Sources/Update/UpdateTitlebarAccessory.swift
@@ -1304,8 +1304,9 @@ private struct NotificationPopoverRow: View {
             // state: `onHover(false)` fires as the pointer moves from the row onto the
             // open menu, re-evaluating this view's body and rebuilding the menu, which
             // macOS then closes out from under the click. A native NSMenu shown from a
-            // right-mouse-down/ctrl-click catcher is immune to that re-evaluation.
-            .background(
+            // right-mouse-down/ctrl-click catcher is immune to that re-evaluation. It sits
+            // in an overlay so it hit-tests above the SwiftUI button.
+            .overlay(
                 NotificationRowContextMenuCatcher(
                     isRead: notification.isRead,
                     onMarkRead: onMarkRead,

From 9f46ef25bf98b6edba7cc9bcac68248b84b154b3 Mon Sep 17 00:00:00 2001
From: arzafran <franco@darkroom.engineering>
Date: Mon, 28 Sep 2026 11:20:26 -0300
Subject: [PATCH 16/19] fix: add missing catalog keys and Japanese translations

---
 Resources/Localizable.xcstrings | 10563 ++++++++++++++++++++++--------
 1 file changed, 7963 insertions(+), 2600 deletions(-)

diff --git a/Resources/Localizable.xcstrings b/Resources/Localizable.xcstrings
index 9c7160076..06fcbc952 100644
--- a/Resources/Localizable.xcstrings
+++ b/Resources/Localizable.xcstrings
@@ -228,13 +228,13 @@
         "en": {
           "stringUnit": {
             "state": "translated",
-              "value": "Comment could not be added. Use a valid line range, a file path up to 16 KB, and nonempty text up to 64 KB."
+            "value": "Comment could not be added. Use a valid line range, a file path up to 16 KB, and nonempty text up to 64 KB."
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-              "value": "コメントを追加できませんでした。有効な行範囲、16 KB 以下のファイルパス、64 KB 以下の空でない本文を使用してください。"
+            "value": "コメントを追加できませんでした。有効な行範囲、16 KB 以下のファイルパス、64 KB 以下の空でない本文を使用してください。"
           }
         }
       }
@@ -245,13 +245,13 @@
         "en": {
           "stringUnit": {
             "state": "translated",
-              "value": "This review already has 2,048 comments. Send or remove comments before adding more."
+            "value": "This review already has 2,048 comments. Send or remove comments before adding more."
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-              "value": "このレビューにはすでに 2,048 件のコメントがあります。追加する前にコメントを送信または削除してください。"
+            "value": "このレビューにはすでに 2,048 件のコメントがあります。追加する前にコメントを送信または削除してください。"
           }
         }
       }
@@ -2457,6 +2457,12 @@
             "state": "translated",
             "value": "Programa"
           }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Programa"
+          }
         }
       }
     },
@@ -2468,6 +2474,12 @@
             "state": "translated",
             "value": "Build"
           }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ビルド"
+          }
         }
       }
     },
@@ -2479,6 +2491,12 @@
             "state": "translated",
             "value": "Commit"
           }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "コミット"
+          }
         }
       }
     },
@@ -2490,6 +2508,12 @@
             "state": "translated",
             "value": "A Ghostty-based terminal with vertical tabs\nand a notification panel for macOS."
           }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "縦型タブと通知パネルを備えた\nGhosttyベースのmacOS用ターミナルです。"
+          }
         }
       }
     },
@@ -2501,6 +2525,12 @@
             "state": "translated",
             "value": "Docs"
           }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ドキュメント"
+          }
         }
       }
     },
@@ -2512,6 +2542,12 @@
             "state": "translated",
             "value": "GitHub"
           }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "GitHub"
+          }
         }
       }
     },
@@ -2523,6 +2559,12 @@
             "state": "translated",
             "value": "Licenses"
           }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ライセンス"
+          }
         }
       }
     },
@@ -2534,224 +2576,540 @@
             "state": "translated",
             "value": "Licenses file not found."
           }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ライセンスファイルが見つかりません。"
+          }
         }
       }
     },
     "agentOverview.allWorkspaces": {
       "extractionState": "manual",
       "localizations": {
-        "en": { "stringUnit": { "state": "translated", "value": "All Workspaces" } },
-        "ja": { "stringUnit": { "state": "translated", "value": "すべてのワークスペース" } }
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "All Workspaces"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "すべてのワークスペース"
+          }
+        }
       }
     },
     "agentOverview.cancel": {
       "extractionState": "manual",
       "localizations": {
-        "en": { "stringUnit": { "state": "translated", "value": "Cancel" } },
-        "ja": { "stringUnit": { "state": "translated", "value": "キャンセル" } }
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Cancel"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "キャンセル"
+          }
+        }
       }
     },
     "agentOverview.copyOutput": {
       "extractionState": "manual",
       "localizations": {
-        "en": { "stringUnit": { "state": "translated", "value": "Copy Output" } },
-        "ja": { "stringUnit": { "state": "translated", "value": "出力をコピー" } }
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Copy Output"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "出力をコピー"
+          }
+        }
       }
     },
     "agentOverview.empty.message": {
       "extractionState": "manual",
       "localizations": {
-        "en": { "stringUnit": { "state": "translated", "value": "Open a workspace in Programa, then check again." } },
-        "ja": { "stringUnit": { "state": "translated", "value": "Programa でワークスペースを開いてから、もう一度確認してください。" } }
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Open a workspace in Programa, then check again."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Programa でワークスペースを開いてから、もう一度確認してください。"
+          }
+        }
       }
     },
     "agentOverview.empty.title": {
       "extractionState": "manual",
       "localizations": {
-        "en": { "stringUnit": { "state": "translated", "value": "No workspaces to show" } },
-        "ja": { "stringUnit": { "state": "translated", "value": "表示するワークスペースがありません" } }
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "No workspaces to show"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "表示するワークスペースがありません"
+          }
+        }
       }
     },
     "agentOverview.helper": {
       "extractionState": "manual",
       "localizations": {
-        "en": { "stringUnit": { "state": "translated", "value": "Helper" } },
-        "ja": { "stringUnit": { "state": "translated", "value": "ヘルパー" } }
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Helper"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ヘルパー"
+          }
+        }
       }
     },
     "agentOverview.helperNumbered": {
       "extractionState": "manual",
       "localizations": {
-        "en": { "stringUnit": { "state": "translated", "value": "Helper %lld" } },
-        "ja": { "stringUnit": { "state": "translated", "value": "ヘルパー %lld" } }
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Helper %lld"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ヘルパー %lld"
+          }
+        }
       }
     },
     "agentOverview.hideOutput": {
       "extractionState": "manual",
       "localizations": {
-        "en": { "stringUnit": { "state": "translated", "value": "Hide Output" } },
-        "ja": { "stringUnit": { "state": "translated", "value": "出力を隠す" } }
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Hide Output"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "出力を隠す"
+          }
+        }
       }
     },
     "agentOverview.metadataSeparator": {
       "extractionState": "manual",
       "localizations": {
-        "en": { "stringUnit": { "state": "translated", "value": " · " } },
-        "ja": { "stringUnit": { "state": "translated", "value": "・" } }
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": " · "
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "・"
+          }
+        }
       }
     },
     "agentOverview.open": {
       "extractionState": "manual",
       "localizations": {
-        "en": { "stringUnit": { "state": "translated", "value": "Open" } },
-        "ja": { "stringUnit": { "state": "translated", "value": "開く" } }
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Open"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "開く"
+          }
+        }
       }
     },
     "agentOverview.output": {
       "extractionState": "manual",
       "localizations": {
-        "en": { "stringUnit": { "state": "translated", "value": "Output" } },
-        "ja": { "stringUnit": { "state": "translated", "value": "出力" } }
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Output"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "出力"
+          }
+        }
       }
     },
     "agentOverview.output.empty": {
       "extractionState": "manual",
       "localizations": {
-        "en": { "stringUnit": { "state": "translated", "value": "No output yet." } },
-        "ja": { "stringUnit": { "state": "translated", "value": "出力はまだありません。" } }
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "No output yet."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "出力はまだありません。"
+          }
+        }
       }
     },
     "agentOverview.programaOnly": {
       "extractionState": "manual",
       "localizations": {
-        "en": { "stringUnit": { "state": "translated", "value": "Shows Programa workspaces and helpers only." } },
-        "ja": { "stringUnit": { "state": "translated", "value": "Programa のワークスペースとヘルパーのみを表示します。" } }
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Shows Programa workspaces and helpers only."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Programa のワークスペースとヘルパーのみを表示します。"
+          }
+        }
       }
     },
     "agentOverview.pullRequest": {
       "extractionState": "manual",
       "localizations": {
-        "en": { "stringUnit": { "state": "translated", "value": "PR #%lld" } },
-        "ja": { "stringUnit": { "state": "translated", "value": "PR #%lld" } }
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "PR #%lld"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "PR #%lld"
+          }
+        }
       }
     },
     "agentOverview.reviewChanges": {
       "extractionState": "manual",
       "localizations": {
-        "en": { "stringUnit": { "state": "translated", "value": "Review Changes" } },
-        "ja": { "stringUnit": { "state": "translated", "value": "変更をレビュー" } }
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Review Changes"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "変更をレビュー"
+          }
+        }
       }
     },
     "agentOverview.runsWithParent": {
       "extractionState": "manual",
       "localizations": {
-        "en": { "stringUnit": { "state": "translated", "value": "Runs with parent — output is shared." } },
-        "ja": { "stringUnit": { "state": "translated", "value": "親と一緒に実行 — 出力は共有されます。" } }
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Runs with parent — output is shared."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "親と一緒に実行 — 出力は共有されます。"
+          }
+        }
       }
     },
     "agentOverview.send": {
       "extractionState": "manual",
       "localizations": {
-        "en": { "stringUnit": { "state": "translated", "value": "Send" } },
-        "ja": { "stringUnit": { "state": "translated", "value": "送信" } }
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Send"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "送信"
+          }
+        }
       }
     },
     "agentOverview.sendMessage": {
       "extractionState": "manual",
       "localizations": {
-        "en": { "stringUnit": { "state": "translated", "value": "Send Message…" } },
-        "ja": { "stringUnit": { "state": "translated", "value": "メッセージを送信…" } }
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Send Message…"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "メッセージを送信…"
+          }
+        }
       }
     },
     "agentOverview.sendMessage.placeholder": {
       "extractionState": "manual",
       "localizations": {
-        "en": { "stringUnit": { "state": "translated", "value": "Type a message" } },
-        "ja": { "stringUnit": { "state": "translated", "value": "メッセージを入力" } }
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Type a message"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "メッセージを入力"
+          }
+        }
       }
     },
     "agentOverview.sendMessage.title": {
       "extractionState": "manual",
       "localizations": {
-        "en": { "stringUnit": { "state": "translated", "value": "Send a Message" } },
-        "ja": { "stringUnit": { "state": "translated", "value": "メッセージを送信" } }
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Send a Message"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "メッセージを送信"
+          }
+        }
       }
     },
     "agentOverview.showOutput": {
       "extractionState": "manual",
       "localizations": {
-        "en": { "stringUnit": { "state": "translated", "value": "Show Output" } },
-        "ja": { "stringUnit": { "state": "translated", "value": "出力を表示" } }
-      }
-    },
-    "agentOverview.state.done": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": { "stringUnit": { "state": "translated", "value": "Done" } },
-        "ja": { "stringUnit": { "state": "translated", "value": "完了" } }
-      }
-    },
-    "agentOverview.state.failed": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Show Output"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "出力を表示"
+          }
+        }
+      }
+    },
+    "agentOverview.state.done": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Done"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "完了"
+          }
+        }
+      }
+    },
+    "agentOverview.state.failed": {
       "extractionState": "manual",
       "localizations": {
-        "en": { "stringUnit": { "state": "translated", "value": "Failed" } },
-        "ja": { "stringUnit": { "state": "translated", "value": "失敗" } }
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Failed"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "失敗"
+          }
+        }
       }
     },
     "agentOverview.state.idle": {
       "extractionState": "manual",
       "localizations": {
-        "en": { "stringUnit": { "state": "translated", "value": "Idle" } },
-        "ja": { "stringUnit": { "state": "translated", "value": "待機中" } }
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Idle"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "待機中"
+          }
+        }
       }
     },
     "agentOverview.state.needsInput": {
       "extractionState": "manual",
       "localizations": {
-        "en": { "stringUnit": { "state": "translated", "value": "Needs input" } },
-        "ja": { "stringUnit": { "state": "translated", "value": "入力待ち" } }
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Needs input"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "入力待ち"
+          }
+        }
       }
     },
     "agentOverview.state.stopped": {
       "extractionState": "manual",
       "localizations": {
-        "en": { "stringUnit": { "state": "translated", "value": "Stopped" } },
-        "ja": { "stringUnit": { "state": "translated", "value": "停止" } }
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Stopped"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "停止"
+          }
+        }
       }
     },
     "agentOverview.state.working": {
       "extractionState": "manual",
       "localizations": {
-        "en": { "stringUnit": { "state": "translated", "value": "Working" } },
-        "ja": { "stringUnit": { "state": "translated", "value": "作業中" } }
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Working"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "作業中"
+          }
+        }
       }
     },
     "agentOverview.stop": {
       "extractionState": "manual",
       "localizations": {
-        "en": { "stringUnit": { "state": "translated", "value": "Stop" } },
-        "ja": { "stringUnit": { "state": "translated", "value": "停止" } }
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Stop"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "停止"
+          }
+        }
       }
     },
     "agentOverview.terminal": {
       "extractionState": "manual",
       "localizations": {
-        "en": { "stringUnit": { "state": "translated", "value": "Terminal" } },
-        "ja": { "stringUnit": { "state": "translated", "value": "ターミナル" } }
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Terminal"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ターミナル"
+          }
+        }
       }
     },
     "agentOverview.title": {
       "extractionState": "manual",
       "localizations": {
-        "en": { "stringUnit": { "state": "translated", "value": "Agent Overview" } },
-        "ja": { "stringUnit": { "state": "translated", "value": "エージェント概要" } }
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Agent Overview"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "エージェント概要"
+          }
+        }
       }
     },
     "agentOverview.window": {
       "extractionState": "manual",
       "localizations": {
-        "en": { "stringUnit": { "state": "translated", "value": "Window %lld" } },
-        "ja": { "stringUnit": { "state": "translated", "value": "ウインドウ %lld" } }
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Window %lld"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ウインドウ %lld"
+          }
+        }
       }
     },
     "about.licenses.windowTitle": {
@@ -2762,6 +3120,12 @@
             "state": "translated",
             "value": "Third-Party Licenses"
           }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "サードパーティライセンス"
+          }
         }
       }
     },
@@ -2773,6 +3137,12 @@
             "state": "translated",
             "value": "Version"
           }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "バージョン"
+          }
         }
       }
     },
@@ -2784,6 +3154,12 @@
             "state": "translated",
             "value": "%1$@, workspace %2$lld of %3$lld"
           }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "%1$@、ワークスペース %2$lld / %3$lld"
+          }
         }
       }
     },
@@ -2795,6 +3171,12 @@
             "state": "translated",
             "value": "Cancel"
           }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "キャンセル"
+          }
         }
       }
     },
@@ -2806,6 +3188,12 @@
             "state": "translated",
             "value": "Apply"
           }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "適用"
+          }
         }
       }
     },
@@ -2817,6 +3205,12 @@
             "state": "translated",
             "value": "Cancel"
           }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "キャンセル"
+          }
         }
       }
     },
@@ -2828,6 +3222,12 @@
             "state": "translated",
             "value": "Enter a hex color in the format #RRGGBB."
           }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "16進数カラーを #RRGGBB の形式で入力してください。"
+          }
         }
       }
     },
@@ -2837,10877 +3237,15840 @@
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Custom Workspace Color"
+            "value": "Custom Workspace Color"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "カスタムワークスペースカラー"
+          }
+        }
+      }
+    },
+    "alert.customTabColor.title": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Custom Tab Color"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "タブのカスタムカラー"
+          }
+        }
+      }
+    },
+    "alert.invalidColor.emptyMessage": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Enter a hex color in the format #RRGGBB."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "16進数カラーを #RRGGBB の形式で入力してください。"
+          }
+        }
+      }
+    },
+    "alert.invalidColor.invalidMessage": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "\"%@\" is not a valid hex color. Use #RRGGBB."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "「%@」は有効な16進数カラーではありません。#RRGGBB の形式で入力してください。"
+          }
+        }
+      }
+    },
+    "alert.invalidColor.ok": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "OK"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "OK"
+          }
+        }
+      }
+    },
+    "alert.invalidColor.title": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Invalid Color"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "無効なカラー"
+          }
+        }
+      }
+    },
+    "alert.moveTab.failed.message": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Programa could not move this tab to the selected destination."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Programa はこのタブを選択した移動先に移動できませんでした。"
+          }
+        }
+      }
+    },
+    "alert.moveTab.failed.title": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Move Failed"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "移動に失敗しました"
+          }
+        }
+      }
+    },
+    "alert.moveTab.message": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Choose a destination for this tab."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "このタブの移動先を選択してください。"
+          }
+        }
+      }
+    },
+    "alert.moveTab.move": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Move"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "移動"
+          }
+        }
+      }
+    },
+    "alert.moveTab.newWorkspaceInCurrentWindow": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "New Workspace in Current Window"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "現在のウインドウに新規ワークスペース"
+          }
+        }
+      }
+    },
+    "alert.moveTab.selectedWorkspaceInNewWindow": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Selected Workspace in New Window"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "新規ウインドウに選択したワークスペース"
+          }
+        }
+      }
+    },
+    "alert.moveTab.title": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Move Tab"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "タブを移動"
+          }
+        }
+      }
+    },
+    "alert.ok": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "OK"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "OK"
+          }
+        }
+      }
+    },
+    "alert.renameTab.message": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Enter a custom name for this tab."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "このタブのカスタム名を入力してください。"
+          }
+        }
+      }
+    },
+    "alert.renameTab.placeholder": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Tab name"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "タブ名"
+          }
+        }
+      }
+    },
+    "alert.renameTab.rename": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Rename"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "名前を変更"
+          }
+        }
+      }
+    },
+    "alert.renameTab.title": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Rename Tab"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "タブの名前を変更"
+          }
+        }
+      }
+    },
+    "alert.newWorktreeWorkspace.branchRequired": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Enter a branch name."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ブランチ名を入力してください。"
+          }
+        }
+      }
+    },
+    "alert.newWorktreeWorkspace.cancel": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Cancel"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "キャンセル"
+          }
+        }
+      }
+    },
+    "alert.newWorktreeWorkspace.create": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Create"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "作成"
+          }
+        }
+      }
+    },
+    "alert.newWorktreeWorkspace.message": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Enter the branch to create or open in a new worktree."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "新しいワークツリーで作成または開くブランチを入力してください。"
+          }
+        }
+      }
+    },
+    "alert.newWorktreeWorkspace.placeholder": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "feature/my-branch"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "feature/my-branch"
+          }
+        }
+      }
+    },
+    "alert.newWorktreeWorkspace.title": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "New Worktree Workspace"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "新しいワークツリーワークスペース"
+          }
+        }
+      }
+    },
+    "alert.renameWorkspace.cancel": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Cancel"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "キャンセル"
+          }
+        }
+      }
+    },
+    "alert.renameWorkspace.message": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Enter a custom name for this workspace."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "このワークスペースのカスタム名を入力してください。"
+          }
+        }
+      }
+    },
+    "alert.renameWorkspace.placeholder": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Workspace name"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ワークスペース名"
+          }
+        }
+      }
+    },
+    "alert.renameWorkspace.rename": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Rename"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "名前を変更"
+          }
+        }
+      }
+    },
+    "alert.renameWorkspace.title": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Rename Workspace"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ワークスペースの名前を変更"
+          }
+        }
+      }
+    },
+    "alert.worktreeFolder.branchCheckedOut": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "That branch is already checked out at %@."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "そのブランチはすでに %@ でチェックアウトされています。"
+          }
+        }
+      }
+    },
+    "alert.worktreeFolder.createFailed.title": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Couldn’t Create Worktree"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ワークツリーを作成できませんでした"
+          }
+        }
+      }
+    },
+    "alert.worktreeFolder.notGitRepo.message": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "This workspace is not inside a Git repository."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "このワークスペースは Git リポジトリ内にありません。"
+          }
+        }
+      }
+    },
+    "alert.worktreeFolder.notGitRepo.title": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Git Repository Required"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Git リポジトリが必要です"
+          }
+        }
+      }
+    },
+    "alert.worktreeFolder.ok": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "OK"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "OK"
+          }
+        }
+      }
+    },
+    "alert.worktreeFolder.pathExists": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "A file or folder already exists at %@."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "%@ にはすでにファイルまたはフォルダがあります。"
+          }
+        }
+      }
+    },
+    "appearance.auto": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Auto"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "自動"
+          }
+        }
+      }
+    },
+    "appearance.dark": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Dark"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ダーク"
+          }
+        }
+      }
+    },
+    "appearance.light": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Light"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ライト"
+          }
+        }
+      }
+    },
+    "appearance.system": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "System"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "システム"
+          }
+        }
+      }
+    },
+    "barBackground (tab chrome)": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "barBackground (tab chrome)"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "barBackground (tab chrome)"
+          }
+        }
+      }
+    },
+    "browser.addressBar.placeholder": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Search or enter URL"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "検索またはURLを入力"
+          }
+        }
+      }
+    },
+    "browser.addressBarSuggestions": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Address bar suggestions"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "アドレスバーの候補"
+          }
+        }
+      }
+    },
+    "browser.alwaysAllowHost": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Always allow this host in Programa"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "このホストをProgramaで常に許可する"
+          }
+        }
+      }
+    },
+    "browser.contextMenu.openLinkInDefaultBrowser": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Open Link in Default Browser"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "リンクを既定のブラウザで開く"
+          }
+        }
+      }
+    },
+    "browser.contextMenu.openLinkInNewTab": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Open Link in New Tab"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "リンクを新規タブで開く"
+          }
+        }
+      }
+    },
+    "browser.dialog.pageSays": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "This page says:"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "このページのメッセージ:"
+          }
+        }
+      }
+    },
+    "browser.dialog.pageSaysAt": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "The page at %@ says:"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "%@ のページのメッセージ:"
+          }
+        }
+      }
+    },
+    "browser.downloadInProgress": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Download in progress"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ダウンロード中"
+          }
+        }
+      }
+    },
+    "browser.downloading": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Downloading..."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ダウンロード中..."
+          }
+        }
+      }
+    },
+    "browser.error.cantOpen.title": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Can't open this page"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "このページを開けません"
+          }
+        }
+      }
+    },
+    "browser.error.cantReach.messageSite": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "The site refused to connect. Check that a server is running on this address."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "このサイトへの接続が拒否されました。このアドレスでサーバーが実行されているか確認してください。"
+          }
+        }
+      }
+    },
+    "browser.error.cantReach.messageURL": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "%@ refused to connect. Check that a server is running on this address."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "%@ への接続が拒否されました。このアドレスでサーバーが実行されているか確認してください。"
+          }
+        }
+      }
+    },
+    "browser.error.cantReach.title": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Can't reach this page"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "このページに接続できません"
+          }
+        }
+      }
+    },
+    "browser.error.checkNetwork": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Check your network connection and try again."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ネットワーク接続を確認して、もう一度お試しください。"
+          }
+        }
+      }
+    },
+    "browser.error.insecure.message": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "%@ uses plain HTTP, so traffic can be read or modified on the network.\n\nOpen this URL in your default browser, or proceed in Programa."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "%@ はプレーンな HTTP を使用しているため、通信内容がネットワーク上で読み取られたり改ざんされたりする可能性があります。\n\nこのURLを既定のブラウザで開くか、そのままProgramaで続行してください。"
+          }
+        }
+      }
+    },
+    "browser.error.insecure.title": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Connection isn't secure"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "接続が安全ではありません"
+          }
+        }
+      }
+    },
+    "browser.error.invalidCertificate": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "The certificate for this site is invalid."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "このサイトの証明書は無効です。"
+          }
+        }
+      }
+    },
+    "browser.error.noInternet": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "No internet connection"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "インターネットに接続されていません"
+          }
+        }
+      }
+    },
+    "browser.error.reload": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Reload"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "再読み込み"
+          }
+        }
+      }
+    },
+    "browser.goBack": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Go Back"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "戻る"
+          }
+        }
+      }
+    },
+    "browser.goForward": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Go Forward"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "進む"
+          }
+        }
+      }
+    },
+    "browser.newTab": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "New tab"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "新規タブ"
+          }
+        }
+      }
+    },
+    "browser.omnibar.accessibilityLabel": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Browser omnibar"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ブラウザのアドレスバー"
+          }
+        }
+      }
+    },
+    "browser.openInDefaultBrowser": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Open in Default Browser"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "既定のブラウザで開く"
+          }
+        }
+      }
+    },
+    "browser.passkeyHandoff.message": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "This page is asking for a passkey, which the built-in browser can't provide. You can finish signing in with your default browser."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "このページはパスキーを要求していますが、内蔵ブラウザでは利用できません。既定のブラウザでサインインを完了できます。"
+          }
+        }
+      }
+    },
+    "browser.passkeyHandoff.title": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Passkeys aren't available in the built-in browser yet"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "パスキーは内蔵ブラウザではまだ利用できません"
+          }
+        }
+      }
+    },
+    "browser.popup.loadingTitle": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Loading…"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "読み込み中…"
+          }
+        }
+      }
+    },
+    "browser.profile.buttonHelp": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Browser Profile: %@"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ブラウザプロファイル: %@"
+          }
+        }
+      }
+    },
+    "browser.profile.default": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Default"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "デフォルト"
+          }
+        }
+      }
+    },
+    "browser.profile.menu.title": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Profiles"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "プロファイル"
+          }
+        }
+      }
+    },
+    "browser.profile.new": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "New Profile..."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "新規プロファイル..."
+          }
+        }
+      }
+    },
+    "browser.profile.new.message": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Create a separate browser profile for cookies, history, and local storage."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Cookie、履歴、ローカルストレージ用に独立したブラウザプロファイルを作成します。"
+          }
+        }
+      }
+    },
+    "browser.profile.new.placeholder": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Profile name"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "プロファイル名"
+          }
+        }
+      }
+    },
+    "browser.profile.new.title": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "New Browser Profile"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "新規ブラウザプロファイル"
+          }
+        }
+      }
+    },
+    "browser.profile.rename": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Rename Current Profile..."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "現在のプロファイルの名前を変更..."
+          }
+        }
+      }
+    },
+    "browser.profile.rename.message": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Choose a new name for this browser profile."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "このブラウザプロファイルの新しい名前を選択してください。"
+          }
+        }
+      }
+    },
+    "browser.profile.rename.title": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Rename Browser Profile"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ブラウザプロファイルの名前を変更"
+          }
+        }
+      }
+    },
+    "browser.reload": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Reload"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "再読み込み"
+          }
+        }
+      }
+    },
+    "browser.stop": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Stop"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "停止"
+          }
+        }
+      }
+    },
+    "browser.switchToTab": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Switch to tab"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "タブに切り替え"
+          }
+        }
+      }
+    },
+    "browser.theme.buttonHelp": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Browser Theme: %@"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ブラウザテーマ: %@"
+          }
+        }
+      }
+    },
+    "browser.toggleDevTools": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Toggle Developer Tools"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "開発者ツールの表示を切り替え"
+          }
+        }
+      }
+    },
+    "cli.claude-teams.usage": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Usage: programa claude-teams [claude-args...]\n\nLaunch Claude Code with agent teams enabled.\n\nThis command:\n  - defaults Claude teammate mode to auto\n  - sets a tmux-like environment so Claude can open Programa helper workspaces\n  - sets CLAUDE_CODE_EXPERIMENTAL_AGENT_TEAMS=1\n  - prepends a private tmux shim to PATH\n  - forwards all remaining arguments to claude\n\nThe tmux shim turns supported tmux window/pane commands into nested helper\nworkspaces in the current Programa window.\n\nExamples:\n  programa claude-teams\n  programa claude-teams --continue\n  programa claude-teams --model sonnet"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "使用方法: programa claude-teams [claude-args...]\n\nエージェントチームを有効にして Claude Code を起動します。\n\nこのコマンドは次の処理を行います:\n  - Claude のチームメイトモードをデフォルトで auto に設定\n  - Claude が Programa のヘルパーワークスペースを開ける tmux 互換環境を設定\n  - CLAUDE_CODE_EXPERIMENTAL_AGENT_TEAMS=1 を設定\n  - 専用の tmux シムを PATH の先頭に追加\n  - 残りの引数をすべて claude に渡す\n\ntmux シムは対応する tmux の window/pane コマンドを、現在の Programa\nウインドウ内にあるネストされたヘルパーワークスペースへ変換します。\n\n例:\n  programa claude-teams\n  programa claude-teams --continue\n  programa claude-teams --model sonnet"
+          }
+        }
+      }
+    },
+    "cli.install.adminRequired": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Administrator privileges were required to write to /usr/local/bin."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "/usr/local/bin への書き込みには管理者権限が必要でした。"
+          }
+        }
+      }
+    },
+    "cli.install.symlinkCreated": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Created symlink:\n\n%1$@ -> %2$@"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "シンボリックリンクを作成しました:\n\n%1$@ -> %2$@"
+          }
+        }
+      }
+    },
+    "cli.installFailed": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Couldn't Install Programa CLI"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Programa CLI をインストールできませんでした"
+          }
+        }
+      }
+    },
+    "cli.installed": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Programa CLI Installed"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Programa CLI をインストールしました"
+          }
+        }
+      }
+    },
+    "cli.omo.usage": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Usage: programa omo [opencode-args...]\n\nLaunch OpenCode with oh-my-openagent in a Programa-aware environment.\n\noh-my-openagent orchestrates multiple AI models as specialized agents in\nparallel. This command sets up a tmux shim so agent panes become native\nPrograma splits with sidebar metadata and notifications.\n\nThis command:\n  - sets a tmux-like environment so oh-my-openagent uses Programa splits\n  - prepends a private tmux shim to PATH\n  - forwards all remaining arguments to opencode\n\nThe tmux shim translates tmux window/pane commands into Programa workspace\nand split operations in the current Programa session.\n\nExamples:\n  programa omo\n  programa omo --continue\n  programa omo --model claude-sonnet-4-6"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "使用方法: programa omo [opencode-args...]\n\nPrograma対応環境でoh-my-openagentを使ってOpenCodeを起動します。\n\noh-my-openagentは複数のAIモデルを専門エージェントとして並列に\nオーケストレーションします。このコマンドはtmuxシムを設定し、エージェントペインを\nサイドバーメタデータと通知を備えたネイティブなPrograma分割にします。\n\nこのコマンドは次の処理を行います:\n  - oh-my-openagentがProgramaの分割を使用するようtmux互換環境を設定\n  - 専用のtmuxシムをPATHの先頭に追加\n  - 残りの引数をすべてopencodeに渡す\n\ntmuxシムは、tmuxのwindow/paneコマンドを、現在のProgramaセッションにおける\nワークスペースと分割の操作に変換します。\n\n例:\n  programa omo\n  programa omo --continue\n  programa omo --model claude-sonnet-4-6"
+          }
+        }
+      }
+    },
+    "cli.uninstall.adminRequired": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Administrator privileges were required to modify /usr/local/bin."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "/usr/local/bin の変更には管理者権限が必要でした。"
+          }
+        }
+      }
+    },
+    "cli.uninstall.notFound": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "No Programa CLI symlink was found at %@."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "%@ に Programa CLI のシンボリックリンクが見つかりませんでした。"
+          }
+        }
+      }
+    },
+    "cli.uninstall.removed": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Removed %@."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "%@ を削除しました。"
+          }
+        }
+      }
+    },
+    "cli.uninstallFailed": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Couldn't Uninstall Programa CLI"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Programa CLI をアンインストールできませんでした"
+          }
+        }
+      }
+    },
+    "cli.uninstalled": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Programa CLI Uninstalled"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Programa CLI をアンインストールしました"
+          }
+        }
+      }
+    },
+    "command.applyLayout.subtitle": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Layout"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "レイアウト"
+          }
+        }
+      }
+    },
+    "command.applyLayout.title": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Apply layout: %@"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "レイアウトを適用: %@"
+          }
+        }
+      }
+    },
+    "command.applyUpdateIfAvailable.subtitle": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Global"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "グローバル"
+          }
+        }
+      }
+    },
+    "command.applyUpdateIfAvailable.title": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Apply Update (If Available)"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "アップデートを適用（利用可能な場合）"
+          }
+        }
+      }
+    },
+    "command.attemptUpdate.subtitle": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Global"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "グローバル"
+          }
+        }
+      }
+    },
+    "command.attemptUpdate.title": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Attempt Update"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "アップデートを試みる"
+          }
+        }
+      }
+    },
+    "command.browserBack.title": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Back"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "戻る"
+          }
+        }
+      }
+    },
+    "command.browserClearHistory.subtitle": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Browser"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ブラウザ"
+          }
+        }
+      }
+    },
+    "command.browserClearHistory.title": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Clear Browser History"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ブラウザ履歴を消去"
+          }
+        }
+      }
+    },
+    "command.browserConsole.title": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Show JavaScript Console"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "JavaScriptコンソールを表示"
+          }
+        }
+      }
+    },
+    "command.browserDesignMode.title": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Toggle Design Mode"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "デザインモードを切り替え"
+          }
+        }
+      }
+    },
+    "command.browserDuplicateRight.subtitle": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Browser Layout"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ブラウザレイアウト"
+          }
+        }
+      }
+    },
+    "command.browserDuplicateRight.title": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Duplicate Browser to the Right"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ブラウザを右側に複製"
+          }
+        }
+      }
+    },
+    "command.browserFocusAddressBar.title": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Focus Address Bar"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "アドレスバーにフォーカス"
+          }
+        }
+      }
+    },
+    "command.browserForward.title": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Forward"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "進む"
+          }
+        }
+      }
+    },
+    "command.browserOpenDefault.title": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Open Current Page in Default Browser"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "現在のページを既定のブラウザで開く"
+          }
+        }
+      }
+    },
+    "command.browserReload.title": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Reload Page"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ページを再読み込み"
+          }
+        }
+      }
+    },
+    "command.browserSplitDown.subtitle": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Browser Layout"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ブラウザレイアウト"
+          }
+        }
+      }
+    },
+    "command.browserSplitDown.title": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Split Browser Down"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ブラウザを下に分割"
+          }
+        }
+      }
+    },
+    "command.browserSplitRight.subtitle": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Browser Layout"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ブラウザレイアウト"
+          }
+        }
+      }
+    },
+    "command.browserSplitRight.title": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Split Browser Right"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ブラウザを右に分割"
+          }
+        }
+      }
+    },
+    "command.browserToggleDevTools.title": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Toggle Developer Tools"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "開発者ツールの表示を切り替え"
+          }
+        }
+      }
+    },
+    "command.browserZoomIn.title": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Zoom In"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "拡大"
+          }
+        }
+      }
+    },
+    "command.browserZoomOut.title": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Zoom Out"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "縮小"
+          }
+        }
+      }
+    },
+    "command.browserZoomReset.title": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Actual Size"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "実際のサイズ"
+          }
+        }
+      }
+    },
+    "command.checkForUpdates.subtitle": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Global"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "グローバル"
+          }
+        }
+      }
+    },
+    "command.checkForUpdates.title": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Check for Updates"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "アップデートを確認"
+          }
+        }
+      }
+    },
+    "command.clearTabName.title": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Clear Tab Name"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "タブ名をクリア"
+          }
+        }
+      }
+    },
+    "command.clearWorkspaceDescription.title": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Clear Workspace Description"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ワークスペースの説明をクリア"
+          }
+        }
+      }
+    },
+    "command.clearWorkspaceName.title": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Clear Workspace Name"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ワークスペース名をクリア"
+          }
+        }
+      }
+    },
+    "command.closeTab.subtitle": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Tab"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "タブ"
+          }
+        }
+      }
+    },
+    "command.closeTab.title": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Close Tab"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "タブを閉じる"
+          }
+        }
+      }
+    },
+    "command.closeWindow.subtitle": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Window"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ウインドウ"
+          }
+        }
+      }
+    },
+    "command.closeWindow.title": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Close Window"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ウインドウを閉じる"
+          }
+        }
+      }
+    },
+    "command.closeWorkspace.subtitle": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Workspace"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ワークスペース"
+          }
+        }
+      }
+    },
+    "command.closeWorkspace.title": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Close Workspace"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ワークスペースを閉じる"
+          }
+        }
+      }
+    },
+    "command.cmuxConfig.customTitle": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Custom: %@"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "カスタム: %@"
+          }
+        }
+      }
+    },
+    "command.cmuxConfig.recipeTitle": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Recipe: %@"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "レシピ: %@"
+          }
+        }
+      }
+    },
+    "command.cmuxConfig.subtitle": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "programa.json"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "programa.json"
+          }
+        }
+      }
+    },
+    "command.disableMinimalMode.title": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Disable Minimal Mode"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ミニマルモードを無効にする"
+          }
+        }
+      }
+    },
+    "command.editWorkspaceDescription.title": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Edit Workspace Description…"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ワークスペースの説明を編集…"
+          }
+        }
+      }
+    },
+    "command.enableMinimalMode.title": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Enable Minimal Mode"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ミニマルモードを有効にする"
+          }
+        }
+      }
+    },
+    "command.equalizeSplits.title": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Equalize Splits"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "分割を均等にする"
+          }
+        }
+      }
+    },
+    "command.installCLI.subtitle": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "CLI"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "CLI"
+          }
+        }
+      }
+    },
+    "command.installCLI.title": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Shell Command: Install 'programa' in PATH"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "シェルコマンド: PATH に 'programa' をインストール"
+          }
+        }
+      }
+    },
+    "command.jumpUnread.subtitle": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Notifications"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "通知"
+          }
+        }
+      }
+    },
+    "command.jumpUnread.title": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Jump to Latest Unread"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "最新の未読へジャンプ"
+          }
+        }
+      }
+    },
+    "command.markTabRead.title": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Mark Tab as Read"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "タブを既読にする"
+          }
+        }
+      }
+    },
+    "command.markTabUnread.title": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Mark Tab as Unread"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "タブを未読にする"
+          }
+        }
+      }
+    },
+    "command.newBrowserTab.subtitle": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Tab"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "タブ"
           }
         }
       }
     },
-    "alert.customTabColor.title": {
+    "command.newBrowserTab.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Custom Tab Color"
+            "value": "New Tab (Browser)"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "タブのカスタムカラー"
+            "value": "新規タブ（ブラウザ）"
           }
         }
       }
     },
-    "alert.invalidColor.emptyMessage": {
+    "command.newClaudeWorkspace.subtitle": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Enter a hex color in the format #RRGGBB."
+            "value": "Open a new workspace running Claude Code in the current project"
           }
-        }
-      }
-    },
-    "alert.invalidColor.invalidMessage": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "\"%@\" is not a valid hex color. Use #RRGGBB."
+            "value": "現在のプロジェクトで Claude Code を起動する新しいワークスペースを開く"
           }
         }
       }
     },
-    "alert.invalidColor.ok": {
+    "command.newClaudeWorkspace.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "OK"
+            "value": "New Claude Code Workspace"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "新規 Claude Code ワークスペース"
           }
         }
       }
     },
-    "alert.invalidColor.title": {
+    "command.newTerminalTab.subtitle": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Invalid Color"
+            "value": "Tab"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "タブ"
           }
         }
       }
     },
-    "alert.moveTab.failed.message": {
+    "command.newTerminalTab.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Programa could not move this tab to the selected destination."
+            "value": "New Tab (Terminal)"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "新規タブ（ターミナル）"
           }
         }
       }
     },
-    "alert.moveTab.failed.title": {
+    "command.newWindow.subtitle": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Move Failed"
+            "value": "Window"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ウインドウ"
           }
         }
       }
     },
-    "alert.moveTab.message": {
+    "command.newWindow.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Choose a destination for this tab."
+            "value": "New Window"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "新規ウインドウ"
           }
         }
       }
     },
-    "alert.moveTab.move": {
+    "command.newWorkspace.subtitle": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Move"
+            "value": "Workspace"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ワークスペース"
           }
         }
       }
     },
-    "alert.moveTab.newWorkspaceInCurrentWindow": {
+    "command.newWorkspace.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "New Workspace in Current Window"
+            "value": "New Workspace"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "新規ワークスペース"
           }
         }
       }
     },
-    "alert.moveTab.selectedWorkspaceInNewWindow": {
+    "command.nextTabInPane.subtitle": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Selected Workspace in New Window"
+            "value": "Tab Navigation"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "タブ移動"
           }
         }
       }
     },
-    "alert.moveTab.title": {
+    "command.nextTabInPane.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Move Tab"
+            "value": "Next Tab in Pane"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ペイン内の次のタブ"
           }
         }
       }
     },
-    "alert.ok": {
+    "command.nextWorkspace.subtitle": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "OK"
+            "value": "Workspace Navigation"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ワークスペース移動"
           }
         }
       }
     },
-    "alert.renameTab.message": {
+    "command.nextWorkspace.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Enter a custom name for this tab."
+            "value": "Next Workspace"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "次のワークスペース"
           }
         }
       }
     },
-    "alert.renameTab.placeholder": {
+    "command.openFolder.subtitle": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Tab name"
+            "value": "Workspace"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ワークスペース"
           }
         }
       }
     },
-    "alert.renameTab.rename": {
+    "command.openFolder.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Rename"
+            "value": "Open Folder…"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "フォルダを開く…"
           }
         }
       }
     },
-    "alert.renameTab.title": {
+    "command.openReviewPanel.subtitle": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Rename Tab"
+            "value": "Diff of the focused terminal's repo"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "フォーカス中ターミナルのリポジトリの差分"
           }
         }
       }
     },
-    "alert.newWorktreeWorkspace.branchRequired": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": { "stringUnit": { "state": "translated", "value": "Enter a branch name." } },
-        "ja": { "stringUnit": { "state": "translated", "value": "ブランチ名を入力してください。" } }
-      }
-    },
-    "alert.newWorktreeWorkspace.cancel": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": { "stringUnit": { "state": "translated", "value": "Cancel" } },
-        "ja": { "stringUnit": { "state": "translated", "value": "キャンセル" } }
-      }
-    },
-    "alert.newWorktreeWorkspace.create": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": { "stringUnit": { "state": "translated", "value": "Create" } },
-        "ja": { "stringUnit": { "state": "translated", "value": "作成" } }
-      }
-    },
-    "alert.newWorktreeWorkspace.message": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": { "stringUnit": { "state": "translated", "value": "Enter the branch to create or open in a new worktree." } },
-        "ja": { "stringUnit": { "state": "translated", "value": "新しいワークツリーで作成または開くブランチを入力してください。" } }
-      }
-    },
-    "alert.newWorktreeWorkspace.placeholder": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": { "stringUnit": { "state": "translated", "value": "feature/my-branch" } },
-        "ja": { "stringUnit": { "state": "translated", "value": "feature/my-branch" } }
-      }
-    },
-    "alert.newWorktreeWorkspace.title": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": { "stringUnit": { "state": "translated", "value": "New Worktree Workspace" } },
-        "ja": { "stringUnit": { "state": "translated", "value": "新しいワークツリーワークスペース" } }
-      }
-    },
-    "alert.renameWorkspace.cancel": {
+    "command.openReviewPanel.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Cancel"
+            "value": "Open Review Panel"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "レビューパネルを開く"
           }
         }
       }
     },
-    "alert.renameWorkspace.message": {
+    "command.openSettings.subtitle": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Enter a custom name for this workspace."
+            "value": "Global"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "グローバル"
           }
         }
       }
     },
-    "alert.renameWorkspace.placeholder": {
+    "command.openSettings.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Workspace name"
+            "value": "Open Settings"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "設定を開く"
           }
         }
       }
     },
-    "alert.renameWorkspace.rename": {
+    "command.openWorkspacePRLinks.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Rename"
+            "value": "Open All Workspace PR Links"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ワークスペースのすべてのPRリンクを開く"
           }
         }
       }
     },
-    "alert.renameWorkspace.title": {
+    "command.pinTab.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Rename Workspace"
+            "value": "Pin Tab"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "タブをピン留め"
           }
         }
       }
     },
-    "alert.worktreeFolder.branchCheckedOut": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": { "stringUnit": { "state": "translated", "value": "That branch is already checked out at %@." } },
-        "ja": { "stringUnit": { "state": "translated", "value": "そのブランチはすでに %@ でチェックアウトされています。" } }
-      }
-    },
-    "alert.worktreeFolder.createFailed.title": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": { "stringUnit": { "state": "translated", "value": "Couldn’t Create Worktree" } },
-        "ja": { "stringUnit": { "state": "translated", "value": "ワークツリーを作成できませんでした" } }
-      }
-    },
-    "alert.worktreeFolder.notGitRepo.message": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": { "stringUnit": { "state": "translated", "value": "This workspace is not inside a Git repository." } },
-        "ja": { "stringUnit": { "state": "translated", "value": "このワークスペースは Git リポジトリ内にありません。" } }
-      }
-    },
-    "alert.worktreeFolder.notGitRepo.title": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": { "stringUnit": { "state": "translated", "value": "Git Repository Required" } },
-        "ja": { "stringUnit": { "state": "translated", "value": "Git リポジトリが必要です" } }
-      }
-    },
-    "alert.worktreeFolder.ok": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": { "stringUnit": { "state": "translated", "value": "OK" } },
-        "ja": { "stringUnit": { "state": "translated", "value": "OK" } }
-      }
-    },
-    "alert.worktreeFolder.pathExists": {
+    "command.pinWorkspace.title": {
       "extractionState": "manual",
       "localizations": {
-        "en": { "stringUnit": { "state": "translated", "value": "A file or folder already exists at %@." } },
-        "ja": { "stringUnit": { "state": "translated", "value": "%@ にはすでにファイルまたはフォルダがあります。" } }
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Pin Workspace"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ワークスペースをピン留め"
+          }
+        }
       }
     },
-    "appearance.auto": {
+    "command.previousTabInPane.subtitle": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Auto"
+            "value": "Tab Navigation"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "タブ移動"
           }
         }
       }
     },
-    "appearance.dark": {
+    "command.previousTabInPane.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Dark"
+            "value": "Previous Tab in Pane"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ペイン内の前のタブ"
           }
         }
       }
     },
-    "appearance.light": {
+    "command.previousWorkspace.subtitle": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Light"
+            "value": "Workspace Navigation"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ワークスペース移動"
           }
         }
       }
     },
-    "appearance.system": {
+    "command.previousWorkspace.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "System"
+            "value": "Previous Workspace"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "前のワークスペース"
           }
         }
       }
     },
-    "barBackground (tab chrome)": {
+    "command.reloadConfiguration.subtitle": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "barBackground (tab chrome)"
+            "value": "Re-read settings.json and programa.json"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "barBackground (tab chrome)"
+            "value": "settings.json と programa.json を再読み込みします"
           }
         }
       }
     },
-    "browser.addressBar.placeholder": {
+    "command.reloadConfiguration.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Search or enter URL"
+            "value": "Reload Configuration"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "設定を再読み込み"
           }
         }
       }
     },
-    "browser.addressBarSuggestions": {
+    "command.renameTab.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Address bar suggestions"
+            "value": "Rename Tab…"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "タブの名前を変更…"
           }
         }
       }
     },
-    "browser.alwaysAllowHost": {
+    "command.renameWorkspace.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Always allow this host in Programa"
+            "value": "Rename Workspace…"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ワークスペースの名前を変更…"
           }
         }
       }
     },
-    "browser.contextMenu.openLinkInDefaultBrowser": {
+    "command.reopenClosedBrowserTab.subtitle": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Open Link in Default Browser"
+            "value": "Browser"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ブラウザ"
           }
         }
       }
     },
-    "browser.contextMenu.openLinkInNewTab": {
+    "command.reopenClosedBrowserTab.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Open Link in New Tab"
+            "value": "Reopen Closed Browser Tab"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "閉じたブラウザタブを再度開く"
           }
         }
       }
     },
-    "browser.dialog.pageSays": {
+    "command.restartSocketListener.subtitle": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "This page says:"
+            "value": "Global"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "グローバル"
           }
         }
       }
     },
-    "browser.dialog.pageSaysAt": {
+    "command.restartSocketListener.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "The page at %@ says:"
+            "value": "Restart CLI Listener"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "CLIリスナーを再起動"
           }
         }
       }
     },
-    "browser.downloadInProgress": {
+    "command.sendFeedback.subtitle": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Download in progress"
+            "value": "Compose feedback to the programa team"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "programa チームにフィードバックを送る"
           }
         }
       }
     },
-    "browser.downloading": {
+    "command.sendFeedback.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Downloading..."
+            "value": "Send Feedback…"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "フィードバックを送信…"
           }
         }
       }
     },
-    "browser.error.cantOpen.title": {
+    "command.showNotifications.subtitle": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Can't open this page"
+            "value": "Notifications"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "通知"
           }
         }
       }
     },
-    "browser.error.cantReach.messageSite": {
+    "command.showNotifications.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "The site refused to connect. Check that a server is running on this address."
+            "value": "Show Notifications"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "通知を表示"
           }
         }
       }
     },
-    "browser.error.cantReach.messageURL": {
+    "command.terminalFind.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "%@ refused to connect. Check that a server is running on this address."
+            "value": "Find…"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "検索…"
           }
         }
       }
     },
-    "browser.error.cantReach.title": {
+    "command.terminalFindNext.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Can't reach this page"
+            "value": "Find Next"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "次を検索"
           }
         }
       }
     },
-    "browser.error.checkNetwork": {
+    "command.terminalFindPrevious.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Check your network connection and try again."
+            "value": "Find Previous"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "前を検索"
           }
         }
       }
     },
-    "browser.error.insecure.message": {
+    "command.terminalHideFind.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "%@ uses plain HTTP, so traffic can be read or modified on the network.\n\nOpen this URL in your default browser, or proceed in Programa."
+            "value": "Hide Find Bar"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "検索バーを隠す"
           }
         }
       }
     },
-    "browser.error.insecure.title": {
+    "command.terminalSplitBrowserDown.subtitle": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Connection isn't secure"
+            "value": "Terminal Layout"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ターミナルレイアウト"
           }
         }
       }
     },
-    "browser.error.invalidCertificate": {
+    "command.terminalSplitBrowserDown.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "The certificate for this site is invalid."
+            "value": "Split Browser Down"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ブラウザを下に分割"
           }
         }
       }
     },
-    "browser.error.noInternet": {
+    "command.terminalSplitBrowserRight.subtitle": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "No internet connection"
+            "value": "Terminal Layout"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ターミナルレイアウト"
           }
         }
       }
     },
-    "browser.error.reload": {
+    "command.terminalSplitBrowserRight.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Reload"
+            "value": "Split Browser Right"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ブラウザを右に分割"
           }
         }
       }
     },
-    "browser.goBack": {
+    "command.terminalSplitDown.subtitle": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Go Back"
+            "value": "Terminal Layout"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ターミナルレイアウト"
           }
         }
       }
     },
-    "browser.goForward": {
+    "command.terminalSplitDown.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Go Forward"
+            "value": "Split Down"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "下に分割"
           }
         }
       }
     },
-    "browser.newTab": {
+    "command.terminalSplitRight.subtitle": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "New tab"
+            "value": "Terminal Layout"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ターミナルレイアウト"
           }
         }
       }
     },
-    "browser.omnibar.accessibilityLabel": {
+    "command.terminalSplitRight.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Browser omnibar"
+            "value": "Split Right"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "ブラウザのアドレスバー"
+            "value": "右に分割"
           }
         }
       }
     },
-    "browser.openInDefaultBrowser": {
+    "command.terminalUseSelectionForFind.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Open in Default Browser"
+            "value": "Use Selection for Find"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "選択範囲を検索に使用"
           }
         }
       }
     },
-    "browser.passkeyHandoff.message": {
+    "command.toggleFullScreen.subtitle": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "This page is asking for a passkey, which the built-in browser can't provide. You can finish signing in with your default browser."
+            "value": "Window"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "このページはパスキーを要求していますが、内蔵ブラウザでは利用できません。既定のブラウザでサインインを完了できます。"
+            "value": "ウインドウ"
           }
         }
       }
     },
-    "browser.passkeyHandoff.title": {
+    "command.toggleFullScreen.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Passkeys aren't available in the built-in browser yet"
+            "value": "Toggle Full Screen"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "パスキーは内蔵ブラウザではまだ利用できません"
+            "value": "フルスクリーンを切り替え"
           }
         }
       }
     },
-    "browser.popup.loadingTitle": {
+    "command.toggleSidebar.subtitle": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Loading…"
+            "value": "Layout"
           }
-        }
-      }
-    },
-    "browser.profile.buttonHelp": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Browser Profile: %@"
+            "value": "レイアウト"
           }
         }
       }
     },
-    "browser.profile.default": {
+    "command.toggleSidebar.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Default"
+            "value": "Toggle Sidebar"
           }
-        }
-      }
-    },
-    "browser.profile.menu.title": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Profiles"
+            "value": "サイドバーを切り替え"
           }
         }
       }
     },
-    "browser.profile.new": {
+    "command.toggleSplitZoom.subtitle": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "New Profile..."
+            "value": "Terminal Layout"
           }
-        }
-      }
-    },
-    "browser.profile.new.message": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Create a separate browser profile for cookies, history, and local storage."
+            "value": "ターミナルレイアウト"
           }
         }
       }
     },
-    "browser.profile.new.placeholder": {
+    "command.toggleSplitZoom.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Profile name"
+            "value": "Toggle Pane Zoom"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ペインズームを切り替え"
           }
         }
       }
     },
-    "browser.profile.new.title": {
+    "command.triggerFlash.subtitle": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "New Browser Profile"
+            "value": "View"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "表示"
           }
         }
       }
     },
-    "browser.profile.rename": {
+    "command.triggerFlash.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Rename Current Profile..."
+            "value": "Flash Focused Panel"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "フォーカス中のパネルを点滅"
           }
         }
       }
     },
-    "browser.profile.rename.message": {
+    "command.uninstallCLI.subtitle": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Choose a new name for this browser profile."
+            "value": "CLI"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "CLI"
           }
         }
       }
     },
-    "browser.profile.rename.title": {
+    "command.uninstallCLI.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Rename Browser Profile"
+            "value": "Shell Command: Uninstall 'programa' from PATH"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "シェルコマンド: PATH から 'programa' をアンインストール"
           }
         }
       }
     },
-    "browser.reload": {
+    "command.unpinTab.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Reload"
+            "value": "Unpin Tab"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "タブのピン留めを解除"
           }
         }
       }
     },
-    "browser.stop": {
+    "command.unpinWorkspace.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Stop"
+            "value": "Unpin Workspace"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ワークスペースのピン留めを解除"
           }
         }
       }
     },
-    "browser.switchToTab": {
+    "commandPalette.description.workspaceInputHint": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Switch to tab"
+            "value": "Press Enter to save. Press Shift-Enter for a new line, or Escape to cancel."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Enterキーで保存します。Shift+Enterで改行、Escapeでキャンセルします。"
           }
         }
       }
     },
-    "browser.theme.buttonHelp": {
+    "commandPalette.description.workspacePlaceholder": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Browser Theme: %@"
+            "value": "Workspace description"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ワークスペースの説明"
           }
         }
       }
     },
-    "browser.toggleDevTools": {
+    "commandPalette.kind.browser": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Toggle Developer Tools"
+            "value": "Browser"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ブラウザ"
           }
         }
       }
     },
-    "cli.claude-teams.usage": {
+    "commandPalette.kind.markdown": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Usage: programa claude-teams [claude-args...]\n\nLaunch Claude Code with agent teams enabled.\n\nThis command:\n  - defaults Claude teammate mode to auto\n  - sets a tmux-like environment so Claude can open Programa helper workspaces\n  - sets CLAUDE_CODE_EXPERIMENTAL_AGENT_TEAMS=1\n  - prepends a private tmux shim to PATH\n  - forwards all remaining arguments to claude\n\nThe tmux shim turns supported tmux window/pane commands into nested helper\nworkspaces in the current Programa window.\n\nExamples:\n  programa claude-teams\n  programa claude-teams --continue\n  programa claude-teams --model sonnet"
+            "value": "Markdown"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "使用方法: programa claude-teams [claude-args...]\n\nエージェントチームを有効にして Claude Code を起動します。\n\nこのコマンドは次の処理を行います:\n  - Claude のチームメイトモードをデフォルトで auto に設定\n  - Claude が Programa のヘルパーワークスペースを開ける tmux 互換環境を設定\n  - CLAUDE_CODE_EXPERIMENTAL_AGENT_TEAMS=1 を設定\n  - 専用の tmux シムを PATH の先頭に追加\n  - 残りの引数をすべて claude に渡す\n\ntmux シムは対応する tmux の window/pane コマンドを、現在の Programa\nウインドウ内にあるネストされたヘルパーワークスペースへ変換します。\n\n例:\n  programa claude-teams\n  programa claude-teams --continue\n  programa claude-teams --model sonnet"
+            "value": "Markdown"
           }
         }
       }
     },
-    "cli.install.adminRequired": {
+    "commandPalette.kind.terminal": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Administrator privileges were required to write to /usr/local/bin."
+            "value": "Terminal"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ターミナル"
           }
         }
       }
     },
-    "cli.install.symlinkCreated": {
+    "commandPalette.kind.workspace": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Created symlink:\n\n%1$@ -> %2$@"
+            "value": "Workspace"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ワークスペース"
           }
         }
       }
     },
-    "cli.installFailed": {
+    "commandPalette.rename.clearCustomName": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Couldn't Install Programa CLI"
+            "value": "(clear custom name)"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "（カスタム名をクリア）"
           }
         }
       }
     },
-    "cli.installed": {
+    "commandPalette.rename.tabConfirmHint": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Programa CLI Installed"
+            "value": "Press Enter to apply this tab name, or Escape to cancel."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Enterキーでこのタブ名を適用、Escapeでキャンセルします。"
           }
         }
       }
     },
-    "cli.omo.usage": {
+    "commandPalette.rename.tabDescription": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Usage: programa omo [opencode-args...]\n\nLaunch OpenCode with oh-my-openagent in a Programa-aware environment.\n\noh-my-openagent orchestrates multiple AI models as specialized agents in\nparallel. This command sets up a tmux shim so agent panes become native\nPrograma splits with sidebar metadata and notifications.\n\nThis command:\n  - sets a tmux-like environment so oh-my-openagent uses Programa splits\n  - prepends a private tmux shim to PATH\n  - forwards all remaining arguments to opencode\n\nThe tmux shim translates tmux window/pane commands into Programa workspace\nand split operations in the current Programa session.\n\nExamples:\n  programa omo\n  programa omo --continue\n  programa omo --model claude-sonnet-4-6"
+            "value": "Choose a custom tab name."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "カスタムタブ名を選択してください。"
           }
         }
       }
     },
-    "cli.uninstall.adminRequired": {
+    "commandPalette.rename.tabInputHint": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Administrator privileges were required to modify /usr/local/bin."
+            "value": "Enter a tab name. Press Enter to rename, Escape to cancel."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "タブ名を入力してください。Enterで名前を変更、Escapeでキャンセルします。"
           }
         }
       }
     },
-    "cli.uninstall.notFound": {
+    "commandPalette.rename.tabPlaceholder": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "No Programa CLI symlink was found at %@."
+            "value": "Tab name"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "タブ名"
           }
         }
       }
     },
-    "cli.uninstall.removed": {
+    "commandPalette.rename.tabTitle": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Removed %@."
+            "value": "Rename Tab"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "タブの名前を変更"
           }
         }
       }
     },
-    "cli.uninstallFailed": {
+    "commandPalette.rename.workspaceConfirmHint": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Couldn't Uninstall Programa CLI"
+            "value": "Press Enter to apply this workspace name, or Escape to cancel."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Enterキーでこのワークスペース名を適用、Escapeでキャンセルします。"
           }
         }
       }
     },
-    "cli.uninstalled": {
+    "commandPalette.rename.workspaceDescription": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Programa CLI Uninstalled"
+            "value": "Choose a custom workspace name."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "カスタムワークスペース名を選択してください。"
           }
         }
       }
     },
-    "command.applyLayout.subtitle": {
+    "commandPalette.rename.workspaceInputHint": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Layout"
+            "value": "Enter a workspace name. Press Enter to rename, Escape to cancel."
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "レイアウト"
+            "value": "ワークスペース名を入力してください。Enterで名前を変更、Escapeでキャンセルします。"
           }
         }
       }
     },
-    "command.applyLayout.title": {
+    "commandPalette.rename.workspacePlaceholder": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Apply layout: %@"
+            "value": "Workspace name"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "レイアウトを適用: %@"
+            "value": "ワークスペース名"
           }
         }
       }
     },
-    "command.applyUpdateIfAvailable.subtitle": {
+    "commandPalette.rename.workspaceTitle": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Global"
+            "value": "Rename Workspace"
           }
-        }
-      }
-    },
-    "command.applyUpdateIfAvailable.title": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Apply Update (If Available)"
+            "value": "ワークスペースの名前を変更"
           }
         }
       }
     },
-    "command.attemptUpdate.subtitle": {
+    "commandPalette.search.commandsEmpty": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Global"
+            "value": "No commands match your search."
           }
-        }
-      }
-    },
-    "command.attemptUpdate.title": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Attempt Update"
+            "value": "検索に一致するコマンドがありません。"
           }
         }
       }
     },
-    "command.browserBack.title": {
+    "commandPalette.search.commandsPlaceholder": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Back"
+            "value": "Type a command"
           }
-        }
-      }
-    },
-    "command.browserClearHistory.subtitle": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Browser"
+            "value": "コマンドを入力"
           }
         }
       }
     },
-    "command.browserClearHistory.title": {
+    "commandPalette.search.switcherEmpty": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Clear Browser History"
+            "value": "No workspaces match your search."
           }
-        }
-      }
-    },
-    "command.browserConsole.title": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Show JavaScript Console"
+            "value": "検索に一致するワークスペースがありません。"
           }
         }
       }
     },
-    "command.browserDesignMode.title": {
+    "commandPalette.search.switcherEmptyAllSurfaces": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Toggle Design Mode"
+            "value": "No workspaces or surfaces match your search."
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "デザインモードを切り替え"
+            "value": "検索に一致するワークスペースまたはサーフェスがありません。"
           }
         }
       }
     },
-    "command.browserDuplicateRight.subtitle": {
+    "commandPalette.search.switcherPlaceholder": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Browser Layout"
+            "value": "Search workspaces"
           }
-        }
-      }
-    },
-    "command.browserDuplicateRight.title": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Duplicate Browser to the Right"
+            "value": "ワークスペースを検索"
           }
         }
       }
     },
-    "command.browserFocusAddressBar.title": {
+    "commandPalette.search.switcherPlaceholderAllSurfaces": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Focus Address Bar"
+            "value": "Search workspaces and surfaces"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ワークスペースとサーフェスを検索"
           }
         }
       }
     },
-    "command.browserForward.title": {
+    "commandPalette.subtitle.browserWithName": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Forward"
+            "value": "Browser • %@"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ブラウザ • %@"
           }
         }
       }
     },
-    "command.browserOpenDefault.title": {
+    "commandPalette.subtitle.tabFallback": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Open Current Page in Default Browser"
+            "value": "Tab"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "タブ"
           }
         }
       }
     },
-    "command.browserReload.title": {
+    "commandPalette.subtitle.tabWithName": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Reload Page"
+            "value": "Tab • %@"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "タブ • %@"
           }
         }
       }
     },
-    "command.browserSplitDown.subtitle": {
+    "commandPalette.subtitle.terminalWithName": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Browser Layout"
+            "value": "Terminal • %@"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ターミナル • %@"
           }
         }
       }
     },
-    "command.browserSplitDown.title": {
+    "commandPalette.subtitle.workspaceFallback": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Split Browser Down"
+            "value": "Workspace"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ワークスペース"
           }
         }
       }
     },
-    "command.browserSplitRight.subtitle": {
+    "commandPalette.subtitle.workspaceWithName": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Browser Layout"
+            "value": "Workspace • %@"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ワークスペース • %@"
           }
         }
       }
     },
-    "command.browserSplitRight.title": {
+    "commandPalette.switcher.windowLabel": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Split Browser Right"
+            "value": "Window %lld"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ウインドウ %lld"
           }
         }
       }
     },
-    "command.browserToggleDevTools.title": {
+    "commandPalette.switcher.workspaceLabel": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Toggle Developer Tools"
+            "value": "Workspace"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ワークスペース"
           }
         }
       }
     },
-    "command.browserZoomIn.title": {
+    "common.allow": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Zoom In"
+            "value": "Allow"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "許可"
           }
         }
       }
     },
-    "command.browserZoomOut.title": {
+    "common.cancel": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Zoom Out"
+            "value": "Cancel"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "キャンセル"
           }
         }
       }
     },
-    "command.browserZoomReset.title": {
+    "common.close": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Actual Size"
+            "value": "Close"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "閉じる"
           }
         }
       }
     },
-    "command.checkForUpdates.subtitle": {
+    "common.copyDetails": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Global"
+            "value": "Copy Details"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "詳細をコピー"
           }
         }
       }
     },
-    "command.checkForUpdates.title": {
+    "common.create": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Check for Updates"
+            "value": "Create"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "作成"
           }
         }
       }
     },
-    "command.clearTabName.title": {
+    "common.installAndRelaunch": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Clear Tab Name"
+            "value": "Install and Relaunch"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "インストールして再起動"
           }
         }
       }
     },
-    "command.clearWorkspaceDescription.title": {
+    "common.later": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Clear Workspace Description"
+            "value": "Later"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "後で"
           }
         }
       }
     },
-    "command.clearWorkspaceName.title": {
+    "common.notNow": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Clear Workspace Name"
+            "value": "Not Now"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "今はしない"
           }
         }
       }
     },
-    "command.closeTab.subtitle": {
+    "common.ok": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Tab"
+            "value": "OK"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "OK"
           }
         }
       }
     },
-    "command.closeTab.title": {
+    "common.rename": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Close Tab"
+            "value": "Rename"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "名前を変更"
           }
         }
       }
     },
-    "command.closeWindow.subtitle": {
+    "common.restartLater": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Window"
+            "value": "Restart Later"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "後で再起動"
           }
         }
       }
     },
-    "command.closeWindow.title": {
+    "common.restartNow": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Close Window"
+            "value": "Restart Now"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "今すぐ再起動"
           }
         }
       }
     },
-    "command.closeWorkspace.subtitle": {
+    "common.retry": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Workspace"
+            "value": "Retry"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "再試行"
           }
         }
       }
     },
-    "command.closeWorkspace.title": {
+    "common.skip": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Close Workspace"
+            "value": "Skip"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "スキップ"
           }
         }
       }
     },
-    "command.cmuxConfig.customTitle": {
+    "contextMenu.chooseCustomColor": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Custom: %@"
+            "value": "Choose Custom Color…"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "カスタムカラーを選択…"
           }
         }
       }
     },
-    "command.cmuxConfig.recipeTitle": {
+    "contextMenu.clearColor": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Recipe: %@"
+            "value": "Clear Color"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "レシピ: %@"
+            "value": "カラーをクリア"
           }
         }
       }
     },
-    "command.cmuxConfig.subtitle": {
+    "contextMenu.clearLatestNotification": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "programa.json"
+            "value": "Clear Latest Notification"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "最新の通知を削除"
           }
         }
       }
     },
-    "command.disableMinimalMode.title": {
+    "contextMenu.clearLatestNotifications": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Disable Minimal Mode"
+            "value": "Clear Latest Notifications"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "最新の通知を削除"
           }
         }
       }
     },
-    "command.editWorkspaceDescription.title": {
+    "contextMenu.clearWorkspaceDescription": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Edit Workspace Description…"
+            "value": "Clear Workspace Description"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ワークスペースの説明をクリア"
           }
         }
       }
     },
-    "command.enableMinimalMode.title": {
+    "contextMenu.closeOtherWorkspaces": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Enable Minimal Mode"
+            "value": "Close Other Workspaces"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "他のワークスペースを閉じる"
           }
         }
       }
     },
-    "command.equalizeSplits.title": {
+    "contextMenu.closeWorkspace": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Equalize Splits"
+            "value": "Close Workspace"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ワークスペースを閉じる"
           }
         }
       }
     },
-    "command.installCLI.subtitle": {
+    "contextMenu.closeWorkspaces": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "CLI"
+            "value": "Close Workspaces"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ワークスペースを閉じる"
           }
         }
       }
     },
-    "command.installCLI.title": {
+    "contextMenu.closeWorkspacesAbove": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Shell Command: Install 'programa' in PATH"
+            "value": "Close Workspaces Above"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "上のワークスペースを閉じる"
           }
         }
       }
     },
-    "command.jumpUnread.subtitle": {
+    "contextMenu.closeWorkspacesBelow": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Notifications"
+            "value": "Close Workspaces Below"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "下のワークスペースを閉じる"
           }
         }
       }
     },
-    "command.jumpUnread.title": {
+    "contextMenu.editWorkspaceDescription": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Jump to Latest Unread"
+            "value": "Edit Workspace Description…"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ワークスペースの説明を編集…"
           }
         }
       }
     },
-    "command.markTabRead.title": {
+    "contextMenu.markWorkspaceRead": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Mark Tab as Read"
+            "value": "Mark Workspace as Read"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ワークスペースを既読にする"
           }
         }
       }
     },
-    "command.markTabUnread.title": {
+    "contextMenu.markWorkspaceUnread": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Mark Tab as Unread"
+            "value": "Mark Workspace as Unread"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ワークスペースを未読にする"
           }
         }
       }
     },
-    "command.newBrowserTab.subtitle": {
+    "contextMenu.markWorkspacesRead": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Tab"
+            "value": "Mark Workspaces as Read"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ワークスペースを既読にする"
           }
         }
       }
     },
-    "command.newBrowserTab.title": {
+    "contextMenu.markWorkspacesUnread": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "New Tab (Browser)"
+            "value": "Mark Workspaces as Unread"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ワークスペースを未読にする"
           }
         }
       }
     },
-    "command.newClaudeWorkspace.subtitle": {
+    "contextMenu.collapseWorktreeFolder": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Open a new workspace running Claude Code in the current project"
+            "value": "Collapse Worktree Folder"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "現在のプロジェクトで Claude Code を起動する新しいワークスペースを開く"
+            "value": "ワークツリーフォルダを折りたたむ"
           }
         }
       }
     },
-    "command.newClaudeWorkspace.title": {
+    "contextMenu.expandWorktreeFolder": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "New Claude Code Workspace"
+            "value": "Expand Worktree Folder"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "新規 Claude Code ワークスペース"
+            "value": "ワークツリーフォルダを展開"
           }
         }
       }
     },
-    "command.newTerminalTab.subtitle": {
+    "contextMenu.moveDown": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Tab"
+            "value": "Move Down"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "下に移動"
           }
         }
       }
     },
-    "command.newTerminalTab.title": {
+    "contextMenu.moveToTop": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "New Tab (Terminal)"
+            "value": "Move to Top"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "先頭に移動"
           }
         }
       }
     },
-    "command.newWindow.subtitle": {
+    "contextMenu.moveUp": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Window"
+            "value": "Move Up"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "上に移動"
           }
         }
       }
     },
-    "command.newWindow.title": {
+    "contextMenu.moveWorkspaceToWindow": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "New Window"
+            "value": "Move Workspace to Window"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ワークスペースをウインドウに移動"
           }
         }
       }
     },
-    "command.newWorkspace.subtitle": {
+    "contextMenu.moveWorkspacesToWindow": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Workspace"
+            "value": "Move Workspaces to Window"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ワークスペースをウインドウに移動"
           }
         }
       }
     },
-    "command.newWorkspace.title": {
+    "contextMenu.newWorktreeWorkspace": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "New Workspace"
+            "value": "New Worktree Workspace…"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "新しいワークツリーワークスペース…"
           }
         }
       }
     },
-    "command.nextTabInPane.subtitle": {
+    "contextMenu.openAgentOverview": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Tab Navigation"
+            "value": "Open Agent Overview"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "エージェント概要を開く"
           }
         }
       }
     },
-    "command.nextTabInPane.title": {
+    "contextMenu.newWindow": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Next Tab in Pane"
+            "value": "New Window"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "新規ウインドウ"
           }
         }
       }
     },
-    "command.nextWorkspace.subtitle": {
+    "contextMenu.pinWorkspace": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Workspace Navigation"
+            "value": "Pin Workspace"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ワークスペースをピン留め"
           }
         }
       }
     },
-    "command.nextWorkspace.title": {
+    "contextMenu.pinWorkspaces": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Next Workspace"
+            "value": "Pin Workspaces"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ワークスペースをピン留め"
           }
         }
       }
     },
-    "command.openFolder.subtitle": {
+    "contextMenu.removeCustomWorkspaceName": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Workspace"
+            "value": "Remove Custom Workspace Name"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "カスタムワークスペース名を削除"
           }
         }
       }
     },
-    "command.openFolder.title": {
+    "contextMenu.renameWorkspace": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Open Folder…"
+            "value": "Rename Workspace…"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ワークスペースの名前を変更…"
           }
         }
       }
     },
-    "command.openReviewPanel.subtitle": {
+    "contextMenu.stopUsingAsWorktreeFolder": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Diff of the focused terminal's repo"
+            "value": "Stop Using as Worktree Folder"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "フォーカス中ターミナルのリポジトリの差分"
+            "value": "ワークツリーフォルダとしての使用を停止"
           }
         }
       }
     },
-    "command.openReviewPanel.title": {
+    "contextMenu.unpinWorkspace": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Open Review Panel"
+            "value": "Unpin Workspace"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "レビューパネルを開く"
+            "value": "ワークスペースのピン留めを解除"
           }
         }
       }
     },
-    "command.openSettings.subtitle": {
+    "contextMenu.unpinWorkspaces": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Global"
+            "value": "Unpin Workspaces"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ワークスペースのピン留めを解除"
           }
         }
       }
     },
-    "command.openSettings.title": {
+    "contextMenu.useAsWorktreeFolder": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Open Settings"
+            "value": "Use as Worktree Folder"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ワークツリーフォルダとして使用"
           }
         }
       }
     },
-    "command.openWorkspacePRLinks.title": {
+    "contextMenu.workspaceColor": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Open All Workspace PR Links"
+            "value": "Workspace Color"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ワークスペースカラー"
           }
         }
       }
     },
-    "command.pinTab.title": {
+    "controlBackgroundColor": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Pin Tab"
+            "value": "controlBackgroundColor"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "controlBackgroundColor"
           }
         }
       }
     },
-    "command.pinWorkspace.title": {
+    "debug.browserToolbarGlass.enable": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Pin Workspace"
+            "value": "Enable Native Glass Browser Toolbar"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ネイティブガラスのブラウザツールバーを有効にする"
           }
         }
       }
     },
-    "command.previousTabInPane.subtitle": {
+    "debug.browserToolbarGlass.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Tab Navigation"
+            "value": "Browser Toolbar Glass"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ブラウザツールバーガラス"
           }
         }
       }
     },
-    "command.previousTabInPane.title": {
+    "debug.browserProfilePopover.group.padding": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Previous Tab in Pane"
+            "value": "Padding"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "パディング"
           }
         }
       }
     },
-    "command.previousWorkspace.subtitle": {
+    "debug.browserProfilePopover.group.preview": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Workspace Navigation"
+            "value": "Preview"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "プレビュー"
           }
         }
       }
     },
-    "command.previousWorkspace.title": {
+    "debug.browserProfilePopover.heading": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Previous Workspace"
+            "value": "Browser Profile Popover"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ブラウザプロファイルポップオーバー"
           }
         }
       }
     },
-    "command.reloadConfiguration.subtitle": {
+    "debug.browserProfilePopover.label.horizontal": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Re-read settings.json and programa.json"
+            "value": "Horizontal"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "settings.json と programa.json を再読み込みします"
+            "value": "水平"
           }
         }
       }
     },
-    "command.reloadConfiguration.title": {
+    "debug.browserProfilePopover.label.vertical": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Reload Configuration"
+            "value": "Vertical"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "設定を再読み込み"
+            "value": "垂直"
           }
         }
       }
     },
-    "command.renameTab.title": {
+    "debug.browserProfilePopover.liveNote": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Rename Tab…"
+            "value": "Changes apply live to the browser profile popover."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "変更はブラウザプロファイルポップオーバーにすぐに反映されます。"
           }
         }
       }
     },
-    "command.renameWorkspace.title": {
+    "debug.browserProfilePopover.note": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Rename Workspace…"
+            "value": "Tune the profile popover padding live while comparing it against the browser toolbar menu."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ブラウザツールバーメニューと比較しながら、プロファイルポップオーバーのパディングをリアルタイムで調整します。"
           }
         }
       }
     },
-    "command.reopenClosedBrowserTab.subtitle": {
+    "debug.browserProfilePopover.reset": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Browser"
+            "value": "Reset"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "リセット"
           }
         }
       }
     },
-    "command.reopenClosedBrowserTab.title": {
+    "debug.devBuildBanner.show": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Reopen Closed Browser Tab"
+            "value": "Show Dev Build Banner"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "開発ビルドバナーを表示"
           }
         }
       }
     },
-    "command.restartSocketListener.subtitle": {
+    "debug.devBuildBanner.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Global"
+            "value": "THIS IS A DEV BUILD"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "これは開発ビルドです"
           }
         }
       }
     },
-    "command.restartSocketListener.title": {
+    "debug.menu.background": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Restart CLI Listener"
+            "value": "Background Debug…"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "背景デバッグ…"
           }
         }
       }
     },
-    "command.sendFeedback.subtitle": {
+    "debug.menu.browserProfilePopoverDebug": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Compose feedback to the programa team"
+            "value": "Browser Profile Popover Debug…"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "programa チームにフィードバックを送る"
+            "value": "ブラウザプロファイルポップオーバーデバッグ…"
           }
         }
       }
     },
-    "command.sendFeedback.title": {
+    "debug.menu.browserToolbarGlass": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Send Feedback…"
+            "value": "Browser Toolbar Glass Debug…"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "フィードバックを送信…"
+            "value": "ブラウザツールバーガラスデバッグ…"
           }
         }
       }
     },
-    "command.showNotifications.subtitle": {
+    "debug.menu.browserToolbarButtonSpacing": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Notifications"
+            "value": "Browser Toolbar Button Spacing"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ブラウザツールバーのボタン間隔"
           }
         }
       }
     },
-    "command.showNotifications.title": {
+    "debug.menu.menuBarExtra": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Show Notifications"
+            "value": "Menu Bar Extra Debug…"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "メニューバー追加項目デバッグ…"
           }
         }
       }
     },
-    "command.terminalFind.title": {
+    "debug.menu.overlayGlass": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Find…"
+            "value": "Overlay Glass Debug…"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "オーバーレイガラスデバッグ…"
           }
         }
       }
     },
-    "command.terminalFindNext.title": {
+    "debug.menu.newLargeScrollbackTab": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Find Next"
+            "value": "New Tab With Large Scrollback"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "大きなスクロールバック付きの新規タブ"
           }
         }
       }
     },
-    "command.terminalFindPrevious.title": {
+    "debug.menu.newLoremTab": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Find Previous"
+            "value": "New Tab With Lorem Search Text"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Lorem検索テキスト付きの新規タブ"
           }
         }
       }
     },
-    "command.terminalHideFind.title": {
+    "debug.menu.openAllWindows": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Hide Find Bar"
+            "value": "Open All Debug Windows"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "すべてのデバッグウインドウを開く"
           }
         }
       }
     },
-    "command.terminalSplitBrowserDown.subtitle": {
+    "debug.menu.openStressWorkspacesWithLoadedSurfaces": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Terminal Layout"
+            "value": "Open Stress Workspaces and Load All Terminals"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ストレスワークスペースを開いてすべてのターミナルを読み込む"
           }
         }
       }
     },
-    "command.terminalSplitBrowserDown.title": {
+    "debug.menu.openWorkspaceColors": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Split Browser Down"
+            "value": "Open Workspaces for All Workspace Colors"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "すべてのワークスペース色を開く"
           }
         }
       }
     },
-    "command.terminalSplitBrowserRight.subtitle": {
+    "debug.menu.settingsAboutTitlebar": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Terminal Layout"
+            "value": "Settings/About Titlebar Debug…"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "設定／情報タイトルバーデバッグ…"
           }
         }
       }
     },
-    "command.terminalSplitBrowserRight.title": {
+    "debug.menu.density": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Split Browser Right"
+            "value": "Density Debug…"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "密度デバッグ…"
           }
         }
       }
     },
-    "command.terminalSplitDown.subtitle": {
+    "debug.menu.sidebar": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Terminal Layout"
+            "value": "Sidebar Debug…"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "サイドバーデバッグ…"
           }
         }
       }
     },
-    "command.terminalSplitDown.title": {
+    "debug.menu.splitButtonLayout": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Split Down"
+            "value": "Split Button Layout Debug…"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "分割ボタンレイアウトデバッグ…"
           }
         }
       }
     },
-    "command.terminalSplitRight.subtitle": {
+    "debug.overlayGlass.enable": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Terminal Layout"
+            "value": "Enable Native Glass Overlays"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ネイティブガラスのオーバーレイを有効にする"
           }
         }
       }
     },
-    "command.terminalSplitRight.title": {
+    "debug.overlayGlass.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Split Right"
+            "value": "Overlay Glass"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "オーバーレイガラス"
           }
         }
       }
     },
-    "command.terminalUseSelectionForFind.title": {
+    "debug.menu.tabBarGlass": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Use Selection for Find"
+            "value": "Tab Bar Glass Debug…"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "タブバーガラスデバッグ…"
           }
         }
       }
     },
-    "command.toggleFullScreen.subtitle": {
+    "debug.tabBarGlass.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Window"
+            "value": "Tab Bar Glass"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "タブバーガラス"
           }
         }
       }
     },
-    "command.toggleFullScreen.title": {
+    "debug.tabBarGlass.enable": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Toggle Full Screen"
+            "value": "Enable Native Glass Tab Pills"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ネイティブガラスのタブピルを有効にする"
           }
         }
       }
     },
-    "command.toggleSidebar.subtitle": {
+    "debug.glass.changesApplyLive": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Layout"
+            "value": "Changes apply live."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "変更はすぐに反映されます。"
           }
         }
       }
     },
-    "command.toggleSidebar.title": {
+    "debug.glass.requiresMacOS26": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Toggle Sidebar"
+            "value": "Native Liquid Glass requires macOS 26."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ネイティブLiquid GlassにはmacOS 26が必要です。"
           }
         }
       }
     },
-    "command.toggleSplitZoom.subtitle": {
+    "debug.menu.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Terminal Layout"
+            "value": "Debug"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "デバッグ"
           }
         }
       }
     },
-    "command.toggleSplitZoom.title": {
+    "debug.menu.windowControls": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Toggle Pane Zoom"
+            "value": "Debug Window Controls…"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "デバッグウインドウコントロール…"
           }
         }
       }
     },
-    "command.triggerFlash.subtitle": {
+    "debug.menu.windows": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "View"
+            "value": "Debug Windows"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "デバッグウインドウ"
           }
         }
       }
     },
-    "command.triggerFlash.title": {
+    "debug.shortcutHints.alwaysShow": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Flash Focused Panel"
+            "value": "Always Show Shortcut Hints"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ショートカットヒントを常に表示"
           }
         }
       }
     },
-    "command.uninstallCLI.subtitle": {
+    "debug.titlebarControls.style": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "CLI"
+            "value": "Titlebar Controls Style"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "タイトルバーコントロールのスタイル"
           }
         }
       }
     },
-    "command.uninstallCLI.title": {
+    "debug.updatePill.automatic": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Shell Command: Uninstall 'programa' from PATH"
+            "value": "Automatic Update Pill"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "更新ピルを自動表示"
           }
         }
       }
     },
-    "command.unpinTab.title": {
+    "debug.updatePill.hide": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Unpin Tab"
+            "value": "Hide Update Pill"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "更新ピルを非表示"
           }
         }
       }
     },
-    "command.unpinWorkspace.title": {
+    "debug.updatePill.menu": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Unpin Workspace"
+            "value": "Update Pill"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "更新ピル"
           }
         }
       }
     },
-    "commandPalette.description.workspaceInputHint": {
+    "debug.updatePill.show": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Press Enter to save. Press Shift-Enter for a new line, or Escape to cancel."
+            "value": "Show Update Pill"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "更新ピルを表示"
           }
         }
       }
     },
-    "commandPalette.description.workspacePlaceholder": {
+    "debug.updatePill.showLoading": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Workspace description"
+            "value": "Show Loading State"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "読み込み状態を表示"
           }
         }
       }
     },
-    "commandPalette.kind.browser": {
+    "debug.updatePill.showLongNightly": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Browser"
+            "value": "Show Long Nightly Pill"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "長いNightly更新ピルを表示"
           }
         }
       }
     },
-    "commandPalette.kind.markdown": {
+    "debug.windows.browserProfilePopover.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Markdown"
+            "value": "Browser Profile Popover Debug"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ブラウザプロファイルポップオーバーデバッグ"
           }
         }
       }
     },
-    "commandPalette.kind.terminal": {
+    "dialog.closeOtherTabs.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Terminal"
+            "value": "Close other tabs?"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "他のタブを閉じますか？"
           }
         }
       }
     },
-    "commandPalette.kind.workspace": {
+    "dialog.closePinnedWorkspace.message": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Workspace"
+            "value": "This workspace is pinned. Closing it will close the workspace and all of its panels."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "このワークスペースはピン留めされています。閉じるとワークスペースとすべてのパネルが閉じられます。"
           }
         }
       }
     },
-    "commandPalette.rename.clearCustomName": {
+    "dialog.closePinnedWorkspace.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "(clear custom name)"
+            "value": "Close pinned workspace?"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ピン留めされたワークスペースを閉じますか？"
           }
         }
       }
     },
-    "commandPalette.rename.tabConfirmHint": {
+    "dialog.closeTab.cancel": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Press Enter to apply this tab name, or Escape to cancel."
+            "value": "Cancel"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "キャンセル"
           }
         }
       }
     },
-    "commandPalette.rename.tabDescription": {
+    "dialog.closeTab.close": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Choose a custom tab name."
+            "value": "Close"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "閉じる"
           }
         }
       }
     },
-    "commandPalette.rename.tabInputHint": {
+    "dialog.closeTab.message": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Enter a tab name. Press Enter to rename, Escape to cancel."
+            "value": "This will close the current tab."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "現在のタブが閉じられます。"
           }
         }
       }
     },
-    "commandPalette.rename.tabPlaceholder": {
+    "dialog.closeTab.messageNamed": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Tab name"
+            "value": "This will close \"%@\"."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "「%@」が閉じられます。"
           }
         }
       }
     },
-    "commandPalette.rename.tabTitle": {
+    "dialog.closeTab.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Rename Tab"
+            "value": "Close tab?"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "タブを閉じますか？"
           }
         }
       }
     },
-    "commandPalette.rename.workspaceConfirmHint": {
+    "dialog.closeWindow.message": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Press Enter to apply this workspace name, or Escape to cancel."
+            "value": "This will close the current window and all of its workspaces."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "現在のウインドウとそのすべてのワークスペースが閉じられます。"
           }
         }
       }
     },
-    "commandPalette.rename.workspaceDescription": {
+    "dialog.closeWindow.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Choose a custom workspace name."
+            "value": "Close window?"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ウインドウを閉じますか？"
           }
         }
       }
     },
-    "commandPalette.rename.workspaceInputHint": {
+    "dialog.closeWorkspace.message": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Enter a workspace name. Press Enter to rename, Escape to cancel."
+            "value": "This will close the workspace and all of its panels."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ワークスペースとそのすべてのパネルが閉じられます。"
           }
         }
       }
     },
-    "commandPalette.rename.workspacePlaceholder": {
+    "dialog.closeWorkspace.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Workspace name"
+            "value": "Close workspace?"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ワークスペースを閉じますか？"
           }
         }
       }
     },
-    "commandPalette.rename.workspaceTitle": {
+    "dialog.closeWorkspaces.message": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Rename Workspace"
+            "value": "This will close %1$lld workspaces and all of their panels:\n%2$@"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "%1$lld 件のワークスペースとそのすべてのパネルが閉じられます:\n%2$@"
           }
         }
       }
     },
-    "commandPalette.search.commandsEmpty": {
+    "dialog.closeWorkspaces.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "No commands match your search."
+            "value": "Close workspaces?"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ワークスペースを閉じますか？"
           }
         }
       }
     },
-    "commandPalette.search.commandsPlaceholder": {
+    "dialog.closeWorkspacesWindow.message": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Type a command"
+            "value": "This will close the current window, its %1$lld workspaces, and all of their panels:\n%2$@"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "現在のウインドウ、その %1$lld 件のワークスペース、およびすべてのパネルが閉じられます:\n%2$@"
           }
         }
       }
     },
-    "commandPalette.search.switcherEmpty": {
+    "dialog.cmuxConfig.confirmCommand.cancel": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "No workspaces match your search."
+            "value": "Cancel"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "キャンセル"
           }
         }
       }
     },
-    "commandPalette.search.switcherEmptyAllSurfaces": {
+    "dialog.cmuxConfig.confirmCommand.configChanged": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "No workspaces or surfaces match your search."
+            "value": "This folder's programa.json has changed since you trusted it."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "このフォルダのprograma.jsonは、信頼してから変更されています。"
           }
         }
       }
     },
-    "commandPalette.search.switcherPlaceholder": {
+    "dialog.cmuxConfig.confirmCommand.messageWithCommand": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Search workspaces"
+            "value": "This will run the following command:\n\n%@"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "次のコマンドを実行します:\n\n%@"
           }
         }
       }
     },
-    "commandPalette.search.switcherPlaceholderAllSurfaces": {
+    "dialog.cmuxConfig.confirmCommand.run": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Search workspaces and surfaces"
+            "value": "Run"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "実行"
           }
         }
       }
     },
-    "commandPalette.subtitle.browserWithName": {
+    "dialog.cmuxConfig.confirmCommand.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Browser • %@"
+            "value": "Run Command"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "コマンドを実行"
           }
         }
       }
     },
-    "commandPalette.subtitle.tabFallback": {
+    "dialog.cmuxConfig.confirmCommand.truncated": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Tab"
+            "value": "… (truncated)"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "…(省略)"
           }
         }
       }
     },
-    "commandPalette.subtitle.tabWithName": {
+    "dialog.cmuxConfig.confirmCommand.trustDirectory": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Tab • %@"
+            "value": "Always trust commands from this folder"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "このフォルダのコマンドを常に信頼する"
           }
         }
       }
     },
-    "commandPalette.subtitle.terminalWithName": {
+    "dialog.cmuxConfig.confirmCommand.workspaceSummary": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Terminal • %@"
+            "value": "Open workspace \"%@\""
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ワークスペース「%@」を開く"
           }
         }
       }
     },
-    "commandPalette.subtitle.workspaceFallback": {
+    "dialog.cmuxConfig.confirmRecipe.insert": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Workspace"
+            "value": "Insert"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "挿入"
           }
         }
       }
     },
-    "commandPalette.subtitle.workspaceWithName": {
+    "dialog.cmuxConfig.confirmRecipe.messageWithPrompt": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Workspace • %@"
+            "value": "This will insert the following prompt into the focused terminal (it will not be sent until you press Return):\n\n%@"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "フォーカスされたターミナルに次のプロンプトを挿入します(Returnキーを押すまで送信されません):\n\n%@"
           }
         }
       }
     },
-    "commandPalette.switcher.windowLabel": {
+    "dialog.cmuxConfig.confirmRecipe.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Window %lld"
+            "value": "Insert Prompt"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "プロンプトを挿入"
           }
         }
       }
     },
-    "commandPalette.switcher.workspaceLabel": {
+    "dialog.cmuxConfig.confirmRestart.cancel": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Workspace"
+            "value": "Cancel"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "キャンセル"
           }
         }
       }
     },
-    "common.allow": {
+    "dialog.cmuxConfig.confirmRestart.message": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Allow"
+            "value": "A workspace with this name already exists. Close it and create a new one?"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "この名前のワークスペースはすでに存在します。閉じて新しく作成しますか？"
           }
         }
       }
     },
-    "common.cancel": {
+    "dialog.cmuxConfig.confirmRestart.recreate": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Cancel"
+            "value": "Recreate"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "キャンセル"
+            "value": "再作成"
           }
         }
       }
     },
-    "common.close": {
+    "dialog.cmuxConfig.confirmRestart.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Close"
+            "value": "Workspace Already Exists"
           }
-        }
-      }
-    },
-    "common.copyDetails": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Copy Details"
+            "value": "ワークスペースはすでに存在します"
           }
         }
       }
     },
-    "common.create": {
+    "dialog.cmuxConfig.invalidRecipe.message": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Create"
+            "value": "Recipe prompts and parameter values must be a single line without control characters. Remove any line breaks, tabs, or control characters and try again. Nothing was inserted into the terminal."
           }
-        }
-      }
-    },
-    "common.installAndRelaunch": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Install and Relaunch"
+            "value": "レシピのプロンプトとパラメータの値は、制御文字を含まない1行のテキストにしてください。改行、タブ、制御文字を削除してから、もう一度お試しください。ターミナルには何も挿入されていません。"
           }
         }
       }
     },
-    "common.later": {
+    "dialog.cmuxConfig.invalidRecipe.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Later"
+            "value": "Prompt Needs Correction"
           }
-        }
-      }
-    },
-    "common.notNow": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Not Now"
+            "value": "プロンプトを修正してください"
           }
         }
       }
     },
-    "common.ok": {
+    "dialog.cmuxConfig.parameter.continue": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "OK"
+            "value": "Continue"
           }
-        }
-      }
-    },
-    "common.rename": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Rename"
+            "value": "続ける"
           }
         }
       }
     },
-    "common.restartLater": {
+    "dialog.cmuxConfig.parameter.message": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Restart Later"
+            "value": "Enter a value for \"%@\"."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "「%@」の値を入力してください。"
           }
         }
       }
     },
-    "common.restartNow": {
+    "dialog.dontWarnCmdQ": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Restart Now"
+            "value": "Don't warn again for Cmd+Q"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Cmd+Qについて今後警告しない"
           }
         }
       }
     },
-    "common.retry": {
+    "dialog.enableNotifications.message": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Retry"
+            "value": "Notifications are disabled for Programa. Enable them in System Settings to see alerts."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Programaの通知は無効になっています。アラートを表示するには、システム設定で有効にしてください。"
           }
         }
       }
     },
-    "common.skip": {
+    "dialog.enableNotifications.notNow": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Skip"
+            "value": "Not Now"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "今はしない"
           }
         }
       }
     },
-    "contextMenu.chooseCustomColor": {
+    "dialog.enableNotifications.openSettings": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Choose Custom Color…"
+            "value": "Open Settings"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "設定を開く"
           }
         }
       }
     },
-    "contextMenu.clearColor": {
+    "dialog.enableNotifications.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Clear Color"
+            "value": "Enable Notifications for Programa"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Programaの通知を有効にする"
           }
         }
       }
     },
-    "contextMenu.clearLatestNotification": {
+    "dialog.renameWorkspace.message": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Clear Latest Notification"
+            "value": "Enter a custom name for this workspace."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "このワークスペースのカスタム名を入力してください。"
           }
         }
       }
     },
-    "contextMenu.clearLatestNotifications": {
+    "dialog.renameWorkspace.placeholder": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Clear Latest Notifications"
+            "value": "Workspace name"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ワークスペース名"
           }
         }
       }
     },
-    "contextMenu.clearWorkspaceDescription": {
+    "dialog.renameWorkspace.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Clear Workspace Description"
+            "value": "Rename Workspace"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ワークスペースの名前を変更"
           }
         }
       }
     },
-    "contextMenu.closeOtherWorkspaces": {
+    "dialog.singleInstanceNotResponding.forceClose": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Close Other Workspaces"
+            "value": "Force Close"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "強制終了"
           }
         }
       }
     },
-    "contextMenu.closeWorkspace": {
+    "dialog.singleInstanceNotResponding.message": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Close Workspace"
+            "value": "The existing Programa instance did not quit. Force closing it may lose unsaved terminal or session state."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "既存のProgramaインスタンスは終了しませんでした。強制終了すると、保存されていないターミナルやセッションの状態が失われる可能性があります。"
           }
         }
       }
     },
-    "contextMenu.closeWorkspaces": {
+    "dialog.singleInstanceNotResponding.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Close Workspaces"
+            "value": "Existing Programa Is Still Open"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "既存の Programa が開いたままです"
           }
         }
       }
     },
-    "contextMenu.closeWorkspacesAbove": {
+    "dialog.clipboardConfirmation.allow": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Close Workspaces Above"
+            "value": "Allow"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "許可"
           }
         }
       }
     },
-    "contextMenu.closeWorkspacesBelow": {
+    "dialog.clipboardConfirmation.cancel": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Close Workspaces Below"
+            "value": "Cancel"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "キャンセル"
           }
         }
       }
     },
-    "contextMenu.editWorkspaceDescription": {
+    "dialog.clipboardConfirmation.paste.message": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Edit Workspace Description…"
+            "value": "This clipboard text may execute commands when pasted into the terminal. Allow this paste?"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "このクリップボードのテキストをターミナルに貼り付けると、コマンドが実行される可能性があります。貼り付けを許可しますか？"
           }
         }
       }
     },
-    "contextMenu.markWorkspaceRead": {
+    "dialog.clipboardConfirmation.paste.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Mark Workspace as Read"
+            "value": "Allow Unsafe Paste?"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "安全でない貼り付けを許可しますか？"
           }
         }
       }
     },
-    "contextMenu.markWorkspaceUnread": {
+    "dialog.clipboardConfirmation.read.message": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Mark Workspace as Unread"
+            "value": "A program running in this terminal requested your clipboard contents. Allow it to read the clipboard?"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "このターミナルで実行中のプログラムがクリップボードの内容を要求しています。読み取りを許可しますか？"
           }
         }
       }
     },
-    "contextMenu.markWorkspacesRead": {
+    "dialog.clipboardConfirmation.read.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Mark Workspaces as Read"
+            "value": "Allow Clipboard Access?"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "クリップボードへのアクセスを許可しますか？"
           }
         }
       }
     },
-    "contextMenu.markWorkspacesUnread": {
+    "error.clipboardFolderPath": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Mark Workspaces as Unread"
+            "value": "Could not load any folder path from the clipboard."
           }
-        }
-      }
-    },
-    "contextMenu.collapseWorktreeFolder": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": { "stringUnit": { "state": "translated", "value": "Collapse Worktree Folder" } },
-        "ja": { "stringUnit": { "state": "translated", "value": "ワークツリーフォルダを折りたたむ" } }
-      }
-    },
-    "contextMenu.expandWorktreeFolder": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": { "stringUnit": { "state": "translated", "value": "Expand Worktree Folder" } },
-        "ja": { "stringUnit": { "state": "translated", "value": "ワークツリーフォルダを展開" } }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "クリップボードからフォルダパスを読み込めませんでした。"
+          }
+        }
       }
     },
-    "contextMenu.moveDown": {
+    "markdown.compare.after": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Move Down"
+            "value": "After"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "変更後"
           }
         }
       }
     },
-    "contextMenu.moveToTop": {
+    "markdown.compare.before": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Move to Top"
+            "value": "Before"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "変更前"
           }
         }
       }
     },
-    "contextMenu.moveUp": {
+    "markdown.fileUnavailable.message": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Move Up"
+            "value": "The file may have been moved or deleted."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ファイルが移動または削除された可能性があります。"
           }
         }
       }
     },
-    "contextMenu.moveWorkspaceToWindow": {
+    "markdown.fileUnavailable.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Move Workspace to Window"
+            "value": "File unavailable"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ファイルを利用できません"
           }
         }
       }
     },
-    "contextMenu.moveWorkspacesToWindow": {
+    "menu.app.about": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Move Workspaces to Window"
+            "value": "About Programa"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Programaについて"
           }
         }
       }
     },
-    "contextMenu.newWorktreeWorkspace": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": { "stringUnit": { "state": "translated", "value": "New Worktree Workspace…" } },
-        "ja": { "stringUnit": { "state": "translated", "value": "新しいワークツリーワークスペース…" } }
-      }
-    },
-    "contextMenu.openAgentOverview": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": { "stringUnit": { "state": "translated", "value": "Open Agent Overview" } },
-        "ja": { "stringUnit": { "state": "translated", "value": "エージェント概要を開く" } }
-      }
-    },
-    "contextMenu.newWindow": {
+    "menu.app.checkForUpdates": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "New Window"
+            "value": "Check for Updates…"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "アップデートを確認…"
           }
         }
       }
     },
-    "contextMenu.pinWorkspace": {
+    "menu.app.ghosttySettings": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Pin Workspace"
+            "value": "Ghostty Settings…"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Ghosttyの設定…"
           }
         }
       }
     },
-    "contextMenu.pinWorkspaces": {
+    "menu.app.reloadConfiguration": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Pin Workspaces"
+            "value": "Reload Configuration"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "設定を再読み込み"
           }
         }
       }
     },
-    "contextMenu.removeCustomWorkspaceName": {
+    "menu.app.settings": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Remove Custom Workspace Name"
+            "value": "Settings…"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "設定…"
           }
         }
       }
     },
-    "contextMenu.renameWorkspace": {
+    "menu.checkForUpdates": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Rename Workspace…"
+            "value": "Check for Updates…"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "アップデートを確認…"
           }
         }
       }
     },
-    "contextMenu.stopUsingAsWorktreeFolder": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": { "stringUnit": { "state": "translated", "value": "Stop Using as Worktree Folder" } },
-        "ja": { "stringUnit": { "state": "translated", "value": "ワークツリーフォルダとしての使用を停止" } }
-      }
-    },
-    "contextMenu.unpinWorkspace": {
+    "menu.currentWindow": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Unpin Workspace"
+            "value": "Current Window"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "現在のウインドウ"
           }
         }
       }
     },
-    "contextMenu.unpinWorkspaces": {
+    "menu.file.closeOtherTabs": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Unpin Workspaces"
+            "value": "Close Other Tabs in Pane"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ペイン内の他のタブを閉じる"
           }
         }
       }
     },
-    "contextMenu.useAsWorktreeFolder": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": { "stringUnit": { "state": "translated", "value": "Use as Worktree Folder" } },
-        "ja": { "stringUnit": { "state": "translated", "value": "ワークツリーフォルダとして使用" } }
-      }
-    },
-    "contextMenu.workspaceColor": {
+    "menu.file.closeTab": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Workspace Color"
+            "value": "Close Tab"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "タブを閉じる"
           }
         }
       }
     },
-    "controlBackgroundColor": {
+    "menu.file.closeWorkspace": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "controlBackgroundColor"
+            "value": "Close Workspace"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "controlBackgroundColor"
+            "value": "ワークスペースを閉じる"
           }
         }
       }
     },
-    "debug.browserToolbarGlass.enable": {
+    "menu.file.commandPalette": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Enable Native Glass Browser Toolbar"
+            "value": "Command Palette…"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "ネイティブガラスのブラウザツールバーを有効にする"
+            "value": "コマンドパレット…"
           }
         }
       }
     },
-    "debug.browserToolbarGlass.title": {
+    "menu.file.goToWorkspace": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Browser Toolbar Glass"
+            "value": "Go to Workspace…"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "ブラウザツールバーガラス"
+            "value": "ワークスペースに移動…"
           }
         }
       }
     },
-    "debug.browserProfilePopover.group.padding": {
+    "menu.file.installClaudeIntegration": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Padding"
+            "value": "Install Claude Code Integration…"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Claude Code 連携をインストール…"
           }
         }
       }
     },
-    "debug.browserProfilePopover.group.preview": {
+    "menu.file.installCodexIntegration": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Preview"
+            "value": "Install Codex Integration…"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Codex 連携をインストール…"
           }
         }
       }
     },
-    "debug.browserProfilePopover.heading": {
+    "menu.file.installOpenCodeIntegration": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Browser Profile Popover"
+            "value": "Install OpenCode Integration…"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "OpenCode 連携をインストール…"
           }
         }
       }
     },
-    "debug.browserProfilePopover.label.horizontal": {
+    "menu.file.newClaudeWorkspace": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Horizontal"
+            "value": "New Claude Code Workspace"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "新規 Claude Code ワークスペース"
           }
         }
       }
     },
-    "debug.browserProfilePopover.label.vertical": {
+    "menu.file.newWindow": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Vertical"
+            "value": "New Window"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "新規ウインドウ"
           }
         }
       }
     },
-    "debug.browserProfilePopover.liveNote": {
+    "menu.file.newWorkspace": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Changes apply live to the browser profile popover."
+            "value": "New Workspace"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "新規ワークスペース"
           }
         }
       }
     },
-    "debug.browserProfilePopover.note": {
+    "menu.file.openFolder": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Tune the profile popover padding live while comparing it against the browser toolbar menu."
+            "value": "Open Folder…"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "フォルダを開く…"
           }
         }
       }
     },
-    "debug.browserProfilePopover.reset": {
+    "menu.file.openFolder.panelPrompt": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Reset"
+            "value": "Open"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "開く"
           }
         }
       }
     },
-    "debug.devBuildBanner.show": {
+    "menu.file.openFolder.panelTitle": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Show Dev Build Banner"
+            "value": "Open Folder"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "フォルダを開く"
           }
         }
       }
     },
-    "debug.devBuildBanner.title": {
+    "menu.file.reopenClosedBrowserPanel": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "THIS IS A DEV BUILD"
+            "value": "Reopen Closed Panel"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "閉じたパネルを再度開く"
           }
         }
       }
     },
-    "debug.menu.background": {
+    "menu.find.find": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Background Debug…"
+            "value": "Find…"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "背景デバッグ…"
+            "value": "検索…"
           }
         }
       }
     },
-    "debug.menu.browserProfilePopoverDebug": {
+    "menu.find.findNext": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Browser Profile Popover Debug…"
+            "value": "Find Next"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "次を検索"
           }
         }
       }
     },
-    "debug.menu.browserToolbarGlass": {
+    "menu.find.findPrevious": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Browser Toolbar Glass Debug…"
+            "value": "Find Previous"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "ブラウザツールバーガラスデバッグ…"
+            "value": "前を検索"
           }
         }
       }
     },
-    "debug.menu.browserToolbarButtonSpacing": {
+    "menu.find.hideFindBar": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Browser Toolbar Button Spacing"
+            "value": "Hide Find Bar"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "検索バーを隠す"
           }
         }
       }
     },
-    "debug.menu.menuBarExtra": {
+    "menu.find.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Menu Bar Extra Debug…"
+            "value": "Find"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "メニューバー追加項目デバッグ…"
+            "value": "検索"
           }
         }
       }
     },
-    "debug.menu.overlayGlass": {
+    "menu.find.useSelectionForFind": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Overlay Glass Debug…"
+            "value": "Use Selection for Find"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "オーバーレイガラスデバッグ…"
+            "value": "選択範囲を検索に使用"
           }
         }
       }
     },
-    "debug.menu.newLargeScrollbackTab": {
+    "menu.notifications.clearAll": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "New Tab With Large Scrollback"
+            "value": "Clear All"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "大きなスクロールバック付きの新規タブ"
+            "value": "すべて削除"
           }
         }
       }
     },
-    "debug.menu.newLoremTab": {
+    "menu.notifications.jumpToUnread": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "New Tab With Lorem Search Text"
+            "value": "Jump to Latest Unread"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Lorem検索テキスト付きの新規タブ"
+            "value": "最新の未読へジャンプ"
           }
         }
       }
     },
-    "debug.menu.openAllWindows": {
+    "menu.notifications.markAllRead": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Open All Debug Windows"
+            "value": "Mark All Read"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "すべてのデバッグウインドウを開く"
+            "value": "すべて既読にする"
           }
         }
       }
     },
-    "debug.menu.openStressWorkspacesWithLoadedSurfaces": {
+    "menu.notifications.show": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Open Stress Workspaces and Load All Terminals"
+            "value": "Show Notifications"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "通知を表示"
           }
         }
       }
     },
-    "debug.menu.openWorkspaceColors": {
+    "menu.notifications.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Open Workspaces for All Workspace Colors"
+            "value": "Notifications"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "すべてのワークスペース色を開く"
+            "value": "通知"
           }
         }
       }
     },
-    "debug.menu.settingsAboutTitlebar": {
+    "menu.openInAndroidStudio": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Settings/About Titlebar Debug…"
+            "value": "Open Current Directory in Android Studio"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "設定／情報タイトルバーデバッグ…"
+            "value": "現在のディレクトリをAndroid Studioで開く"
           }
         }
       }
     },
-    "debug.menu.density": {
+    "menu.openInAntigravity": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Density Debug…"
+            "value": "Open Current Directory in Antigravity"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "密度デバッグ…"
+            "value": "現在のディレクトリをAntigravityで開く"
           }
         }
       }
     },
-    "debug.menu.sidebar": {
+    "menu.openInCursor": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Sidebar Debug…"
+            "value": "Open Current Directory in Cursor"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "サイドバーデバッグ…"
+            "value": "現在のディレクトリをCursorで開く"
           }
         }
       }
     },
-    "debug.menu.splitButtonLayout": {
+    "menu.openInFinder": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Split Button Layout Debug…"
+            "value": "Open Current Directory in Finder"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "分割ボタンレイアウトデバッグ…"
+            "value": "現在のディレクトリをFinderで開く"
           }
         }
       }
     },
-    "debug.overlayGlass.enable": {
+    "menu.openInGhostty": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Enable Native Glass Overlays"
+            "value": "Open Current Directory in Ghostty"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "ネイティブガラスのオーバーレイを有効にする"
+            "value": "現在のディレクトリをGhosttyで開く"
           }
         }
       }
     },
-    "debug.overlayGlass.title": {
+    "menu.openInITerm2": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Overlay Glass"
+            "value": "Open Current Directory in iTerm2"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "オーバーレイガラス"
+            "value": "現在のディレクトリをiTerm2で開く"
           }
         }
       }
     },
-    "debug.menu.tabBarGlass": {
+    "menu.openInIntelliJ": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Tab Bar Glass Debug…"
+            "value": "Open Current Directory in IntelliJ IDEA"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "タブバーガラスデバッグ…"
+            "value": "現在のディレクトリをIntelliJ IDEAで開く"
           }
         }
       }
     },
-    "debug.tabBarGlass.title": {
+    "menu.openInTerminal": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Tab Bar Glass"
+            "value": "Open Current Directory in Terminal"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "タブバーガラス"
+            "value": "現在のディレクトリをTerminalで開く"
           }
         }
       }
     },
-    "debug.tabBarGlass.enable": {
+    "menu.openInTower": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Enable Native Glass Tab Pills"
+            "value": "Open Current Directory in Tower"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "ネイティブガラスのタブピルを有効にする"
+            "value": "現在のディレクトリをTowerで開く"
           }
         }
       }
     },
-    "debug.glass.changesApplyLive": {
+    "menu.openInVSCodeDesktop": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Changes apply live."
+            "value": "Open Current Directory in VS Code"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "変更はすぐに反映されます。"
+            "value": "現在のディレクトリをVS Codeで開く"
           }
         }
       }
     },
-    "debug.glass.requiresMacOS26": {
+    "menu.openInWarp": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Native Liquid Glass requires macOS 26."
+            "value": "Open Current Directory in Warp"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "ネイティブLiquid GlassにはmacOS 26が必要です。"
+            "value": "現在のディレクトリをWarpで開く"
           }
         }
       }
     },
-    "debug.menu.title": {
+    "menu.openInWindsurf": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Debug"
+            "value": "Open Current Directory in Windsurf"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "デバッグ"
+            "value": "現在のディレクトリをWindsurfで開く"
           }
         }
       }
     },
-    "debug.menu.windowControls": {
+    "menu.openInXcode": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Debug Window Controls…"
+            "value": "Open Current Directory in Xcode"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "デバッグウインドウコントロール…"
+            "value": "現在のディレクトリをXcodeで開く"
           }
         }
       }
     },
-    "debug.menu.windows": {
+    "menu.openInZed": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Debug Windows"
+            "value": "Open Current Directory in Zed"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "デバッグウインドウ"
+            "value": "現在のディレクトリをZedで開く"
           }
         }
       }
     },
-    "debug.shortcutHints.alwaysShow": {
+    "menu.preferences": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Always Show Shortcut Hints"
+            "value": "Preferences…"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "ショートカットヒントを常に表示"
+            "value": "環境設定…"
           }
         }
       }
     },
-    "debug.titlebarControls.style": {
+    "menu.updateLogs.copyFocusLogs": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Titlebar Controls Style"
+            "value": "Copy Focus Logs"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "タイトルバーコントロールのスタイル"
+            "value": "フォーカスログをコピー"
           }
         }
       }
     },
-    "debug.updatePill.automatic": {
+    "menu.updateLogs.copyUpdateLogs": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Automatic Update Pill"
+            "value": "Copy Update Logs"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "更新ピルを自動表示"
+            "value": "アップデートログをコピー"
           }
         }
       }
     },
-    "debug.updatePill.hide": {
+    "menu.view.actualSize": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Hide Update Pill"
+            "value": "Actual Size"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "更新ピルを非表示"
+            "value": "実際のサイズ"
           }
         }
       }
     },
-    "debug.updatePill.menu": {
+    "menu.view.back": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Update Pill"
+            "value": "Back"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "更新ピル"
+            "value": "戻る"
           }
         }
       }
     },
-    "debug.updatePill.show": {
+    "menu.view.clearBrowserHistory": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Show Update Pill"
+            "value": "Clear Browser History"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "更新ピルを表示"
+            "value": "ブラウザ履歴を消去"
           }
         }
       }
     },
-    "debug.updatePill.showLoading": {
+    "menu.view.editWorkspaceDescription": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Show Loading State"
+            "value": "Edit Workspace Description…"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "読み込み状態を表示"
+            "value": "ワークスペースの説明を編集…"
           }
         }
       }
     },
-    "debug.updatePill.showLongNightly": {
+    "menu.view.forward": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Show Long Nightly Pill"
+            "value": "Forward"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "長いNightly更新ピルを表示"
+            "value": "進む"
           }
         }
       }
     },
-    "debug.windows.browserProfilePopover.title": {
+    "menu.view.jumpToUnread": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Browser Profile Popover Debug"
+            "value": "Jump to Latest Unread"
           }
-        }
-      }
-    },
-    "dialog.closeOtherTabs.title": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Close other tabs?"
+            "value": "最新の未読に移動"
           }
         }
       }
     },
-    "dialog.closePinnedWorkspace.message": {
+    "menu.view.nextSurface": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "This workspace is pinned. Closing it will close the workspace and all of its panels."
+            "value": "Next Surface"
           }
-        }
-      }
-    },
-    "dialog.closePinnedWorkspace.title": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Close pinned workspace?"
+            "value": "次のサーフェス"
           }
         }
       }
     },
-    "dialog.closeTab.cancel": {
+    "menu.view.nextWorkspace": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Cancel"
+            "value": "Next Workspace"
           }
-        }
-      }
-    },
-    "dialog.closeTab.close": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Close"
+            "value": "次のワークスペース"
           }
         }
       }
     },
-    "dialog.closeTab.message": {
+    "menu.view.previousSurface": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "This will close the current tab."
+            "value": "Previous Surface"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "前のサーフェス"
           }
         }
       }
     },
-    "dialog.closeTab.messageNamed": {
+    "menu.view.previousWorkspace": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "This will close \"%@\"."
+            "value": "Previous Workspace"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "前のワークスペース"
           }
         }
       }
     },
-    "dialog.closeTab.title": {
+    "menu.view.reloadPage": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Close tab?"
+            "value": "Reload Page"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ページを再読み込み"
           }
         }
       }
     },
-    "dialog.closeWindow.message": {
+    "menu.view.renameWorkspace": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "This will close the current window and all of its workspaces."
+            "value": "Rename Workspace…"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ワークスペース名を変更…"
           }
         }
       }
     },
-    "dialog.closeWindow.title": {
+    "menu.view.showJSConsole": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Close window?"
+            "value": "Show JavaScript Console"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "JavaScriptコンソールを表示"
           }
         }
       }
     },
-    "dialog.closeWorkspace.message": {
+    "menu.view.showNotifications": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "This will close the workspace and all of its panels."
+            "value": "Show Notifications"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "通知を表示"
           }
         }
       }
     },
-    "dialog.closeWorkspace.title": {
+    "menu.view.splitBrowserDown": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Close workspace?"
+            "value": "Split Browser Down"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ブラウザを下に分割"
           }
         }
       }
     },
-    "dialog.closeWorkspaces.message": {
+    "menu.view.splitBrowserRight": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "This will close %1$lld workspaces and all of their panels:\n%2$@"
+            "value": "Split Browser Right"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ブラウザを右に分割"
           }
         }
       }
     },
-    "dialog.closeWorkspaces.title": {
+    "menu.view.splitDown": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Close workspaces?"
+            "value": "Split Down"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "下に分割"
           }
         }
       }
     },
-    "dialog.closeWorkspacesWindow.message": {
+    "menu.view.splitRight": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "This will close the current window, its %1$lld workspaces, and all of their panels:\n%2$@"
+            "value": "Split Right"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "右に分割"
           }
         }
       }
     },
-    "dialog.cmuxConfig.confirmCommand.cancel": {
+    "menu.view.toggleDevTools": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Cancel"
+            "value": "Toggle Developer Tools"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "開発者ツールを切り替え"
           }
         }
       }
     },
-    "dialog.cmuxConfig.confirmCommand.configChanged": {
+    "menu.view.toggleSidebar": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "This folder's programa.json has changed since you trusted it."
+            "value": "Toggle Sidebar"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "このフォルダのprograma.jsonは、信頼してから変更されています。"
+            "value": "サイドバーを切り替え"
           }
         }
       }
     },
-    "dialog.cmuxConfig.confirmCommand.messageWithCommand": {
+    "menu.view.workspace": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "This will run the following command:\n\n%@"
+            "value": "Workspace %lld"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "次のコマンドを実行します:\n\n%@"
+            "value": "ワークスペース %lld"
           }
         }
       }
     },
-    "dialog.cmuxConfig.confirmCommand.run": {
+    "menu.view.zoomIn": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Run"
+            "value": "Zoom In"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "拡大"
           }
         }
       }
     },
-    "dialog.cmuxConfig.confirmCommand.title": {
+    "menu.view.zoomOut": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Run Command"
+            "value": "Zoom Out"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "縮小"
           }
         }
       }
     },
-    "dialog.cmuxConfig.confirmCommand.truncated": {
+    "menu.windowNumber": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "… (truncated)"
+            "value": "Window %lld"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "…(省略)"
+            "value": "ウインドウ %lld"
           }
         }
       }
     },
-    "dialog.cmuxConfig.confirmCommand.trustDirectory": {
+    "notification.longCommand.failed": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Always trust commands from this folder"
+            "value": "Failed (exit %@) after %@"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "このフォルダのコマンドを常に信頼する"
+            "value": "失敗しました (終了コード %@) - %@ 経過"
           }
         }
       }
     },
-    "dialog.cmuxConfig.confirmCommand.workspaceSummary": {
+    "notification.longCommand.succeeded": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Open workspace \"%@\""
+            "value": "Finished in %@"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "ワークスペース「%@」を開く"
+            "value": "%@ で完了しました"
           }
         }
       }
     },
-    "dialog.cmuxConfig.confirmRecipe.insert": {
+    "notifications.clearAll": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Insert"
+            "value": "Clear All"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "挿入"
+            "value": "すべて消去"
           }
         }
       }
     },
-    "dialog.cmuxConfig.confirmRecipe.messageWithPrompt": {
+    "notifications.empty.description": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "This will insert the following prompt into the focused terminal (it will not be sent until you press Return):\n\n%@"
+            "value": "Desktop notifications will appear here for quick review."
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "フォーカスされたターミナルに次のプロンプトを挿入します(Returnキーを押すまで送信されません):\n\n%@"
+            "value": "デスクトップ通知はここに表示され、すぐに確認できます。"
           }
         }
       }
     },
-    "dialog.cmuxConfig.confirmRecipe.title": {
+    "notifications.empty.subtitle": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Insert Prompt"
+            "value": "Desktop notifications will appear here."
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "プロンプトを挿入"
+            "value": "デスクトップ通知はここに表示されます。"
           }
         }
       }
     },
-    "dialog.cmuxConfig.confirmRestart.cancel": {
+    "notifications.empty.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Cancel"
+            "value": "No notifications yet"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "通知はまだありません"
           }
         }
       }
     },
-    "dialog.cmuxConfig.confirmRestart.message": {
+    "notifications.jumpToLatest": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "A workspace with this name already exists. Close it and create a new one?"
+            "value": "Jump to Latest"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "最新に移動"
           }
         }
       }
     },
-    "dialog.cmuxConfig.confirmRestart.recreate": {
+    "notifications.jumpToLatestUnread": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Recreate"
+            "value": "Jump to Latest Unread"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "最新の未読に移動"
           }
         }
       }
     },
-    "dialog.cmuxConfig.confirmRestart.title": {
+    "notifications.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Workspace Already Exists"
+            "value": "Notifications"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "通知"
           }
         }
       }
     },
-    "dialog.cmuxConfig.invalidRecipe.message": {
+    "notificationsPopover.markRead": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Recipe prompts and parameter values must be a single line without control characters. Remove any line breaks, tabs, or control characters and try again. Nothing was inserted into the terminal."
+            "value": "Mark as Read"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "レシピのプロンプトとパラメータの値は、制御文字を含まない1行のテキストにしてください。改行、タブ、制御文字を削除してから、もう一度お試しください。ターミナルには何も挿入されていません。"
+            "value": "既読にする"
           }
         }
       }
     },
-    "dialog.cmuxConfig.invalidRecipe.title": {
+    "notificationsPopover.markUnread": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Prompt Needs Correction"
+            "value": "Mark as Unread"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "プロンプトを修正してください"
+            "value": "未読にする"
           }
         }
       }
     },
-    "dialog.cmuxConfig.parameter.continue": {
+    "panel.displayName.fallback": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Continue"
+            "value": "Tab"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "続ける"
+            "value": "タブ"
           }
         }
       }
     },
-    "dialog.cmuxConfig.parameter.message": {
+    "panel.openFolder.prompt": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Enter a value for \"%@\"."
+            "value": "Open"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "「%@」の値を入力してください。"
+            "value": "開く"
           }
         }
       }
     },
-    "dialog.dontWarnCmdQ": {
+    "panel.openFolder.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Don't warn again for Cmd+Q"
+            "value": "Open Folder"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "フォルダを開く"
           }
         }
       }
     },
-    "dialog.enableNotifications.message": {
+    "search.close.help": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Notifications are disabled for Programa. Enable them in System Settings to see alerts."
+            "value": "Close (Esc)"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "閉じる (Esc)"
           }
         }
       }
     },
-    "dialog.enableNotifications.notNow": {
+    "search.nextMatch.help": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Not Now"
+            "value": "Next match (Return)"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "次の一致 (Return)"
           }
         }
       }
     },
-    "dialog.enableNotifications.openSettings": {
+    "search.placeholder": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Open Settings"
+            "value": "Search"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "検索"
           }
         }
       }
     },
-    "dialog.enableNotifications.title": {
+    "search.previousMatch.help": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Enable Notifications for Programa"
+            "value": "Previous match (Shift+Return)"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "前の一致 (Shift+Return)"
           }
         }
       }
     },
-    "dialog.renameWorkspace.message": {
+    "settings.agents.browserSplit": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Enter a custom name for this workspace."
+            "value": "Open a browser beside new agents"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "新規エージェントの横にブラウザを開く"
           }
         }
       }
     },
-    "dialog.renameWorkspace.placeholder": {
+    "settings.agents.browserSplit.subtitleOff": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Workspace name"
+            "value": "New agent workspaces open with a terminal only."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "新規エージェントワークスペースはターミナルのみで開きます。"
           }
         }
       }
     },
-    "dialog.renameWorkspace.title": {
+    "settings.agents.browserSplit.subtitleOn": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Rename Workspace"
+            "value": "New agent workspaces get a browser split next to the terminal."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "新規エージェントワークスペースには、ターミナルの横にブラウザの分割が追加されます。"
           }
         }
       }
     },
-    "dialog.singleInstanceNotResponding.forceClose": {
+    "settings.app.commandPaletteSearchAllSurfaces": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Force Close"
+            "value": "Command Palette Searches All Surfaces"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "強制終了"
+            "value": "コマンドパレットですべてのサーフェスを検索"
           }
         }
       }
     },
-    "dialog.singleInstanceNotResponding.message": {
+    "settings.app.commandPaletteSearchAllSurfaces.subtitleOff": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "The existing Programa instance did not quit. Force closing it may lose unsaved terminal or session state."
+            "value": "Cmd+P matches workspace rows only."
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "既存のProgramaインスタンスは終了しませんでした。強制終了すると、保存されていないターミナルやセッションの状態が失われる可能性があります。"
+            "value": "Cmd+Pはワークスペースの行のみに一致します。"
           }
         }
       }
     },
-    "dialog.singleInstanceNotResponding.title": {
+    "settings.app.commandPaletteSearchAllSurfaces.subtitleOn": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Existing Programa Is Still Open"
+            "value": "Cmd+P also matches terminal, browser, and markdown surfaces across workspaces."
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "既存の Programa が開いたままです"
+            "value": "Cmd+Pは、ワークスペース全体のターミナル、ブラウザ、Markdownサーフェスにも一致します。"
           }
         }
       }
     },
-    "dialog.clipboardConfirmation.allow": {
+    "settings.app.minimalMode": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Allow"
+            "value": "Minimal Mode"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "許可"
+            "value": "ミニマルモード"
           }
         }
       }
     },
-    "dialog.clipboardConfirmation.cancel": {
+    "settings.app.minimalMode.subtitleOff": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Cancel"
+            "value": "Use the standard workspace title bar and controls."
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "キャンセル"
+            "value": "標準のワークスペースタイトルバーとコントロールを使用します。"
           }
         }
       }
     },
-    "dialog.clipboardConfirmation.paste.message": {
+    "settings.app.minimalMode.subtitleOn": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "This clipboard text may execute commands when pasted into the terminal. Allow this paste?"
+            "value": "Hide the workspace title bar and move workspace controls into the sidebar."
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "このクリップボードのテキストをターミナルに貼り付けると、コマンドが実行される可能性があります。貼り付けを許可しますか？"
+            "value": "ワークスペースのタイトルバーを非表示にし、ワークスペースのコントロールをサイドバーに移動します。"
           }
         }
       }
     },
-    "dialog.clipboardConfirmation.paste.title": {
+    "settings.app.newWorkspacePlacement": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Allow Unsafe Paste?"
+            "value": "New Workspace Placement"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "安全でない貼り付けを許可しますか？"
+            "value": "新規ワークスペースの配置"
           }
         }
       }
     },
-    "dialog.clipboardConfirmation.read.message": {
+    "settings.app.persistScrollback": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "A program running in this terminal requested your clipboard contents. Allow it to read the clipboard?"
+            "value": "Save Scrollback on Quit"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "このターミナルで実行中のプログラムがクリップボードの内容を要求しています。読み取りを許可しますか？"
+            "value": "終了時にスクロールバックを保存"
           }
         }
       }
     },
-    "dialog.clipboardConfirmation.read.title": {
+    "settings.app.persistScrollback.incomplete": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Allow Clipboard Access?"
+            "value": "Scrollback privacy could not be fully applied. Retry to finish protecting existing sessions."
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "クリップボードへのアクセスを許可しますか？"
+            "value": "スクロールバックのプライバシー設定を完全に適用できませんでした。再試行して既存のセッションを保護してください。"
           }
         }
       }
     },
-    "error.clipboardFolderPath": {
+    "settings.app.persistScrollback.retry": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Could not load any folder path from the clipboard."
+            "value": "Retry"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "再試行"
           }
         }
       }
     },
-    "markdown.compare.after": {
+    "settings.app.persistScrollback.warning": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "After"
+            "value": "Some older sessions may still write terminal output to disk."
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "変更後"
+            "value": "一部の古いセッションでは、ターミナル出力が引き続きディスクに書き込まれる可能性があります。"
           }
         }
       }
     },
-    "markdown.compare.before": {
+    "settings.app.persistScrollback.subtitleOff": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Before"
+            "value": "Terminal scrollback is not written to disk."
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "変更前"
+            "value": "スクロールバックはディスクに書き込まれません。"
           }
         }
       }
     },
-    "markdown.fileUnavailable.message": {
+    "settings.app.persistScrollback.subtitleOn": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "The file may have been moved or deleted."
+            "value": "Terminal scrollback is saved and restored on next launch."
           }
-        }
-      }
-    },
-    "markdown.fileUnavailable.title": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "File unavailable"
+            "value": "スクロールバックは保存され、次回起動時に復元されます。"
           }
         }
       }
     },
-    "menu.app.about": {
+    "settings.app.reorderOnNotification": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "About Programa"
+            "value": "Reorder on Notification"
           }
-        }
-      }
-    },
-    "menu.app.checkForUpdates": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Check for Updates…"
+            "value": "通知時に並べ替え"
           }
         }
       }
     },
-    "menu.app.ghosttySettings": {
+    "settings.app.reorderOnNotification.subtitle": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Ghostty Settings…"
+            "value": "Move workspaces to the top when they receive a notification. Disable for stable shortcut positions."
           }
-        }
-      }
-    },
-    "menu.app.reloadConfiguration": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Reload Configuration"
+            "value": "通知を受け取ったワークスペースを一番上に移動します。ショートカットの位置を固定したい場合は無効にしてください。"
           }
         }
       }
     },
-    "menu.app.settings": {
+    "settings.app.settingsFile.openButton": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Settings…"
+            "value": "Open settings.json"
           }
-        }
-      }
-    },
-    "menu.checkForUpdates": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Check for Updates…"
+            "value": "settings.jsonを開く"
           }
         }
       }
     },
-    "menu.currentWindow": {
+    "settings.app.showInMenuBar": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Current Window"
+            "value": "Show in Menu Bar"
           }
-        }
-      }
-    },
-    "menu.file.closeOtherTabs": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Close Other Tabs in Pane"
+            "value": "メニューバーに表示"
           }
         }
       }
     },
-    "menu.file.closeTab": {
+    "settings.app.showInMenuBar.subtitle": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Close Tab"
+            "value": "Keep Programa in the menu bar for unread notifications and quick actions."
           }
-        }
-      }
-    },
-    "menu.file.closeWorkspace": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Close Workspace"
+            "value": "Programaをメニューバーに常駐させ、未読通知やクイック操作を利用できるようにします。"
           }
         }
       }
     },
-    "menu.file.commandPalette": {
+    "settings.app.theme": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Command Palette…"
+            "value": "Theme"
           }
-        }
-      }
-    },
-    "menu.file.goToWorkspace": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Go to Workspace…"
+            "value": "テーマ"
           }
         }
       }
     },
-    "menu.file.installClaudeIntegration": {
+    "settings.app.warnBeforeQuit": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Install Claude Code Integration…"
+            "value": "Warn Before Quit"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Claude Code 連携をインストール…"
+            "value": "終了前に警告"
           }
         }
       }
     },
-    "menu.file.installCodexIntegration": {
+    "settings.app.warnBeforeQuit.subtitleOff": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Install Codex Integration…"
+            "value": "Cmd+Q quits immediately without confirmation."
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Codex 連携をインストール…"
+            "value": "Cmd+Qで確認なしにすぐ終了します。"
           }
         }
       }
     },
-    "menu.file.installOpenCodeIntegration": {
+    "settings.app.warnBeforeQuit.subtitleOn": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Install OpenCode Integration…"
+            "value": "Show a confirmation before quitting with Cmd+Q."
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "OpenCode 連携をインストール…"
+            "value": "Cmd+Qで終了する前に確認を表示します。"
           }
         }
       }
     },
-    "menu.file.newClaudeWorkspace": {
+    "settings.automation.agentScreenDetection": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "New Claude Code Workspace"
+            "value": "Screen-Based Agent Detection"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "新規 Claude Code ワークスペース"
+            "value": "画面ベースのエージェント検出"
           }
         }
       }
     },
-    "menu.file.newWindow": {
+    "settings.automation.agentScreenDetection.note": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "New Window"
+            "value": "Applies to agents such as Gemini CLI and GitHub Copilot CLI that have no installed hooks. A hooks-managed session (Claude Code, Codex, OpenCode) always takes priority over this."
           }
-        }
-      }
-    },
-    "menu.file.newWorkspace": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "New Workspace"
+            "value": "フックが未導入のエージェント（Gemini CLI、GitHub Copilot CLI など）に適用されます。フックで管理されているセッション（Claude Code、Codex、OpenCode）は常にこちらより優先されます。"
           }
         }
       }
     },
-    "menu.file.openFolder": {
+    "settings.automation.agentScreenDetection.subtitleOff": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Open Folder…"
+            "value": "Agent status is only shown for CLIs with an installed integration."
           }
-        }
-      }
-    },
-    "menu.file.openFolder.panelPrompt": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Open"
+            "value": "エージェントの状態は、連携機能が導入済みの CLI でのみ表示されます。"
           }
         }
       }
     },
-    "menu.file.openFolder.panelTitle": {
+    "settings.automation.agentScreenDetection.subtitleOn": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Open Folder"
+            "value": "Infers working/blocked/idle status for agent CLIs without an installed integration by reading the terminal screen."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "連携機能が未導入のエージェント CLI について、ターミナル画面を読み取って作業中/ブロック中/待機中の状態を推測します。"
           }
         }
       }
     },
-    "menu.file.reopenClosedBrowserPanel": {
+    "settings.automation.claudeCode": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Reopen Closed Panel"
+            "value": "Claude Code Integration"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "閉じたパネルを再度開く"
+            "value": "Claude Code連携"
           }
         }
       }
     },
-    "menu.find.find": {
+    "settings.automation.claudeCode.customPath": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Find…"
+            "value": "Claude Binary Path"
           }
-        }
-      }
-    },
-    "menu.find.findNext": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Find Next"
+            "value": "Claudeバイナリのパス"
           }
         }
       }
     },
-    "menu.find.findPrevious": {
+    "settings.automation.claudeCode.customPath.placeholder": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Find Previous"
+            "value": "e.g. /usr/local/bin/claude"
           }
-        }
-      }
-    },
-    "menu.find.hideFindBar": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Hide Find Bar"
+            "value": "例: /usr/local/bin/claude"
           }
         }
       }
     },
-    "menu.find.title": {
+    "settings.automation.claudeCode.customPath.subtitle": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Find"
+            "value": "Custom path to the claude binary. Leave empty to use PATH."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "claudeバイナリへのカスタムパスです。空欄にするとPATHを使用します。"
           }
         }
       }
     },
-    "menu.find.useSelectionForFind": {
+    "settings.automation.claudeCode.note": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Use Selection for Find"
+            "value": "When enabled, Programa wraps the claude command to inject session tracking and notification hooks. Disable if you prefer to manage Claude Code hooks yourself."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "有効にすると、Programaはclaudeコマンドをラップして、セッション追跡と通知フックを組み込みます。Claude Codeのフックを自分で管理したい場合は無効にしてください。"
           }
         }
       }
     },
-    "menu.notifications.clearAll": {
+    "settings.automation.claudeCode.subtitleOff": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Clear All"
+            "value": "Claude Code runs without Programa integration."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Claude CodeはProgramaとの連携なしで動作します。"
           }
         }
       }
     },
-    "menu.notifications.jumpToUnread": {
+    "settings.automation.claudeCode.subtitleOn": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Jump to Latest Unread"
+            "value": "Sidebar shows Claude session status and notifications."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "サイドバーにClaudeセッションの状態と通知が表示されます。"
           }
         }
       }
     },
-    "menu.notifications.markAllRead": {
+    "settings.automation.openAccess.dialog.cancel": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Mark All Read"
+            "value": "Cancel"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "キャンセル"
           }
         }
       }
     },
-    "menu.notifications.show": {
+    "settings.automation.openAccess.dialog.confirm": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Show Notifications"
+            "value": "Enable Full Open Access"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "フルオープンアクセスを有効にする"
           }
         }
       }
     },
-    "menu.notifications.title": {
+    "settings.automation.openAccess.dialog.message": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Notifications"
+            "value": "This disables ancestry and password checks and opens the socket to all local users. Only enable when you understand the risk."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "これにより、親プロセスの確認とパスワードチェックが無効になり、ソケットがすべてのローカルユーザーに開放されます。リスクを理解した上でのみ有効にしてください。"
           }
         }
       }
     },
-    "menu.openInAndroidStudio": {
+    "settings.automation.openAccess.dialog.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Open Current Directory in Android Studio"
+            "value": "Enable full open access?"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "フルオープンアクセスを有効にしますか？"
           }
         }
       }
     },
-    "menu.openInAntigravity": {
+    "settings.automation.openAccessWarning": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Open Current Directory in Antigravity"
+            "value": "Warning: Full open access makes the control socket world-readable/writable on this Mac and disables auth checks. Use only for local debugging."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "警告: フルオープンアクセスにすると、このMac上のコントロールソケットが誰でも読み書きできる状態になり、認証チェックが無効になります。ローカルでのデバッグ用途以外では使用しないでください。"
           }
         }
       }
     },
-    "menu.openInCursor": {
+    "settings.automation.port.note": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Open Current Directory in Cursor"
+            "value": "Each workspace gets PROGRAMA_PORT and PROGRAMA_PORT_END env vars with a dedicated port range. New terminals inherit these values."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "各ワークスペースには、専用のポート範囲を示すPROGRAMA_PORTとPROGRAMA_PORT_ENDの環境変数が割り当てられます。新規ターミナルはこれらの値を引き継ぎます。"
           }
         }
       }
     },
-    "menu.openInFinder": {
+    "settings.automation.portBase": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Open Current Directory in Finder"
+            "value": "Port Base"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ポートのベース番号"
           }
         }
       }
     },
-    "menu.openInGhostty": {
+    "settings.automation.portBase.subtitle": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Open Current Directory in Ghostty"
+            "value": "Starting port for PROGRAMA_PORT env var."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "PROGRAMA_PORT環境変数の開始ポート番号です。"
           }
         }
       }
     },
-    "menu.openInITerm2": {
+    "settings.automation.portRange": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Open Current Directory in iTerm2"
+            "value": "Port Range Size"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ポート範囲のサイズ"
           }
         }
       }
     },
-    "menu.openInIntelliJ": {
+    "settings.automation.portRange.subtitle": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Open Current Directory in IntelliJ IDEA"
+            "value": "Number of ports per workspace."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ワークスペースごとのポート数です。"
           }
         }
       }
     },
-    "menu.openInTerminal": {
+    "settings.automation.socketMode": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Open Current Directory in Terminal"
+            "value": "Socket Control Mode"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ソケット制御モード"
           }
         }
       }
     },
-    "menu.openInTower": {
+    "settings.automation.socketMode.note": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Open Current Directory in Tower"
+            "value": "Controls access to the local Unix socket for programmatic control. Choose a mode that matches your threat model."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "プログラムによる制御用のローカルUnixソケットへのアクセスを管理します。脅威モデルに合ったモードを選択してください。"
           }
         }
       }
     },
-    "menu.openInVSCodeDesktop": {
+    "settings.automation.socketOverrides.note": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Open Current Directory in VS Code"
+            "value": "Overrides: PROGRAMA_SOCKET_ENABLE, PROGRAMA_SOCKET_MODE, and PROGRAMA_SOCKET_PATH (set PROGRAMA_ALLOW_SOCKET_OVERRIDE=1 for release builds)."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "上書き設定: PROGRAMA_SOCKET_ENABLE、PROGRAMA_SOCKET_MODE、PROGRAMA_SOCKET_PATH（リリースビルドではPROGRAMA_ALLOW_SOCKET_OVERRIDE=1を設定してください）。"
           }
         }
       }
     },
-    "menu.openInWarp": {
+    "settings.automation.socketPassword": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Open Current Directory in Warp"
+            "value": "Socket Password"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ソケットパスワード"
           }
         }
       }
     },
-    "menu.openInWindsurf": {
+    "settings.automation.socketPassword.change": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Open Current Directory in Windsurf"
+            "value": "Change"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "変更"
           }
         }
       }
     },
-    "menu.openInXcode": {
+    "settings.automation.socketPassword.clear": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Open Current Directory in Xcode"
+            "value": "Clear"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "消去"
           }
         }
       }
     },
-    "menu.openInZed": {
+    "settings.automation.socketPassword.clearFailed": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Open Current Directory in Zed"
+            "value": "Failed to clear password (%@)."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "パスワードの消去に失敗しました（%@）。"
           }
         }
       }
     },
-    "menu.preferences": {
+    "settings.automation.socketPassword.cleared": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Preferences…"
+            "value": "Password cleared."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "パスワードを消去しました。"
           }
         }
       }
     },
-    "menu.updateLogs.copyFocusLogs": {
+    "settings.automation.socketPassword.enterFirst": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Copy Focus Logs"
+            "value": "Enter a password first."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "先にパスワードを入力してください。"
           }
         }
       }
     },
-    "menu.updateLogs.copyUpdateLogs": {
+    "settings.automation.socketPassword.placeholder": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Copy Update Logs"
+            "value": "Password"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "パスワード"
           }
         }
       }
     },
-    "menu.view.actualSize": {
+    "settings.automation.socketPassword.saveFailed": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Actual Size"
+            "value": "Failed to save password (%@)."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "パスワードの保存に失敗しました（%@）。"
           }
         }
       }
     },
-    "menu.view.back": {
+    "settings.automation.socketPassword.saved": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Back"
+            "value": "Password saved."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "パスワードを保存しました。"
           }
         }
       }
     },
-    "menu.view.clearBrowserHistory": {
+    "settings.automation.socketPassword.set": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Clear Browser History"
+            "value": "Set"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "設定"
           }
         }
       }
     },
-    "menu.view.editWorkspaceDescription": {
+    "settings.automation.socketPassword.subtitleSet": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Edit Workspace Description…"
+            "value": "Stored in Application Support."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Application Supportに保存されています。"
           }
         }
       }
     },
-    "menu.view.forward": {
+    "settings.automation.socketPassword.subtitleUnset": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Forward"
+            "value": "No password set. External clients will be blocked until one is configured."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "パスワードが未設定です。設定するまで外部クライアントはブロックされます。"
           }
         }
       }
     },
-    "menu.view.jumpToUnread": {
+    "settings.blendMode.behindWindow": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Jump to Latest Unread"
+            "value": "Behind Window"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ウインドウの背後"
           }
         }
       }
     },
-    "menu.view.nextSurface": {
+    "settings.blendMode.withinWindow": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Next Surface"
+            "value": "Within Window"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ウインドウ内"
           }
         }
       }
     },
-    "menu.view.nextWorkspace": {
+    "settings.browser.externalBrowser": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Next Workspace"
+            "value": "Open External Links With"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "外部リンクを開くブラウザ"
           }
         }
       }
     },
-    "menu.view.previousSurface": {
+    "settings.browser.externalBrowser.subtitle": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Previous Surface"
+            "value": "Used for terminal links and browser links that open outside Programa."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Programa の外部で開くターミナルリンクやブラウザリンクに使用されます。"
           }
         }
       }
     },
-    "menu.view.previousWorkspace": {
+    "settings.browser.externalBrowser.systemDefault": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Previous Workspace"
+            "value": "System Default"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "システムのデフォルト"
           }
         }
       }
     },
-    "menu.view.reloadPage": {
+    "menu.file.installAsideMCP": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Reload Page"
+            "value": "Install Aside Browser MCP…"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Aside ブラウザ MCP をインストール…"
           }
         }
       }
     },
-    "menu.view.renameWorkspace": {
+    "settings.browser.externalPatterns": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Rename Workspace…"
+            "value": "URLs to Always Open Externally"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "常に外部で開くURL"
           }
         }
       }
     },
-    "menu.view.showJSConsole": {
+    "settings.browser.externalPatterns.subtitle": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Show JavaScript Console"
+            "value": "Applies to terminal link clicks and intercepted `open https://...` calls. One rule per line. Plain text matches any URL substring, or prefix with `re:` for regex (for example: openai.com/usage, re:^https?://[^/]*\\\\.example\\\\.com/(billing|usage))."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ターミナルのリンククリックと、インターセプトされた `open https://...` 呼び出しに適用されます。1行に1つのルールを記述します。プレーンテキストはURLの部分文字列に一致し、正規表現を使う場合は `re:` を先頭に付けます（例: openai.com/usage, re:^https?://[^/]*\\\\.example\\\\.com/(billing|usage)）。"
           }
         }
       }
     },
-    "menu.view.showNotifications": {
+    "settings.browser.history": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Show Notifications"
+            "value": "Browsing History"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "閲覧履歴"
           }
         }
       }
     },
-    "menu.view.splitBrowserDown": {
+    "settings.browser.history.clearButton": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Split Browser Down"
+            "value": "Clear History…"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "履歴を消去…"
           }
         }
       }
     },
-    "menu.view.splitBrowserRight": {
+    "settings.browser.history.clearDialog.cancel": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Split Browser Right"
+            "value": "Cancel"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "キャンセル"
           }
         }
       }
     },
-    "menu.view.splitDown": {
+    "settings.browser.history.clearDialog.confirm": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Split Down"
+            "value": "Clear History"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "履歴を消去"
           }
         }
       }
     },
-    "menu.view.splitRight": {
+    "settings.browser.history.clearDialog.message": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Split Right"
+            "value": "This removes visited-page suggestions from the browser omnibar."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ブラウザのアドレスバーから、閲覧済みページの候補が削除されます。"
           }
         }
       }
     },
-    "menu.view.toggleDevTools": {
+    "settings.browser.history.clearDialog.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Toggle Developer Tools"
+            "value": "Clear browser history?"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ブラウザの履歴を消去しますか？"
           }
         }
       }
     },
-    "menu.view.toggleSidebar": {
+    "settings.browser.history.subtitleEmpty": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Toggle Sidebar"
+            "value": "No saved pages yet."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "保存されたページはまだありません。"
           }
         }
       }
     },
-    "menu.view.workspace": {
+    "settings.browser.history.subtitleMany": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Workspace %lld"
+            "value": "%lld saved pages appear in omnibar suggestions."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "%lld件の保存されたページがアドレスバーの候補に表示されます。"
           }
         }
       }
     },
-    "menu.view.zoomIn": {
+    "settings.browser.history.subtitleOne": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Zoom In"
+            "value": "1 saved page appears in omnibar suggestions."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "1件の保存されたページがアドレスバーの候補に表示されます。"
           }
         }
       }
     },
-    "menu.view.zoomOut": {
+    "settings.browser.hostWhitelist": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Zoom Out"
+            "value": "Hosts to Open in Embedded Browser"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "内蔵ブラウザで開くホスト"
           }
         }
       }
     },
-    "menu.windowNumber": {
+    "settings.browser.hostWhitelist.subtitle": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Window %lld"
+            "value": "Applies to terminal link clicks and intercepted `open https://...` calls. Only these hosts open in Programa. Others open in your default browser. One host or wildcard per line (for example: example.com, *.internal.example). Leave empty to open all hosts in Programa."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ターミナルのリンククリックと、インターセプトされた `open https://...` 呼び出しに適用されます。ここに指定したホストのみがProgramaで開きます。それ以外は既定のブラウザで開きます。1行に1つのホストまたはワイルドカードを記述します（例: example.com, *.internal.example）。空欄にすると、すべてのホストがProgramaで開きます。"
           }
         }
       }
     },
-    "notification.longCommand.failed": {
+    "settings.browser.httpAllowlist": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Failed (exit %@) after %@"
+            "value": "HTTP Hosts Allowed in Embedded Browser"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "失敗しました (終了コード %@) - %@ 経過"
+            "value": "内蔵ブラウザで許可するHTTPホスト"
           }
         }
       }
     },
-    "notification.longCommand.succeeded": {
+    "settings.browser.httpAllowlist.description": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Finished in %@"
+            "value": "Controls which HTTP (non-HTTPS) hosts can open in Programa without a warning prompt. Defaults include localhost, 127.0.0.1, ::1, 0.0.0.0, and *.localtest.me."
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "%@ で完了しました"
+            "value": "警告なしでProgramaで開けるHTTP（非HTTPS）ホストを制御します。デフォルトではlocalhost、127.0.0.1、::1、0.0.0.0、*.localtest.meが含まれます。"
           }
         }
       }
     },
-    "notifications.clearAll": {
+    "settings.browser.httpAllowlist.hint": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Clear All"
+            "value": "One host or wildcard per line (for example: localhost, 127.0.0.1, ::1, 0.0.0.0, *.localtest.me)."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "1行に1つのホストまたはワイルドカードを記述します（例: localhost, 127.0.0.1, ::1, 0.0.0.0, *.localtest.me）。"
           }
         }
       }
     },
-    "notifications.empty.description": {
+    "settings.browser.httpAllowlist.save": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Desktop notifications will appear here for quick review."
+            "value": "Save"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "保存"
           }
         }
       }
     },
-    "notifications.empty.subtitle": {
+    "settings.browser.interceptOpen": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Desktop notifications will appear here."
+            "value": "Intercept open http(s) in Terminal"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ターミナル内の open http(s) をインターセプト"
           }
         }
       }
     },
-    "notifications.empty.title": {
+    "settings.browser.interceptOpen.subtitle": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "No notifications yet"
+            "value": "When off, `open https://...` and `open http://...` always use your default browser."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "オフの場合、`open https://...` と `open http://...` は常に既定のブラウザを使用します。"
           }
         }
       }
     },
-    "notifications.jumpToLatest": {
+    "settings.browser.openTerminalLinks": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Jump to Latest"
+            "value": "Open Terminal Links in Programa Browser"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ターミナルのリンクをProgramaブラウザで開く"
           }
         }
       }
     },
-    "notifications.jumpToLatestUnread": {
+    "settings.browser.openTerminalLinks.subtitle": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Jump to Latest Unread"
+            "value": "When off, links clicked in terminal output open in your default browser."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "オフの場合、ターミナル出力内でクリックしたリンクは既定のブラウザで開きます。"
           }
         }
       }
     },
-    "notifications.title": {
+    "settings.browser.searchEngine": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Notifications"
+            "value": "Default Search Engine"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "既定の検索エンジン"
           }
         }
       }
     },
-    "notificationsPopover.markRead": {
+    "settings.browser.searchEngine.subtitle": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Mark as Read"
+            "value": "Used by the browser address bar when input is not a URL."
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "既読にする"
+            "value": "入力がURLでない場合に、ブラウザのアドレスバーで使用されます。"
           }
         }
       }
     },
-    "notificationsPopover.markUnread": {
+    "settings.browser.searchSuggestions": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Mark as Unread"
+            "value": "Show Search Suggestions"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "未読にする"
+            "value": "検索候補を表示"
           }
         }
       }
     },
-    "panel.displayName.fallback": {
+    "settings.browser.theme": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Tab"
+            "value": "Browser Theme"
           }
-        }
-      }
-    },
-    "panel.openFolder.prompt": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Open"
+            "value": "ブラウザのテーマ"
           }
         }
       }
     },
-    "panel.openFolder.title": {
+    "settings.browser.theme.subtitleForced": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Open Folder"
+            "value": "%@ forces that color scheme for compatible pages."
           }
-        }
-      }
-    },
-    "search.close.help": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Close (Esc)"
+            "value": "%@は、対応するページでその配色を強制します。"
           }
         }
       }
     },
-    "search.nextMatch.help": {
+    "settings.browser.theme.subtitleSystem": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Next match (Return)"
+            "value": "System follows app and macOS appearance."
           }
-        }
-      }
-    },
-    "search.placeholder": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Search"
+            "value": "「システム」はアプリとmacOSの外観に従います。"
           }
         }
       }
     },
-    "search.previousMatch.help": {
+    "settings.material.contentBackground": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Previous match (Shift+Return)"
+            "value": "Content Background"
           }
-        }
-      }
-    },
-    "settings.agents.browserSplit": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Open a browser beside new agents"
+            "value": "コンテンツ背景"
           }
         }
       }
     },
-    "settings.agents.browserSplit.subtitleOff": {
+    "settings.material.fullScreenUI": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "New agent workspaces open with a terminal only."
+            "value": "Full Screen UI"
           }
-        }
-      }
-    },
-    "settings.agents.browserSplit.subtitleOn": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "New agent workspaces get a browser split next to the terminal."
+            "value": "フルスクリーンUI"
           }
         }
       }
     },
-    "settings.app.commandPaletteSearchAllSurfaces": {
+    "settings.material.headerView": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Command Palette Searches All Surfaces"
+            "value": "Header View"
           }
-        }
-      }
-    },
-    "settings.app.commandPaletteSearchAllSurfaces.subtitleOff": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Cmd+P matches workspace rows only."
+            "value": "ヘッダービュー"
           }
         }
       }
     },
-    "settings.app.commandPaletteSearchAllSurfaces.subtitleOn": {
+    "settings.material.hudWindow": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Cmd+P also matches terminal, browser, and markdown surfaces across workspaces."
+            "value": "HUD Window"
           }
-        }
-      }
-    },
-    "settings.app.minimalMode": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Minimal Mode"
+            "value": "HUDウインドウ"
           }
         }
       }
     },
-    "settings.app.minimalMode.subtitleOff": {
+    "settings.material.liquidGlass": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Use the standard workspace title bar and controls."
+            "value": "Liquid Glass (macOS 26+)"
           }
-        }
-      }
-    },
-    "settings.app.minimalMode.subtitleOn": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Hide the workspace title bar and move workspace controls into the sidebar."
+            "value": "リキッドガラス（macOS 26以降）"
           }
         }
       }
     },
-    "settings.app.newWorkspacePlacement": {
+    "settings.material.menu": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "New Workspace Placement"
+            "value": "Menu"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "メニュー"
           }
         }
       }
     },
-    "settings.app.persistScrollback": {
+    "settings.material.none": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Save Scrollback on Quit"
+            "value": "None"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "終了時にスクロールバックを保存"
+            "value": "なし"
           }
         }
       }
     },
-    "settings.app.persistScrollback.incomplete": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": { "stringUnit": { "state": "translated", "value": "Scrollback privacy could not be fully applied. Retry to finish protecting existing sessions." } },
-        "ja": { "stringUnit": { "state": "translated", "value": "スクロールバックのプライバシー設定を完全に適用できませんでした。再試行して既存のセッションを保護してください。" } }
-      }
-    },
-    "settings.app.persistScrollback.retry": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": { "stringUnit": { "state": "translated", "value": "Retry" } },
-        "ja": { "stringUnit": { "state": "translated", "value": "再試行" } }
-      }
-    },
-    "settings.app.persistScrollback.warning": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": { "stringUnit": { "state": "translated", "value": "Some older sessions may still write terminal output to disk." } },
-        "ja": { "stringUnit": { "state": "translated", "value": "一部の古いセッションでは、ターミナル出力が引き続きディスクに書き込まれる可能性があります。" } }
-      }
-    },
-    "settings.app.persistScrollback.subtitleOff": {
+    "settings.material.popover": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Terminal scrollback is not written to disk."
+            "value": "Popover"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "スクロールバックはディスクに書き込まれません。"
+            "value": "ポップオーバー"
           }
         }
       }
     },
-    "settings.app.persistScrollback.subtitleOn": {
+    "settings.material.sheet": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Terminal scrollback is saved and restored on next launch."
+            "value": "Sheet"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "スクロールバックは保存され、次回起動時に復元されます。"
+            "value": "シート"
           }
         }
       }
     },
-    "settings.app.reorderOnNotification": {
+    "settings.material.sidebar": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Reorder on Notification"
+            "value": "Sidebar"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "サイドバー"
           }
         }
       }
     },
-    "settings.app.reorderOnNotification.subtitle": {
+    "settings.material.toolTip": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Move workspaces to the top when they receive a notification. Disable for stable shortcut positions."
+            "value": "Tool Tip"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ツールチップ"
           }
         }
       }
     },
-    "settings.app.settingsFile.openButton": {
+    "settings.material.underWindow": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Open settings.json"
+            "value": "Under Window"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ウインドウの下"
           }
         }
       }
     },
-    "settings.app.showInMenuBar": {
+    "settings.material.windowBackground": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Show in Menu Bar"
+            "value": "Window Background"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ウインドウ背景"
           }
         }
       }
     },
-    "settings.app.showInMenuBar.subtitle": {
+    "settings.notifications.command.placeholder": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Keep Programa in the menu bar for unread notifications and quick actions."
+            "value": "say \"done\""
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "say \"done\""
           }
         }
       }
     },
-    "settings.app.theme": {
+    "settings.notifications.command.subtitle": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Theme"
+            "value": "Run a shell command when a notification arrives. $PROGRAMA_NOTIFICATION_TITLE, $PROGRAMA_NOTIFICATION_SUBTITLE, $PROGRAMA_NOTIFICATION_BODY are set."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "通知が届いたときにシェルコマンドを実行します。$PROGRAMA_NOTIFICATION_TITLE、$PROGRAMA_NOTIFICATION_SUBTITLE、$PROGRAMA_NOTIFICATION_BODY が設定されます。"
           }
         }
       }
     },
-    "settings.app.warnBeforeQuit": {
+    "settings.notifications.command.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Warn Before Quit"
+            "value": "Notification Command"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "通知コマンド"
           }
         }
       }
     },
-    "settings.app.warnBeforeQuit.subtitleOff": {
+    "settings.notifications.desktop.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Cmd+Q quits immediately without confirmation."
+            "value": "Desktop Notifications"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "デスクトップ通知"
           }
         }
       }
     },
-    "settings.app.warnBeforeQuit.subtitleOn": {
+    "settings.notifications.longCommandThreshold.subtitle": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Show a confirmation before quitting with Cmd+Q."
+            "value": "Notify when a command finishes in a pane you're not looking at, if it ran at least this long. Set to 0 to disable."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "見ていないペインでコマンドが完了したとき、実行時間がこの秒数以上であれば通知します。0にすると無効になります。"
           }
         }
       }
     },
-    "settings.automation.agentScreenDetection": {
+    "settings.notifications.longCommandThreshold.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Screen-Based Agent Detection"
+            "value": "Long Command Notification"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "画面ベースのエージェント検出"
+            "value": "長時間コマンドの通知"
           }
         }
       }
     },
-    "settings.automation.agentScreenDetection.note": {
+    "settings.notifications.longCommandThreshold.unit": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Applies to agents such as Gemini CLI and GitHub Copilot CLI that have no installed hooks. A hooks-managed session (Claude Code, Codex, OpenCode) always takes priority over this."
+            "value": "sec"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "フックが未導入のエージェント（Gemini CLI、GitHub Copilot CLI など）に適用されます。フックで管理されているセッション（Claude Code、Codex、OpenCode）は常にこちらより優先されます。"
+            "value": "秒"
           }
         }
       }
     },
-    "settings.automation.agentScreenDetection.subtitleOff": {
+    "settings.notifications.sound.subtitle": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Agent status is only shown for CLIs with an installed integration."
+            "value": "Sound played when a notification arrives."
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "エージェントの状態は、連携機能が導入済みの CLI でのみ表示されます。"
+            "value": "通知が届いたときに再生されるサウンドです。"
           }
         }
       }
     },
-    "settings.automation.agentScreenDetection.subtitleOn": {
+    "settings.notifications.sound.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Infers working/blocked/idle status for agent CLIs without an installed integration by reading the terminal screen."
+            "value": "Notification Sound"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "連携機能が未導入のエージェント CLI について、ターミナル画面を読み取って作業中/ブロック中/待機中の状態を推測します。"
+            "value": "通知サウンド"
           }
         }
       }
     },
-    "settings.automation.claudeCode": {
+    "settings.preset.hudGlass": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Claude Code Integration"
+            "value": "HUD Glass"
           }
-        }
-      }
-    },
-    "settings.automation.claudeCode.customPath": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Claude Binary Path"
+            "value": "HUDガラス"
           }
         }
       }
     },
-    "settings.automation.claudeCode.customPath.placeholder": {
+    "settings.preset.liquidGlass": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "e.g. /usr/local/bin/claude"
+            "value": "Liquid Glass"
           }
-        }
-      }
-    },
-    "settings.automation.claudeCode.customPath.subtitle": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Custom path to the claude binary. Leave empty to use PATH."
+            "value": "リキッドガラス"
           }
         }
       }
     },
-    "settings.automation.claudeCode.note": {
+    "settings.preset.nativeSidebar": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "When enabled, Programa wraps the claude command to inject session tracking and notification hooks. Disable if you prefer to manage Claude Code hooks yourself."
+            "value": "Native Sidebar"
           }
-        }
-      }
-    },
-    "settings.automation.claudeCode.subtitleOff": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Claude Code runs without Programa integration."
+            "value": "ネイティブサイドバー"
           }
         }
       }
     },
-    "settings.automation.claudeCode.subtitleOn": {
+    "settings.preset.popoverGlass": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Sidebar shows Claude session status and notifications."
+            "value": "Popover Glass"
           }
-        }
-      }
-    },
-    "settings.automation.openAccess.dialog.cancel": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Cancel"
+            "value": "ポップオーバーガラス"
           }
         }
       }
     },
-    "settings.automation.openAccess.dialog.confirm": {
+    "settings.preset.raycastGray": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Enable Full Open Access"
+            "value": "Raycast Gray"
           }
-        }
-      }
-    },
-    "settings.automation.openAccess.dialog.message": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "This disables ancestry and password checks and opens the socket to all local users. Only enable when you understand the risk."
+            "value": "Raycastグレー"
           }
         }
       }
     },
-    "settings.automation.openAccess.dialog.title": {
+    "settings.preset.softBlur": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Enable full open access?"
+            "value": "Soft Blur"
           }
-        }
-      }
-    },
-    "settings.automation.openAccessWarning": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Warning: Full open access makes the control socket world-readable/writable on this Mac and disables auth checks. Use only for local debugging."
+            "value": "ソフトブラー"
           }
         }
       }
     },
-    "settings.automation.port.note": {
+    "settings.preset.underWindow": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Each workspace gets PROGRAMA_PORT and PROGRAMA_PORT_END env vars with a dedicated port range. New terminals inherit these values."
+            "value": "Under Window"
           }
-        }
-      }
-    },
-    "settings.automation.portBase": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Port Base"
+            "value": "ウインドウの下"
           }
         }
       }
     },
-    "settings.automation.portBase.subtitle": {
+    "settings.reset.resetAll": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Starting port for PROGRAMA_PORT env var."
+            "value": "Reset All Settings"
           }
-        }
-      }
-    },
-    "settings.automation.portRange": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Port Range Size"
+            "value": "すべての設定をリセット"
           }
         }
       }
     },
-    "settings.automation.portRange.subtitle": {
+    "settings.section.agents": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Number of ports per workspace."
+            "value": "Agents"
           }
-        }
-      }
-    },
-    "settings.automation.socketMode": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Socket Control Mode"
+            "value": "エージェント"
           }
         }
       }
     },
-    "settings.automation.socketMode.note": {
+    "settings.section.app": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Controls access to the local Unix socket for programmatic control. Choose a mode that matches your threat model."
+            "value": "App"
           }
-        }
-      }
-    },
-    "settings.automation.socketOverrides.note": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Overrides: PROGRAMA_SOCKET_ENABLE, PROGRAMA_SOCKET_MODE, and PROGRAMA_SOCKET_PATH (set PROGRAMA_ALLOW_SOCKET_OVERRIDE=1 for release builds)."
+            "value": "アプリ"
           }
         }
       }
     },
-    "settings.automation.socketPassword": {
+    "settings.section.appearance": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Socket Password"
+            "value": "Appearance"
           }
-        }
-      }
-    },
-    "settings.automation.socketPassword.change": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Change"
+            "value": "外観"
           }
         }
       }
     },
-    "settings.automation.socketPassword.clear": {
+    "settings.section.browserData": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Clear"
+            "value": "Data"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "データ"
           }
         }
       }
     },
-    "settings.automation.socketPassword.clearFailed": {
+    "settings.section.browserLinks": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Failed to clear password (%@)."
+            "value": "Link Handling"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "リンクの処理"
           }
         }
       }
     },
-    "settings.automation.socketPassword.cleared": {
+    "settings.section.browsing": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Password cleared."
+            "value": "Browsing"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "閲覧"
           }
         }
       }
     },
-    "settings.automation.socketPassword.enterFirst": {
+    "settings.section.keyboardShortcuts": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Enter a password first."
+            "value": "Keyboard Shortcuts"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "キーボードショートカット"
           }
         }
       }
     },
-    "settings.automation.socketPassword.placeholder": {
+    "settings.section.notifications": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Password"
+            "value": "Notifications"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "通知"
           }
         }
       }
     },
-    "settings.automation.socketPassword.saveFailed": {
+    "settings.section.ports": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Failed to save password (%@)."
+            "value": "Ports"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ポート"
           }
         }
       }
     },
-    "settings.automation.socketPassword.saved": {
+    "settings.section.reset": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Password saved."
+            "value": "Reset"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "リセット"
           }
         }
       }
     },
-    "settings.automation.socketPassword.set": {
+    "settings.section.sidebar": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Set"
+            "value": "Sidebar"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "サイドバー"
           }
         }
       }
     },
-    "settings.automation.socketPassword.subtitleSet": {
+    "settings.section.socketControl": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Stored in Application Support."
+            "value": "Socket Control"
           }
-        }
-      }
-    },
-    "settings.automation.socketPassword.subtitleUnset": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "No password set. External clients will be blocked until one is configured."
+            "value": "ソケット制御"
           }
         }
       }
     },
-    "settings.blendMode.behindWindow": {
+    "settings.section.terminal": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Behind Window"
+            "value": "Terminal"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ターミナル"
           }
         }
       }
     },
-    "settings.blendMode.withinWindow": {
+    "settings.shortcuts.chords": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Within Window"
+            "value": "Shortcut Chords"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "複合ショートカット"
           }
         }
       }
     },
-    "settings.browser.externalBrowser": {
+    "settings.shortcuts.chords.docsButton": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Open External Links With"
+            "value": "Chord docs"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "外部リンクを開くブラウザ"
+            "value": "複合ショートカットのドキュメント"
           }
         }
       }
     },
-    "settings.browser.externalBrowser.subtitle": {
+    "settings.shortcuts.chords.subtitle": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Used for terminal links and browser links that open outside Programa."
+            "value": "Add tmux-style multi-step shortcuts in settings.json, for example [\"ctrl+b\", \"c\"]."
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Programa の外部で開くターミナルリンクやブラウザリンクに使用されます。"
+            "value": "settings.jsonでtmux風の複数ステップのショートカットを追加します（例: [\"ctrl+b\", \"c\"]）。"
           }
         }
       }
     },
-    "settings.browser.externalBrowser.systemDefault": {
+    "settings.shortcuts.managedByFile": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "System Default"
+            "value": "Managed in settings.json"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "システムのデフォルト"
+            "value": "settings.jsonで管理されています"
           }
         }
       }
     },
-    "menu.file.installAsideMCP": {
+    "settings.shortcuts.recordHint": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Install Aside Browser MCP…"
+            "value": "Click a shortcut value to record. Press a second key for a chord, or click again to keep the first key."
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Aside ブラウザ MCP をインストール…"
+            "value": "ショートカットの値をクリックして記録します。複合ショートカットにする場合は2つ目のキーを押し、最初のキーのままにする場合はもう一度クリックしてください。"
           }
         }
       }
     },
-    "settings.browser.externalPatterns": {
+    "settings.shortcuts.showHints": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "URLs to Always Open Externally"
+            "value": "Show Shortcut Hints While Holding Modifiers"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "修飾キーを押している間、ショートカットヒントを表示"
           }
         }
       }
     },
-    "settings.browser.externalPatterns.subtitle": {
+    "settings.shortcuts.showHints.subtitleOff": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Applies to terminal link clicks and intercepted `open https://...` calls. One rule per line. Plain text matches any URL substring, or prefix with `re:` for regex (for example: openai.com/usage, re:^https?://[^/]*\\\\.example\\\\.com/(billing|usage))."
+            "value": "Holding shortcut modifiers keeps shortcut hint pills hidden."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ショートカットの修飾キーを押していても、ショートカットヒントのピルは表示されません。"
           }
         }
       }
     },
-    "settings.browser.history": {
+    "settings.shortcuts.showHints.subtitleOn": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Browsing History"
+            "value": "Holding the configured shortcut modifiers shows shortcut hint pills."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "設定した修飾キーを押すと、ショートカットヒントのピルが表示されます。"
           }
         }
       }
     },
-    "settings.browser.history.clearButton": {
+    "settings.sidebarAppearance.matchTerminalBackground": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Clear History…"
+            "value": "Match Terminal Background"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ターミナル背景に合わせる"
           }
         }
       }
     },
-    "settings.browser.history.clearDialog.cancel": {
+    "settings.sidebarAppearance.matchTerminalBackground.subtitle": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Cancel"
+            "value": "Use the same background color and transparency as the terminal."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ターミナルと同じ背景色と透明度を使用します。"
           }
         }
       }
     },
-    "settings.browser.history.clearDialog.confirm": {
+    "settings.sidebarAppearance.showClaudeQuota": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Clear History"
+            "value": "Show Provider Usage"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "プロバイダーの使用量を表示"
           }
         }
       }
     },
-    "settings.browser.history.clearDialog.message": {
+    "settings.sidebarAppearance.showClaudeQuota.subtitle": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "This removes visited-page suggestions from the browser omnibar."
+            "value": "Show on-demand usage for providers with available usage data in the sidebar footer."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "サイドバーのフッターに、利用データがあるプロバイダーの使用量を必要なときだけ表示します。"
           }
         }
       }
     },
-    "settings.browser.history.clearDialog.title": {
+    "settings.state.active": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Clear browser history?"
+            "value": "Active"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "アクティブ"
           }
         }
       }
     },
-    "settings.browser.history.subtitleEmpty": {
+    "settings.state.followWindow": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "No saved pages yet."
+            "value": "Follow Window"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ウインドウに従う"
           }
         }
       }
     },
-    "settings.browser.history.subtitleMany": {
+    "settings.state.inactive": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "%lld saved pages appear in omnibar suggestions."
+            "value": "Inactive"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "非アクティブ"
           }
         }
       }
     },
-    "settings.browser.history.subtitleOne": {
+    "settings.terminalTheme.changeFailed": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "1 saved page appears in omnibar suggestions."
+            "value": "Couldn’t change the terminal theme."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ターミナルテーマを変更できませんでした。"
           }
         }
       }
     },
-    "settings.browser.hostWhitelist": {
+    "settings.terminalTheme.dark": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Hosts to Open in Embedded Browser"
+            "value": "Dark Theme"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ダークテーマ"
           }
         }
       }
     },
-    "settings.browser.hostWhitelist.subtitle": {
+    "settings.terminalTheme.dark.subtitle": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Applies to terminal link clicks and intercepted `open https://...` calls. Only these hosts open in Programa. Others open in your default browser. One host or wildcard per line (for example: example.com, *.internal.example). Leave empty to open all hosts in Programa."
+            "value": "Used when Programa has a dark appearance."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Programa がダーク表示のときに使用します。"
           }
         }
       }
     },
-    "settings.browser.httpAllowlist": {
+    "settings.terminalTheme.light": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "HTTP Hosts Allowed in Embedded Browser"
+            "value": "Light Theme"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ライトテーマ"
           }
         }
       }
     },
-    "settings.browser.httpAllowlist.description": {
+    "settings.terminalTheme.light.subtitle": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Controls which HTTP (non-HTTPS) hosts can open in Programa without a warning prompt. Defaults include localhost, 127.0.0.1, ::1, 0.0.0.0, and *.localtest.me."
+            "value": "Used when Programa has a light appearance."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Programa がライト表示のときに使用します。"
           }
         }
       }
     },
-    "settings.browser.httpAllowlist.hint": {
+    "settings.terminalTheme.managedByFile": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "One host or wildcard per line (for example: localhost, 127.0.0.1, ::1, 0.0.0.0, *.localtest.me)."
+            "value": "Managed in settings.json"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "settings.json で管理されています"
           }
         }
       }
     },
-    "settings.browser.httpAllowlist.save": {
+    "settings.terminalTheme.useGhosttyConfiguration": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Save"
+            "value": "Use Ghostty Configuration"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Ghostty の設定を使用"
           }
         }
       }
     },
-    "settings.browser.interceptOpen": {
+    "settings.tab.appearance": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Intercept open http(s) in Terminal"
+            "value": "Appearance"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "外観"
           }
         }
       }
     },
-    "settings.browser.interceptOpen.subtitle": {
+    "settings.tab.automation": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "When off, `open https://...` and `open http://...` always use your default browser."
+            "value": "Automation"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "自動化"
           }
         }
       }
     },
-    "settings.browser.openTerminalLinks": {
+    "settings.tab.browser": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Open Terminal Links in Programa Browser"
+            "value": "Browser"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ブラウザ"
           }
         }
       }
     },
-    "settings.browser.openTerminalLinks.subtitle": {
+    "settings.tab.general": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "When off, links clicked in terminal output open in your default browser."
+            "value": "General"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "一般"
           }
         }
       }
     },
-    "settings.browser.searchEngine": {
+    "settings.tab.shortcuts": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Default Search Engine"
+            "value": "Shortcuts"
           }
-        }
-      }
-    },
-    "settings.browser.searchEngine.subtitle": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Used by the browser address bar when input is not a URL."
+            "value": "ショートカット"
           }
         }
       }
     },
-    "settings.browser.searchSuggestions": {
+    "settings.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Show Search Suggestions"
+            "value": "Settings"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "設定"
           }
         }
       }
     },
-    "settings.browser.theme": {
+    "settings.workspaceColors.indicator": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Browser Theme"
+            "value": "Workspace Color Indicator"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ワークスペースカラーインジケータ"
           }
         }
       }
     },
-    "settings.browser.theme.subtitleForced": {
+    "shortcut.closeWindow.label": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "%@ forces that color scheme for compatible pages."
+            "value": "Close Window"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ウインドウを閉じる"
           }
         }
       }
     },
-    "settings.browser.theme.subtitleSystem": {
+    "shortcut.closeWorkspace.label": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "System follows app and macOS appearance."
+            "value": "Close Workspace"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ワークスペースを閉じる"
           }
         }
       }
     },
-    "settings.material.contentBackground": {
+    "shortcut.editWorkspaceDescription.label": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Content Background"
+            "value": "Edit Workspace Description"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ワークスペースの説明を編集"
           }
         }
       }
     },
-    "settings.material.fullScreenUI": {
+    "shortcut.flashFocusedPanel.label": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Full Screen UI"
+            "value": "Flash Focused Panel"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "フォーカス中のパネルを点滅"
           }
         }
       }
     },
-    "settings.material.headerView": {
+    "shortcut.focusPaneDown.label": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Header View"
+            "value": "Focus Pane Down"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "下のペインにフォーカス"
           }
         }
       }
     },
-    "settings.material.hudWindow": {
+    "shortcut.focusPaneLeft.label": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "HUD Window"
+            "value": "Focus Pane Left"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "左のペインにフォーカス"
           }
         }
       }
     },
-    "settings.material.liquidGlass": {
+    "shortcut.focusPaneRight.label": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Liquid Glass (macOS 26+)"
+            "value": "Focus Pane Right"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "リキッドガラス（macOS 26以降）"
+            "value": "右のペインにフォーカス"
           }
         }
       }
     },
-    "settings.material.menu": {
+    "shortcut.focusPaneUp.label": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Menu"
+            "value": "Focus Pane Up"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "上のペインにフォーカス"
           }
         }
       }
     },
-    "settings.material.none": {
+    "shortcut.jumpToUnread.label": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "None"
+            "value": "Jump to Latest Unread"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "最新の未読に移動"
           }
         }
       }
     },
-    "settings.material.popover": {
+    "shortcut.key.tab": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Popover"
+            "value": "Tab"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Tab"
           }
         }
       }
     },
-    "settings.material.sheet": {
+    "shortcut.newSurface.label": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Sheet"
+            "value": "New Surface"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "新規サーフェス"
           }
         }
       }
     },
-    "settings.material.sidebar": {
+    "shortcut.newWindow.label": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Sidebar"
+            "value": "New Window"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "新規ウインドウ"
           }
         }
       }
     },
-    "settings.material.toolTip": {
+    "shortcut.newWorkspace.label": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Tool Tip"
+            "value": "New Workspace"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "新規ワークスペース"
           }
         }
       }
     },
-    "settings.material.underWindow": {
+    "shortcut.nextSurface.label": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Under Window"
+            "value": "Next Surface"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "次のサーフェス"
           }
         }
       }
     },
-    "settings.material.windowBackground": {
+    "shortcut.nextWorkspace.label": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Window Background"
+            "value": "Next Workspace"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "次のワークスペース"
           }
         }
       }
     },
-    "settings.notifications.command.placeholder": {
+    "shortcut.openBrowser.label": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "say \"done\""
+            "value": "Open Browser"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "say \"done\""
+            "value": "ブラウザを開く"
           }
         }
       }
     },
-    "settings.notifications.command.subtitle": {
+    "shortcut.openFolder.label": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Run a shell command when a notification arrives. $PROGRAMA_NOTIFICATION_TITLE, $PROGRAMA_NOTIFICATION_SUBTITLE, $PROGRAMA_NOTIFICATION_BODY are set."
+            "value": "Open Folder"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "通知が届いたときにシェルコマンドを実行します。$PROGRAMA_NOTIFICATION_TITLE、$PROGRAMA_NOTIFICATION_SUBTITLE、$PROGRAMA_NOTIFICATION_BODY が設定されます。"
+            "value": "フォルダを開く"
           }
         }
       }
     },
-    "settings.notifications.command.title": {
+    "shortcut.pressShortcut.prompt": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Notification Command"
+            "value": "Press shortcut…"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "通知コマンド"
+            "value": "ショートカットを押してください…"
           }
         }
       }
     },
-    "settings.notifications.desktop.title": {
+    "shortcut.previousSurface.label": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Desktop Notifications"
+            "value": "Previous Surface"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "デスクトップ通知"
+            "value": "前のサーフェス"
           }
         }
       }
     },
-    "settings.notifications.longCommandThreshold.subtitle": {
+    "shortcut.previousWorkspace.label": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Notify when a command finishes in a pane you're not looking at, if it ran at least this long. Set to 0 to disable."
+            "value": "Previous Workspace"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "見ていないペインでコマンドが完了したとき、実行時間がこの秒数以上であれば通知します。0にすると無効になります。"
+            "value": "前のワークスペース"
           }
         }
       }
     },
-    "settings.notifications.longCommandThreshold.title": {
+    "shortcut.recorder.pendingChord": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Long Command Notification"
+            "value": "%@ …"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "長時間コマンドの通知"
+            "value": "%@ …"
           }
         }
       }
     },
-    "settings.notifications.longCommandThreshold.unit": {
+    "shortcut.renameTab.label": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "sec"
+            "value": "Rename Tab"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "秒"
+            "value": "タブ名を変更"
           }
         }
       }
     },
-    "settings.notifications.sound.subtitle": {
+    "shortcut.renameWorkspace.label": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Sound played when a notification arrives."
+            "value": "Rename Workspace"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ワークスペース名を変更"
           }
         }
       }
     },
-    "settings.notifications.sound.title": {
+    "shortcut.selectSurfaceByNumber.label": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Notification Sound"
+            "value": "Select Surface 1…9"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "サーフェスを1〜9で選択"
           }
         }
       }
     },
-    "settings.preset.hudGlass": {
+    "shortcut.selectWorkspaceByNumber.label": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "HUD Glass"
+            "value": "Select Workspace 1…9"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ワークスペースを1〜9で選択"
           }
         }
       }
     },
-    "settings.preset.liquidGlass": {
+    "shortcut.showBrowserJSConsole.label": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Liquid Glass"
+            "value": "Show Browser JavaScript Console"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "リキッドガラス"
+            "value": "ブラウザのJavaScriptコンソールを表示"
           }
         }
       }
     },
-    "settings.preset.nativeSidebar": {
+    "shortcut.showNotifications.label": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Native Sidebar"
+            "value": "Show Notifications"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "通知を表示"
           }
         }
       }
     },
-    "settings.preset.popoverGlass": {
+    "shortcut.splitBrowserDown.label": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Popover Glass"
+            "value": "Split Browser Down"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ブラウザを下に分割"
           }
         }
       }
     },
-    "settings.preset.raycastGray": {
+    "shortcut.splitBrowserRight.label": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Raycast Gray"
+            "value": "Split Browser Right"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ブラウザを右に分割"
           }
         }
       }
     },
-    "settings.preset.softBlur": {
+    "shortcut.splitDown.label": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Soft Blur"
+            "value": "Split Down"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "下に分割"
           }
         }
       }
     },
-    "settings.preset.underWindow": {
+    "shortcut.splitRight.label": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Under Window"
+            "value": "Split Right"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "右に分割"
           }
         }
       }
     },
-    "settings.reset.resetAll": {
+    "shortcut.toggleBrowserDevTools.label": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Reset All Settings"
+            "value": "Toggle Browser Developer Tools"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ブラウザの開発者ツールを切り替え"
           }
         }
       }
     },
-    "settings.section.agents": {
+    "shortcut.togglePaneZoom.label": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Agents"
+            "value": "Toggle Pane Zoom"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "エージェント"
+            "value": "ペインのズームを切り替え"
           }
         }
       }
     },
-    "settings.section.app": {
+    "shortcut.toggleSidebar.label": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "App"
+            "value": "Toggle Sidebar"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "サイドバーを切り替え"
           }
         }
       }
     },
-    "settings.section.appearance": {
+    "shortcut.toggleTerminalCopyMode.label": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Appearance"
+            "value": "Toggle Terminal Copy Mode"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "外観"
+            "value": "ターミナルのコピーモードを切り替え"
           }
         }
       }
     },
-    "settings.section.browserData": {
+    "shortcuts.help.tooltip": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Data"
+            "value": "Keyboard Shortcuts"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "データ"
+            "value": "キーボードショートカット"
           }
         }
       }
     },
-    "settings.section.browserLinks": {
+    "sidebar.activeTabIndicator.leftRail": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Link Handling"
+            "value": "Left Rail"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "リンクの処理"
+            "value": "左のレール"
           }
         }
       }
     },
-    "settings.section.browsing": {
+    "sidebar.activeTabIndicator.solidFill": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Browsing"
+            "value": "Solid Fill"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "閲覧"
+            "value": "塗りつぶし"
           }
         }
       }
     },
-    "settings.section.keyboardShortcuts": {
+    "sidebar.agentIndicator.idle": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Keyboard Shortcuts"
+            "value": "Idle"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "アイドル"
           }
         }
       }
     },
-    "settings.section.notifications": {
+    "sidebar.agentIndicator.needsInput": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Notifications"
+            "value": "Needs input"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "通知"
+            "value": "入力待ち"
           }
         }
       }
     },
-    "settings.section.ports": {
+    "sidebar.agentIndicator.needsInputStale": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Ports"
+            "value": "Needs input (stale)"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "ポート"
+            "value": "入力待ち（古い）"
           }
         }
       }
     },
-    "settings.section.reset": {
+    "sidebar.agentIndicator.working": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Reset"
+            "value": "Working"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "作業中"
           }
         }
       }
     },
-    "settings.section.sidebar": {
+    "sidebar.agentIndicator.workingStale": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Sidebar"
+            "value": "Working (stale)"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "サイドバー"
+            "value": "作業中（古い）"
           }
         }
       }
     },
-    "settings.section.socketControl": {
+    "sidebar.closeWorkspace.tooltip": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Socket Control"
+            "value": "Close Workspace"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "ソケット制御"
+            "value": "ワークスペースを閉じる"
           }
         }
       }
     },
-    "settings.section.terminal": {
+    "sidebar.folderIcon.dragHint": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Terminal"
+            "value": "Drag to open in Finder or another app"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "ターミナル"
+            "value": "ドラッグしてFinderや他のアプリで開く"
           }
         }
       }
     },
-    "settings.shortcuts.chords": {
+    "sidebar.help.button": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Shortcut Chords"
+            "value": "Help"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ヘルプ"
           }
         }
       }
     },
-    "settings.shortcuts.chords.docsButton": {
+    "sidebar.help.changelog": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Chord docs"
+            "value": "Changelog"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "変更履歴"
           }
         }
       }
     },
-    "settings.shortcuts.chords.subtitle": {
+    "sidebar.help.githubIssues": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Add tmux-style multi-step shortcuts in settings.json, for example [\"ctrl+b\", \"c\"]."
+            "value": "GitHub Issues"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "GitHub Issues"
           }
         }
       }
     },
-    "settings.shortcuts.managedByFile": {
+    "sidebar.help.sendFeedback": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Managed in settings.json"
+            "value": "Send Feedback"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "フィードバックを送信"
           }
         }
       }
     },
-    "settings.shortcuts.recordHint": {
+    "sidebar.help.twitter": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Click a shortcut value to record. Press a second key for a chord, or click again to keep the first key."
+            "value": "X (Twitter)"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "X（Twitter）"
           }
         }
       }
     },
-    "settings.shortcuts.showHints": {
+    "sidebar.help.website": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Show Shortcut Hints While Holding Modifiers"
+            "value": "Darkroom"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Darkroom"
           }
         }
       }
     },
-    "settings.shortcuts.showHints.subtitleOff": {
+    "sidebar.help.welcome": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Holding shortcut modifiers keeps shortcut hint pills hidden."
+            "value": "Welcome to Programa!"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Programaへようこそ！"
           }
         }
       }
     },
-    "settings.shortcuts.showHints.subtitleOn": {
+    "sidebar.metadata.showLess": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Holding the configured shortcut modifiers shows shortcut hint pills."
+            "value": "Show less"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "折りたたむ"
           }
         }
       }
     },
-    "settings.sidebarAppearance.matchTerminalBackground": {
+    "sidebar.metadata.showLessDetails": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Match Terminal Background"
+            "value": "Show less details"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "詳細を折りたたむ"
           }
         }
       }
     },
-    "settings.sidebarAppearance.matchTerminalBackground.subtitle": {
+    "sidebar.metadata.showMore": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Use the same background color and transparency as the terminal."
+            "value": "Show more"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "もっと見る"
           }
         }
       }
     },
-    "settings.sidebarAppearance.showClaudeQuota": {
+    "sidebar.metadata.showMoreDetails": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Show Provider Usage"
+            "value": "Show more details"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "プロバイダーの使用量を表示"
+            "value": "詳細をもっと見る"
           }
         }
       }
     },
-    "settings.sidebarAppearance.showClaudeQuota.subtitle": {
+    "sidebar.pathMenu.macintoshHD": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Show on-demand usage for providers with available usage data in the sidebar footer."
+            "value": "Macintosh HD"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "サイドバーのフッターに、利用データがあるプロバイダーの使用量を必要なときだけ表示します。"
+            "value": "Macintosh HD"
           }
         }
       }
     },
-    "settings.state.active": {
+    "sidebar.pinnedWorkspaceProtected.tooltip": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Active"
+            "value": "Pinned workspace. Closing requires confirmation."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ピン留めされたワークスペースです。閉じるには確認が必要です。"
           }
         }
       }
     },
-    "settings.state.followWindow": {
+    "sidebar.port.label": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Follow Window"
+            "value": ":%lld"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": ":%lld"
           }
         }
       }
     },
-    "settings.state.inactive": {
+    "sidebar.port.openTooltip": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Inactive"
+            "value": "Open localhost:%lld"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "localhost:%lldを開く"
           }
         }
       }
     },
-    "settings.terminalTheme.changeFailed": {
+    "sidebar.pullRequest.openTooltip": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Couldn’t change the terminal theme."
+            "value": "Open %1$@ #%2$lld"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "ターミナルテーマを変更できませんでした。"
+            "value": "%1$@ #%2$lldを開く"
           }
         }
       }
     },
-    "settings.terminalTheme.dark": {
+    "sidebar.pullRequest.statusClosed": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Dark Theme"
+            "value": "closed"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "ダークテーマ"
+            "value": "クローズ済み"
           }
         }
       }
     },
-    "settings.terminalTheme.dark.subtitle": {
+    "sidebar.pullRequest.statusMerged": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Used when Programa has a dark appearance."
+            "value": "merged"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Programa がダーク表示のときに使用します。"
+            "value": "マージ済み"
           }
         }
       }
     },
-    "settings.terminalTheme.light": {
+    "sidebar.pullRequest.statusOpen": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Light Theme"
+            "value": "open"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "ライトテーマ"
+            "value": "オープン"
           }
         }
       }
     },
-    "settings.terminalTheme.light.subtitle": {
+    "sidebar.quota.fiveHour": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Used when Programa has a light appearance."
+            "value": "5h"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Programa がライト表示のときに使用します。"
+            "value": "5時間"
           }
         }
       }
     },
-    "settings.terminalTheme.managedByFile": {
+    "sidebar.quota.percent": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Managed in settings.json"
+            "value": "%@%%"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "settings.json で管理されています"
+            "value": "%@%%"
           }
         }
       }
     },
-    "settings.terminalTheme.useGhosttyConfiguration": {
+    "sidebar.quota.resetDays": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Use Ghostty Configuration"
+            "value": "%@d"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Ghostty の設定を使用"
+            "value": "%@日"
           }
         }
       }
     },
-    "settings.tab.appearance": {
+    "sidebar.quota.resetHours": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Appearance"
+            "value": "%@h"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "外観"
+            "value": "%@時間"
           }
         }
       }
     },
-    "settings.tab.automation": {
+    "sidebar.quota.resetMinutes": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Automation"
+            "value": "%@m"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "自動化"
+            "value": "%@分"
           }
         }
       }
     },
-    "settings.tab.browser": {
+    "sidebar.quota.resetNow": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Browser"
+            "value": "now"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "ブラウザ"
+            "value": "現在"
           }
         }
       }
     },
-    "settings.tab.general": {
+    "sidebar.quota.sevenDay": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "General"
+            "value": "7d"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "一般"
+            "value": "7日"
           }
         }
       }
     },
-    "settings.tab.shortcuts": {
+    "sidebar.usage.button": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Shortcuts"
+            "value": "Provider Usage"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "ショートカット"
+            "value": "プロバイダーの使用量"
           }
         }
       }
     },
-    "settings.title": {
+    "sidebar.usage.duration.days": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Settings"
+            "value": "%@d"
           }
-        }
-      }
-    },
-    "settings.workspaceColors.indicator": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Workspace Color Indicator"
+            "value": "%@日"
           }
         }
       }
     },
-    "shortcut.closeWindow.label": {
+    "sidebar.usage.duration.hours": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Close Window"
+            "value": "%@h"
           }
-        }
-      }
-    },
-    "shortcut.closeWorkspace.label": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Close Workspace"
+            "value": "%@時間"
           }
         }
       }
     },
-    "shortcut.editWorkspaceDescription.label": {
+    "sidebar.usage.duration.minutes": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Edit Workspace Description"
+            "value": "%@m"
           }
-        }
-      }
-    },
-    "shortcut.flashFocusedPanel.label": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Flash Focused Panel"
+            "value": "%@分"
           }
         }
       }
     },
-    "shortcut.focusPaneDown.label": {
+    "sidebar.usage.empty.subtitle": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Focus Pane Down"
+            "value": "Sign in to a supported provider to view usage."
           }
-        }
-      }
-    },
-    "shortcut.focusPaneLeft.label": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Focus Pane Left"
+            "value": "使用量を表示するには、対応するプロバイダーにサインインしてください。"
           }
         }
       }
     },
-    "shortcut.focusPaneRight.label": {
+    "sidebar.usage.empty.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Focus Pane Right"
+            "value": "No usage available"
           }
-        }
-      }
-    },
-    "shortcut.focusPaneUp.label": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Focus Pane Up"
+            "value": "使用量を取得できません"
           }
         }
       }
     },
-    "shortcut.jumpToUnread.label": {
+    "sidebar.usage.error.claudeInvalid": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Jump to Latest Unread"
+            "value": "Claude usage data is invalid."
           }
-        }
-      }
-    },
-    "shortcut.key.tab": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Tab"
+            "value": "Claudeの使用量データが無効です。"
           }
         }
       }
     },
-    "shortcut.newSurface.label": {
+    "sidebar.usage.error.claudeRead": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "New Surface"
+            "value": "Claude usage could not be read."
           }
-        }
-      }
-    },
-    "shortcut.newWindow.label": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "New Window"
+            "value": "Claudeの使用量を読み込めませんでした。"
           }
         }
       }
     },
-    "shortcut.newWorkspace.label": {
+    "sidebar.usage.error.codexInvalid": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "New Workspace"
+            "value": "OpenAI returned invalid usage data."
           }
-        }
-      }
-    },
-    "shortcut.nextSurface.label": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Next Surface"
+            "value": "OpenAIから無効な使用量データが返されました。"
           }
         }
       }
     },
-    "shortcut.nextWorkspace.label": {
+    "sidebar.usage.error.codexRead": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Next Workspace"
+            "value": "OpenAI usage could not be read."
           }
-        }
-      }
-    },
-    "shortcut.openBrowser.label": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Open Browser"
+            "value": "OpenAIの使用量を読み込めませんでした。"
           }
         }
       }
     },
-    "shortcut.openFolder.label": {
+    "sidebar.usage.loading": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Open Folder"
+            "value": "Loading usage…"
           }
-        }
-      }
-    },
-    "shortcut.pressShortcut.prompt": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Press shortcut…"
+            "value": "使用量を読み込み中…"
           }
         }
       }
     },
-    "shortcut.previousSurface.label": {
+    "sidebar.usage.provider.claude": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Previous Surface"
+            "value": "Claude"
           }
-        }
-      }
-    },
-    "shortcut.previousWorkspace.label": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Previous Workspace"
+            "value": "Claude"
           }
         }
       }
     },
-    "shortcut.recorder.pendingChord": {
+    "sidebar.usage.provider.codex": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "%@ …"
+            "value": "OpenAI"
           }
-        }
-      }
-    },
-    "shortcut.renameTab.label": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Rename Tab"
+            "value": "OpenAI"
           }
         }
       }
     },
-    "shortcut.renameWorkspace.label": {
+    "sidebar.usage.refresh": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Rename Workspace"
+            "value": "Refresh"
           }
-        }
-      }
-    },
-    "shortcut.selectSurfaceByNumber.label": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Select Surface 1…9"
+            "value": "更新"
           }
         }
       }
     },
-    "shortcut.selectWorkspaceByNumber.label": {
+    "sidebar.usage.refreshing": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Select Workspace 1…9"
+            "value": "Refreshing usage"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "使用量を更新中"
           }
         }
       }
     },
-    "shortcut.showBrowserJSConsole.label": {
+    "sidebar.usage.summary.creditBalance": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Show Browser JavaScript Console"
+            "value": "%@ credits"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "クレジット残高 %@"
           }
         }
       }
     },
-    "shortcut.showNotifications.label": {
+    "sidebar.usage.summary.plan": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Show Notifications"
+            "value": "%@ plan"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "%@プラン"
           }
         }
       }
     },
-    "shortcut.splitBrowserDown.label": {
+    "sidebar.usage.summary.resetCredits": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Split Browser Down"
+            "value": "%@ reset credits"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "リセットクレジット %@件"
           }
         }
       }
     },
-    "shortcut.splitBrowserRight.label": {
+    "sidebar.usage.summary.unlimitedCredits": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Split Browser Right"
+            "value": "Unlimited credits"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "クレジット無制限"
           }
         }
       }
     },
-    "shortcut.splitDown.label": {
+    "sidebar.usage.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Split Down"
+            "value": "Provider Usage"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "プロバイダーの使用量"
           }
         }
       }
     },
-    "shortcut.splitRight.label": {
+    "sidebar.usage.unavailable": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Split Right"
+            "value": "Unavailable"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "利用不可"
           }
         }
       }
     },
-    "shortcut.toggleBrowserDevTools.label": {
+    "sidebar.usage.window.accessibility": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Toggle Browser Developer Tools"
+            "value": "%1$@, %2$@, %3$@"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "%1$@、%2$@、%3$@"
           }
         }
       }
     },
-    "shortcut.togglePaneZoom.label": {
+    "sidebar.usage.window.currentSession": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Toggle Pane Zoom"
+            "value": "Current session"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "現在のセッション"
           }
         }
       }
     },
-    "shortcut.toggleSidebar.label": {
+    "sidebar.usage.window.currentWindow": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Toggle Sidebar"
+            "value": "Current window"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "現在の利用枠"
           }
         }
       }
     },
-    "shortcut.toggleTerminalCopyMode.label": {
+    "sidebar.usage.window.remaining": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Toggle Terminal Copy Mode"
+            "value": "%@%% left"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "残り%@%%"
           }
         }
       }
     },
-    "shortcuts.help.tooltip": {
+    "sidebar.usage.window.resetsIn": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Keyboard Shortcuts"
+            "value": "Resets in %@"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "キーボードショートカット"
+            "value": "%@後にリセット"
           }
         }
       }
     },
-    "sidebar.activeTabIndicator.leftRail": {
+    "sidebar.usage.window.resetsNow": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Left Rail"
+            "value": "Resets now"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "今すぐリセット"
           }
         }
       }
     },
-    "sidebar.activeTabIndicator.solidFill": {
+    "sidebar.usage.window.weekly": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Solid Fill"
+            "value": "Weekly"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "週間"
           }
         }
       }
     },
-    "sidebar.agentIndicator.idle": {
+    "sidebar.workspace.accessibilityHint": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Idle"
+            "value": "Activate to focus this workspace. Drag to reorder, or use Move Up and Move Down actions."
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "アイドル"
+            "value": "アクティブにするとこのワークスペースにフォーカスします。ドラッグして並べ替えるか、「上に移動」「下に移動」アクションを使用してください。"
           }
         }
       }
     },
-    "sidebar.agentIndicator.needsInput": {
+    "sidebar.workspace.moveDownAction": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Needs input"
+            "value": "Move Down"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "入力待ち"
+            "value": "下に移動"
           }
         }
       }
     },
-    "sidebar.agentIndicator.needsInputStale": {
+    "sidebar.workspace.moveUpAction": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Needs input (stale)"
+            "value": "Move Up"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "入力待ち（古い）"
+            "value": "上に移動"
           }
         }
       }
     },
-    "sidebar.agentIndicator.working": {
+    "sidebar.worktreeBadge.accessibilityLabel": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Working"
+            "value": "Git worktree workspace"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "作業中"
+            "value": "Git worktree ワークスペース"
           }
         }
       }
     },
-    "sidebar.agentIndicator.workingStale": {
+    "sidebar.worktreeBadge.tooltip": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Working (stale)"
+            "value": "Git worktree workspace"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "作業中（古い）"
+            "value": "Git worktree ワークスペース"
           }
         }
       }
     },
-    "sidebar.closeWorkspace.tooltip": {
+    "sidebar.worktreeFolder.tooltip": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Close Workspace"
+            "value": "Worktree folder"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ワークツリーフォルダ"
           }
         }
       }
     },
-    "sidebar.folderIcon.dragHint": {
+    "socketControl.allowAll.description": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Drag to open in Finder or another app"
+            "value": "Allow any local process and user to connect with no auth. Unsafe."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "認証なしで、あらゆるローカルプロセスとユーザーの接続を許可します。安全ではありません。"
           }
         }
       }
     },
-    "sidebar.help.button": {
+    "socketControl.allowAll.name": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Help"
+            "value": "Full open access"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "フルオープンアクセス"
           }
         }
       }
     },
-    "sidebar.help.changelog": {
+    "socketControl.automation.description": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Changelog"
+            "value": "Allow external local automation clients from this macOS user (no ancestry check)."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "このmacOSユーザーからの外部ローカル自動化クライアントを許可します（親プロセスの確認なし）。"
           }
         }
       }
     },
-    "sidebar.help.githubIssues": {
+    "socketControl.automation.name": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "GitHub Issues"
+            "value": "Automation mode"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "自動化モード"
           }
         }
       }
     },
-    "sidebar.help.sendFeedback": {
+    "socketControl.cmuxOnly.description": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Send Feedback"
+            "value": "Only processes started inside Programa terminals can send commands."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Programaのターミナル内から起動したプロセスのみがコマンドを送信できます。"
           }
         }
       }
     },
-    "sidebar.help.twitter": {
+    "socketControl.cmuxOnly.name": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "X (Twitter)"
+            "value": "Programa processes only"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "X（Twitter）"
+            "value": "Programaのプロセスのみ"
           }
         }
       }
     },
-    "sidebar.help.website": {
+    "socketControl.error.passwordFilePath": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Darkroom"
+            "value": "Unable to resolve socket password file path."
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Darkroom"
+            "value": "ソケットのパスワードファイルのパスを解決できません。"
           }
         }
       }
     },
-    "sidebar.help.welcome": {
+    "socketControl.off.description": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Welcome to Programa!"
+            "value": "Disable the local control socket."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ローカルの制御ソケットを無効にします。"
           }
         }
       }
     },
-    "sidebar.metadata.showLess": {
+    "socketControl.off.name": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Show less"
+            "value": "Off"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "オフ"
           }
         }
       }
     },
-    "sidebar.metadata.showLessDetails": {
+    "socketControl.password.description": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Show less details"
+            "value": "Require socket authentication with a password stored in a local file."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ローカルファイルに保存されたパスワードによるソケット認証を要求します。"
           }
         }
       }
     },
-    "sidebar.metadata.showMore": {
+    "socketControl.password.name": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Show more"
+            "value": "Password mode"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "パスワードモード"
           }
         }
       }
     },
-    "sidebar.metadata.showMoreDetails": {
+    "statusMenu.blockedAgents.one": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Show more details"
+            "value": "1 agent blocked"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ブロックされているエージェントが1件"
           }
         }
       }
     },
-    "sidebar.pathMenu.macintoshHD": {
+    "statusMenu.blockedAgents.other": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Macintosh HD"
+            "value": "%lld agents blocked"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ブロックされているエージェントが%lld件"
           }
         }
       }
     },
-    "sidebar.pinnedWorkspaceProtected.tooltip": {
+    "statusMenu.blockedAgents.tooltip": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Pinned workspace. Closing requires confirmation."
+            "value": "Click to jump to a blocked agent"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "クリックしてブロックされているエージェントに移動します"
           }
         }
       }
     },
-    "sidebar.port.label": {
+    "statusMenu.clearAll": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": ":%lld"
+            "value": "Clear All"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "すべて消去"
           }
         }
       }
     },
-    "sidebar.port.openTooltip": {
+    "statusMenu.jumpToLatestUnread": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Open localhost:%lld"
+            "value": "Jump to Latest Unread"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "最新の未読に移動"
           }
         }
       }
     },
-    "sidebar.pullRequest.openTooltip": {
+    "statusMenu.markAllRead": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Open %1$@ #%2$lld"
+            "value": "Mark All Read"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "すべて既読にする"
           }
         }
       }
     },
-    "sidebar.pullRequest.statusClosed": {
+    "statusMenu.noUnread": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "closed"
+            "value": "No unread notifications"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "未読の通知はありません"
           }
         }
       }
     },
-    "sidebar.pullRequest.statusMerged": {
+    "statusMenu.showNotifications": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "merged"
+            "value": "Show Notifications"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "通知を表示"
           }
         }
       }
     },
-    "sidebar.pullRequest.statusOpen": {
+    "statusMenu.tooltip.unread.one": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "open"
+            "value": "1 unread notification"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "未読の通知が1件"
           }
         }
       }
     },
-    "sidebar.quota.fiveHour": {
+    "statusMenu.tooltip.unread.other": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "5h"
+            "value": "%lld unread notifications"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "5時間"
+            "value": "未読の通知が%lld件"
           }
         }
       }
     },
-    "sidebar.quota.percent": {
+    "statusMenu.unreadCount.one": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "%@%%"
+            "value": "1 unread notification"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "%@%%"
+            "value": "未読の通知が1件"
           }
         }
       }
     },
-    "sidebar.quota.resetDays": {
+    "statusMenu.unreadCount.other": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "%@d"
+            "value": "%lld unread notifications"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "%@日"
+            "value": "未読の通知が%lld件"
           }
         }
       }
     },
-    "sidebar.quota.resetHours": {
+    "terminalContextMenu.copy": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "%@h"
+            "value": "Copy"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "%@時間"
+            "value": "コピー"
           }
         }
       }
     },
-    "sidebar.quota.resetMinutes": {
+    "terminalContextMenu.paste": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "%@m"
+            "value": "Paste"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "%@分"
+            "value": "ペースト"
           }
         }
       }
     },
-    "sidebar.quota.resetNow": {
+    "terminalContextMenu.resetTerminal": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "now"
+            "value": "Reset Terminal"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "現在"
+            "value": "ターミナルをリセット"
           }
         }
       }
     },
-    "sidebar.quota.sevenDay": {
+    "terminalContextMenu.splitHorizontally": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "7d"
+            "value": "Split Horizontally"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "7日"
+            "value": "水平に分割"
           }
         }
       }
     },
-    "sidebar.usage.button": {
+    "terminalContextMenu.splitVertically": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Provider Usage"
+            "value": "Split Vertically"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "プロバイダーの使用量"
+            "value": "垂直に分割"
           }
         }
       }
     },
-    "sidebar.usage.duration.days": {
+    "terminalContextMenu.triggerFlash": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "%@d"
+            "value": "Trigger Flash"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "%@日"
+            "value": "フラッシュを発生"
           }
         }
       }
     },
-    "sidebar.usage.duration.hours": {
+    "theme.dark": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "%@h"
+            "value": "Dark"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "%@時間"
+            "value": "ダーク"
           }
         }
       }
     },
-    "sidebar.usage.duration.minutes": {
+    "theme.light": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "%@m"
+            "value": "Light"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "%@分"
+            "value": "ライト"
           }
         }
       }
     },
-    "sidebar.usage.empty.subtitle": {
+    "theme.system": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Sign in to a supported provider to view usage."
+            "value": "System"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "使用量を表示するには、対応するプロバイダーにサインインしてください。"
+            "value": "システム"
           }
         }
       }
     },
-    "sidebar.usage.empty.title": {
+    "titlebar.newWorkspace.accessibilityLabel": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "No usage available"
+            "value": "New Workspace"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "使用量を取得できません"
+            "value": "新規ワークスペース"
           }
         }
       }
     },
-    "sidebar.usage.error.claudeInvalid": {
+    "titlebar.newWorkspace.tooltip": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Claude usage data is invalid."
+            "value": "New workspace"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Claudeの使用量データが無効です。"
+            "value": "新規ワークスペース"
           }
         }
       }
     },
-    "sidebar.usage.error.claudeRead": {
+    "titlebar.notifications.accessibilityLabel": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Claude usage could not be read."
+            "value": "Notifications"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Claudeの使用量を読み込めませんでした。"
+            "value": "通知"
           }
         }
       }
     },
-    "sidebar.usage.error.codexInvalid": {
+    "titlebar.notifications.tooltip": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "OpenAI returned invalid usage data."
+            "value": "Show notifications"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "OpenAIから無効な使用量データが返されました。"
+            "value": "通知を表示"
           }
         }
       }
     },
-    "sidebar.usage.error.codexRead": {
+    "titlebar.sidebar.accessibilityLabel": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "OpenAI usage could not be read."
+            "value": "Toggle Sidebar"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "OpenAIの使用量を読み込めませんでした。"
+            "value": "サイドバーを切り替え"
           }
         }
       }
     },
-    "sidebar.usage.loading": {
+    "titlebar.sidebar.tooltip": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Loading usage…"
+            "value": "Show or hide the sidebar"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "使用量を読み込み中…"
+            "value": "サイドバーの表示/非表示を切り替え"
           }
         }
       }
     },
-    "sidebar.usage.provider.claude": {
+    "update.available.short": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Claude"
+            "value": "Update Available"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Claude"
+            "value": "アップデートあり"
           }
         }
       }
     },
-    "sidebar.usage.provider.codex": {
+    "update.available.withVersion": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "OpenAI"
+            "value": "Update Available: %@"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "OpenAI"
+            "value": "アップデートあり: %@"
           }
         }
       }
     },
-    "sidebar.usage.refresh": {
+    "update.checking": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Refresh"
+            "value": "Checking for Updates…"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "更新"
+            "value": "アップデートを確認中…"
           }
         }
       }
     },
-    "sidebar.usage.refreshing": {
+    "update.configureAutoUpdates": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Refreshing usage"
+            "value": "Configure automatic update preferences"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "使用量を更新中"
+            "value": "自動アップデートの設定を行う"
           }
         }
       }
     },
-    "sidebar.usage.summary.creditBalance": {
+    "update.downloadAndInstall": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "%@ credits"
+            "value": "Download and install the latest version"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "クレジット残高 %@"
+            "value": "最新バージョンをダウンロードしてインストールする"
           }
         }
       }
     },
-    "sidebar.usage.summary.plan": {
+    "update.downloading.progress": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "%@ plan"
+            "value": "Downloading: %@"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "%@プラン"
+            "value": "ダウンロード中: %@"
           }
         }
       }
     },
-    "sidebar.usage.summary.resetCredits": {
+    "update.downloading.status": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "%@ reset credits"
+            "value": "Downloading…"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "リセットクレジット %@件"
+            "value": "ダウンロード中…"
           }
         }
       }
     },
-    "sidebar.usage.summary.unlimitedCredits": {
+    "update.downloadingPackage": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Unlimited credits"
+            "value": "Downloading the update package"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "クレジット無制限"
+            "value": "アップデートパッケージをダウンロード中"
           }
         }
       }
     },
-    "sidebar.usage.title": {
+    "update.error.appLocation.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Provider Usage"
+            "value": "App Location Issue"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "プロバイダーの使用量"
+            "value": "アプリの場所の問題"
           }
         }
       }
     },
-    "sidebar.usage.unavailable": {
+    "update.error.connectionLost.message": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Unavailable"
+            "value": "The network connection was lost while checking for updates. Try again."
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "利用不可"
+            "value": "アップデートの確認中にネットワーク接続が切断されました。もう一度お試しください。"
           }
         }
       }
     },
-    "sidebar.usage.window.accessibility": {
+    "update.error.connectionLost.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "%1$@, %2$@, %3$@"
+            "value": "Connection Lost"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "%1$@、%2$@、%3$@"
+            "value": "接続が切断されました"
           }
         }
       }
     },
-    "sidebar.usage.window.currentSession": {
+    "update.error.downloadFailed.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Current session"
+            "value": "Couldn't Download Update"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "現在のセッション"
+            "value": "アップデートをダウンロードできませんでした"
           }
         }
       }
     },
-    "sidebar.usage.window.currentWindow": {
+    "update.error.failed.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Current window"
+            "value": "Update Failed"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "現在の利用枠"
+            "value": "アップデートに失敗しました"
           }
         }
       }
     },
-    "sidebar.usage.window.remaining": {
+    "update.error.feedDownload.message": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "%@%% left"
+            "value": "Programa couldn't download the update feed. Check your connection and try again."
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "残り%@%%"
+            "value": "Programaはアップデートフィードをダウンロードできませんでした。接続を確認してもう一度お試しください。"
           }
         }
       }
     },
-    "sidebar.usage.window.resetsIn": {
+    "update.error.feedError.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Resets in %@"
+            "value": "Update Feed Error"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "%@後にリセット"
+            "value": "アップデートフィードのエラー"
           }
         }
       }
     },
-    "sidebar.usage.window.resetsNow": {
+    "update.error.feedRead.message": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Resets now"
+            "value": "The update feed could not be read. Please try again later."
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "今すぐリセット"
+            "value": "アップデートフィードを読み込めませんでした。しばらくしてからもう一度お試しください。"
           }
         }
       }
     },
-    "sidebar.usage.window.weekly": {
+    "update.error.insecureFeed.message": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Weekly"
+            "value": "The update feed is insecure. Please contact support."
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "週間"
+            "value": "アップデートフィードが安全ではありません。サポートにお問い合わせください。"
           }
         }
       }
     },
-    "sidebar.workspace.accessibilityHint": {
+    "update.error.insecureFeed.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Activate to focus this workspace. Drag to reorder, or use Move Up and Move Down actions."
+            "value": "Insecure Update Feed"
           }
-        }
-      }
-    },
-    "sidebar.workspace.moveDownAction": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Move Down"
+            "value": "安全でないアップデートフィード"
           }
         }
       }
     },
-    "sidebar.workspace.moveUpAction": {
+    "update.error.invalidFeed.message": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Move Up"
+            "value": "The update feed URL is invalid. Please contact support."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "アップデートフィードのURLが無効です。サポートにお問い合わせください。"
           }
         }
       }
     },
-    "sidebar.worktreeBadge.accessibilityLabel": {
+    "update.error.invalidFeed.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Git worktree workspace"
+            "value": "Invalid Update Feed"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Git worktree ワークスペース"
+            "value": "無効なアップデートフィード"
           }
         }
       }
     },
-    "sidebar.worktreeBadge.tooltip": {
+    "update.error.noInternet.message": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Git worktree workspace"
+            "value": "Programa can't reach the update server. Check your internet connection and try again."
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Git worktree ワークスペース"
+            "value": "Programaはアップデートサーバーに接続できません。インターネット接続を確認してもう一度お試しください。"
           }
         }
       }
     },
-    "sidebar.worktreeFolder.tooltip": {
+    "update.error.noInternet.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Worktree folder"
+            "value": "No Internet Connection"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "ワークツリーフォルダ"
+            "value": "インターネットに接続されていません"
           }
         }
       }
     },
-    "socketControl.allowAll.description": {
+    "update.error.permissionError.message": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Allow any local process and user to connect with no auth. Unsafe."
+            "value": "Move Programa into Applications and relaunch to enable updates."
           }
-        }
-      }
-    },
-    "socketControl.allowAll.name": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Full open access"
+            "value": "Programaを「アプリケーション」フォルダに移動して再起動すると、アップデートが有効になります。"
           }
         }
       }
     },
-    "socketControl.automation.description": {
+    "update.error.permissionError.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Allow external local automation clients from this macOS user (no ancestry check)."
+            "value": "Updater Permission Error"
           }
-        }
-      }
-    },
-    "socketControl.automation.name": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Automation mode"
+            "value": "アップデーターの権限エラー"
           }
         }
       }
     },
-    "socketControl.cmuxOnly.description": {
+    "update.error.secureConnectionFailed.message": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Only processes started inside Programa terminals can send commands."
+            "value": "A secure connection to the update server couldn't be established. Try again later."
           }
-        }
-      }
-    },
-    "socketControl.cmuxOnly.name": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Programa processes only"
+            "value": "アップデートサーバーへの安全な接続を確立できませんでした。しばらくしてからもう一度お試しください。"
           }
         }
       }
     },
-    "socketControl.error.passwordFilePath": {
+    "update.error.secureConnectionFailed.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Unable to resolve socket password file path."
+            "value": "Secure Connection Failed"
           }
-        }
-      }
-    },
-    "socketControl.off.description": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Disable the local control socket."
+            "value": "安全な接続に失敗しました"
           }
         }
       }
     },
-    "socketControl.off.name": {
+    "update.error.serverNotFound.message": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Off"
+            "value": "The update server can't be found. Check your connection or try again later."
           }
-        }
-      }
-    },
-    "socketControl.password.description": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Require socket authentication with a password stored in a local file."
+            "value": "アップデートサーバーが見つかりません。接続を確認するか、しばらくしてからもう一度お試しください。"
           }
         }
       }
     },
-    "socketControl.password.name": {
+    "update.error.serverNotFound.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Password mode"
+            "value": "Server Not Found"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "サーバーが見つかりません"
           }
         }
       }
     },
-    "statusMenu.blockedAgents.one": {
+    "update.error.serverUnreachable.message": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "1 agent blocked"
+            "value": "Programa couldn't connect to the update server. Check your connection or try again later."
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "ブロックされているエージェントが1件"
+            "value": "Programaはアップデートサーバーに接続できませんでした。接続を確認するか、しばらくしてからもう一度お試しください。"
           }
         }
       }
     },
-    "statusMenu.blockedAgents.other": {
+    "update.error.serverUnreachable.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "%lld agents blocked"
+            "value": "Server Unreachable"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "ブロックされているエージェントが%lld件"
+            "value": "サーバーに到達できません"
           }
         }
       }
     },
-    "statusMenu.blockedAgents.tooltip": {
+    "update.error.signatureError.message": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Click to jump to a blocked agent"
+            "value": "The update's signature could not be verified. Please try again later."
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "クリックしてブロックされているエージェントに移動します"
+            "value": "アップデートの署名を検証できませんでした。しばらくしてからもう一度お試しください。"
           }
         }
       }
     },
-    "statusMenu.clearAll": {
+    "update.error.signatureError.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Clear All"
+            "value": "Update Signature Error"
           }
-        }
-      }
-    },
-    "statusMenu.jumpToLatestUnread": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Jump to Latest Unread"
+            "value": "アップデートの署名エラー"
           }
         }
       }
     },
-    "statusMenu.markAllRead": {
+    "update.error.stillStarting": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Mark All Read"
+            "value": "Updater is still starting. Try again in a moment."
           }
-        }
-      }
-    },
-    "statusMenu.noUnread": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "No unread notifications"
+            "value": "アップデーターはまだ起動中です。しばらくしてからもう一度お試しください。"
           }
         }
       }
     },
-    "statusMenu.showNotifications": {
+    "update.error.timedOut.message": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Show Notifications"
+            "value": "The update server took too long to respond. Try again in a moment."
           }
-        }
-      }
-    },
-    "statusMenu.tooltip.unread.one": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "1 unread notification"
+            "value": "アップデートサーバーからの応答に時間がかかりすぎました。しばらくしてからもう一度お試しください。"
           }
         }
       }
     },
-    "statusMenu.tooltip.unread.other": {
+    "update.error.timedOut.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "%lld unread notifications"
+            "value": "Update Timed Out"
           }
-        }
-      }
-    },
-    "statusMenu.unreadCount.one": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "1 unread notification"
+            "value": "アップデートがタイムアウトしました"
           }
         }
       }
     },
-    "statusMenu.unreadCount.other": {
+    "update.extracting.progress": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "%lld unread notifications"
+            "value": "Preparing: %@"
           }
-        }
-      }
-    },
-    "terminalContextMenu.copy": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Copy"
+            "value": "準備中: %@"
           }
         }
       }
     },
-    "terminalContextMenu.paste": {
+    "update.installAndRelaunch": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Paste"
+            "value": "Install Update and Relaunch"
           }
-        }
-      }
-    },
-    "terminalContextMenu.resetTerminal": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Reset Terminal"
+            "value": "アップデートをインストールして再起動"
           }
         }
       }
     },
-    "terminalContextMenu.splitHorizontally": {
+    "update.installing.status": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Split Horizontally"
+            "value": "Installing…"
           }
-        }
-      }
-    },
-    "terminalContextMenu.splitVertically": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Split Vertically"
+            "value": "インストール中…"
           }
         }
       }
     },
-    "terminalContextMenu.triggerFlash": {
+    "update.installingAndRestarting": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Trigger Flash"
+            "value": "Installing update and preparing to restart"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "アップデートをインストールし、再起動の準備をしています"
           }
         }
       }
     },
-    "theme.dark": {
+    "update.noUpdates.message": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Dark"
+            "value": "You are running the latest version"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "最新バージョンをお使いです"
           }
         }
       }
     },
-    "theme.light": {
+    "update.noUpdates.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Light"
+            "value": "No Updates Available"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "利用可能なアップデートはありません"
           }
         }
       }
     },
-    "theme.system": {
+    "update.permissionRequest.text": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "System"
+            "value": "Enable Automatic Updates?"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "自動アップデートを有効にしますか？"
           }
         }
       }
     },
-    "titlebar.newWorkspace.accessibilityLabel": {
+    "update.pleaseWait": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "New Workspace"
+            "value": "Please wait while we check for available updates"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "利用可能なアップデートを確認していますので、しばらくお待ちください"
           }
         }
       }
     },
-    "titlebar.newWorkspace.tooltip": {
+    "update.popover.autoUpdatesDescription": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "New workspace"
+            "value": "Programa can automatically check for updates in the background."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Programaはバックグラウンドで自動的にアップデートを確認できます。"
           }
         }
       }
     },
-    "titlebar.notifications.accessibilityLabel": {
+    "update.popover.checking": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Notifications"
+            "value": "Checking for updates…"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "アップデートを確認中…"
           }
         }
       }
     },
-    "titlebar.notifications.tooltip": {
+    "update.popover.details": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Show notifications"
+            "value": "Details"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "詳細"
           }
         }
       }
     },
-    "titlebar.sidebar.accessibilityLabel": {
+    "update.popover.downloadingUpdate": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Toggle Sidebar"
+            "value": "Downloading Update"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "アップデートをダウンロード中"
           }
         }
       }
     },
-    "titlebar.sidebar.tooltip": {
+    "update.popover.enableAutoUpdates": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Show or hide the sidebar"
+            "value": "Enable automatic updates?"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "自動アップデートを有効にしますか？"
           }
         }
       }
     },
-    "update.available.short": {
+    "update.popover.noUpdatesFound": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Update Available"
+            "value": "No Updates Found"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "アップデートは見つかりませんでした"
           }
         }
       }
     },
-    "update.available.withVersion": {
+    "update.popover.noUpdatesFound.message": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Update Available: %@"
+            "value": "You're already running the latest version."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "すでに最新バージョンをお使いです。"
           }
         }
       }
     },
-    "update.checking": {
+    "update.popover.preparingUpdate": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Checking for Updates…"
+            "value": "Preparing Update"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "アップデートを準備中"
           }
         }
       }
     },
-    "update.configureAutoUpdates": {
+    "update.popover.released": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Configure automatic update preferences"
+            "value": "Released:"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "公開日:"
           }
         }
       }
     },
-    "update.downloadAndInstall": {
+    "update.popover.restartRequired": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Download and install the latest version"
+            "value": "Restart Required"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "再起動が必要です"
           }
         }
       }
     },
-    "update.downloading.progress": {
+    "update.popover.restartRequired.message": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Downloading: %@"
+            "value": "The update is ready. Please restart the application to complete the installation."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "アップデートの準備ができました。インストールを完了するには、アプリを再起動してください。"
           }
         }
       }
     },
-    "update.downloading.status": {
+    "update.popover.size": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Downloading…"
+            "value": "Size:"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "サイズ:"
           }
         }
       }
     },
-    "update.downloadingPackage": {
+    "update.popover.updateAvailable": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Downloading the update package"
+            "value": "Update Available"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "アップデートあり"
           }
         }
       }
     },
-    "update.error.appLocation.title": {
+    "update.popover.version": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "App Location Issue"
+            "value": "Version:"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "バージョン:"
           }
         }
       }
     },
-    "update.error.connectionLost.message": {
+    "update.preparingUpdate": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "The network connection was lost while checking for updates. Try again."
+            "value": "Extracting and preparing the update"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "アップデートを展開して準備しています"
           }
         }
       }
     },
-    "update.error.connectionLost.title": {
+    "update.restartToComplete": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Connection Lost"
+            "value": "Restart to Complete Update"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "再起動してアップデートを完了"
           }
         }
       }
     },
-    "update.error.downloadFailed.title": {
+    "update.viewGitHubCommit": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Couldn't Download Update"
+            "value": "View GitHub Commit"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "GitHubのコミットを表示"
           }
         }
       }
     },
-    "update.error.failed.title": {
+    "update.viewReleaseNotes": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Update Failed"
+            "value": "View Release Notes"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "リリースノートを表示"
           }
         }
       }
     },
-    "update.error.feedDownload.message": {
+    "windowBackgroundColor": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Programa couldn't download the update feed. Check your connection and try again."
+            "value": "windowBackgroundColor"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "windowBackgroundColor"
           }
         }
       }
     },
-    "update.error.feedError.title": {
+    "workspace.closeProtected.message": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Update Feed Error"
+            "value": "Pinned workspaces can't be closed while pinned. Unpin the workspace first."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ピン留めされたワークスペースは、ピン留めを解除しないと閉じられません。先にピン留めを解除してください。"
           }
         }
       }
     },
-    "update.error.feedRead.message": {
+    "workspace.displayName.fallback": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "The update feed could not be read. Please try again later."
+            "value": "Workspace"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ワークスペース"
           }
         }
       }
     },
-    "update.error.insecureFeed.message": {
+    "workspace.emptyPanel.browser": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "The update feed is insecure. Please contact support."
+            "value": "Browser"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ブラウザ"
           }
         }
       }
     },
-    "update.error.insecureFeed.title": {
+    "workspace.emptyPanel.terminal": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Insecure Update Feed"
+            "value": "Terminal"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ターミナル"
           }
         }
       }
     },
-    "update.error.invalidFeed.message": {
+    "workspace.emptyPanel.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "The update feed URL is invalid. Please contact support."
+            "value": "Empty Panel"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "空のパネル"
           }
         }
       }
     },
-    "update.error.invalidFeed.title": {
+    "workspace.placement.afterCurrent": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Invalid Update Feed"
+            "value": "After current"
           }
-        }
-      }
-    },
-    "update.error.noInternet.message": {
-      "extractionState": "manual",
-      "localizations": {
-        "en": {
+        },
+        "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Programa can't reach the update server. Check your internet connection and try again."
+            "value": "現在の後"
           }
         }
       }
     },
-    "update.error.noInternet.title": {
+    "workspace.placement.afterCurrent.description": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "No Internet Connection"
+            "value": "Insert new workspaces directly after the active workspace."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "アクティブなワークスペースの直後に新規ワークスペースを挿入します。"
           }
         }
       }
     },
-    "update.error.permissionError.message": {
+    "workspace.placement.end": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Move Programa into Applications and relaunch to enable updates."
+            "value": "End"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "末尾"
           }
         }
       }
     },
-    "update.error.permissionError.title": {
+    "workspace.placement.end.description": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Updater Permission Error"
+            "value": "Append new workspaces to the bottom of the list."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "新規ワークスペースをリストの末尾に追加します。"
           }
         }
       }
     },
-    "update.error.secureConnectionFailed.message": {
+    "workspace.placement.top": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "A secure connection to the update server couldn't be established. Try again later."
+            "value": "Top"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "先頭"
           }
         }
       }
     },
-    "update.error.secureConnectionFailed.title": {
+    "workspace.placement.top.description": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Secure Connection Failed"
+            "value": "Insert new workspaces at the top of the list."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "新規ワークスペースをリストの先頭に挿入します。"
           }
         }
       }
     },
-    "update.error.serverNotFound.message": {
+    "tabBar.autoTitle.pullRequest": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "The update server can't be found. Check your connection or try again later."
+            "value": "PR #%lld"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "PR #%lld"
           }
         }
       }
     },
-    "update.error.serverNotFound.title": {
+    "tabBar.newTerminalTab": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Server Not Found"
+            "value": "New Terminal Tab"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "新規ターミナルタブ"
           }
         }
       }
     },
-    "update.error.serverUnreachable.message": {
+    "tabBar.newBrowserTab": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Programa couldn't connect to the update server. Check your connection or try again later."
+            "value": "New Browser Tab"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "新規ブラウザタブ"
           }
         }
       }
     },
-    "update.error.serverUnreachable.title": {
+    "tabBar.splitRight": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Server Unreachable"
+            "value": "Split Right"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "右に分割"
           }
         }
       }
     },
-    "update.error.signatureError.message": {
+    "tabBar.splitDown": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "The update's signature could not be verified. Please try again later."
+            "value": "Split Down"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "下に分割"
           }
         }
       }
     },
-    "update.error.signatureError.title": {
+    "tabBar.closeTab": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Update Signature Error"
+            "value": "Close Tab"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "タブを閉じる"
           }
         }
       }
     },
-    "update.error.stillStarting": {
+    "tabBar.splitLimitReached": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Updater is still starting. Try again in a moment."
+            "value": "Split limit reached"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "アップデーターはまだ起動中です。しばらくしてからもう一度お試しください。"
+            "value": "分割の上限に達しました"
           }
         }
       }
     },
-    "update.error.timedOut.message": {
+    "tabBar.newTab": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "The update server took too long to respond. Try again in a moment."
+            "value": "New Tab"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "新規タブ"
           }
         }
       }
     },
-    "update.error.timedOut.title": {
+    "crash_recovery.notification.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Update Timed Out"
+            "value": "Restored after an unexpected exit"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "予期しない終了から復元しました"
           }
         }
       }
     },
-    "update.extracting.progress": {
+    "crash_recovery.notification.body": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Preparing: %@"
+            "value": "Programa quit unexpectedly last time. Saved workspaces are being restored and available processes reconnected. Terminals that cannot reconnect start a new shell."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "前回、Programa は予期せず終了しました。保存されたワークスペースを復元し、利用可能なプロセスに再接続しています。再接続できないターミナルでは新しいシェルを起動します。"
           }
         }
       }
     },
-    "update.installAndRelaunch": {
+    "session_recovery.freshShell.notice": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Install Update and Relaunch"
+            "value": "A new shell was started because the previous process could not be reconnected."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "以前のプロセスに再接続できなかったため、新しいシェルを起動しました。"
           }
         }
       }
     },
-    "update.installing.status": {
+    "dialog.quitSaveFailed.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Installing…"
+            "value": "Couldn’t Save Sessions"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "セッションを保存できませんでした"
           }
         }
       }
     },
-    "update.installingAndRestarting": {
+    "dialog.quitSaveFailed.message": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Installing update and preparing to restart"
+            "value": "Programa stayed open because it couldn’t save your sessions. Check available disk space and try quitting again."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "セッションを保存できなかったため、Programa は終了せずに開いたままです。ディスクの空き容量を確認して、もう一度終了してください。"
           }
         }
       }
     },
-    "update.noUpdates.message": {
+    "session_reconcile.window.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "You are running the latest version"
+            "value": "Recovered Sessions"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "復元されたセッション"
           }
         }
       }
     },
-    "update.noUpdates.title": {
+    "session_reconcile.notification.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "No Updates Available"
+            "value": "Recovered %lld session(s) from before the last restart"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "前回の再起動前のセッションを%lld件復元しました"
           }
         }
       }
     },
-    "update.permissionRequest.text": {
+    "session_reconcile.notification.body": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Enable Automatic Updates?"
+            "value": "Programa found terminal sessions still running from before the last restart and reattached them into a new window."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "前回の再起動前から実行中だったターミナルセッションを見つけ、新しいウィンドウに再アタッチしました。"
           }
         }
       }
     },
-    "update.pleaseWait": {
+    "settings.terminalOpacity.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Please wait while we check for available updates"
+            "value": "Opacity"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "不透明度"
           }
         }
       }
     },
-    "update.popover.autoUpdatesDescription": {
+    "settings.terminalOpacity.subtitle": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Programa can automatically check for updates in the background."
+            "value": "Terminal background transparency."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ターミナルの背景の透明度です。"
           }
         }
       }
     },
-    "update.popover.checking": {
+    "settings.terminalBlur.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Checking for updates…"
+            "value": "Background Blur"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "背景のぼかし"
           }
         }
       }
     },
-    "update.popover.details": {
+    "settings.terminalBlur.subtitle": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Details"
+            "value": "Blur the desktop behind a transparent terminal background."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "透明なターミナル背景の奥にあるデスクトップをぼかします。"
           }
         }
       }
     },
-    "update.popover.downloadingUpdate": {
+    "settings.terminalFont.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Downloading Update"
+            "value": "Font"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "フォント"
           }
         }
       }
     },
-    "update.popover.enableAutoUpdates": {
+    "settings.terminalFont.subtitle": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Enable automatic updates?"
+            "value": "Font family and size used in the terminal."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ターミナルで使用するフォントとサイズです。"
           }
         }
       }
     },
-    "update.popover.noUpdatesFound": {
+    "settings.terminalFont.familyPlaceholder": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "No Updates Found"
+            "value": "System Default"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "システムのデフォルト"
           }
         }
       }
     },
-    "update.popover.noUpdatesFound.message": {
+    "settings.app.preferredEditor": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "You're already running the latest version."
+            "value": "Open Files With"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ファイルを開くアプリ"
           }
         }
       }
     },
-    "update.popover.preparingUpdate": {
+    "settings.app.preferredEditor.subtitle": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Preparing Update"
+            "value": "Command to open files on Cmd-click. Leave empty for system default."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Cmdクリックでファイルを開くコマンドです。空欄にするとシステムのデフォルトを使用します。"
           }
         }
       }
     },
-    "update.popover.released": {
+    "settings.app.preferredEditor.placeholder": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Released:"
+            "value": "e.g. code, zed, subl"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "例: code, zed, subl"
           }
         }
       }
     },
-    "update.popover.restartRequired": {
+    "settings.section.customCommands": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Restart Required"
+            "value": "Custom Commands"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "カスタムコマンド"
           }
         }
       }
     },
-    "update.popover.restartRequired.message": {
+    "settings.customCommands.trustedDirectories": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "The update is ready. Please restart the application to complete the installation."
+            "value": "Trusted Directories"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "信頼済みディレクトリ"
           }
         }
       }
     },
-    "update.popover.size": {
+    "settings.customCommands.trustedDirectories.subtitle": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Size:"
+            "value": "Commands from programa.json in these directories run without confirmation. One path per line."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "これらのディレクトリ内のprograma.jsonのコマンドは、確認なしで実行されます。1行に1つのパスを記述します。"
           }
         }
       }
     },
-    "update.popover.updateAvailable": {
+    "settings.customCommands.trustedDirectories.note": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Update Available"
+            "value": "Place a programa.json in your project root to define custom commands. Trust a directory from the confirmation dialog, or add paths here. For git repos, trusting the root covers all subdirectories."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "プロジェクトのルートにprograma.jsonを配置すると、カスタムコマンドを定義できます。確認ダイアログからディレクトリを信頼するか、ここにパスを追加してください。Gitリポジトリの場合、ルートを信頼するとすべてのサブディレクトリに適用されます。"
           }
         }
       }
     },
-    "update.popover.version": {
+    "menu.app.openProgramaSettingsFile": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Version:"
+            "value": "Open settings.json"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "settings.jsonを開く"
           }
         }
       }
     },
-    "update.preparingUpdate": {
+    "menu.quitPrograma": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Extracting and preparing the update"
+            "value": "Quit Programa"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Programaを終了"
           }
         }
       }
     },
-    "update.restartToComplete": {
+    "commandPalette.kind.review": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Restart to Complete Update"
+            "value": "Review"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "レビュー"
           }
         }
       }
     },
-    "update.viewGitHubCommit": {
+    "ghostty.copy-mode.indicator": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "View GitHub Commit"
+            "value": "vim"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "vim"
           }
         }
       }
     },
-    "update.viewReleaseNotes": {
+    "ghostty.key-table.indicator": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "View Release Notes"
+            "value": "key table"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "キーテーブル"
           }
         }
       }
     },
-    "windowBackgroundColor": {
+    "ghostty.key-table.icon.accessibility": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "windowBackgroundColor"
+            "value": "Key table"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "windowBackgroundColor"
+            "value": "キーテーブル"
           }
         }
       }
     },
-    "workspace.closeProtected.message": {
+    "shortcut.openReview.label": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Pinned workspaces can't be closed while pinned. Unpin the workspace first."
+            "value": "Open Review Panel"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "レビューパネルを開く"
           }
         }
       }
     },
-    "workspace.displayName.fallback": {
+    "dialog.quitPrograma.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Workspace"
+            "value": "Quit Programa?"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Programaを終了しますか？"
           }
         }
       }
     },
-    "workspace.emptyPanel.browser": {
+    "dialog.quitPrograma.message": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Browser"
+            "value": "This will close all windows and workspaces."
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "ブラウザ"
+            "value": "すべてのウインドウとワークスペースが閉じられます。"
           }
         }
       }
     },
-    "workspace.emptyPanel.terminal": {
+    "dialog.quitPrograma.quit": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Terminal"
+            "value": "Quit"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "ターミナル"
+            "value": "終了"
           }
         }
       }
     },
-    "workspace.emptyPanel.title": {
+    "sidebar.debug.selectionColor": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Empty Panel"
+            "value": "Selection Color"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "空のパネル"
+            "value": "選択色"
           }
         }
       }
     },
-    "workspace.placement.afterCurrent": {
+    "sidebar.debug.resetSelectionColor": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "After current"
+            "value": "Reset to Default"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "デフォルトに戻す"
           }
         }
       }
     },
-    "workspace.placement.afterCurrent.description": {
+    "browser.proceedInPrograma": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Insert new workspaces directly after the active workspace."
+            "value": "Proceed in Programa"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Programaで続行"
           }
         }
       }
     },
-    "workspace.placement.end": {
+    "review.title.uncommitted": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "End"
+            "value": "Review: Uncommitted"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "レビュー: 未コミット"
           }
         }
       }
     },
-    "workspace.placement.end.description": {
+    "review.title.branch": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Append new workspaces to the bottom of the list."
+            "value": "Review: vs %@"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "レビュー: %@との比較"
           }
         }
       }
     },
-    "workspace.placement.top": {
+    "review.refresh.help": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Top"
+            "value": "Refresh diff"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "差分を更新"
           }
         }
       }
     },
-    "workspace.placement.top.description": {
+    "review.empty.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Insert new workspaces at the top of the list."
+            "value": "No changes to review"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "レビューする変更はありません"
           }
         }
       }
     },
-    "tabBar.autoTitle.pullRequest": {
+    "review.empty.message": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "PR #%lld"
+            "value": "The reviewed surface's worktree has no diffable changes right now."
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "PR #%lld"
+            "value": "レビュー対象サーフェスのワークツリーには、現在差分として表示できる変更がありません。"
           }
         }
       }
     },
-    "tabBar.newTerminalTab": {
+    "review.error.notGitRepository.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "New Terminal Tab"
+            "value": "Not a git repository"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "新規ターミナルタブ"
+            "value": "Gitリポジトリではありません"
           }
         }
       }
     },
-    "tabBar.newBrowserTab": {
+    "review.error.unknownBaseBranch.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "New Browser Tab"
+            "value": "Unknown base branch"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "新規ブラウザタブ"
+            "value": "ベースブランチが不明です"
           }
         }
       }
     },
-    "tabBar.splitRight": {
+    "review.error.commandFailed.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Split Right"
+            "value": "Couldn't read the diff"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "右に分割"
+            "value": "差分を読み取れませんでした"
           }
         }
       }
     },
-    "tabBar.splitDown": {
+    "review.error.notGitRepository.message": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Split Down"
+            "value": "This surface's working directory isn't inside a git worktree."
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "下に分割"
+            "value": "このサーフェスの作業ディレクトリは、Gitワークツリー内にありません。"
           }
         }
       }
     },
-    "tabBar.closeTab": {
+    "review.error.unknownBaseBranch.message": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Close Tab"
+            "value": "Couldn't resolve '%@', 'main', or 'master'."
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "タブを閉じる"
+            "value": "「%@」、「main」、「master」のいずれも解決できませんでした。"
           }
         }
       }
     },
-    "tabBar.splitLimitReached": {
+    "review.error.commandFailed.message": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Split limit reached"
+            "value": "A git command failed: %@"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "分割の上限に達しました"
+            "value": "Gitコマンドが失敗しました: %@"
           }
         }
       }
     },
-    "tabBar.newTab": {
+    "review.status.added": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "New Tab"
+            "value": "A"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "新規タブ"
+            "value": "A"
           }
         }
       }
     },
-    "crash_recovery.notification.title": {
+    "review.status.modified": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Restored after an unexpected exit"
+            "value": "M"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "予期しない終了から復元しました"
+            "value": "M"
           }
         }
       }
     },
-    "crash_recovery.notification.body": {
+    "review.status.deleted": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Programa quit unexpectedly last time. Saved workspaces are being restored and available processes reconnected. Terminals that cannot reconnect start a new shell."
+            "value": "D"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "前回、Programa は予期せず終了しました。保存されたワークスペースを復元し、利用可能なプロセスに再接続しています。再接続できないターミナルでは新しいシェルを起動します。"
+            "value": "D"
           }
         }
       }
     },
-    "session_recovery.freshShell.notice": {
+    "review.status.renamed": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "A new shell was started because the previous process could not be reconnected."
+            "value": "R"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "以前のプロセスに再接続できなかったため、新しいシェルを起動しました。"
+            "value": "R"
           }
         }
       }
     },
-    "dialog.quitSaveFailed.title": {
+    "review.notDiffable.binary": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Couldn’t Save Sessions"
+            "value": "Binary file -- not diffable"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "セッションを保存できませんでした"
+            "value": "バイナリファイル - 差分表示不可"
           }
         }
       }
     },
-    "dialog.quitSaveFailed.message": {
+    "review.notDiffable.tooLarge": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Programa stayed open because it couldn’t save your sessions. Check available disk space and try quitting again."
+            "value": "Too large to diff (%lld KB)"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "セッションを保存できなかったため、Programa は終了せずに開いたままです。ディスクの空き容量を確認して、もう一度終了してください。"
+            "value": "差分表示するには大きすぎます（%lld KB）"
           }
         }
       }
     },
-    "session_reconcile.window.title": {
+    "review.notDiffable.newUntrackedFile": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Recovered Sessions"
+            "value": "New file"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "復元されたセッション"
+            "value": "新規ファイル"
           }
         }
       }
     },
-    "session_reconcile.notification.title": {
+    "review.composer.placeholder": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Recovered %lld session(s) from before the last restart"
+            "value": "Add a comment…"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "前回の再起動前のセッションを%lld件復元しました"
+            "value": "コメントを追加…"
           }
         }
       }
     },
-    "session_reconcile.notification.body": {
+    "review.composer.add": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Programa found terminal sessions still running from before the last restart and reattached them into a new window."
+            "value": "Add"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "前回の再起動前から実行中だったターミナルセッションを見つけ、新しいウィンドウに再アタッチしました。"
+            "value": "追加"
           }
         }
       }
     },
-    "settings.terminalOpacity.title": {
+    "review.composer.cancel": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Opacity"
+            "value": "Cancel"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "不透明度"
+            "value": "キャンセル"
           }
         }
       }
     },
-    "settings.terminalOpacity.subtitle": {
+    "review.pendingComments.title": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Terminal background transparency."
+            "value": "Pending comments (%lld)"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "ターミナルの背景の透明度です。"
+            "value": "保留中のコメント（%lld）"
           }
         }
       }
     },
-    "settings.terminalBlur.title": {
+    "review.sendToAgent.button": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Background Blur"
+            "value": "Send to agent"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "背景のぼかし"
+            "value": "エージェントに送信"
           }
         }
       }
     },
-    "settings.terminalBlur.subtitle": {
+    "review.comment.stale": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Blur the desktop behind a transparent terminal background."
+            "value": "line numbers may have shifted"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "透明なターミナル背景の奥にあるデスクトップをぼかします。"
+            "value": "行番号がずれている可能性があります"
           }
         }
       }
     },
-    "settings.terminalFont.title": {
+    "review.comment.remove.help": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Font"
+            "value": "Remove comment"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "フォント"
+            "value": "コメントを削除"
           }
         }
       }
     },
-    "settings.terminalFont.subtitle": {
+    "cli.omx.usage": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Font family and size used in the terminal."
+            "value": "Usage: programa omx [omx-args...]\n\nLaunch Oh My Codex (OMX) with native programa pane integration.\n\nOMX is a multi-agent orchestration layer for OpenAI Codex CLI. This\ncommand sets up a tmux shim so OMX team mode, HUD, and agent panes\nbecome native programa splits.\n\nThis command:\n  - sets a tmux-like environment so OMX uses programa splits\n  - prepends a private tmux shim to PATH\n  - forwards all remaining arguments to omx\n\nInstall: npm install -g oh-my-codex\n\nExamples:\n  programa omx\n  programa omx --madmax --high\n  programa omx team"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "ターミナルで使用するフォントとサイズです。"
+            "value": "使用方法: programa omx [omx-args...]\n\nprograma のペインとネイティブに連携した状態で Oh My Codex (OMX) を起動します。\n\nOMX は OpenAI Codex CLI 向けのマルチエージェント・オーケストレーション層です。\nこのコマンドは tmux シムを設定し、OMX のチームモード、HUD、エージェントの\nペインを programa のネイティブな分割として表示します。\n\nこのコマンドは次の処理を行います:\n  - OMX が programa の分割を使うよう tmux 互換の環境を設定\n  - 専用の tmux シムを PATH の先頭に追加\n  - 残りの引数をすべて omx に渡す\n\nインストール: npm install -g oh-my-codex\n\n例:\n  programa omx\n  programa omx --madmax --high\n  programa omx team"
           }
         }
       }
     },
-    "settings.terminalFont.familyPlaceholder": {
+    "cli.omc.usage": {
       "extractionState": "manual",
       "localizations": {
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "System Default"
+            "value": "Usage: programa omc [omc-args...]\n\nLaunch Oh My Claude Code (OMC) with native programa pane integration.\n\nOMC is a multi-agent orchestration system for Claude Code with\nspecialized agents, smart model routing, and team pipelines. This\ncommand sets up a tmux shim so OMC team mode and agent panes become\nnative programa splits.\n\nThis command:\n  - sets a tmux-like environment so OMC uses programa splits\n  - prepends a private tmux shim to PATH\n  - injects NODE_OPTIONS restore module for Claude compatibility\n  - forwards all remaining arguments to omc\n\nInstall: npm install -g oh-my-claude-sisyphus\n\nExamples:\n  programa omc\n  programa omc team 3:claude \"implement feature\"\n  programa omc --watch"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "システムのデフォルト"
+            "value": "使用方法: programa omc [omc-args...]\n\nprograma のペインとネイティブに連携した状態で Oh My Claude Code (OMC) を起動します。\n\nOMC は Claude Code 向けのマルチエージェント・オーケストレーション・システムで、\n専門エージェント、スマートなモデルルーティング、チームパイプラインを備えています。\nこのコマンドは tmux シムを設定し、OMC のチームモードとエージェントのペインを\nprograma のネイティブな分割として表示します。\n\nこのコマンドは次の処理を行います:\n  - OMC が programa の分割を使うよう tmux 互換の環境を設定\n  - 専用の tmux シムを PATH の先頭に追加\n  - Claude との互換性のため NODE_OPTIONS の復元モジュールを注入\n  - 残りの引数をすべて omc に渡す\n\nインストール: npm install -g oh-my-claude-sisyphus\n\n例:\n  programa omc\n  programa omc team 3:claude \"implement feature\"\n  programa omc --watch"
           }
         }
       }

From a2caa4a6233493f1f67c52242a98c613a7390f91 Mon Sep 17 00:00:00 2001
From: arzafran <franco@darkroom.engineering>
Date: Mon, 28 Sep 2026 11:22:13 -0300
Subject: [PATCH 17/19] fix: honor Reduce Motion for moving animations

---
 Sources/ContentView.swift               |  3 ++-
 Sources/Find/BrowserSearchOverlay.swift |  3 ++-
 Sources/Find/SurfaceSearchOverlay.swift |  3 ++-
 Sources/GhosttySurfaceScrollView.swift  |  7 ++++-
 Sources/Panels/MarkdownPanelView.swift  |  3 ++-
 Sources/SettingsView.swift              |  3 ++-
 Sources/TabItemView.swift               | 34 ++++++++++++++++++-------
 Sources/Update/UpdatePill.swift         |  3 ++-
 Sources/WindowBrowserSlotView.swift     |  7 ++++-
 9 files changed, 49 insertions(+), 17 deletions(-)

diff --git a/Sources/ContentView.swift b/Sources/ContentView.swift
index 84fa93db8..6ab4581ed 100644
--- a/Sources/ContentView.swift
+++ b/Sources/ContentView.swift
@@ -10,6 +10,7 @@ import WebKit
 struct ContentView: View {
     @ObservedObject var updateViewModel: UpdateViewModel
     let windowId: UUID
+    @Environment(\.accessibilityReduceMotion) private var reduceMotion
     @EnvironmentObject var tabManager: TabManager
     @EnvironmentObject var notificationStore: TerminalNotificationStore
     @EnvironmentObject var sidebarState: SidebarState
@@ -4655,7 +4656,7 @@ struct ContentView: View {
             commandPaletteController.commandPaletteScrollTargetIndex = selectedIndex
         }
         if animated {
-            withAnimation(.easeOut(duration: 0.1)) {
+            withAnimation(reduceMotion ? nil : .easeOut(duration: 0.1)) {
                 assignTarget()
             }
         } else {
diff --git a/Sources/Find/BrowserSearchOverlay.swift b/Sources/Find/BrowserSearchOverlay.swift
index 5b31e7f65..36e078e65 100644
--- a/Sources/Find/BrowserSearchOverlay.swift
+++ b/Sources/Find/BrowserSearchOverlay.swift
@@ -16,6 +16,7 @@ struct BrowserSearchOverlay: View {
     @State private var dragOffset: CGSize = .zero
     @State private var barSize: CGSize = .zero
     @State private var isSearchFieldFocused: Bool = true
+    @Environment(\.accessibilityReduceMotion) private var reduceMotion
     @AppStorage(ProgramaGlassSettings.overlaysEnabledKey)
     private var overlayLiquidGlassEnabled = false
 
@@ -162,7 +163,7 @@ struct BrowserSearchOverlay: View {
                             y: centerPos.y + value.translation.height
                         )
                         let newCorner = closestCorner(to: newCenter, in: geo.size)
-                        withAnimation(.easeOut(duration: 0.2)) {
+                        withAnimation(reduceMotion ? nil : .easeOut(duration: 0.2)) {
                             corner = newCorner
                             dragOffset = .zero
                         }
diff --git a/Sources/Find/SurfaceSearchOverlay.swift b/Sources/Find/SurfaceSearchOverlay.swift
index 3604fced2..f79a24dc5 100644
--- a/Sources/Find/SurfaceSearchOverlay.swift
+++ b/Sources/Find/SurfaceSearchOverlay.swift
@@ -28,6 +28,7 @@ struct SurfaceSearchOverlay: View {
     @State private var dragOffset: CGSize = .zero
     @State private var barSize: CGSize = .zero
     @State private var isSearchFieldFocused: Bool = true
+    @Environment(\.accessibilityReduceMotion) private var reduceMotion
     @AppStorage(ProgramaGlassSettings.overlaysEnabledKey)
     private var overlayLiquidGlassEnabled = false
 
@@ -182,7 +183,7 @@ struct SurfaceSearchOverlay: View {
                             y: centerPos.y + value.translation.height
                         )
                         let newCorner = closestCorner(to: newCenter, in: geo.size)
-                        withAnimation(.easeOut(duration: 0.2)) {
+                        withAnimation(reduceMotion ? nil : .easeOut(duration: 0.2)) {
                             corner = newCorner
                             dragOffset = .zero
                         }
diff --git a/Sources/GhosttySurfaceScrollView.swift b/Sources/GhosttySurfaceScrollView.swift
index 60ddc8f12..c4f4eb7a4 100644
--- a/Sources/GhosttySurfaceScrollView.swift
+++ b/Sources/GhosttySurfaceScrollView.swift
@@ -1499,10 +1499,15 @@ final class GhosttySurfaceScrollView: NSView {
                 logDropZoneOverlay(event: "update", zone: zone, frame: targetFrame)
             }
 #endif
+            // Reduce Motion: apply the frame directly instead of animating it sliding/
+            // resizing into place; the alpha fade still runs (dissolves are allowed).
+            if needsFrameUpdate && NSWorkspace.shared.accessibilityDisplayShouldReduceMotion {
+                applyDropZoneOverlayFrame(targetFrame)
+            }
             NSAnimationContext.runAnimationGroup { context in
                 context.duration = 0.18
                 context.timingFunction = CAMediaTimingFunction(name: .easeInEaseOut)
-                if needsFrameUpdate {
+                if needsFrameUpdate && !NSWorkspace.shared.accessibilityDisplayShouldReduceMotion {
                     dropZoneOverlayView.animator().frame = targetFrame
                 }
                 if dropZoneOverlayView.alphaValue < 1 {
diff --git a/Sources/Panels/MarkdownPanelView.swift b/Sources/Panels/MarkdownPanelView.swift
index 707516b06..e5a6742fc 100644
--- a/Sources/Panels/MarkdownPanelView.swift
+++ b/Sources/Panels/MarkdownPanelView.swift
@@ -252,6 +252,7 @@ struct MarkdownSearchOverlay: View {
     @State private var corner: Corner = .topRight
     @State private var dragOffset: CGSize = .zero
     @State private var barSize: CGSize = .zero
+    @Environment(\.accessibilityReduceMotion) private var reduceMotion
 
     private let padding: CGFloat = 8
 
@@ -349,7 +350,7 @@ struct MarkdownSearchOverlay: View {
                             x: centerPos.x + value.translation.width,
                             y: centerPos.y + value.translation.height
                         )
-                        withAnimation(.easeOut(duration: 0.2)) {
+                        withAnimation(reduceMotion ? nil : .easeOut(duration: 0.2)) {
                             corner = closestCorner(to: newCenter, in: geo.size)
                             dragOffset = .zero
                         }
diff --git a/Sources/SettingsView.swift b/Sources/SettingsView.swift
index 01c750d59..65b14f92a 100644
--- a/Sources/SettingsView.swift
+++ b/Sources/SettingsView.swift
@@ -31,6 +31,7 @@ struct SettingsView: View {
     /// Shared by the tab strip and the scrolling rows so they line up on both edges.
     private let contentHorizontalInset: CGFloat = 20
 
+    @Environment(\.accessibilityReduceMotion) private var reduceMotion
     @State private var selectedTab: SettingsTab = .general
     @State private var measuredContentHeight: CGFloat = 0
     @State private var minimumWindowWidth: CGFloat = SettingsWindowMetrics.contentWidth
@@ -472,7 +473,7 @@ struct SettingsView: View {
             // the selected one, so scrolling in the same pass would find nothing.
             selectedTab = SettingsTab.owning(target)
             DispatchQueue.main.async {
-                withAnimation(.easeInOut(duration: 0.2)) {
+                withAnimation(reduceMotion ? nil : .easeInOut(duration: 0.2)) {
                     proxy.scrollTo(target, anchor: .top)
                 }
             }
diff --git a/Sources/TabItemView.swift b/Sources/TabItemView.swift
index bf571c194..49a0f3274 100644
--- a/Sources/TabItemView.swift
+++ b/Sources/TabItemView.swift
@@ -336,6 +336,20 @@ struct TabItemView: View, Equatable {
         settings.visibleAuxiliaryDetails
     }
 
+    // Read imperatively instead of @Environment(\.accessibilityReduceMotion): this
+    // struct's Equatable conformance and typing-latency contract (CLAUDE.md) forbid
+    // adding environment/observed properties that would need to join `==`.
+    private var reduceMotion: Bool {
+        NSWorkspace.shared.accessibilityDisplayShouldReduceMotion
+    }
+
+    // Shared by the metadata/log/progress row transitions below: they insert and
+    // remove with a slide-down under normal motion, and a plain dissolve when
+    // Reduce Motion is on.
+    private var reduceMotionAwareRowTransition: AnyTransition {
+        reduceMotion ? .opacity : .opacity.combined(with: .move(edge: .top))
+    }
+
     var body: some View {
         let _ = workspaceObservationGeneration
         let closeWorkspaceTooltip = String(localized: "sidebar.closeWorkspace.tooltip", defaultValue: "Close Workspace")
@@ -546,7 +560,7 @@ struct TabItemView: View, Equatable {
                         isActive: usesInvertedActiveForeground,
                         onFocus: { updateSelection() }
                     )
-                    .transition(.opacity.combined(with: .move(edge: .top)))
+                    .transition(reduceMotionAwareRowTransition)
                 }
                 if !metadataBlocks.isEmpty {
                     SidebarMetadataMarkdownBlocks(
@@ -554,7 +568,7 @@ struct TabItemView: View, Equatable {
                         isActive: usesInvertedActiveForeground,
                         onFocus: { updateSelection() }
                     )
-                    .transition(.opacity.combined(with: .move(edge: .top)))
+                    .transition(reduceMotionAwareRowTransition)
                 }
             }
 
@@ -570,7 +584,7 @@ struct TabItemView: View, Equatable {
                         .lineLimit(1)
                         .truncationMode(.tail)
                 }
-                .transition(.opacity.combined(with: .move(edge: .top)))
+                .transition(reduceMotionAwareRowTransition)
             }
 
             // Progress bar
@@ -594,7 +608,7 @@ struct TabItemView: View, Equatable {
                             .lineLimit(1)
                     }
                 }
-                .transition(.opacity.combined(with: .move(edge: .top)))
+                .transition(reduceMotionAwareRowTransition)
             }
 
             // Branch + directory row
@@ -700,9 +714,9 @@ struct TabItemView: View, Equatable {
                 .lineLimit(1)
             }
         }
-        .animation(.easeInOut(duration: 0.2), value: tab.logEntries.count)
-        .animation(.easeInOut(duration: 0.2), value: tab.progress != nil)
-        .animation(.easeInOut(duration: 0.2), value: tab.metadataBlocks.count)
+        .animation(reduceMotion ? nil : .easeInOut(duration: 0.2), value: tab.logEntries.count)
+        .animation(reduceMotion ? nil : .easeInOut(duration: 0.2), value: tab.progress != nil)
+        .animation(reduceMotion ? nil : .easeInOut(duration: 0.2), value: tab.metadataBlocks.count)
         .padding(.leading, showsWorktreeBadge ? 14 : 0)
         .padding(.horizontal, rowMetrics.horizontalPadding)
         .padding(.vertical, rowMetrics.verticalPadding)
@@ -2049,6 +2063,7 @@ private struct SidebarMetadataRows: View {
     let onFocus: () -> Void
 
     @State private var isExpanded: Bool = false
+    @Environment(\.accessibilityReduceMotion) private var reduceMotion
     private let collapsedEntryLimit = 3
 
     var body: some View {
@@ -2060,7 +2075,7 @@ private struct SidebarMetadataRows: View {
             if shouldShowToggle {
                 Button(isExpanded ? String(localized: "sidebar.metadata.showLess", defaultValue: "Show less") : String(localized: "sidebar.metadata.showMore", defaultValue: "Show more")) {
                     onFocus()
-                    withAnimation(.easeInOut(duration: 0.15)) {
+                    withAnimation(reduceMotion ? nil : .easeInOut(duration: 0.15)) {
                         isExpanded.toggle()
                     }
                 }
@@ -2198,6 +2213,7 @@ private struct SidebarMetadataMarkdownBlocks: View {
     let onFocus: () -> Void
 
     @State private var isExpanded: Bool = false
+    @Environment(\.accessibilityReduceMotion) private var reduceMotion
     private let collapsedBlockLimit = 1
 
     var body: some View {
@@ -2213,7 +2229,7 @@ private struct SidebarMetadataMarkdownBlocks: View {
             if shouldShowToggle {
                 Button(isExpanded ? String(localized: "sidebar.metadata.showLessDetails", defaultValue: "Show less details") : String(localized: "sidebar.metadata.showMoreDetails", defaultValue: "Show more details")) {
                     onFocus()
-                    withAnimation(.easeInOut(duration: 0.15)) {
+                    withAnimation(reduceMotion ? nil : .easeInOut(duration: 0.15)) {
                         isExpanded.toggle()
                     }
                 }
diff --git a/Sources/Update/UpdatePill.swift b/Sources/Update/UpdatePill.swift
index ddadb1ad2..540e63076 100644
--- a/Sources/Update/UpdatePill.swift
+++ b/Sources/Update/UpdatePill.swift
@@ -6,6 +6,7 @@ import SwiftUI
 struct UpdatePill: View {
     @ObservedObject var model: UpdateViewModel
     @State private var showPopover = false
+    @Environment(\.accessibilityReduceMotion) private var reduceMotion
 
     private let textFont = NSFont.systemFont(ofSize: 11, weight: .medium)
 
@@ -18,7 +19,7 @@ struct UpdatePill: View {
                         showPopover = false
                     }
                 }
-                .transition(.opacity.combined(with: .scale(scale: 0.95)))
+                .transition(reduceMotion ? .opacity : .opacity.combined(with: .scale(scale: 0.95)))
         }
     }
 
diff --git a/Sources/WindowBrowserSlotView.swift b/Sources/WindowBrowserSlotView.swift
index e368d5aef..f4cb901d9 100644
--- a/Sources/WindowBrowserSlotView.swift
+++ b/Sources/WindowBrowserSlotView.swift
@@ -452,10 +452,15 @@ final class WindowBrowserSlotView: NSView {
         }
 
         bringInteractionLayersToFrontIfNeeded()
+        // Reduce Motion: apply the frame directly instead of animating it sliding/
+        // resizing into place; the alpha fade still runs (dissolves are allowed).
+        if needsFrameUpdate && NSWorkspace.shared.accessibilityDisplayShouldReduceMotion {
+            applyDropZoneOverlayFrame(targetFrame)
+        }
         NSAnimationContext.runAnimationGroup { context in
             context.duration = 0.18
             context.timingFunction = CAMediaTimingFunction(name: .easeInEaseOut)
-            if needsFrameUpdate {
+            if needsFrameUpdate && !NSWorkspace.shared.accessibilityDisplayShouldReduceMotion {
                 dropZoneOverlayView.animator().frame = targetFrame
             }
             if dropZoneOverlayView.alphaValue < 1 {

From bfcd6d904e59e3a67b66a00cf0b15ab9c558ff2e Mon Sep 17 00:00:00 2001
From: arzafran <franco@darkroom.engineering>
Date: Mon, 28 Sep 2026 11:34:12 -0300
Subject: [PATCH 18/19] fix: route the tab context menu through hit-testing

---
 .../Bonsplit/Internal/Views/TabItemView.swift | 82 ++++++++++---------
 1 file changed, 45 insertions(+), 37 deletions(-)

diff --git a/vendor/bonsplit/Sources/Bonsplit/Internal/Views/TabItemView.swift b/vendor/bonsplit/Sources/Bonsplit/Internal/Views/TabItemView.swift
index 4f56cfa16..4801ea8b5 100644
--- a/vendor/bonsplit/Sources/Bonsplit/Internal/Views/TabItemView.swift
+++ b/vendor/bonsplit/Sources/Bonsplit/Internal/Views/TabItemView.swift
@@ -214,8 +214,9 @@ struct TabItemView: View {
         // A SwiftUI `.contextMenu` here gets closed by macOS the instant this view re-renders
         // while the menu is open (constant re-eval from closure props, hover state changes when
         // the pointer crosses onto the open menu, etc.) -- AppKit's own tracking loop is immune
-        // to that since it owns the run loop for the popup, not SwiftUI's diffing.
-        .background(TabContextMenuHostView(
+        // to that since it owns the run loop for the popup, not SwiftUI's diffing. It sits in an
+        // overlay so normal hit-testing reaches it; that skips clipped and non-interactive tabs.
+        .overlay(TabContextMenuHostView(
             tab: tab,
             contextMenuState: contextMenuState,
             onContextAction: onContextAction,
@@ -621,18 +622,10 @@ private struct TabContextMenuHostView: NSViewRepresentable {
         var contextMenuState: TabContextMenuState?
         var onContextAction: ((TabContextAction) -> Void)?
         var onApplyTabColor: ((String) -> Void)?
-        weak var view: NSView?
-        var monitor: Any?
         // Keeps this popup's NSMenuItem targets alive for the duration of the menu; replaced
         // (and the previous batch released) on every new popup.
         var retainedTargets: [ClosureMenuItemTarget] = []
 
-        deinit {
-            if let monitor {
-                NSEvent.removeMonitor(monitor)
-            }
-        }
-
         func popUpMenu(for event: NSEvent, in view: NSView) {
             guard let tab, let contextMenuState else { return }
             var targets: [ClosureMenuItemTarget] = []
@@ -834,45 +827,60 @@ private struct TabContextMenuHostView: NSViewRepresentable {
 
     func makeCoordinator() -> Coordinator { Coordinator() }
 
-    func makeNSView(context: Context) -> NSView {
-        let view = NSView(frame: .zero)
-        view.wantsLayer = true
-        view.layer?.backgroundColor = NSColor.clear.cgColor
-
-        context.coordinator.view = view
+    func makeNSView(context: Context) -> TabContextMenuCaptureView {
+        let view = TabContextMenuCaptureView()
+        view.coordinator = context.coordinator
         context.coordinator.tab = tab
         context.coordinator.contextMenuState = contextMenuState
         context.coordinator.onContextAction = onContextAction
         context.coordinator.onApplyTabColor = onApplyTabColor
-
-        // Only intercept right-mouse-down and ctrl-left-mouse-down so left click selection,
-        // middle click close, and drag/reorder all keep working unmodified.
-        let coordinator = context.coordinator
-        coordinator.monitor = NSEvent.addLocalMonitorForEvents(matching: [.rightMouseDown, .leftMouseDown]) { [weak coordinator] event in
-            guard let coordinator, let v = coordinator.view, let w = v.window else { return event }
-            guard event.window === w else { return event }
-
-            let isRightClick = event.type == .rightMouseDown
-            let isCtrlClick = event.type == .leftMouseDown && event.modifierFlags.contains(.control)
-            guard isRightClick || isCtrlClick else { return event }
-
-            let p = v.convert(event.locationInWindow, from: nil)
-            guard v.bounds.contains(p) else { return event }
-
-            coordinator.popUpMenu(for: event, in: v)
-            return nil // swallow so it doesn't also select the tab or start a drag
-        }
-
         return view
     }
 
-    func updateNSView(_ nsView: NSView, context: Context) {
+    func updateNSView(_ nsView: TabContextMenuCaptureView, context: Context) {
         // Refresh on every render so a stale enabled/disabled state or pinned/unread flag
         // from a previous render can never be shown in a freshly popped menu.
-        context.coordinator.view = nsView
+        nsView.coordinator = context.coordinator
         context.coordinator.tab = tab
         context.coordinator.contextMenuState = contextMenuState
         context.coordinator.onContextAction = onContextAction
         context.coordinator.onApplyTabColor = onApplyTabColor
     }
 }
+
+/// Claims only right-mouse-down and ctrl-left-mouse-down in `hitTest`, so left-click
+/// selection, middle-click close, hover, and drag/reorder hit-test through to the tab
+/// underneath. Control-click arrives as a genuine `.leftMouseDown` with `.control` set,
+/// so `hitTest` must recognize it too or the click falls through to plain selection.
+private final class TabContextMenuCaptureView: NSView {
+    weak var coordinator: TabContextMenuHostView.Coordinator?
+
+    override func hitTest(_ point: NSPoint) -> NSView? {
+        guard let event = NSApp.currentEvent,
+              let superview,
+              bounds.contains(convert(point, from: superview)) else { return nil }
+        if event.type == .rightMouseDown {
+            return self
+        }
+        if event.type == .leftMouseDown, event.modifierFlags.contains(.control) {
+            return self
+        }
+        return nil
+    }
+
+    override func mouseDown(with event: NSEvent) {
+        guard event.modifierFlags.contains(.control) else {
+            super.mouseDown(with: event)
+            return
+        }
+        rightMouseDown(with: event)
+    }
+
+    override func rightMouseDown(with event: NSEvent) {
+        guard let coordinator else {
+            super.rightMouseDown(with: event)
+            return
+        }
+        coordinator.popUpMenu(for: event, in: self)
+    }
+}

From 4694173f152ae827727cac16d0d1812d41cc036c Mon Sep 17 00:00:00 2001
From: arzafran <franco@darkroom.engineering>
Date: Mon, 28 Sep 2026 11:34:13 -0300
Subject: [PATCH 19/19] fix: compile V2MethodNames into the unit test target

---
 GhosttyTabs.xcodeproj/project.pbxproj | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/GhosttyTabs.xcodeproj/project.pbxproj b/GhosttyTabs.xcodeproj/project.pbxproj
index e01a1fd3a..6b6d8e8a3 100644
--- a/GhosttyTabs.xcodeproj/project.pbxproj
+++ b/GhosttyTabs.xcodeproj/project.pbxproj
@@ -339,6 +339,7 @@
 					9EAF4699346282F2171FCDB7 /* ProgramaDirectoryTrustTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3CA3597273B50CC0592C0164 /* ProgramaDirectoryTrustTests.swift */; };
 		C7A10002 /* V2MethodNames.swift in Sources */ = {isa = PBXBuildFile; fileRef = C7A10001 /* V2MethodNames.swift */; };
 		B0F65D90C522CCE8ECCBE4AF /* V2MethodNames.swift in Sources */ = {isa = PBXBuildFile; fileRef = C7A10001 /* V2MethodNames.swift */; };
+		E3A7C19D5B2F48D06C1E9A73 /* V2MethodNames.swift in Sources */ = {isa = PBXBuildFile; fileRef = C7A10001 /* V2MethodNames.swift */; };
 		C7A20002 /* V2CommandCatalogContractTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C7A20001 /* V2CommandCatalogContractTests.swift */; };
 		/* End PBXBuildFile section */
 
@@ -1754,6 +1755,7 @@
 					F6D8BDB710C64A444F3DE4F0 /* MCPSocketBridgeTests.swift in Sources */,
 					386AE1E1270DD8B6AA427C61 /* SocketPathResolution.swift in Sources */,
 					7B3E9C21A4F0D85E63C1470B /* MCPSocketBridge.swift in Sources */,
+					E3A7C19D5B2F48D06C1E9A73 /* V2MethodNames.swift in Sources */,
 				);
 				runOnlyForDeploymentPostprocessing = 0;
 			};