dsh-better-ask-user 0.1.5 → 0.1.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-better-ask-user",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "Independent ask_user_question plugin: configurable wait, input-extended countdown, markdown/mobile card, native or default timeout behavior, and PTC deadline exemption.",
   "license": "GPL-3.0",
   "repository": {

package/src/ask-tool.js

@@ -5,12 +5,16 @@ import { buildDefaultAnswer } from './default-answer.js'
 /** Model-visible notice for the native pending result. */
 export const PENDING_QUESTION_NOTICE = 'No answer batch arrived before the timeout. This is pending, not a skipped answer. Continue useful independent work. The user can still answer; their reply will be a user message identified as answer_to_pending_question with this callId and the original questions. Do not treat this as permission.'
 
+/** Model-visible warning for a host auto-selected default batch. */
+export const AUTO_SELECTED_WARNING = 'These answers were auto-selected by the host timeout behavior, not submitted by the user. Do not treat them as user confirmation.'
+
 function questionRequest(questions, exec) {
   return {
     questions: questions.map(question => ({
       id: question.id,
       question: question.question,
       ...(question.header !== undefined ? { header: question.header } : {}),
+      ...(question.detail !== undefined ? { detail: question.detail } : {}),
       ...(question.options !== undefined ? {
         options: question.options.map(option => ({ ...option })),
       } : {}),
@@ -36,14 +40,51 @@ function answerResult(result) {
       selected: [...answer.selected],
       ...(answer.custom !== undefined ? { custom: answer.custom } : {}),
     })),
+    ...(result.autoSelected === true ? { autoSelected: true, warning: AUTO_SELECTED_WARNING } : {}),
+  }
+}
+
+/** Add the optional detail field to the model-visible question schema. */
+function parametersWithDetail(parameters) {
+  if (parameters === undefined) return parameters
+  const next = structuredClone(parameters)
+  const properties = next?.properties?.questions?.items?.properties
+  if (properties !== undefined && properties.detail === undefined) {
+    properties.detail = {
+      type: 'string',
+      description: 'Optional longer detail or context rendered as sanitized markdown below the question.',
+    }
+  }
+  return next
+}
+
+/** Allow the additive auto-selected warning fields on the normal answer branch. */
+function extendAutoSelectedSchema(schema) {
+  const branches = Array.isArray(schema?.oneOf) ? schema.oneOf : [schema]
+  for (const branch of branches) {
+    const properties = branch?.properties
+    if (properties?.answers === undefined) continue
+    if (properties.autoSelected === undefined) {
+      properties.autoSelected = {
+        type: 'boolean',
+        description: 'True when the host auto-selected the default batch after the timeout; not a user answer.',
+      }
+    }
+    if (properties.warning === undefined) {
+      properties.warning = { type: 'string', description: 'Model-visible warning for an auto-selected batch.' }
+    }
   }
+  return schema
 }
 
 /** The timed path can return the official pending shape; keep it valid. */
 function outputWithPending(base) {
   const output = { ...base.output }
-  const schema = structuredClone(base.output.schema)
-  if (Array.isArray(schema?.oneOf) && schema.oneOf.some(branch => branch?.properties?.pending !== undefined)) return output
+  const schema = extendAutoSelectedSchema(structuredClone(base.output.schema))
+  if (Array.isArray(schema?.oneOf) && schema.oneOf.some(branch => branch?.properties?.pending !== undefined)) {
+    output.schema = schema
+    return output
+  }
   output.schema = {
     oneOf: [
       schema,
@@ -71,9 +112,10 @@ function outputWithPending(base) {
  */
 export function createBetterAskTool(ctx, base, readConfig) {
   const output = outputWithPending(base)
+  const parameters = parametersWithDetail(base.parameters)
 
   const execute = async (args, exec) => {
-    const violations = validateJsonSchemaValue(base.parameters, args, '')
+    const violations = validateJsonSchemaValue(parameters, args, '')
     if (violations.length > 0) throw new ToolArgsError(violations)
     validateQuestionIds(args.questions)
 
@@ -113,5 +155,5 @@ export function createBetterAskTool(ctx, base, readConfig) {
     return answerResult(result)
   }
 
-  return { ...base, output, execute }
-}
+  return { ...base, parameters, output, execute }
+}

package/src/client/AskHistoryRow.module.css

@@ -0,0 +1,47 @@
+.row {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  min-height: 24px;
+  min-width: 0;
+  color: var(--dsw-alias-label-secondary);
+}
+.icon {
+  display: inline-flex;
+  align-items: center;
+  flex: none;
+  color: var(--dsw-alias-label-tertiary);
+}
+.title {
+  flex: none;
+  font: var(--dsw-font-xs-strong-13);
+  color: var(--dsw-alias-label-secondary);
+}
+.summary {
+  min-width: 0;
+  flex: 1;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  font: var(--dsw-font-xs-13);
+  color: var(--dsw-alias-label-tertiary);
+}
+.open {
+  flex: none;
+  cursor: pointer;
+  border: .5px solid var(--dsw-alias-border-l4);
+  border-radius: 999px;
+  background: var(--dsw-alias-bg-base);
+  color: var(--dsw-alias-label-secondary);
+  padding: 1px 8px;
+  font: var(--dsw-font-xxs-12);
+  line-height: 16px;
+}
+.open:hover {
+  background: var(--dsw-alias-interactive-bg-hover-solid);
+  color: var(--dsw-alias-label-primary);
+}
+.open:focus-visible {
+  outline: var(--dsw-focus-ring-width) solid var(--dsw-focus-ring-color, var(--dsw-alias-state-business-primary));
+  outline-offset: 1px;
+}

package/src/client/AskHistoryRow.tsx

@@ -0,0 +1,134 @@
+/** History row for ask_user_question: compact summary plus a replay button. */
+import { IconQuestionOutlineRegular } from '@deepseek-ai/dsh-client-ui-primitives'
+import type { PropsLocale } from '@deepseek-ai/dsh-client-ui-slots'
+import type { ToolCallViewProps, UserQuestionRecord } from '@deepseek-ai/dsh-client-ui-tool/client'
+import type { AskUserQuestionItem } from '@deepseek-ai/dsh-user-questions/types'
+import type { QuestionKey } from './locales.ts'
+import css from './AskHistoryRow.module.css'
+
+type AskHistoryRowProps = ToolCallViewProps & PropsLocale<'question'> & {
+  revealPanel: (callId: string) => boolean
+  reviewPanel: (callId: string, record: UserQuestionRecord) => boolean
+}
+
+interface AnswerEntry {
+  id: string
+  selected: string[]
+  custom?: string
+}
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === 'object' && value !== null && !Array.isArray(value)
+}
+
+function parseJson(text: string): unknown {
+  try {
+    return JSON.parse(text)
+  } catch {
+    return undefined
+  }
+}
+
+function resultText(content: readonly unknown[]): string | undefined {
+  const parts: string[] = []
+  for (const block of content) {
+    if (!isRecord(block) || block.type !== 'text' || typeof block.text !== 'string') continue
+    parts.push(block.text)
+  }
+  return parts.length === 0 ? undefined : parts.join('\n')
+}
+
+function questionList(argsRaw: string): AskUserQuestionItem[] | undefined {
+  const parsed = parseJson(argsRaw)
+  if (!isRecord(parsed) || !Array.isArray(parsed.questions) || parsed.questions.length === 0) return undefined
+  const questions: AskUserQuestionItem[] = []
+  for (const candidate of parsed.questions) {
+    if (!isRecord(candidate) || typeof candidate.id !== 'string' || typeof candidate.question !== 'string') return undefined
+    questions.push({
+      id: candidate.id,
+      question: candidate.question,
+      ...(typeof candidate.header === 'string' ? { header: candidate.header } : {}),
+      ...(Array.isArray(candidate.options)
+        ? {
+            options: candidate.options.flatMap(option => isRecord(option) && typeof option.label === 'string'
+              ? [{
+                  label: option.label,
+                  ...(typeof option.description === 'string' ? { description: option.description } : {}),
+                }]
+              : []),
+          }
+        : {}),
+      ...(typeof candidate.multi_select === 'boolean' ? { multi_select: candidate.multi_select } : {}),
+    })
+  }
+  return questions
+}
+
+function answerList(text: string | undefined): AnswerEntry[] | undefined {
+  if (text === undefined) return undefined
+  const parsed = parseJson(text)
+  if (!isRecord(parsed) || !Array.isArray(parsed.answers)) return undefined
+  const answers: AnswerEntry[] = []
+  for (const candidate of parsed.answers) {
+    if (!isRecord(candidate)
+      || typeof candidate.id !== 'string'
+      || !Array.isArray(candidate.selected)
+      || !candidate.selected.every(value => typeof value === 'string')
+      || (candidate.custom !== undefined && typeof candidate.custom !== 'string')) return undefined
+    answers.push({
+      id: candidate.id,
+      selected: candidate.selected,
+      ...(candidate.custom === undefined ? {} : { custom: candidate.custom }),
+    })
+  }
+  return answers
+}
+
+function isPending(text: string | undefined): boolean {
+  if (text === undefined) return false
+  const parsed = parseJson(text)
+  return isRecord(parsed) && parsed.pending === true
+}
+
+/** The compact history re-entry for one ask call, top-level or nested. */
+export function AskHistoryRow({
+  callId,
+  block,
+  phase,
+  revealPanel,
+  reviewPanel,
+  t,
+}: AskHistoryRowProps): React.JSX.Element {
+  const argsRaw = 'kind' in block ? block.call?.argsRaw ?? '' : block.argsRaw
+  const output = 'kind' in block ? resultText(block.content) : undefined
+  const questions = questionList(argsRaw)
+  const answers = answerList(output)
+  const record: UserQuestionRecord | undefined = questions !== undefined && answers !== undefined
+    ? { questions, answers }
+    : undefined
+  const summary = questions?.[0]?.question.split('\n').find(line => line.trim() !== '')?.trim() ?? t('history.title')
+  const review = record !== undefined
+  const action = review
+    ? () => { reviewPanel(callId, record) }
+    : isPending(output) || phase === 'start'
+      ? () => { revealPanel(callId) }
+      : undefined
+
+  return (
+    <div className={css.row}>
+      <span className={css.icon} aria-hidden="true"><IconQuestionOutlineRegular /></span>
+      <span className={css.title}>{t('history.title')}</span>
+      <span className={css.summary} title={summary}>{summary}</span>
+      {action !== undefined && (
+        <button
+          type="button"
+          className={css.open}
+          onClick={action}
+          aria-label={review ? t('history.review') : t('history.reopen')}
+        >
+          {review ? t('history.review') : t('history.reopen')}
+        </button>
+      )}
+    </div>
+  )
+}

package/src/client/index.ts

@@ -27,6 +27,7 @@ import type { ToolCallId } from '@deepseek-ai/dsh-llm'
 import { brandString } from '@deepseek-ai/dsh-brand'
 import { createWaterfallRequest, PendingQuestion, type BetterAskConfig, type QuestionRpcChannel } from './contract/slots.ts'
 import { createQuestionDraftStore } from './draft-store.ts'
+import { AskHistoryRow } from './AskHistoryRow.tsx'
 import { QuestionComposer } from './QuestionComposer.tsx'
 import { questionReplyDefinition } from './question-reply.ts'
 import { QuestionReplyView } from './QuestionReplyView.tsx'
@@ -414,6 +415,20 @@ export function apply(ctx: ClientContext): void {
   } satisfies UserQuestionPanels)
   ctx.effect(() => disposePanels, 'ui-user-questions: answer panels')
   ctx.effect(() => publishContinuedQuestions(ctx, cards), 'ui-user-questions: continued questions')
+  ctx.slots.inject('tool.call.toolview', () => ctx.slots.register({
+    name: 'tool.call.toolview',
+    key: 'ask_user_question',
+    locale: NS,
+    // The shipped `@deepseek-ai/dsh-client-ui-tool` already registers
+    // `ask-question-toolview` for this key at priority 0, and the slot registry
+    // rejects a second entry at the same priority (which failed the whole client
+    // boot). A lower priority shadows it: lowest renders.
+    priority: -1,
+    inject: (sessionId: SessionId) => ({
+      revealPanel: (callId: string) => ctx.get('userQuestionPanels')?.reveal(sessionId, callId) ?? false,
+      reviewPanel: (callId: string, record: UserQuestionRecord) => ctx.get('userQuestionPanels')?.review(sessionId, callId, record) ?? false,
+    }),
+  }, AskHistoryRow))
   ctx.slots.inject('conversation.composer', () => ctx.slots.register(
     {
       name: 'conversation.composer',

package/src/client/locales.ts

@@ -7,6 +7,9 @@ export const zh = {
   'error.unavailable': '当前无法提交，请稍候再试。',
   'error.resubmit': '回答未送达，工作已继续，请再提交一次。',
   'status.sent': '回答已发送；面板未能关闭。',
+  'history.title': '问题',
+  'history.review': '查看',
+  'history.reopen': '打开',
   'wait.takeTime': '慢慢回答',
   'wait.countdown': '{seconds} 秒后继续工作',
   'wait.paused': '已暂停 · 剩余 {seconds} 秒',
@@ -47,6 +50,9 @@ export const en = {
   'error.unavailable': 'Cannot submit right now; try again in a moment.',
   'error.resubmit': 'The answer did not arrive before work continued; submit it again.',
   'status.sent': 'Reply sent; the panel could not close.',
+  'history.title': 'Question',
+  'history.review': 'Review',
+  'history.reopen': 'Open',
   'wait.takeTime': 'Take time',
   'wait.countdown': 'Continuing in {seconds}s',
   'wait.paused': 'Paused · {seconds}s remaining',

package/src/settings.js

@@ -12,9 +12,11 @@ function hasOwn(value, key) {
   return value !== null && typeof value === 'object' && Object.hasOwn(value, key)
 }
 
-function descriptor(service, ns) {
+async function descriptor(service, ns) {
   try {
-    return service.describe(ns)
+    const rows = await service.describe()
+    if (!Array.isArray(rows)) return undefined
+    return rows.find(row => row?.ns === ns)
   } catch {
     return undefined
   }
@@ -36,25 +38,25 @@ export async function migrateLegacyQuestionTimeout(service) {
     return { status: 'unavailable' }
   }
   const deadline = Date.now() + WAIT_MS
-  let source = descriptor(service, LEGACY_GOAL_NS)
-  let target = descriptor(service, ASK_NS)
+  let source = await descriptor(service, LEGACY_GOAL_NS)
+  let target = await descriptor(service, ASK_NS)
   while ((source === undefined || target === undefined) && Date.now() < deadline) {
     await sleep(WAIT_INTERVAL_MS)
-    source = descriptor(service, LEGACY_GOAL_NS)
-    target = descriptor(service, ASK_NS)
+    source = await descriptor(service, LEGACY_GOAL_NS)
+    target = await descriptor(service, ASK_NS)
   }
   if (source === undefined || target === undefined) return { status: 'pending' }
   if (!hasOwn(source.user, 'questionTimeoutSeconds')) return { status: 'no-change' }
   if (hasOwn(target.user, 'questionTimeoutSeconds')) return { status: 'no-change' }
   const value = source.value?.questionTimeoutSeconds
   if (!validSeconds(value)) return { status: 'no-change' }
-  if (target.writable !== true) return { status: 'pending' }
+  if (service.writable === false) return { status: 'pending' }
   try {
     await service.update(ASK_NS, { questionTimeoutSeconds: value }, target.revision)
   } catch (error) {
     return { status: 'error', error: error instanceof Error ? error.message : String(error) }
   }
-  const after = descriptor(service, ASK_NS)
+  const after = await descriptor(service, ASK_NS)
   return after?.user?.questionTimeoutSeconds === value
     ? { status: 'complete', value }
     : { status: 'pending', value }
@@ -76,4 +78,4 @@ export function mountLegacyMigration(ctx) {
       inner.logger?.warn?.('better-ask-user: legacy question wait migration failed: ' + String(error))
     })
   })
-}
+}