acryl-cli-linux-x64 0.1.31 → 0.1.36

package/runtime/node_modules/acryl-harness-runtime/src/acryl-home.ts

@@ -0,0 +1,50 @@
+/**
+ * ACRYL's own data root, nested one level above the DSH engine home it
+ * composes.
+ *
+ * The stock DSH Desktop app (from dshdesktop.com) uses plain `~/.dsh`, and so
+ * did every ACRYL surface until now — sharing that root made the two
+ * genuinely different products silently share credentials/settings/sessions,
+ * which is both confusing and useless for comparing ACRYL against a stock
+ * DSH Desktop install side by side. ACRYL now owns `~/.acryl` and nests each
+ * engine's artifacts under it by engine name:
+ *
+ * ```txt
+ * ~/.acryl/            ACRYL's own root — everything not engine-specific
+ * ~/.acryl/.dsh/        the DSH engine home (what DSH_HOME resolves to)
+ * ~/.acryl/.pi/         reserved for a future pi.dev engine
+ * ```
+ *
+ * `$DSH_HOME`, if a caller has already set it explicitly, still wins — this
+ * only changes the *default* the harness's own `resolveDshHome()` falls
+ * back to when nothing overrides it.
+ *
+ * @module acryl-harness-runtime/acryl-home
+ */
+
+import { homedir } from 'node:os'
+import { join } from 'node:path'
+import { resolveDshHome } from '@deepseek-ai/dsh-home-paths'
+
+/** ACRYL's own root directory name under the OS home. */
+export const ACRYL_HOME_DIR_NAME = '.acryl'
+
+/** The DSH engine's directory name, nested under ACRYL's root. */
+export const ACRYL_DSH_ENGINE_DIR_NAME = '.dsh'
+
+/** ACRYL's own root — `~/.acryl` unless `$ACRYL_HOME` overrides it. */
+export function resolveAcrylHome(env: Record<string, string | undefined> = process.env): string {
+  const overridden = env.ACRYL_HOME?.trim()
+  return overridden && overridden !== '' ? overridden : join(homedir(), ACRYL_HOME_DIR_NAME)
+}
+
+/**
+ * The DSH engine home ACRYL boots against: `$DSH_HOME` if a caller already
+ * set it (highest precedence, same as `resolveDshHome()` itself), otherwise
+ * `<acrylHome>/.dsh` instead of the harness's own bare `~/.dsh` default.
+ */
+export function resolveAcrylDshHome(env: Record<string, string | undefined> = process.env): string {
+  const overridden = env.DSH_HOME?.trim()
+  if (overridden && overridden !== '') return resolveDshHome(undefined, env)
+  return resolveDshHome(join(resolveAcrylHome(env), ACRYL_DSH_ENGINE_DIR_NAME), env)
+}

package/runtime/node_modules/acryl-harness-runtime/src/index.ts

@@ -14,6 +14,16 @@ export {
   type AcrylSessionBridge,
   type AcrylSessionBridgeOptions,
 } from './session-bridge.ts'
+export {
+  installSessionLogExporter,
+  type InstallSessionLogExporterOptions,
+} from './session-log-exporter.ts'
+export {
+  ACRYL_DSH_ENGINE_DIR_NAME,
+  ACRYL_HOME_DIR_NAME,
+  resolveAcrylDshHome,
+  resolveAcrylHome,
+} from './acryl-home.ts'
 
 import { writeFileSync } from 'node:fs'
 import { createRequire } from 'node:module'
@@ -30,8 +40,10 @@ import {
   resolveProfileDir,
 } from '@deepseek-ai/dsh-app-boot'
 
+import { resolveAcrylDshHome } from './acryl-home.ts'
 import { createAcrylCodingCapabilityPatches } from './coding-capabilities.ts'
 import { installAcrylWorkspaceStatusTool } from './plugin-acryl-workspace-status.ts'
+import { installSessionLogExporter } from './session-log-exporter.ts'
 
 const require = createRequire(import.meta.url)
 const dshInstallAnchor = require.resolve('@deepseek-ai/dsh/package.json')
