refactor: colocate user interaction with ui packages

packages/core/README.md

@@ -7,7 +7,6 @@ The packages every harness build is assembled from: the session log, the system-
 | `session/` | Event-sourced session log + in-memory store | `ctx.sessions` |
 | `system-prompt/` | Prompt-section + tool-schema assembly registry | `ctx.systemPrompt` |
 | `tools/` | Tool registry + `tools/pre-execute`/`tools/post-execute` pipeline | `ctx.tools` |
-| `user-interaction/` | Abstract human question/answer seam used by UI-backed confirmation tools | `ctx.userInteraction` |
 | `agent/` | Agent interface, registry, `agent/*` event vocabulary | `ctx.agents` |
 | `agent-loop/` | The concrete loop plugin: `ReactLoopAgent` + the loop driver | `ctx.agentLoop` |
 | `agent-core/` | Bundle plugin: the providerless/executor-less/UI-less spine as code | (loads the spine) |

packages/core/user-interaction/README.md

@@ -1,24 +0,0 @@
-# @deepseek-ai/dsh-user-interaction
-
-Abstract user-interaction seam. It owns `ctx.userInteraction`, the service a model-facing tool or permission plugin uses when it needs to pause work and ask the human for a decision.
-
-## Service: `UserInteractionService` (ctx key: `userInteraction`)
-
-### Public API
-
-- `ctx.userInteraction.registerProvider(provider): () => void` Register the UI-side provider. Only one provider may be active in a context; disposal unregisters it.
-- `ctx.userInteraction.ask(request): Promise<AskUserQuestionAnswer>` Ask the active provider and wait for the answer.
-
-### Key Types
-
-- `AskUserQuestionRequest` — `{ questions: [{ id, question, header?, options?, multiSelect? }], agent?, signal? }`.
-- `AskUserQuestionOption` — `{ label, description? }`.
-- `AskUserQuestionAnswer` — `{ answers: [{ id, selected, custom? }] }`.
-- `UserInteractionProvider` — UI implementation with `ask(request)`.
-- `UserInteractionError` — `HarnessError` subclass with codes such as `EMPTY_QUESTIONS`, `NO_PROVIDER`, `DUPLICATE_PROVIDER`, and `ASK_ABORTED`.
-
-When an answer includes `custom`, `selected` is empty; custom text is an override rather than a supplement to selected choices.
-
-## Role
-
-This is the interface package. Model-facing consumers such as `@deepseek-ai/dsh-tool-ask-user` depend on this seam; UI front doors such as the `stdio-agent` readline module and the `acp` bridge provide the provider. The loop stays unchanged: a tool call simply awaits a promise, and the tool result resumes the normal agent loop.

packages/core/user-interaction/package.json

@@ -1,34 +0,0 @@
-{
-  "name": "@deepseek-ai/dsh-user-interaction",
-  "description": "Abstract user-interaction seam (ctx.userInteraction) for asking the human during agent runs",
-  "version": "0.0.1",
-  "private": true,
-  "type": "module",
-  "main": "lib/index.js",
-  "types": "lib/types/index.d.ts",
-  "exports": {
-    ".": {
-      "types": "./lib/types/index.d.ts",
-      "default": "./lib/index.js"
-    },
-    "./src/*": "./src/*",
-    "./package.json": "./package.json"
-  },
-  "files": [
-    "lib/index.js",
-    "lib/types/**/*.d.ts",
-    "lib/types/**/*.d.ts.map",
-    "src"
-  ],
-  "license": "BSD-3-Clause",
-  "peerDependencies": {
-    "@deepseek-ai/dsh-agent": "^0.0.1",
-    "@deepseek-ai/dsh-llm": "^0.0.1",
-    "cordis": "^4.0.0-rc.6"
-  },
-  "devDependencies": {
-    "@deepseek-ai/dsh-agent": "workspace:^",
-    "@deepseek-ai/dsh-llm": "workspace:^",
-    "cordis": "^4.0.0-rc.6"
-  }
-}

packages/core/user-interaction/src/index.ts

