nox-qwen-agent-cli 1.1.4 → 1.1.5

package/agent-system-prompt.js

@@ -47,6 +47,13 @@ Editing rules:
 Planning rules:
 Use a plan when the task has multiple steps, affects several files, requires investigation, or requires tests.
 
+Clarification rules:
+- If a request is broad, ambiguous, risky, destructive, or missing acceptance criteria, ask concise clarifying questions before changing files or running commands with side effects.
+- Ask only for details that materially affect the implementation, validation, or safety of the task.
+- Keep clarification questions numbered, specific, and limited to five unless the user explicitly asks for a deeper requirements interview.
+- When a reasonable default is safe, state the assumption and continue instead of blocking.
+- If the user explicitly asks for clarification mode, do not execute the task yet; return the questions and the proposed assumptions only.
+
 Progress rules:
 For longer operations, provide brief progress updates after meaningful milestones. Do not narrate every low-level command.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nox-qwen-agent-cli",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "description": "Cross-platform OpenAI-compatible Qwen coding agent CLI",
   "type": "module",
   "license": "UNLICENSED",

package/qwen.js

@@ -19,6 +19,14 @@ const MAX_FILE_BYTES = 20 * 1024 * 1024;
 const MAX_COMMAND_OUTPUT = 128 * 1024;
 const MAX_API_RETRIES = 2;
 const MAX_SHELL_TIMEOUT_MS = 10 * 60 * 1000;
+const CLARIFY_REQUEST_PROMPT = `Clarify this request before execution.
+Do not modify files, run commands with side effects, or implement the task yet.
+Ask the minimum set of precise questions needed to remove ambiguity, identify acceptance criteria, and confirm risky choices.
+Use no more than five numbered questions unless the user explicitly asks for a deeper requirements interview.
+If the request is already clear enough, say so and list the assumptions you would use before execution.
+
+Request:
+`;
 const SYSTEM_PROMPT_RULES = `The tools attached to the request are authoritative. Use their exact names and JSON schemas.
 Use tools for every local operation. Never claim a command ran or a file changed without a tool result.
 Perform one coherent tool action at a time, inspect its result, and continue until the task is complete.
@@ -226,6 +234,7 @@ function parseArgs(argv) {
     prompt: "",
     stream: true,
     yes: false,
+    clarify: false,
     approvalMode: "ask",
     history: true,
     resume: "",
@@ -238,6 +247,7 @@ function parseArgs(argv) {
     else if (value === "-p" || value === "--prompt") options.prompt = argv[++index] || "";
     else if (value === "--base-url") options.baseUrl = argv[++index] || options.baseUrl;
     else if (value === "-C" || value === "--workspace") options.workspace = argv[++index] || options.workspace;
+    else if (value === "--clarify") options.clarify = true;
     else if (value === "--no-stream") options.stream = false;
     else if (value === "--stream") options.stream = true;
     else if (value === "--request-timeout") options.requestTimeoutMs = Number.parseInt(argv[++index] || "", 10) * 1000;
@@ -262,11 +272,13 @@ Usage:
   qwen
   qwen install ext
   qwen -m gpt-5.5 -p "inspect this project"
+  qwen --clarify -p "add auth"
   qwen --yes --no-stream
 
 Options:
   -m, --model MODEL       Select model without the menu
   -p, --prompt TEXT       Run one task and exit
+  --clarify              Ask precise clarification questions for --prompt before execution
   -C, --workspace PATH    Active workspace
   --base-url URL          OpenAI-compatible base URL
   --stream / --no-stream  Streaming mode; streaming is default
@@ -287,10 +299,15 @@ Interactive commands:
   /resume SESSION         Resume a saved chat
   /approval ask|auto      Change approval mode for this session
   /plan TASK              Require a visible plan before execution
+  /clarify TASK           Ask precise questions and assumptions before execution
   /clear                  Alias for /new
   /exit                   Exit`;
 }
 
+function clarifyPrompt(request) {
+  return `${CLARIFY_REQUEST_PROMPT}${String(request || "").trim()}`;
+}
+
 function configuredApiKey() {
   return String(
     process.env.NOX_API_KEY
@@ -764,6 +781,44 @@ function shellQuote(value) {
   return `'${String(value).replace(/'/g, `'\\''`)}'`;
 }
 
+function parseTextToolCall(content) {
+  const text = typeof content === "string" ? content.trim() : "";
+  const match = text.match(/^<NOX_TOOL_CALL>([\s\S]+)<\/NOX_TOOL_CALL>$/);
+  if (!match) return null;
+  let payload;
+  try {
+    payload = JSON.parse(match[1]);
+  } catch {
+    return null;
+  }
+  const name = String(payload?.tool || "");
+  if (!name) return null;
+  const id = String(payload?.id || `text_tool_${crypto.randomUUID().slice(0, 8)}`);
+  const args = payload?.args && typeof payload.args === "object" && !Array.isArray(payload.args)
+    ? payload.args
+    : {};
+  return {
+    id,
+    type: "function",
+    function: {
+      name,
+      arguments: JSON.stringify(args),
+    },
+  };
+}
+
+function normalizeAssistantToolTransport(assistant) {
+  const nativeCalls = Array.isArray(assistant.tool_calls) ? assistant.tool_calls : [];
+  if (nativeCalls.length) return assistant;
+  const textCall = parseTextToolCall(assistant.content);
+  if (!textCall) return assistant;
+  return {
+    ...assistant,
+    content: null,
+    tool_calls: [textCall],
+  };
+}
+
 async function runShell(command, cwd, timeoutValue) {
   const timeoutMs = Math.max(1, Math.min(MAX_SHELL_TIMEOUT_MS, Number(timeoutValue || 120000)));
   return await new Promise((resolvePromise) => {