mixdog 0.9.9 → 0.9.11

package/scripts/smoke-runtime-negative.ps1

@@ -1,106 +1,106 @@
-# smoke-runtime-negative.ps1 — Negative-path tests against released win32-x64
-# runtime tarball. Validates: download, sha256, corrupt-tarball, fresh-extract
-# boot, double-init refusal, hostile-env survival.
-#
-# Env: TAG / OS / ARCH / RUNTIME_RELEASE_REPOSITORY (default tribgames/mixdog)
-
-$ErrorActionPreference = 'Stop'
-
-$Tag         = if ($env:TAG)                { $env:TAG }  else { 'runtime-v0.4.0' }
-$Os          = if ($env:OS)                 { $env:OS }   else { 'win32' }
-$Arch        = if ($env:ARCH)               { $env:ARCH } else { 'x64' }
-$ReleaseRepo = if ($env:RUNTIME_RELEASE_REPOSITORY) { $env:RUNTIME_RELEASE_REPOSITORY } else { 'tribgames/mixdog' }
-$PgVer       = '16.4'
-$PgvectorVer = '0.8.2'
-
-$Asset = "mixdog-runtime-${Os}-${Arch}-pg${PgVer}-pgvector${PgvectorVer}.tar.gz"
-$Url   = "https://github.com/${ReleaseRepo}/releases/download/${Tag}/${Asset}"
-
-$Work = New-Item -ItemType Directory -Force -Path "$env:TEMP\smoke-$([guid]::NewGuid().ToString('N'))" | Select-Object -ExpandProperty FullName
-
-try {
-    Write-Host "==> Negative-path smoke for ${Os}-${Arch} from $Url"
-
-    Write-Host "==> Test 1: HEAD reaches release asset"
-    $resp = Invoke-WebRequest -Uri $Url -Method Head -UseBasicParsing -ErrorAction Stop
-    Write-Host "  HTTP $($resp.StatusCode)"
-
-    Write-Host "==> Test 2: full download + sha256"
-    $TarPath = Join-Path $Work $Asset
-    Invoke-WebRequest -Uri $Url -OutFile $TarPath -UseBasicParsing
-    $sha = (Get-FileHash -Algorithm SHA256 $TarPath).Hash.ToLower()
-    Write-Host "  sha256=$sha"
-
-    Write-Host "==> Test 3: corrupt tarball — flip a byte and ensure tar errors"
-    $CorruptPath = "$Work\corrupt.tar.gz"
-    Copy-Item $TarPath $CorruptPath
-    $bytes = [byte[]]::new(1); $rand = [System.Random]::new(); $rand.NextBytes($bytes)
-    $stream = [System.IO.File]::OpenWrite($CorruptPath)
-    $stream.Position = 102400
-    $stream.Write($bytes, 0, 1)
-    $stream.Close()
-    $CorruptDir = "$Work\corrupt"
-    New-Item -ItemType Directory -Force -Path $CorruptDir | Out-Null
-    $TarProc = Start-Process -FilePath tar -ArgumentList @('-xzf', $CorruptPath, '-C', $CorruptDir.Replace('\','/')) -Wait:$false -PassThru -WindowStyle Hidden
-    if (-not $TarProc.WaitForExit(15000)) {
-        Stop-Process -Id $TarProc.Id -Force -ErrorAction SilentlyContinue
-        Write-Host "  PASS: corrupted tarball extraction timed out and was stopped"
-    } elseif ($TarProc.ExitCode -eq 0) {
-        Write-Host "  WARN: corrupted tarball extracted without error (tar gzip recovery)"
-    } else {
-        Write-Host "  PASS: corrupted tarball rejected by tar (exit $($TarProc.ExitCode))"
-    }
-
-    Write-Host "==> Test 4: fresh-extract boot (extension load + distance query)"
-    $FreshDir = "$Work\fresh"
-    New-Item -ItemType Directory -Force -Path $FreshDir | Out-Null
-    & tar -xzf $TarPath -C ($FreshDir.Replace('\','/'))
-    if ($LASTEXITCODE -ne 0) { throw "fresh extract failed" }
-
-    $PgBin   = "$FreshDir\bin"
-    $Data    = "$FreshDir\pgdata"
-    $Log     = "$FreshDir\pg.log"
-    $Port    = 55897
-
-    # Hostile env: minimal PATH (System32 only), no PGROOT/PGDATA
-    $SavedPath = $env:PATH
-    $SavedPgRoot = $env:PGROOT
-    $env:PATH   = "$env:SystemRoot\System32;$env:SystemRoot"
-    $env:PGROOT = $null
-    $env:PGDATA = $null
-
-    try {
-        & "$PgBin\postgres.exe" --version
-        if ($LASTEXITCODE -ne 0) { throw "FAIL: postgres --version" }
-        & "$PgBin\initdb.exe" -D $Data --username=postgres --auth-local=trust --no-locale -E UTF8 | Out-Null
-        if ($LASTEXITCODE -ne 0) { throw "FAIL: initdb" }
-        & "$PgBin\pg_ctl.exe" -D $Data -o "-p $Port -h 127.0.0.1" -l $Log -w start
-        if ($LASTEXITCODE -ne 0) { Get-Content $Log | Select-Object -Last 30; throw "FAIL: pg_ctl start" }
-
-        try {
-            & "$PgBin\psql.exe" -h 127.0.0.1 -p $Port -U postgres -d postgres -c "CREATE EXTENSION vector;" | Out-Null
-            if ($LASTEXITCODE -ne 0) { throw "FAIL: CREATE EXTENSION" }
-            $ExtV = & "$PgBin\psql.exe" -h 127.0.0.1 -p $Port -U postgres -d postgres -tAc "SELECT extversion FROM pg_extension WHERE extname='vector';"
-            if ($ExtV.Trim() -ne $PgvectorVer) { throw "FAIL: extversion='$ExtV' expected='$PgvectorVer'" }
-            Write-Host "  PASS: fresh-extract boot + vector extension"
-        } finally {
-            & "$PgBin\pg_ctl.exe" -D $Data -m fast stop 2>$null | Out-Null
-        }
-
-        Write-Host "==> Test 5: second initdb on initialized dir refused"
-        $rc = (Start-Process -FilePath "$PgBin\initdb.exe" -ArgumentList "-D",$Data,"-U","postgres" -Wait -PassThru -NoNewWindow).ExitCode
-        if ($rc -eq 0) {
-            Write-Host "  WARN: second initdb succeeded (unexpected)"
-        } else {
-            Write-Host "  PASS: second initdb refused (exit $rc)"
-        }
-    } finally {
-        $env:PATH   = $SavedPath
-        $env:PGROOT = $SavedPgRoot
-    }
-
-    Write-Host "==> All negative-path smokes: PASS"
-}
-finally {
-    Remove-Item -Recurse -Force $Work -ErrorAction SilentlyContinue
-}
+# smoke-runtime-negative.ps1 — Negative-path tests against released win32-x64
+# runtime tarball. Validates: download, sha256, corrupt-tarball, fresh-extract
+# boot, double-init refusal, hostile-env survival.
+#
+# Env: TAG / OS / ARCH / RUNTIME_RELEASE_REPOSITORY (default tribgames/mixdog)
+
+$ErrorActionPreference = 'Stop'
+
+$Tag         = if ($env:TAG)                { $env:TAG }  else { 'runtime-v0.4.0' }
+$Os          = if ($env:OS)                 { $env:OS }   else { 'win32' }
+$Arch        = if ($env:ARCH)               { $env:ARCH } else { 'x64' }
+$ReleaseRepo = if ($env:RUNTIME_RELEASE_REPOSITORY) { $env:RUNTIME_RELEASE_REPOSITORY } else { 'tribgames/mixdog' }
+$PgVer       = '16.4'
+$PgvectorVer = '0.8.2'
+
+$Asset = "mixdog-runtime-${Os}-${Arch}-pg${PgVer}-pgvector${PgvectorVer}.tar.gz"
+$Url   = "https://github.com/${ReleaseRepo}/releases/download/${Tag}/${Asset}"
+
+$Work = New-Item -ItemType Directory -Force -Path "$env:TEMP\smoke-$([guid]::NewGuid().ToString('N'))" | Select-Object -ExpandProperty FullName
+
+try {
+    Write-Host "==> Negative-path smoke for ${Os}-${Arch} from $Url"
+
+    Write-Host "==> Test 1: HEAD reaches release asset"
+    $resp = Invoke-WebRequest -Uri $Url -Method Head -UseBasicParsing -ErrorAction Stop
+    Write-Host "  HTTP $($resp.StatusCode)"
+
+    Write-Host "==> Test 2: full download + sha256"
+    $TarPath = Join-Path $Work $Asset
+    Invoke-WebRequest -Uri $Url -OutFile $TarPath -UseBasicParsing
+    $sha = (Get-FileHash -Algorithm SHA256 $TarPath).Hash.ToLower()
+    Write-Host "  sha256=$sha"
+
+    Write-Host "==> Test 3: corrupt tarball — flip a byte and ensure tar errors"
+    $CorruptPath = "$Work\corrupt.tar.gz"
+    Copy-Item $TarPath $CorruptPath
+    $bytes = [byte[]]::new(1); $rand = [System.Random]::new(); $rand.NextBytes($bytes)
+    $stream = [System.IO.File]::OpenWrite($CorruptPath)
+    $stream.Position = 102400
+    $stream.Write($bytes, 0, 1)
+    $stream.Close()
+    $CorruptDir = "$Work\corrupt"
+    New-Item -ItemType Directory -Force -Path $CorruptDir | Out-Null
+    $TarProc = Start-Process -FilePath tar -ArgumentList @('-xzf', $CorruptPath, '-C', $CorruptDir.Replace('\','/')) -Wait:$false -PassThru -WindowStyle Hidden
+    if (-not $TarProc.WaitForExit(15000)) {
+        Stop-Process -Id $TarProc.Id -Force -ErrorAction SilentlyContinue
+        Write-Host "  PASS: corrupted tarball extraction timed out and was stopped"
+    } elseif ($TarProc.ExitCode -eq 0) {
+        Write-Host "  WARN: corrupted tarball extracted without error (tar gzip recovery)"
+    } else {
+        Write-Host "  PASS: corrupted tarball rejected by tar (exit $($TarProc.ExitCode))"
+    }
+
+    Write-Host "==> Test 4: fresh-extract boot (extension load + distance query)"
+    $FreshDir = "$Work\fresh"
+    New-Item -ItemType Directory -Force -Path $FreshDir | Out-Null
+    & tar -xzf $TarPath -C ($FreshDir.Replace('\','/'))
+    if ($LASTEXITCODE -ne 0) { throw "fresh extract failed" }
+
+    $PgBin   = "$FreshDir\bin"
+    $Data    = "$FreshDir\pgdata"
+    $Log     = "$FreshDir\pg.log"
+    $Port    = 55897
+
+    # Hostile env: minimal PATH (System32 only), no PGROOT/PGDATA
+    $SavedPath = $env:PATH
+    $SavedPgRoot = $env:PGROOT
+    $env:PATH   = "$env:SystemRoot\System32;$env:SystemRoot"
+    $env:PGROOT = $null
+    $env:PGDATA = $null
+
+    try {
+        & "$PgBin\postgres.exe" --version
+        if ($LASTEXITCODE -ne 0) { throw "FAIL: postgres --version" }
+        & "$PgBin\initdb.exe" -D $Data --username=postgres --auth-local=trust --no-locale -E UTF8 | Out-Null
+        if ($LASTEXITCODE -ne 0) { throw "FAIL: initdb" }
+        & "$PgBin\pg_ctl.exe" -D $Data -o "-p $Port -h 127.0.0.1" -l $Log -w start
+        if ($LASTEXITCODE -ne 0) { Get-Content $Log | Select-Object -Last 30; throw "FAIL: pg_ctl start" }
+
+        try {
+            & "$PgBin\psql.exe" -h 127.0.0.1 -p $Port -U postgres -d postgres -c "CREATE EXTENSION vector;" | Out-Null
+            if ($LASTEXITCODE -ne 0) { throw "FAIL: CREATE EXTENSION" }
+            $ExtV = & "$PgBin\psql.exe" -h 127.0.0.1 -p $Port -U postgres -d postgres -tAc "SELECT extversion FROM pg_extension WHERE extname='vector';"
+            if ($ExtV.Trim() -ne $PgvectorVer) { throw "FAIL: extversion='$ExtV' expected='$PgvectorVer'" }
+            Write-Host "  PASS: fresh-extract boot + vector extension"
+        } finally {
+            & "$PgBin\pg_ctl.exe" -D $Data -m fast stop 2>$null | Out-Null
+        }
+
+        Write-Host "==> Test 5: second initdb on initialized dir refused"
+        $rc = (Start-Process -FilePath "$PgBin\initdb.exe" -ArgumentList "-D",$Data,"-U","postgres" -Wait -PassThru -NoNewWindow).ExitCode
+        if ($rc -eq 0) {
+            Write-Host "  WARN: second initdb succeeded (unexpected)"
+        } else {
+            Write-Host "  PASS: second initdb refused (exit $rc)"
+        }
+    } finally {
+        $env:PATH   = $SavedPath
+        $env:PGROOT = $SavedPgRoot
+    }
+
+    Write-Host "==> All negative-path smokes: PASS"
+}
+finally {
+    Remove-Item -Recurse -Force $Work -ErrorAction SilentlyContinue
+}

package/scripts/tool-smoke.mjs

@@ -345,6 +345,23 @@ const grepOut = await executeBuiltinTool('grep', {
 }, root);
 assertOk('grep', grepOut, /smoke\.mjs/);
 
+const grepBracketPathOut = await executeBuiltinTool('grep', {
+  pattern: 'tool-smoke',
+  path: '[]',
+  glob: '*.mjs',
+  head_limit: 5,
+}, root);
+assertOk('grep path [] coerces to cwd', grepBracketPathOut, /tool-smoke\.mjs/);
+
+const grepRedirectOut = await executeBuiltinTool('grep', {
+  pattern: 'assertOk',
+  path: 'bogus/wrong/prefix/scripts/tool-smoke.mjs',
+  head_limit: 3,
+}, root);
+if (!/^\[redirected from/.test(grepRedirectOut) || !/assertOk/.test(grepRedirectOut)) {
+  throw new Error(`grep ENOENT should auto-redirect on unique suffix hit:\n${grepRedirectOut.slice(0, 800)}`);
+}
+
 const redundantAllFilesGlobGrepOut = await executeBuiltinTool('grep', {
   pattern: 'standalone mixdog CLI/TUI coding agent',
   glob: '**/*',
@@ -367,6 +384,98 @@ const explicitSrcGlobOut = await executeBuiltinTool('glob', {
 }, root);
 assertOk('glob explicit src', explicitSrcGlobOut, /src[\\/].*engine\.mjs/i);
 
+const globPathOnlyOut = await executeBuiltinTool('glob', {
+  path: 'scripts',
+  head_limit: 8,
+}, root);
+assertOk('glob path-only default *', globPathOnlyOut, /tool-smoke\.mjs/i);
+
+const grepNoPatternGlobOut = await executeBuiltinTool('grep', {
+  path: 'scripts',
+  glob: 'tool-smoke.mjs',
+  head_limit: 5,
+}, root);
+assertOk('grep without pattern routes to glob', grepNoPatternGlobOut, /tool-smoke\.mjs/i);
+
+const grepManyPatterns = [
+  ...Array.from({ length: 20 }, (_, i) => `__tool_smoke_miss_${i}__`),
+  'tool-smoke',
+];
+const grepManyPatternsOut = await executeBuiltinTool('grep', {
+  pattern: grepManyPatterns,
+  path: 'scripts',
+  glob: '*.mjs',
+  head_limit: 5,
+}, root);
+if (/exceeds the 20-pattern cap/i.test(String(grepManyPatternsOut))) {
+  throw new Error(`grep should chunk >20 patterns instead of error:\n${grepManyPatternsOut.slice(0, 400)}`);
+}
+assertOk('grep >20 pattern chunk merge', grepManyPatternsOut, /tool-smoke\.mjs/i);
+if (!/\[pattern set split into 2 chunks\]/.test(String(grepManyPatternsOut))) {
+  throw new Error(`grep >20 patterns should emit chunk advisory:\n${grepManyPatternsOut.slice(0, 400)}`);
+}
+
+function grepCountTotalMatches(body) {
+  const m = String(body).match(/\[total (\d+) match/i);
+  return m ? Number(m[1]) : null;
+}
+
+const grepCountSingleOut = await executeBuiltinTool('grep', {
+  pattern: 'assertOk',
+  path: 'scripts/tool-smoke.mjs',
+  output_mode: 'count',
+}, root);
+const singleCountTotal = grepCountTotalMatches(grepCountSingleOut);
+if (singleCountTotal == null || singleCountTotal < 1) {
+  throw new Error(`grep count baseline failed:\n${grepCountSingleOut.slice(0, 400)}`);
+}
+
+const grepCountOverlapPatterns = [
+  ...Array.from({ length: 19 }, (_, i) => `__count_overlap_a_${i}__`),
+  'assertOk',
+  ...Array.from({ length: 19 }, (_, i) => `__count_overlap_b_${i}__`),
+  'assertOk',
+];
+const grepCountOverlapOut = await executeBuiltinTool('grep', {
+  pattern: grepCountOverlapPatterns,
+  path: 'scripts/tool-smoke.mjs',
+  output_mode: 'count',
+}, root);
+const overlapCountTotal = grepCountTotalMatches(grepCountOverlapOut);
+if (overlapCountTotal !== singleCountTotal) {
+  throw new Error(
+    `chunked count must not double-count overlapping lines (single=${singleCountTotal} overlap=${overlapCountTotal}):\n${grepCountOverlapOut.slice(0, 600)}`,
+  );
+}
+
+const grepChunkContextPatterns = [
+  ...Array.from({ length: 20 }, (_, i) => `__ctx_chunk_miss_${i}__`),
+  'grepCountTotalMatches',
+];
+const grepChunkContextOut = await executeBuiltinTool('grep', {
+  pattern: grepChunkContextPatterns,
+  path: 'scripts/tool-smoke.mjs',
+  '-C': 1,
+  head_limit: 30,
+}, root);
+if (!/\[pattern set split into 2 chunks\]/.test(String(grepChunkContextOut))) {
+  throw new Error(`chunked -C grep should split patterns:\n${grepChunkContextOut.slice(0, 500)}`);
+}
+if (!/tool-smoke\.mjs:\d+:/.test(String(grepChunkContextOut))) {
+  throw new Error(`chunked -C must emit path-prefixed match lines:\n${grepChunkContextOut.slice(0, 800)}`);
+}
+if (!/tool-smoke\.mjs-\d+-/.test(String(grepChunkContextOut))) {
+  throw new Error(`chunked -C must keep path-prefixed context lines:\n${grepChunkContextOut.slice(0, 800)}`);
+}
+const ctxBodyLines = String(grepChunkContextOut).split('\n').filter((l) => l && !/^\[/.test(l) && !/^\(no matches\)/.test(l));
+const orphanLineOnlyContext = ctxBodyLines.some((l) => /^\d+-/.test(l));
+if (orphanLineOnlyContext) {
+  throw new Error(`chunked -C must not leave line-only context orphans:\n${grepChunkContextOut.slice(0, 800)}`);
+}
+if (!/function grepCountTotalMatches/.test(String(grepChunkContextOut))) {
+  throw new Error(`chunked -C should include match span:\n${grepChunkContextOut.slice(0, 800)}`);
+}
+
 const findOut = await executeBuiltinTool('find', {
   query: 'tool smoke',
   path: '.',

package/src/defaults/mixdog-config.template.json

@@ -1,5 +1,6 @@
 {
   "outputStyle": "default",
+  "mcpServers": {},
   "channels": {
     "promptInjection": {
       "mode": "hook",

package/src/mixdog-session-runtime.mjs

@@ -818,6 +818,10 @@ export async function createMixdogSessionRuntime({
   }
 
   function skillToolContent(name) {
+    if (typeof contextMod.isSkillDisabled === 'function' && contextMod.isSkillDisabled(name)) {
+      const label = String(name || '').trim() || 'skill';
+      return `Error: skill "${label}" is disabled`;
+    }
     const skill = skillContent(name);
     // Return the general tool envelope so the main/Lead session behaves the
     // same as agent-loop sessions: the model-visible tool_result is the short
@@ -1596,6 +1600,9 @@ export async function createMixdogSessionRuntime({
   // Channels are opt-in: only boot the worker when this session started in (or
   // was toggled into) remote mode. Non-remote sessions never contend for the
   // channel; see startRemote()/stopRemote() and the `/remote` toggle.
+  // `remote.autoStart` in mixdog-config.json makes every session claim remote
+  // at boot (same force-takeover semantics as `mixdog --remote` / `/remote`).
+  if (!remoteEnabled && config?.remote?.autoStart === true) remoteEnabled = true;
   if (remoteEnabled) startRemote();
 
   function contextStatusCacheKeyFor({ messages, tools }) {
@@ -1657,6 +1664,7 @@ export async function createMixdogSessionRuntime({
     getRoute: () => route,
     getSession: () => session,
     getRemoteEnabled: () => remoteEnabled,
+    adoptConfig,
     saveConfigAndAdopt,
     scheduleBackendSave,
     cfgMod,

package/src/rules/agent/30-explorer.md

@@ -6,29 +6,27 @@ kind: retrieval
 
 # Role: explorer
 
-You are a one-shot locator, not a researcher. You find WHERE, never WHY or
-HOW: no reading code to understand it, no explaining behaviour, no tracing
-logic across files. Coordinates are the entire deliverable.
+You are a one-shot locator, not a researcher. You find WHERE, never WHY —
+no understanding code, explaining behaviour, or tracing logic. Coordinates
+are the entire deliverable.
 
-Default shape: ONE tool turn, then the answer. Turn 1 is ONE maximal batch:
-a single `grep` carrying ALL literal strings/errors/identifier guesses
-(content mode, small `-C`), plus `code_graph`/`find`/`glob` in the same
-turn. Fire everything at once; never probe one tool at a time. Any second
-turn means turn 1 under-batched.
+Default shape: ONE maximal-batch turn, then the answer. Fire everything at
+once: a single `grep` whose pattern[] carries ALL literal strings/errors/
+identifier guesses — synonyms, casings, variants — plus `code_graph`/`find`/
+`glob` in the SAME turn when useful. Width is free, turns are not.
 
-Answer straight from search output: grep/code_graph hits already carry
-`path:line` — NEVER spend a turn on `read` just to confirm or polish an
-anchor you already have. Prefer user-visible strings and identifiers.
-`dist`/generated hits are leads, not answers: trace them back to source.
+Answer straight from search output: hits already carry `path:line` — never
+spend a turn on `read` to confirm or polish an anchor. `dist`/generated
+hits are leads, not answers: trace them to source.
 
-Budget: 5 tool turns; coordinates only, zero analysis. The FIRST
-credible `path:line` ends the search — answer in that same turn; do not
-verify, refine, or collect extras. A plausible anchor now beats a perfect
-anchor later: mark weak ones `?` instead of checking them. Turns 2-5 exist
-ONLY for a zero-anchor turn 1: derive new tokens from returned paths/names
-or widen scope (no repeated synonyms), batching ALL remaining candidates in
-one shot. Past turn 5 you are wasting the caller's time: answer with
-best-so-far anchors or `EXPLORATION_FAILED`.
+Budget: 5 turns of maximal batches. Credible `path:line` on screen means the
+search is OVER — answer in that turn; no verifying or collecting extras;
+mark weak anchors `?`. Turns 2-5 exist ONLY for a zero-anchor turn 1: derive
+new tokens from returned paths/names or widen scope, packing ALL candidates
+into the next batch. Concept queries: grep implementation vocabulary
+(file/dir names, symbol fragments, config keys). `EXPLORATION_FAILED` only
+after all 5 turns found zero anchors — giving up early is as wrong as
+over-searching; at turn 5 answer best-so-far.
 
 Answer format, nothing else:
 - up to 5 lines: `path:line — symbol/name — short reason` (append `?` if weak)

package/src/rules/lead/02-channels.md

@@ -1,3 +1,3 @@
-# Channels
-
-- Channel features are handled by the runtime.
+# Channels
+
+- Channel features are handled by the runtime.

package/src/runtime/agent/orchestrator/config.mjs

@@ -81,6 +81,16 @@ export function normalizeProfileConfig(value = {}) {
     return { title, language };
 }
 
+/** Persisted `skills.disabled` name list (deduped, trimmed, sorted). */
+export function normalizeSkillsConfig(value = {}) {
+    const raw = value && typeof value === 'object' ? value : {};
+    const disabled = Array.isArray(raw.disabled)
+        ? [...new Set(raw.disabled.map((n) => String(n).trim()).filter(Boolean))]
+        : [];
+    disabled.sort((a, b) => a.localeCompare(b));
+    return { disabled };
+}
+
 // Look up the catalog entry for a stored language id (defaults to 'system').
 export function profileLanguageEntry(languageId) {
     const id = String(languageId || 'system');
@@ -435,6 +445,7 @@ export function loadConfig(options = {}) {
                 workflow: raw.workflow && typeof raw.workflow === 'object' ? { active: String(raw.workflow.active || 'default') } : { active: 'default' },
                 agentMaintenance: { enabled: true, interval: '1h', ...raw.agentMaintenance },
                 profile: normalizeProfileConfig(raw.profile),
+                skills: normalizeSkillsConfig(raw.skills),
                 // No idleMs default here: absent idleMs means "provider default"
                 // (config-helpers normalizeAutoClearConfig custom:false path).
                 // Injecting a fixed 1h would mark every config custom:true and
@@ -467,6 +478,7 @@ export function loadConfig(options = {}) {
         workflow: { active: 'default' },
         agentMaintenance: { enabled: true, interval: '1h' },
         profile: normalizeProfileConfig(null),
+        skills: normalizeSkillsConfig(null),
                 autoClear: { enabled: true },
         compaction: {},
         trajectory: { enabled: true },
@@ -493,6 +505,23 @@ export function loadConfig(options = {}) {
  * via persistAgentConfig((current) => ({ ...current, <field> })) so a
  * concurrent instance's edits are not reverted.
  */
+/** In-lock patch of `skills.disabled` only (avoids whole-config lost-update). */
+export function patchSkillsDisabled(disabledNames) {
+    const names = disabledNames instanceof Set
+        ? [...disabledNames]
+        : (Array.isArray(disabledNames) ? disabledNames : []);
+    const nextSkills = normalizeSkillsConfig({ disabled: names });
+    persistAgentConfig((current) => {
+        const cur = { ...current };
+        const target = (cur.agent && cur.agent.providers)
+            ? (cur.agent = { ...cur.agent })
+            : cur;
+        target.skills = nextSkills;
+        return cur;
+    });
+    return nextSkills;
+}
+
 export function saveConfig(config) {
     // Strip ephemeral defaults from providers but preserve any unknown
     // per-provider subkey so future schema additions round-trip through the
@@ -544,6 +573,7 @@ export function saveConfig(config) {
         workflow: config.workflow || { active: 'default' },
         agentMaintenance: config.agentMaintenance || {},
         profile: normalizeProfileConfig(config.profile),
+        skills: normalizeSkillsConfig(config.skills),
         autoClear: config.autoClear || {},
         compaction: config.compaction || {},
         trajectory: config.trajectory || {},