@@ -1,128 +0,0 @@
-/**
- * User-interaction seam (`ctx.userInteraction`): a UI-backed service for
- * pausing an agent tool call until the human answers a question. The model-
- * facing tool lives in `@deepseek-ai/dsh-tool-ask-user`; UI packages provide
- * the single active provider.
- *
- * @module @deepseek-ai/dsh-user-interaction
- */
-
-import { Context, Service } from 'cordis'
-import type { Agent } from '@deepseek-ai/dsh-agent'
-import { HarnessError } from '@deepseek-ai/dsh-llm'
-
-declare module 'cordis' {
-  interface Context {
-    userInteraction: UserInteractionService
-  }
-}
-
-/** One selectable answer offered to the user. */
-export interface AskUserQuestionOption {
-  /** User-facing label. */
-  label: string
-  /** Optional extra context rendered by capable UIs. */
-  description?: string
-}
-
-/** One question in an ask_user_question request. */
-export interface AskUserQuestionItem {
-  /** Stable model-provided question id, echoed in the answer. */
-  id: string
-  /** The question to display. */
-  question: string
-  /** Optional short heading/group label. */
-  header?: string
-  /** Optional choices the UI can render as a menu. */
-  options?: AskUserQuestionOption[]
-  /** Whether more than one option may be selected. Defaults to single-select. */
-  multiSelect?: boolean
-}
-
-/** Request for a human answer. */
-export interface AskUserQuestionRequest {
-  /** Questions to display. */
-  questions: AskUserQuestionItem[]
-  /** Calling agent, when the request came from an agent tool call. */
-  agent?: Agent
-  /** Abort signal for the owning tool/step. */
-  signal?: AbortSignal
-}
-
-/** Answer to one question. */
-export interface AskUserQuestionAnswerItem {
-  /** The answered question id. */
-  id: string
-  /** Selected option labels. Empty when the answer is purely custom text. */
-  selected: string[]
-  /** Optional free-text "Other" answer. */
-  custom?: string
-}
-
-/** The human's answer. */
-export interface AskUserQuestionAnswer {
-  /** Structured answers keyed by question id. */
-  answers: AskUserQuestionAnswerItem[]
-}
-
-/** UI-side provider for user questions. */
-export interface UserInteractionProvider {
-  ask(request: AskUserQuestionRequest): Promise<AskUserQuestionAnswer>
-}
-
-/** Stable error taxonomy for user-interaction failures. */
-export class UserInteractionError extends HarnessError {
-  constructor(message: string, code: string, options?: ErrorOptions) {
-    super(message, code, options)
-    this.name = 'UserInteractionError'
-  }
-}
-
-/** `ctx.userInteraction`: one active UI provider plus an `ask()` surface. */
-export class UserInteractionService extends Service {
-  private provider: UserInteractionProvider | undefined
-
-  constructor(ctx: Context) {
-    super(ctx, 'userInteraction')
-  }
-
-  /**
-   * Register the UI provider. Only one provider may be active in a context.
-   *
-   * @param provider UI-side implementation that collects answers.
-   * @returns Disposer that unregisters this provider.
-   */
-  registerProvider(provider: UserInteractionProvider): () => void {
-    const dispose = this.ctx.effect(function* (this: UserInteractionService) {
-      if (this.provider !== undefined) {
-        throw new UserInteractionError('a user-interaction provider is already registered', 'DUPLICATE_PROVIDER')
-      }
-      this.provider = provider
-      yield () => {
-        this.provider = undefined
-      }
-    }.bind(this), 'userInteraction.registerProvider()')
-    return () => void dispose()
-  }
-
-  /**
-   * Ask the active UI provider and wait for the user's answer.
-   *
-   * @param request Questions, owner agent, and abort signal.
-   * @returns The answer chosen or typed by the human.
-   */
-  async ask(request: AskUserQuestionRequest): Promise<AskUserQuestionAnswer> {
-    if (request.signal?.aborted) {
-      throw new UserInteractionError('ask_user_question was aborted before the user answered', 'ASK_ABORTED')
-    }
-    if (request.questions.length === 0) {
-      throw new UserInteractionError('ask_user_question requires at least one question', 'EMPTY_QUESTIONS')
-    }
-    if (this.provider === undefined) {
-      throw new UserInteractionError('no user-interaction provider is registered', 'NO_PROVIDER')
-    }
-    return this.provider.ask(request)
-  }
-}
-
-export default UserInteractionService

packages/core/user-interaction/tests/user-interaction.spec.ts