@@ -53,6 +65,7 @@ export async function bootAcrylHarnessProfile(
   options: BootAcrylHarnessProfileOptions,
 ): Promise<AcrylHarnessRuntime> {
   if (options.profile.trim() === '') throw new Error('ACRYL Harness profile must not be empty')
+  process.env.DSH_HOME = resolveAcrylDshHome()
   const profileDirectory = resolveProfileDir(options.profile)
   initProfile(profileDirectory, DEFAULT_PROFILE_BUNDLES)
   healProfilesModuleFallback(dshInstallAnchor)
@@ -72,6 +85,7 @@ export async function bootAcrylHarnessProfile(
   }
   const ctx = await boot('acryl', rootConfig, patches, options.prepare)
   if ((ctx as { tools?: unknown }).tools) installAcrylWorkspaceStatusTool(ctx)
+  installSessionLogExporter(ctx, { surface: 'tui' })
   let disposed = false
   return Object.freeze({
     ctx,
@@ -110,6 +124,7 @@ export async function bootAcrylWebProfile(
   options: BootAcrylWebProfileOptions = {},
 ): Promise<AcrylWebRuntime> {
   const profileName = 'web'
+  process.env.DSH_HOME = resolveAcrylDshHome()
   const profileDirectory = resolveProfileDir(profileName)
   initProfile(profileDirectory, DEFAULT_PROFILE_BUNDLES)
   healProfilesModuleFallback(dshInstallAnchor)
@@ -127,6 +142,7 @@ export async function bootAcrylWebProfile(
     return options.prepare?.(hostCtx)
   })
   if ((ctx as { tools?: unknown }).tools) installAcrylWorkspaceStatusTool(ctx)
+  installSessionLogExporter(ctx, { surface: 'web' })
   const startup = ctx.get('webStartup') as { host?: string; port?: number } | undefined
   const host = startup?.host ?? '127.0.0.1'
   const port = startup?.port ?? 3080

package/runtime/node_modules/acryl-harness-runtime/src/session-bridge.ts

@@ -1,5 +1,5 @@
 import type { Context } from '@deepseek-ai/cordis'
-import type { Agent, AgentHandle } from '@deepseek-ai/dsh-agent'
+import { installModelSelection, type Agent, type AgentHandle, type ModelSelectionRef } from '@deepseek-ai/dsh-agent'
 import { createUserMessage } from '@deepseek-ai/dsh-llm'
 import { SessionId, type SessionEvent } from '@deepseek-ai/dsh-session'
 import type {} from '@deepseek-ai/dsh-agent-default-model'
@@ -39,6 +39,15 @@ export interface AcrylSessionBridge {
     listener: (event: SessionEvent) => void,
   ): Promise<AcrylSessionEventSubscription>
   submitPrompt(input: { readonly sessionId: string; readonly text: string }): Promise<void>
+  /**
+   * Switch an already-open session's live model. `agentOptions.provider`/`model`
+   * are a one-time construction input to `ctx.agents.create` — not a live
+   * setting — so this is the only thing that changes what a running session
+   * sends its next request to (`ModelSelectionRef` installed on the agent's
+   * own scoped context via `installModelSelection`, per-step prompt assembly
+   * reads it fresh).
+   */
+  selectModel(input: { readonly sessionId: string; readonly provider: string; readonly model: string }): Promise<void>
   cancel(sessionId: string): Promise<void>
   dispose(): Promise<void>
 }
@@ -101,6 +110,8 @@ export function createAcrylSessionBridge(
   options: AcrylSessionBridgeOptions,
 ): AcrylSessionBridge {
   const handles = new Map<string, AgentHandle>()
+  const modelSelections = new Map<string, ModelSelectionRef>()
+  const modelSelectionDisposers = new Map<string, () => void>()
   const subscribers = new Map<string, Set<(snapshot: AcrylSessionSnapshot) => void>>()
   const eventListeners = new Map<string, Set<(event: SessionEvent) => void>>()
   let disposed = false
@@ -170,6 +181,9 @@ export function createAcrylSessionBridge(
             agentOptions: { provider: selection.provider, model: selection.model },
           })
       handles.set(handle.agent.id, handle)
+      const ref: ModelSelectionRef = { current: undefined, assembled: undefined }
+      modelSelectionDisposers.set(handle.agent.id, installModelSelection(handle.agent.ctx, ref))
+      modelSelections.set(handle.agent.id, ref)
       return handle.agent.id
     },
     snapshot,
@@ -235,6 +249,12 @@ export function createAcrylSessionBridge(
       }))
       await accepted
     },
+    async selectModel(input: { readonly sessionId: string; readonly provider: string; readonly model: string }): Promise<void> {
+      agentFor(input.sessionId)
+      const ref = modelSelections.get(input.sessionId)
+      if (ref === undefined) throw new Error(`ACRYL session ${input.sessionId} has no installed model selection`)
+      ref.current = { provider: input.provider, model: input.model }
+    },
     async cancel(sessionId: string): Promise<void> {
       agentFor(sessionId).cancel({ kind: 'user' })
     },
