dsh-better-ask-user 0.1.2 → 0.1.4

package/package.json

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

@@ -1,17 +1,10 @@
-/** ask_user_question scope shadow: host-controlled wait and timeout behavior. */
+/** ask_user_question scope shadow: official contract plus the plugin-managed wait. */
 import { ToolArgsError, validateJsonSchemaValue } from '@deepseek-ai/dsh-tools'
-import { TIMED_WAIT_PARAMETER } from '@deepseek-ai/dsh-user-questions'
 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.'
 
-/** Compatibility wait field description; the host owns the real wait. */
-const COMPATIBILITY_TIMEOUT = {
-  type: 'integer',
-  description: 'Compatibility wait field. The host controls the wait duration and timeout behavior; any value supplied here is ignored.',
-}
-
 function questionRequest(questions, exec) {
   return {
     questions: questions.map(question => ({
@@ -22,7 +15,6 @@ function questionRequest(questions, exec) {
         options: question.options.map(option => ({ ...option })),
       } : {}),
       ...(question.multi_select !== undefined ? { multiSelect: question.multi_select } : {}),
-      ...(question.detail !== undefined ? { detail: question.detail } : {}),
     })),
     ...(exec.agent !== undefined ? { agent: exec.agent } : {}),
     signal: exec.signal,
@@ -44,33 +36,30 @@ function answerResult(result) {
       selected: [...answer.selected],
       ...(answer.custom !== undefined ? { custom: answer.custom } : {}),
     })),
-    ...(result.autoSelected === true ? { autoSelected: true } : {}),
   }
 }
 
-function answersOutputSchema(schema) {
-  const next = structuredClone(schema)
-  const branches = Array.isArray(next.oneOf) ? next.oneOf : [next]
-  for (const branch of branches) {
-    if (branch?.properties?.answers !== undefined) {
-      branch.properties.autoSelected = {
-        type: 'boolean',
-        description: 'True when the host selected default options after the wait expired; this is not a user answer.',
-      }
-    }
+/** 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
+  output.schema = {
+    oneOf: [
+      schema,
+      {
+        type: 'object',
+        additionalProperties: false,
+        properties: {
+          pending: { type: 'boolean' },
+          callId: { type: 'string' },
+          message: { type: 'string' },
+        },
+        required: ['pending', 'callId', 'message'],
+      },
+    ],
   }
-  return next
-}
-
-function timeoutParameters(parameters) {
-  const next = structuredClone(parameters)
-  if (next?.properties === undefined) next.properties = {}
-  if (next.properties[TIMED_WAIT_PARAMETER] === undefined) {
-    next.properties[TIMED_WAIT_PARAMETER] = COMPATIBILITY_TIMEOUT
-  } else {
-    next.properties[TIMED_WAIT_PARAMETER] = { ...next.properties[TIMED_WAIT_PARAMETER], ...COMPATIBILITY_TIMEOUT }
-  }
-  return next
+  return output
 }
 
 /**
@@ -78,23 +67,13 @@ function timeoutParameters(parameters) {
  * @param ctx - root host context with userQuestions and optional goals.
  * @param base - existing official ask_user_question definition.
  * @param readConfig - live config reader.
- * @returns a ToolDefinition replacing the base behavior.
+ * @returns a ToolDefinition with the official contract and the plugin wait.
  */
 export function createBetterAskTool(ctx, base, readConfig) {
-  const parameters = timeoutParameters(base.parameters)
-  const output = {
-    ...base.output,
-    schema: answersOutputSchema(base.output.schema),
-    render: (_args, value) => [{
-      type: 'text',
-      text: value?.autoSelected === true
-        ? 'auto-selected default answer after the question wait expired; this is not a user answer. Verify before relying on it.\n' + JSON.stringify(value)
-        : JSON.stringify(value),
-    }],
-  }
+  const output = outputWithPending(base)
 
   const execute = async (args, exec) => {
-    const violations = validateJsonSchemaValue(parameters, args, '')
+    const violations = validateJsonSchemaValue(base.parameters, args, '')
     if (violations.length > 0) throw new ToolArgsError(violations)
     validateQuestionIds(args.questions)
 
@@ -108,7 +87,7 @@ export function createBetterAskTool(ctx, base, readConfig) {
     const seconds = config.questionTimeoutSeconds
     const questions = questionRequest(args.questions, exec)
     const defaultAnswer = mode === 'default' && seconds !== -1
-      ? buildDefaultAnswer(args.questions)
+      ? answerResult(buildDefaultAnswer(args.questions))
       : undefined
 
     if (seconds === -1) {
@@ -124,17 +103,11 @@ export function createBetterAskTool(ctx, base, readConfig) {
       better: { waitMs, timeoutMode: mode, defaultAnswer },
     }, exec.callId, waitMs)
     if ('pending' in result) {
-      if (mode === 'default' && defaultAnswer !== undefined) return defaultAnswer
+      if (mode === 'default' && defaultAnswer !== undefined) return answerResult(defaultAnswer)
       return { ...result, message: PENDING_QUESTION_NOTICE }
     }
     return answerResult(result)
   }
 
-  return {
-    ...base,
-    description: base.description + ' The host controls the wait duration and timeout behavior; the timeout argument is a compatibility field and is ignored.',
-    parameters,
-    output,
-    execute,
-  }
+  return { ...base, output, execute }
 }