@@ -1,86 +0,0 @@
-import { describe, expect, it, vi } from 'vitest'
-import { Context } from 'cordis'
-import UserInteractionService, {
-  UserInteractionError,
-  type AskUserQuestionRequest,
-  type UserInteractionProvider,
-} from '@deepseek-ai/dsh-user-interaction'
-
-function provider(answer = 'approved'): UserInteractionProvider & { seen: AskUserQuestionRequest[] } {
-  const seen: AskUserQuestionRequest[] = []
-  return {
-    seen,
-    async ask(request) {
-      seen.push(request)
-      return { answers: [{ id: request.questions[0]?.id ?? 'missing', selected: [answer] }] }
-    },
-  }
-}
-
-describe('UserInteractionService', () => {
-  it('delegates ask requests to the registered provider', async () => {
-    const ctx = new Context()
-    await ctx.plugin(UserInteractionService)
-    const p = provider('yes')
-    ctx.userInteraction.registerProvider(p)
-
-    const result = await ctx.userInteraction.ask({ questions: [{ id: 'confirm', question: 'Proceed?' }] })
-
-    expect(result).toEqual({ answers: [{ id: 'confirm', selected: ['yes'] }] })
-    expect(p.seen).toEqual([{ questions: [{ id: 'confirm', question: 'Proceed?' }] }])
-  })
-
-  it('rejects ask requests when no provider is registered', async () => {
-    const ctx = new Context()
-    await ctx.plugin(UserInteractionService)
-
-    await expect(ctx.userInteraction.ask({ questions: [{ id: 'confirm', question: 'Proceed?' }] }))
-      .rejects.toMatchObject({ name: 'UserInteractionError', code: 'NO_PROVIDER' })
-  })
-
-  it('registers providers with HMR-safe disposal', async () => {
-    const ctx = new Context()
-    await ctx.plugin(UserInteractionService)
-    const p = provider()
-    const dispose = ctx.userInteraction.registerProvider(p)
-
-    dispose()
-    dispose()
-
-    await expect(ctx.userInteraction.ask({ questions: [{ id: 'confirm', question: 'Proceed?' }] }))
-      .rejects.toMatchObject({ code: 'NO_PROVIDER' })
-  })
-
-  it('rejects duplicate providers instead of replacing the active UI', async () => {
-    const ctx = new Context()
-    await ctx.plugin(UserInteractionService)
-    ctx.userInteraction.registerProvider(provider('first'))
-
-    expect(() => ctx.userInteraction.registerProvider(provider('second')))
-      .toThrow(UserInteractionError)
-  })
-
-  it('fails before reaching the provider when the signal is already aborted', async () => {
-    const ctx = new Context()
-    await ctx.plugin(UserInteractionService)
-    const p = { ask: vi.fn(async () => ({ answers: [{ id: 'confirm', selected: ['too late'] }] })) }
-    ctx.userInteraction.registerProvider(p)
-    const controller = new AbortController()
-    controller.abort()
-
-    await expect(ctx.userInteraction.ask({ questions: [{ id: 'confirm', question: 'Proceed?' }], signal: controller.signal }))
-      .rejects.toMatchObject({ code: 'ASK_ABORTED' })
-    expect(p.ask).not.toHaveBeenCalled()
-  })
-
-  it('rejects empty question batches before reaching the provider', async () => {
-    const ctx = new Context()
-    await ctx.plugin(UserInteractionService)
-    const p = { ask: vi.fn(async () => ({ answers: [] })) }
-    ctx.userInteraction.registerProvider(p)
-
-    await expect(ctx.userInteraction.ask({ questions: [] }))
-      .rejects.toMatchObject({ name: 'UserInteractionError', code: 'EMPTY_QUESTIONS' })
-    expect(p.ask).not.toHaveBeenCalled()
-  })
-})

packages/core/user-interaction/tsconfig.json

@@ -1,24 +0,0 @@
-{
-  "extends": "../../../tsconfig.base.json",
-  "compilerOptions": {
-    "rootDir": "src",
-    "outDir": "lib/types"
-  },
-  "include": [
-    "src"
-  ],
-  "references": [
-    {
-      "path": "../../../vendor/cosmokit"
-    },
-    {
-      "path": "../../../vendor/cordis"
-    },
-    {
-      "path": "../agent"
-    },
-    {
-      "path": "../../llm/llm"
-    }
-  ]
-}