@@ -244,6 +264,9 @@ export function createAcrylSessionBridge(
       offSessionEvent()
       subscribers.clear()
       eventListeners.clear()
+      for (const dispose of modelSelectionDisposers.values()) dispose()
+      modelSelectionDisposers.clear()
+      modelSelections.clear()
       // Durable continuity: idle the turn, checkpoint the session log, then
       // release the native handle. Mirror of Tomo's shutdown sequence, owned
       // here so every surface gets the same durability guarantee.

package/runtime/node_modules/acryl-harness-runtime/src/session-log-exporter.ts

@@ -0,0 +1,69 @@
+/**
+ * A durable, cross-surface debug log for ACRYL sessions.
+ *
+ * Cordis's own `ctx.logger` already carries every structured log record any
+ * plugin emits, but nothing in this stack persisted it anywhere — a failure
+ * like a vendored provider's OAuth error only ever reached the terminal
+ * transcript, gone the moment the pane scrolled or the process exited. This
+ * registers one JSONL file exporter on `ctx.logger` per surface (CLI/TUI,
+ * web, and — once wired there too — the desktop GUI), so `error`/`warn`
+ * records (and everything, when `ACRYL_LOG_LEVEL=debug`) survive the session
+ * and can be read back after the fact instead of re-derived from a
+ * screenshot.
+ *
+ * @module acryl-harness-runtime/session-log-exporter
+ */
+
+import { appendFileSync, mkdirSync } from 'node:fs'
+import { join } from 'node:path'
+import type { Context } from '@deepseek-ai/cordis'
+import { resolveDshHome } from '@deepseek-ai/dsh-home-paths'
+
+export interface InstallSessionLogExporterOptions {
+  /** Which ACRYL surface this process is (`tui`, `web`, `desktop`) — becomes part of the log filename. */
+  readonly surface: string
+  /** Harness home override; defaults to `$DSH_HOME`/`~/.dsh` exactly like credentials/settings resolve it. */
+  readonly dshHome?: string
+}
+
+const LOGGER_LEVEL_WARN = 2
+const LOGGER_LEVEL_DEBUG = 3
+
+/**
+ * Register the file exporter for this process's lifetime. `ctx.logger.exporter()`
+ * already ties its own disposal to the fiber that registers it (see
+ * `LoggerService.exporter` in `@deepseek-ai/cordis`), so this needs no extra
+ * `ctx.effect()` wrapper of its own.
+ * @param ctx - the plugin context whose `ctx.logger` gains the exporter.
+ * @param options - which surface/home this log file belongs to.
+ */
+export function installSessionLogExporter(ctx: Context, options: InstallSessionLogExporterOptions): void {
+  const dshHome = resolveDshHome(options.dshHome)
+  const logDir = join(dshHome, 'logs')
+  try {
+    mkdirSync(logDir, { recursive: true, mode: 0o700 })
+  } catch {
+    return // best-effort diagnostics only; a session must never fail to start over this
+  }
+  const day = new Date().toISOString().slice(0, 10)
+  const logFile = join(logDir, `acryl-${options.surface}-${day}.jsonl`)
+  const threshold = process.env.ACRYL_LOG_LEVEL === 'debug' ? LOGGER_LEVEL_DEBUG : LOGGER_LEVEL_WARN
+
+  ctx.logger.exporter({
+    export(message) {
+      if (message.level > threshold) return
+      try {
+        appendFileSync(logFile, `${JSON.stringify({
+          ts: new Date(message.ts).toISOString(),
+          type: message.type,
+          name: message.name,
+          args: message.args.map(arg => (arg instanceof Error
+            ? { message: arg.message, stack: arg.stack, name: arg.name }
+            : arg)),
+        })}\n`, { mode: 0o600 })
+      } catch {
+        // best-effort: a write failure here must never take a session down
+      }
+    },
+  })
+}

package/runtime/package.json

@@ -1,6 +1,6 @@
 {
-  "name": "acryl-tui",
-  "version": "0.1.31",
+  "name": "acryl-cli",
+  "version": "0.1.36",
   "private": true,
   "description": "Canonical ACRYL pi-tui coding-agent terminal client",
   "license": "MIT",
@@ -25,7 +25,9 @@
     "node": ">=22"
   },
   "scripts": {
+    "prebuild": "node scripts/generate-build-info.mjs",
     "build": "tsdown && tsc -p tsconfig.json --emitDeclarationOnly",
+    "pretypecheck": "node scripts/generate-build-info.mjs",
     "typecheck": "tsc -p tsconfig.json --noEmit && tsc -p tsconfig.tests.json --noEmit",
     "test": "vitest run",
     "tui": "node lib/bin.js tui",

package/runtime/receipt.json

@@ -2,7 +2,7 @@
   "schemaVersion": 1,
   "surface": "cli",
   "target": "linux-x64",
-  "version": "0.1.31",
+  "version": "0.1.36",
   "packageName": "acryl-cli-linux-x64",
-  "payloadSha256": "28662eabe7bc951c7b2dcc1f038eaffedaa340ee1a8ff8ad721fea5f95d501c9"
+  "payloadSha256": "99de89fd03be2f9ae485b5d15b52063a909928eaff7c9330f178d98e55a22a32"
 }