dsh-better-ask-user 0.1.6 → 0.1.7

package/lib/client.js

@@ -580,7 +580,7 @@ function AskHistoryRow({
     revealPanel(callId);
   } : void 0;
   return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: AskHistoryRow_default.row, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: AskHistoryRow_default.icon, "aria-hidden": "true", children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_dsh_client_ui_primitives.IconQuestionOutline14, {}) }),
+    /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: AskHistoryRow_default.icon, "aria-hidden": "true", children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_dsh_client_ui_primitives.IconQuestionOutlineRegular, {}) }),
     /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: AskHistoryRow_default.title, children: t("history.title") }),
     /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: AskHistoryRow_default.summary, title: summary, children: summary }),
     action !== void 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
@@ -2017,6 +2017,11 @@ function apply(ctx) {
     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) => ({
       revealPanel: (callId) => ctx.get("userQuestionPanels")?.reveal(sessionId, callId) ?? false,
       reviewPanel: (callId, record) => ctx.get("userQuestionPanels")?.review(sessionId, callId, record) ?? false

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-better-ask-user",
-  "version": "0.1.6",
+  "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.tsx

@@ -1,5 +1,5 @@
 /** History row for ask_user_question: compact summary plus a replay button. */
-import { IconQuestionOutline14 } from '@deepseek-ai/dsh-client-ui-primitives'
+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'
@@ -116,7 +116,7 @@ export function AskHistoryRow({
 
   return (
     <div className={css.row}>
-      <span className={css.icon} aria-hidden="true"><IconQuestionOutline14 /></span>
+      <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 && (
@@ -131,4 +131,4 @@ export function AskHistoryRow({
       )}
     </div>
   )
-}
+}

package/src/client/index.ts

@@ -419,6 +419,11 @@ export function apply(ctx: ClientContext): void {
     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,

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))
     })
   })
-}
+}