update

.codex/config.toml##os.Darwin

@@ -7,8 +7,6 @@ tool_output_token_limit = 25000
 # With tool_output_token_limit=25000 ⇒ 273000 - (25000 + 15000) = 233000
 model_auto_compact_token_limit = 233000
 suppress_unstable_features_warning = true
-notify = ["/Users/sudacode/.codex/computer-use/Codex Computer Use.app/Contents/SharedSupport/SkyComputerUseClient.app/Contents/MacOS/SkyComputerUseClient", "turn-ended"]
-
 [features]
 ghost_commit = false
 unified_exec = true
@@ -17,7 +15,6 @@ web_request = true
 skills = true
 shell_snapshot = true
 multi_agent = true
-js_repl = false
 
 [projects."/home/kyasuda/gitlab/python_package_registry"]
 trust_level = "trusted"
@@ -82,29 +79,23 @@ trust_level = "trusted"
 [projects."/Users/sudacode/.agents/skills"]
 trust_level = "trusted"
 
-<<<<<<< Updated upstream
 [projects."/Users/sudacode/projects/japanese/texthooker-ui"]
 trust_level = "trusted"
 
 [projects."/Users/sudacode"]
 trust_level = "trusted"
 
-||||||| Stash base
-=======
->>>>>>> Stashed changes
 [projects."/Users/sudacode/tmp"]
 trust_level = "trusted"
 
 [mcp_servers.backlog]
 command = "backlog"
 args = ["mcp", "start"]
-enabled = false
 
 [mcp_servers.playwright]
 command = "npx"
 args = ["@playwright/mcp@latest"]
 
-<<<<<<< Updated upstream
 [plugins."github@openai-curated"]
 enabled = true
 
@@ -141,114 +132,3 @@ source = "/Users/sudacode/.codex/.tmp/bundled-marketplaces/openai-bundled"
 last_updated = "2026-05-09T00:22:09Z"
 source_type = "local"
 source = "/Users/sudacode/.cache/codex-runtimes/codex-primary-runtime/plugins/openai-primary-runtime"
-||||||| Stash base
-=======
-[mcp_servers.node_repl]
-args = []
-command = "/Applications/Codex.app/Contents/Resources/node_repl"
-startup_timeout_sec = 120
-
-[mcp_servers.node_repl.env]
-NODE_REPL_NATIVE_PIPE_CONNECT_TIMEOUT_MS = "1000"
-NODE_REPL_NODE_MODULE_DIRS = ""
-NODE_REPL_NODE_PATH = "/Applications/Codex.app/Contents/Resources/node"
-NODE_REPL_TRUSTED_CODE_PATHS = "/Users/sudacode/.codex"
-CODEX_HOME = "/Users/sudacode/.codex"
-NODE_REPL_TRUSTED_BROWSER_CLIENT_SHA256S = "496c7b3cb95b4bc20cff49b513150606e0da0000c92bf752206bee5a6c248423"
-BROWSER_USE_AVAILABLE_BACKENDS = "chrome,iab"
-BROWSER_USE_MARKETPLACE_NAME = "openai-bundled"
-NODE_REPL_UNTRUSTED_ENV_ALLOWLIST = "BROWSER_USE_MARKETPLACE_NAME"
-SKY_CUA_SERVICE_PATH = "/Users/sudacode/.codex/.tmp/bundled-marketplaces/openai-bundled/plugins/computer-use/Codex Computer Use.app"
-CODEX_CLI_PATH = "/Applications/Codex.app/Contents/Resources/codex"
-
-[tui.model_availability_nux]
-"gpt-5.5" = 4
-
-[marketplaces.openai-bundled]
-last_updated = "2026-05-27T07:34:13Z"
-source_type = "local"
-source = "/Users/sudacode/.codex/.tmp/bundled-marketplaces/openai-bundled"
-
-[marketplaces.openai-primary-runtime]
-last_updated = "2026-05-22T02:44:58Z"
-source_type = "local"
-source = "/Users/sudacode/.cache/codex-runtimes/codex-primary-runtime/plugins/openai-primary-runtime"
-
-[marketplaces.claude-plugins-official]
-last_updated = "2026-05-27T19:16:53Z"
-last_revision = "1109c43a9d088619227511bc7397245eb26b7977"
-source_type = "git"
-source = "https://github.com/anthropics/claude-plugins-official.git"
-
-[plugins."documents@openai-primary-runtime"]
-enabled = true
-
-[plugins."spreadsheets@openai-primary-runtime"]
-enabled = true
-
-[plugins."presentations@openai-primary-runtime"]
-enabled = true
-
-[plugins."code-review@claude-plugins-official"]
-enabled = true
-
-[plugins."code-simplifier@claude-plugins-official"]
-enabled = true
-
-[plugins."frontend-design@claude-plugins-official"]
-enabled = true
-
-[plugins."playwright@claude-plugins-official"]
-enabled = true
-
-[plugins."computer-use@openai-bundled"]
-enabled = true
-
-[plugins."chrome@openai-bundled"]
-enabled = true
-
-[plugins."hugging-face@openai-curated"]
-enabled = true
-
-[plugins."github@openai-curated"]
-enabled = true
-
-[plugins."browser@openai-bundled"]
-enabled = true
-
-[desktop]
-appearanceLightCodeThemeId = "catppuccin"
-appearanceDarkCodeThemeId = "catppuccin"
-followUpQueueMode = "steer"
-git-branch-prefix = ""
-git-pull-request-merge-method = "squash"
-git-show-sidebar-pr-icons = true
-git-create-pull-request-as-draft = false
-
-[desktop.appearanceLightChromeTheme]
-accent = "#8839ef"
-contrast = 45
-ink = "#4c4f69"
-opaqueWindows = false
-surface = "#eff1f5"
-
-[desktop.appearanceLightChromeTheme.fonts]
-
-[desktop.appearanceLightChromeTheme.semanticColors]
-diffAdded = "#40a02b"
-diffRemoved = "#d20f39"
-skill = "#8839ef"
-
-[desktop.appearanceDarkChromeTheme]
-accent = "#cba6f7"
-contrast = 60
-ink = "#cdd6f4"
-opaqueWindows = false
-surface = "#1e1e2e"
-
-[desktop.appearanceDarkChromeTheme.fonts]
-
-[desktop.appearanceDarkChromeTheme.semanticColors]
-diffAdded = "#a6e3a1"
-diffRemoved = "#f38ba8"
-skill = "#cba6f7"

.gitconfig##os.Darwin

@@ -10,7 +10,7 @@
 [pull]
 	rebase = true
 [rebase]
-	autoStash = true
+	autoStash = false
 [fetch]
 	prune = true
 [diff]