Merge remote-tracking branch 'origin/master' into codex/basic-session-search

# Conflicts:
#	apps/web/tests/snapshots/question-composer/answered.expected.md
#	packages/client/connection/tests/fake-api.ts
#	packages/client/runtime/README.i18n.yaml
#	packages/client/runtime/tests/fake-api.ts
#	packages/client/ui-workspace/README.i18n.yaml
#	packages/client/ui-workspace/README.md
#	packages/client/ui-workspace/README.zh.md
#	packages/client/ui-workspace/src/client/WorkspaceBrowser.tsx
#	packages/client/ui-workspace/tests/apply.spec.ts
#	packages/host/apiproxy/README.i18n.yaml
#	packages/host/apiproxy/README.md
#	packages/host/apiproxy/README.zh.md
#	packages/host/apiproxy/src/api-proxy.ts
#	packages/host/apiproxy/src/api/index.ts
#	packages/host/apiproxy/src/api/sessions.schema.ts
#	packages/host/apiproxy/src/fetch/client.ts
#	packages/host/apiproxy/src/fetch/handler.ts
#	packages/host/apiproxy/tests/fetch-carrier.spec.ts
#	packages/host/apiproxy/tests/rpc-schemas.spec.ts
#	packages/session-query/session-query/tests/search-helpers.spec.ts

apps/cli/cordis.yml

@@ -84,6 +84,10 @@
 - id: llm-retry
   name: '@deepseek-ai/dsh-llm-retry'
 
+# Session store root. AppCLIEntry resolves the engineering default to a
+# global dir under the Harness home ($DSH_HOME, else ~/.dsh): sessions live
+# in one place across every cwd, not a project-local ./.sessions. The
+# persistenceRoot profile key (user config) still overrides this per field.
 - id: session-persistence-jsonl
   name: '@deepseek-ai/dsh-session-persistence-jsonl'
   config:
@@ -114,6 +118,10 @@
 - id: workspace
   name: '@deepseek-ai/dsh-workspace'
 
+# Managed child-process groups for the bash executor (spawn/kill/output plumbing).
+- id: subprocess
+  name: '@deepseek-ai/dsh-subprocess-local'
+
 - id: bash-local
   name: '@deepseek-ai/dsh-bash-local'
 
@@ -292,6 +300,7 @@
 - id: ui-conversation
   name: '@deepseek-ai/dsh-client-ui-conversation'
 
+
 - id: ui-workspace
   name: '@deepseek-ai/dsh-client-ui-workspace'
 
@@ -309,6 +318,10 @@
 - id: ui-subagent
   name: '@deepseek-ai/dsh-client-ui-subagent'
 
+# Model selection: the /model popupSelect + composer seat over session.models.
+- id: ui-model
+  name: '@deepseek-ai/dsh-client-ui-model'
+
 - id: ui-question
   name: '@deepseek-ai/dsh-client-ui-question'
 

apps/cli/package.json

@@ -29,6 +29,7 @@
     "@deepseek-ai/dsh-client-ui-command": "workspace:^",
     "@deepseek-ai/dsh-client-ui-conversation": "workspace:^",
     "@deepseek-ai/dsh-client-ui-layout": "workspace:^",
+    "@deepseek-ai/dsh-client-ui-model": "workspace:^",
     "@deepseek-ai/dsh-client-ui-models": "workspace:^",
     "@deepseek-ai/dsh-client-ui-question": "workspace:^",
     "@deepseek-ai/dsh-client-ui-settings": "workspace:^",
@@ -53,6 +54,7 @@
     "@deepseek-ai/dsh-llm-retry": "workspace:^",
     "@deepseek-ai/dsh-paths": "workspace:^",
     "@deepseek-ai/dsh-plan-mode": "workspace:^",
+    "@deepseek-ai/dsh-subprocess-local": "workspace:^",
     "@deepseek-ai/dsh-session": "workspace:^",
     "@deepseek-ai/dsh-session-persistence-jsonl": "workspace:^",
     "@deepseek-ai/dsh-session-query": "workspace:^",

apps/cli/src/app-cli-entry.ts

@@ -117,10 +117,11 @@ export class AppCLIEntry {
   }
 
   /**
-   * Compose the patch set from the three non-yml config sources: profile
-   * json (user config), CLI flags, and the resolved frontend dist. Patches
-   * replace a row's config wholesale, so each patched row's yml static
-   * values are re-read here (bypass parse) and merged under the overrides.
+   * Compose the patch set from the non-yml config sources: computed
+   * engineering defaults (the global session root), profile json (user
+   * config, overriding those defaults), CLI flags, and the resolved frontend
+   * dist. Patches replace a row's config wholesale, so each patched row's yml
+   * static values are re-read here (bypass parse) and merged under the overrides.
    */
   private composePatches(): void {
     const rows = this.parseYmlRows()
@@ -131,6 +132,12 @@ export class AppCLIEntry {
       overrides.set(entryId, bag)
     }
 
+    // Source 0: computed engineering defaults. The session store defaults to
+    // a global dir under the Harness home ($DSH_HOME, else ~/.dsh) so history
+    // is shared across every cwd, not a project-local ./.sessions. The profile
+    // (Source 1) overwrites this same field via last-write-wins in put().
+    put('session-persistence-jsonl', 'root', join(resolveDshHome(), 'sessions'))
+
     // Source 1: profile json (missing file = empty; unmapped key = loud).
     for (const [key, value] of Object.entries(this.readProfile())) {
       const mapping = PROFILE_MAPPINGS.find(m => m.jsonPath === key)

apps/cli/src/tui.ts

@@ -11,6 +11,7 @@
  * @module @deepseek-ai/dsh/tui
  */
 
+import { join } from 'node:path'
 import { fileURLToPath } from 'node:url'
 import {
   addHarnessSourceSection,
@@ -62,6 +63,7 @@ export async function runTui(config: string | undefined, resumeSessionId: string
   // The bin already loaded the invoking directory's .env; the personal .env
   // only fills what is still unset (process.loadEnvFile never overrides).
   loadEnv(NAME, resolveDshHome())
+  process.env.DSH_BUNDLED_SKILL_DIR = join(SOURCE_ROOT, 'skills')
   // The in-place `/resume` handoff re-execs `dsh` with a normalized `--resume`
   // flag, so the resumed process rehydrates through this same intake. The host
   // is offered only when Node exposes `process.execve` and knows its own entry.