@rdmind/rdmind 0.2.2-alpha.2 → 0.2.2-alpha.3

package/cli.js

@@ -157359,7 +157359,7 @@ __export(geminiContentGenerator_exports2, {
   createGeminiContentGenerator: () => createGeminiContentGenerator
 });
 function createGeminiContentGenerator(config2, gcConfig) {
-  const version2 = "0.2.2-alpha.2";
+  const version2 = "0.2.2-alpha.3";
   const userAgent2 = config2.userAgent || `QwenCode/${version2} (${process.platform}; ${process.arch})`;
   const baseHeaders = {
     "User-Agent": userAgent2
@@ -247729,7 +247729,7 @@ var init_config3 = __esm({
           this.getDebugMode(),
           this.getFileService(),
           this.getExtensionContextFilePaths(),
-          this.getFolderTrust(),
+          this.isTrustedFolder(),
           this.getImportFormat()
         );
         this.setUserMemory(memoryContent);
@@ -254755,8 +254755,8 @@ var init_git_commit = __esm({
   "packages/core/src/generated/git-commit.ts"() {
     "use strict";
     init_esbuild_shims();
-    GIT_COMMIT_INFO = "0d9e721ec";
-    CLI_VERSION = "0.2.2-alpha.2";
+    GIT_COMMIT_INFO = "ebe48cf8a";
+    CLI_VERSION = "0.2.2-alpha.3";
   }
 });
 
@@ -294850,7 +294850,7 @@ var init_settingsSchema = __esm({
             showInDialog: false,
             mergeStrategy: "concat" /* CONCAT */
           },
-          loadMemoryFromIncludeDirectories: {
+          loadFromIncludeDirectories: {
             type: "boolean",
             label: "Load Memory From Include Directories",
             category: "Context",
@@ -304481,7 +304481,9 @@ var init_en3 = __esm({
       "Enable User Feedback": "Enable User Feedback",
       "How is Qwen doing this session? (optional)": "How is Qwen doing this session? (optional)",
       Bad: "Bad",
+      Fine: "Fine",
       Good: "Good",
+      Dismiss: "Dismiss",
       "Not Sure Yet": "Not Sure Yet",
       "Any other key": "Any other key",
       "Disable Loading Phrases": "Disable Loading Phrases",
@@ -305552,7 +305554,9 @@ var init_zh = __esm({
       "Enable User Feedback": "\u542F\u7528\u7528\u6237\u53CD\u9988",
       "How is Qwen doing this session? (optional)": "Qwen \u8FD9\u6B21\u8868\u73B0\u5982\u4F55\uFF1F\uFF08\u53EF\u9009\uFF09",
       Bad: "\u4E0D\u6EE1\u610F",
+      Fine: "\u8FD8\u884C",
       Good: "\u6EE1\u610F",
+      Dismiss: "\u5FFD\u7565",
       "Not Sure Yet": "\u6682\u4E0D\u8BC4\u4EF7",
       "Any other key": "\u4EFB\u610F\u5176\u4ED6\u952E",
       "Disable Loading Phrases": "\u7981\u7528\u52A0\u8F7D\u77ED\u8BED",
@@ -355436,7 +355440,7 @@ __name(getPackageJson, "getPackageJson");
 // packages/cli/src/utils/version.ts
 async function getCliVersion() {
   const pkgJson = await getPackageJson();
-  return "0.2.2-alpha.2";
+  return "0.2.2-alpha.3";
 }
 __name(getCliVersion, "getCliVersion");
 
@@ -359968,7 +359972,7 @@ async function loadCliConfig(settings, argv, cwd7 = process.cwd(), overrideExten
     sandbox: sandboxConfig,
     targetDir: cwd7,
     includeDirectories,
-    loadMemoryFromIncludeDirectories: settings.context?.loadMemoryFromIncludeDirectories || false,
+    loadMemoryFromIncludeDirectories: settings.context?.loadFromIncludeDirectories || false,
     importFormat: settings.context?.importFormat || "tree",
     debugMode,
     question,
@@ -363251,7 +363255,7 @@ var formatDuration = /* @__PURE__ */ __name((milliseconds) => {
 
 // packages/cli/src/generated/git-commit.ts
 init_esbuild_shims();
-var GIT_COMMIT_INFO2 = "0d9e721ec";
+var GIT_COMMIT_INFO2 = "ebe48cf8a";
 
 // packages/cli/src/utils/systemInfo.ts
 async function getNpmVersion() {
@@ -373547,6 +373551,7 @@ var ControlContext = class {
   permissionMode;
   sdkMcpServers;
   mcpClients;
+  inputClosed;
   onInterrupt;
   constructor(options2) {
     this.config = options2.config;
@@ -373557,6 +373562,7 @@ var ControlContext = class {
     this.permissionMode = options2.permissionMode || "default";
     this.sdkMcpServers = /* @__PURE__ */ new Set();
     this.mcpClients = /* @__PURE__ */ new Map();
+    this.inputClosed = false;
     this.onInterrupt = options2.onInterrupt;
   }
 };
@@ -373622,6 +373628,9 @@ var BaseController = class {
    * Respects the provided AbortSignal for cancellation.
    */
   async sendControlRequest(payload, timeoutMs = DEFAULT_REQUEST_TIMEOUT_MS, signal) {
+    if (this.context.inputClosed) {
+      throw new Error("Input closed");
+    }
     if (signal?.aborted) {
       throw new Error("Request aborted");
     }
@@ -374385,16 +374394,19 @@ var PermissionController = class extends BaseController {
           error2
         );
       }
+      const errorMessage = error2 instanceof Error ? error2.message : String(error2);
       const confirmationType = toolCall.confirmationDetails.type;
       if (["edit", "exec", "mcp"].includes(confirmationType)) {
         const execOrMcpDetails = toolCall.confirmationDetails;
-        await execOrMcpDetails.onConfirm(
-          "cancel" /* Cancel */,
-          void 0
-        );
+        await execOrMcpDetails.onConfirm("cancel" /* Cancel */, {
+          cancelMessage: `Error: ${errorMessage}`
+        });
       } else {
         await toolCall.confirmationDetails.onConfirm(
-          "cancel" /* Cancel */
+          "cancel" /* Cancel */,
+          {
+            cancelMessage: `Error: ${errorMessage}`
+          }
         );
       }
     } finally {
@@ -374606,6 +374618,30 @@ var ControlDispatcher = class {
       }
     }
   }
+  /**
+   * Marks stdin as closed and rejects all pending outgoing requests.
+   * After this is called, new outgoing requests will be rejected immediately.
+   * This should be called when stdin closes to avoid waiting for responses.
+   */
+  markInputClosed() {
+    if (this.context.inputClosed) {
+      return;
+    }
+    this.context.inputClosed = true;
+    const requestIds = Array.from(this.pendingOutgoingRequests.keys());
+    if (this.context.debugMode) {
+      console.error(
+        `[ControlDispatcher] Input closed, rejecting ${requestIds.length} pending outgoing requests`
+      );
+    }
+    for (const id of requestIds) {
+      const pending = this.pendingOutgoingRequests.get(id);
+      if (pending) {
+        this.deregisterOutgoingRequest(id);
+        pending.reject(new Error("Input closed"));
+      }
+    }
+  }
   /**
    * Stops all pending requests and cleans up all controllers
    */
@@ -374634,7 +374670,7 @@ var ControlDispatcher = class {
     this.sdkMcpController.cleanup();
   }
   /**
-   * Registers an incoming request in the pending registry
+   * Registers an incoming request in the pending registry.
    */
   registerIncomingRequest(requestId, controller, abortController, timeoutId) {
     this.pendingIncomingRequests.set(requestId, {
@@ -375422,6 +375458,9 @@ var Session2 = class {
         }
         throw streamError;
       }
+      if (this.dispatcher) {
+        this.dispatcher.markInputClosed();
+      }
       await this.waitForAllPendingWork();
       await this.shutdown();
     } catch (error2) {
@@ -405858,27 +405897,32 @@ var import_jsx_runtime95 = __toESM(require_jsx_runtime(), 1);
 var FEEDBACK_OPTIONS = {
   GOOD: 1,
   BAD: 2,
-  NOT_SURE: 3
+  FINE: 3,
+  DISMISS: 0
 };
 var FEEDBACK_OPTION_KEYS = {
   [FEEDBACK_OPTIONS.GOOD]: "1",
   [FEEDBACK_OPTIONS.BAD]: "2",
-  [FEEDBACK_OPTIONS.NOT_SURE]: "any"
+  [FEEDBACK_OPTIONS.FINE]: "3",
+  [FEEDBACK_OPTIONS.DISMISS]: "0"
 };
-var FEEDBACK_DIALOG_KEYS = ["1", "2"];
+var FEEDBACK_DIALOG_KEYS = ["1", "2", "3", "0"];
 var FeedbackDialog = /* @__PURE__ */ __name(() => {
   const uiState = useUIState();
   const uiActions = useUIActions();
   useKeypress(
     (key) => {
-      if (key.name === FEEDBACK_OPTION_KEYS[FEEDBACK_OPTIONS.GOOD]) {
-        uiActions.submitFeedback(FEEDBACK_OPTIONS.GOOD);
-      } else if (key.name === FEEDBACK_OPTION_KEYS[FEEDBACK_OPTIONS.BAD]) {
+      if (key.name === FEEDBACK_OPTION_KEYS[FEEDBACK_OPTIONS.BAD]) {
         uiActions.submitFeedback(FEEDBACK_OPTIONS.BAD);
+      } else if (key.name === FEEDBACK_OPTION_KEYS[FEEDBACK_OPTIONS.FINE]) {
+        uiActions.submitFeedback(FEEDBACK_OPTIONS.FINE);
+      } else if (key.name === FEEDBACK_OPTION_KEYS[FEEDBACK_OPTIONS.GOOD]) {
+        uiActions.submitFeedback(FEEDBACK_OPTIONS.GOOD);
+      } else if (key.name === FEEDBACK_OPTION_KEYS[FEEDBACK_OPTIONS.DISMISS]) {
+        uiActions.submitFeedback(FEEDBACK_OPTIONS.DISMISS);
       } else {
-        uiActions.submitFeedback(FEEDBACK_OPTIONS.NOT_SURE);
+        uiActions.temporaryCloseFeedbackDialog();
       }
-      uiActions.closeFeedbackDialog();
     },
     { isActive: uiState.isFeedbackDialogOpen }
   );
@@ -405902,10 +405946,19 @@ var FeedbackDialog = /* @__PURE__ */ __name(() => {
       /* @__PURE__ */ (0, import_jsx_runtime95.jsx)(Text3, { children: t4("Bad") }),
       /* @__PURE__ */ (0, import_jsx_runtime95.jsx)(Text3, { children: " " }),
       /* @__PURE__ */ (0, import_jsx_runtime95.jsxs)(Text3, { color: "cyan", children: [
-        t4("Any other key"),
-        ": "
+        FEEDBACK_OPTION_KEYS[FEEDBACK_OPTIONS.FINE],
+        ":",
+        " "
       ] }),
-      /* @__PURE__ */ (0, import_jsx_runtime95.jsx)(Text3, { children: t4("Not Sure Yet") })
+      /* @__PURE__ */ (0, import_jsx_runtime95.jsx)(Text3, { children: t4("Fine") }),
+      /* @__PURE__ */ (0, import_jsx_runtime95.jsx)(Text3, { children: " " }),
+      /* @__PURE__ */ (0, import_jsx_runtime95.jsxs)(Text3, { color: "cyan", children: [
+        FEEDBACK_OPTION_KEYS[FEEDBACK_OPTIONS.DISMISS],
+        ":",
+        " "
+      ] }),
+      /* @__PURE__ */ (0, import_jsx_runtime95.jsx)(Text3, { children: t4("Dismiss") }),
+      /* @__PURE__ */ (0, import_jsx_runtime95.jsx)(Text3, { children: " " })
     ] })
   ] });
 }, "FeedbackDialog");
@@ -405952,6 +406005,7 @@ var InputPrompt = /* @__PURE__ */ __name(({
 }) => {
   const isShellFocused = useShellFocusState();
   const uiState = useUIState();
+  const uiActions = useUIActions();
   const [justNavigatedHistory, setJustNavigatedHistory] = (0, import_react97.useState)(false);
   const [escPressCount, setEscPressCount] = (0, import_react97.useState)(0);
   const [showEscapePrompt, setShowEscapePrompt] = (0, import_react97.useState)(false);
@@ -406130,8 +406184,12 @@ var InputPrompt = /* @__PURE__ */ __name(({
       if (vimHandleInput && vimHandleInput(key)) {
         return;
       }
-      if (uiState.isFeedbackDialogOpen && FEEDBACK_DIALOG_KEYS.includes(key.name)) {
-        return;
+      if (uiState.isFeedbackDialogOpen) {
+        if (FEEDBACK_DIALOG_KEYS.includes(key.name)) {
+          return;
+        } else {
+          uiActions.temporaryCloseFeedbackDialog();
+        }
       }
       if (key.name !== "escape") {
         if (escPressCount > 0 || showEscapePrompt) {
@@ -406417,7 +406475,8 @@ var InputPrompt = /* @__PURE__ */ __name(({
       commandSearchCompletion,
       onToggleShortcuts,
       showShortcuts,
-      uiState
+      uiState,
+      uiActions
     ]
   );
   useKeypress(handleInput, { isActive: !isEmbeddedShellFocused });
@@ -407381,35 +407440,42 @@ var useFeedbackDialog = /* @__PURE__ */ __name(({
   sessionStats
 }) => {
   const [isFeedbackDialogOpen, setIsFeedbackDialogOpen] = (0, import_react102.useState)(false);
+  const [isFeedbackDismissedTemporarily, setIsFeedbackDismissedTemporarily] = (0, import_react102.useState)(false);
   const openFeedbackDialog = (0, import_react102.useCallback)(() => {
     setIsFeedbackDialogOpen(true);
-    settings.setValue(
-      "User" /* User */,
-      "ui.feedbackLastShownTimestamp",
-      Date.now()
-    );
-  }, [settings]);
+  }, []);
   const closeFeedbackDialog = (0, import_react102.useCallback)(
     () => setIsFeedbackDialogOpen(false),
     []
   );
+  const temporaryCloseFeedbackDialog = (0, import_react102.useCallback)(() => {
+    setIsFeedbackDialogOpen(false);
+    setIsFeedbackDismissedTemporarily(true);
+  }, []);
   const submitFeedback = (0, import_react102.useCallback)(
     (rating) => {
-      const feedbackEvent = new UserFeedbackEvent(
-        sessionStats.sessionId,
-        rating,
-        config2.getModel(),
-        config2.getApprovalMode()
+      if (rating >= FEEDBACK_OPTIONS.GOOD && rating <= FEEDBACK_OPTIONS.FINE) {
+        const feedbackEvent = new UserFeedbackEvent(
+          sessionStats.sessionId,
+          rating,
+          config2.getModel(),
+          config2.getApprovalMode()
+        );
+        logUserFeedback(config2, feedbackEvent);
+      }
+      settings.setValue(
+        "User" /* User */,
+        "ui.feedbackLastShownTimestamp",
+        Date.now()
       );
-      logUserFeedback(config2, feedbackEvent);
       closeFeedbackDialog();
     },
-    [config2, sessionStats, closeFeedbackDialog]
+    [closeFeedbackDialog, sessionStats.sessionId, config2, settings]
   );
   (0, import_react102.useEffect)(() => {
     const checkAndShowFeedback = /* @__PURE__ */ __name(() => {
       if (streamingState === "idle" /* Idle */ && history.length > 0) {
-        if (config2.getAuthType() !== "qwen-oauth" /* QWEN_OAUTH */ || !config2.getUsageStatisticsEnabled() || settings.merged.ui?.enableUserFeedback === false || !lastMessageIsAIResponse(history) || Math.random() > FEEDBACK_SHOW_PROBABILITY || !meetsMinimumSessionRequirements(sessionStats)) {
+        if (config2.getAuthType() !== "qwen-oauth" /* QWEN_OAUTH */ || !config2.getUsageStatisticsEnabled() || settings.merged.ui?.enableUserFeedback === false || !lastMessageIsAIResponse(history) || Math.random() > FEEDBACK_SHOW_PROBABILITY || !meetsMinimumSessionRequirements(sessionStats) || isFeedbackDismissedTemporarily) {
           return;
         }
         if (shouldShowFeedbackBasedOnFatigue()) {
@@ -407423,14 +407489,21 @@ var useFeedbackDialog = /* @__PURE__ */ __name(({
     history,
     sessionStats,
     isFeedbackDialogOpen,
+    isFeedbackDismissedTemporarily,
     openFeedbackDialog,
     settings.merged.ui?.enableUserFeedback,
     config2
   ]);
+  (0, import_react102.useEffect)(() => {
+    if (streamingState === "responding" /* Responding */ && isFeedbackDismissedTemporarily) {
+      setIsFeedbackDismissedTemporarily(false);
+    }
+  }, [streamingState, isFeedbackDismissedTemporarily]);
   return {
     isFeedbackDialogOpen,
     openFeedbackDialog,
     closeFeedbackDialog,
+    temporaryCloseFeedbackDialog,
     submitFeedback
   };
 }, "useFeedbackDialog");
@@ -417067,7 +417140,7 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     try {
       const { memoryContent, fileCount } = await loadHierarchicalGeminiMemory(
         process48.cwd(),
-        settings.merged.context?.loadMemoryFromIncludeDirectories ? config2.getWorkspaceContext().getDirectories() : [],
+        settings.merged.context?.loadFromIncludeDirectories ? config2.getWorkspaceContext().getDirectories() : [],
         config2.getDebugMode(),
         config2.getFileService(),
         config2.getExtensionContextFilePaths(),
@@ -417599,6 +417672,7 @@ ${migrationResult.failedFiles.map((f5) => `  \u2022 ${f5.file}: ${f5.error}`).jo
     isFeedbackDialogOpen,
     openFeedbackDialog,
     closeFeedbackDialog,
+    temporaryCloseFeedbackDialog,
     submitFeedback
   } = useFeedbackDialog({
     config: config2,
@@ -417856,6 +417930,7 @@ ${migrationResult.failedFiles.map((f5) => `  \u2022 ${f5.file}: ${f5.error}`).jo
       // Feedback dialog
       openFeedbackDialog,
       closeFeedbackDialog,
+      temporaryCloseFeedbackDialog,
       submitFeedback
     }),
     [
@@ -417899,6 +417974,7 @@ ${migrationResult.failedFiles.map((f5) => `  \u2022 ${f5.file}: ${f5.error}`).jo
       // Feedback dialog
       openFeedbackDialog,
       closeFeedbackDialog,
+      temporaryCloseFeedbackDialog,
       submitFeedback
     ]
   );
@@ -419229,7 +419305,8 @@ var usageSchema = external_exports.object({
 });
 var sessionUpdateMetaSchema = external_exports.object({
   usage: usageSchema.optional().nullable(),
-  durationMs: external_exports.number().optional().nullable()
+  durationMs: external_exports.number().optional().nullable(),
+  toolName: external_exports.string().optional().nullable()
 });
 var requestPermissionResponseSchema = external_exports.object({
   outcome: requestPermissionOutcomeSchema
@@ -419403,6 +419480,7 @@ var sessionUpdateSchema = external_exports.union([
     kind: toolKindSchema,
     locations: external_exports.array(toolCallLocationSchema).optional(),
     rawInput: external_exports.unknown().optional(),
+    _meta: sessionUpdateMetaSchema.optional().nullable(),
     sessionUpdate: external_exports.literal("tool_call"),
     status: toolCallStatusSchema,
     title: external_exports.string(),
@@ -419414,6 +419492,7 @@ var sessionUpdateSchema = external_exports.union([
     locations: external_exports.array(toolCallLocationSchema).optional().nullable(),
     rawInput: external_exports.unknown().optional(),
     rawOutput: external_exports.unknown().optional(),
+    _meta: sessionUpdateMetaSchema.optional().nullable(),
     sessionUpdate: external_exports.literal("tool_call_update"),
     status: toolCallStatusSchema.optional().nullable(),
     title: external_exports.string().optional().nullable(),
@@ -420047,7 +420126,8 @@ var ToolCallEmitter = class extends BaseEmitter {
       content: [],
       locations,
       kind: kind2,
-      rawInput: params.args ?? {}
+      rawInput: params.args ?? {},
+      _meta: { toolName: params.toolName }
     });
     return true;
   }
@@ -420088,7 +420168,8 @@ var ToolCallEmitter = class extends BaseEmitter {
       sessionUpdate: "tool_call_update",
       toolCallId: params.callId,
       status: params.success ? "completed" : "failed",
-      content: contentArray
+      content: contentArray,
+      _meta: { toolName: params.toolName }
     };
     if (params.resultDisplay !== void 0) {
       update2["rawOutput"] = params.resultDisplay;
@@ -420102,14 +420183,15 @@ var ToolCallEmitter = class extends BaseEmitter {
    * @param callId - The tool call ID
    * @param error - The error that occurred
    */
-  async emitError(callId, error2) {
+  async emitError(callId, toolName, error2) {
     await this.sendUpdate({
       sessionUpdate: "tool_call_update",
       toolCallId: callId,
       status: "failed",
       content: [
         { type: "content", content: { type: "text", text: error2.message } }
-      ]
+      ],
+      _meta: { toolName }
     });
   }
   // ==================== Public Utilities ====================
@@ -421008,7 +421090,11 @@ var Session3 = class {
     } catch (e4) {
       subAgentCleanupFunctions.forEach((cleanup) => cleanup());
       const error2 = e4 instanceof Error ? e4 : new Error(String(e4));
-      await this.toolCallEmitter.emitError(callId, error2);
+      await this.toolCallEmitter.emitError(
+        callId,
+        fc.name ?? "unknown_tool",
+        error2
+      );
       const errorParts = [
         {
           functionResponse: {
@@ -421263,7 +421349,7 @@ ${pathList}
     if (pathSpecsToRead.length > 0) {
       const readResult = await readManyFilesTool.buildAndExecute(
         {
-          paths_with_line_ranges: pathSpecsToRead
+          paths: pathSpecsToRead
         },
         abortSignal
       );
@@ -421436,7 +421522,7 @@ var GeminiAgent = class {
       name: APPROVAL_MODE_INFO[mode].name,
       description: APPROVAL_MODE_INFO[mode].description
     }));
-    const version2 = "0.2.2-alpha.2";
+    const version2 = "0.2.2-alpha.3";
     return {
       protocolVersion: PROTOCOL_VERSION,
       agentInfo: {

package/locales/en.js

@@ -322,7 +322,9 @@ export default {
   'How is Qwen doing this session? (optional)':
     'How is Qwen doing this session? (optional)',
   Bad: 'Bad',
+  Fine: 'Fine',
   Good: 'Good',
+  Dismiss: 'Dismiss',
   'Not Sure Yet': 'Not Sure Yet',
   'Any other key': 'Any other key',
   'Disable Loading Phrases': 'Disable Loading Phrases',

package/locales/zh.js

@@ -312,7 +312,9 @@ export default {
   'Enable User Feedback': '启用用户反馈',
   'How is Qwen doing this session? (optional)': 'Qwen 这次表现如何？（可选）',
   Bad: '不满意',
+  Fine: '还行',
   Good: '满意',
+  Dismiss: '忽略',
   'Not Sure Yet': '暂不评价',
   'Any other key': '任意其他键',
   'Disable Loading Phrases': '禁用加载短语',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rdmind/rdmind",
-  "version": "0.2.2-alpha.2",
+  "version": "0.2.2-alpha.3",
   "description": "RDMind - AI-powered coding assistant",
   "type": "module",
   "main": "cli.js",
@@ -20,7 +20,7 @@
     "locales"
   ],
   "config": {
-    "sandboxImageUri": "ghcr.io/qwenlm/qwen-code:0.2.2-alpha.2"
+    "sandboxImageUri": "ghcr.io/qwenlm/qwen-code:0.2.2-alpha.3"
   },
   "publishConfig": {
     "access": "public"
@@ -32,8 +32,7 @@
     "@lydell/node-pty-darwin-x64": "1.1.0",
     "@lydell/node-pty-linux-x64": "1.1.0",
     "@lydell/node-pty-win32-arm64": "1.1.0",
-    "@lydell/node-pty-win32-x64": "1.1.0",
-    "node-pty": "^1.0.0"
+    "@lydell/node-pty-win32-x64": "1.1.0"
   },
   "engines": {
     "node": ">=20.0.0"