@rudderhq/cli 0.3.6-canary.3 → 0.3.6-canary.30

package/dist/index.js

@@ -572,6 +572,13 @@ var init_constants = __esm({
   }
 });
 
+// ../packages/shared/dist/agent-run.js
+var init_agent_run = __esm({
+  "../packages/shared/dist/agent-run.js"() {
+    "use strict";
+  }
+});
+
 // ../packages/shared/dist/types/observability.js
 var init_observability = __esm({
   "../packages/shared/dist/types/observability.js"() {
@@ -784,7 +791,7 @@ var init_adapter_skills = __esm({
 
 // ../packages/shared/dist/validators/chat.js
 import { z as z4 } from "zod";
-var chatConversationStatusSchema, chatIssueCreationModeSchema, chatMessageRoleSchema, chatMessageKindSchema, chatMessageStatusSchema, chatContextEntityTypeSchema, createChatContextLinkSchema, createChatConversationSchema, setChatProjectContextSchema, updateChatConversationSchema, addChatMessageSchema, chatRichReferenceDisplaySchema, chatIssueIdentifierSchema, chatAskUserIdentifierSchema, chatAskUserOptionSchema, chatAskUserQuestionSchema, chatAskUserRequestSchema, chatIssueRichReferenceSchema, chatIssueCommentRichReferenceSchema, chatRichReferenceSchema, chatRichReferencesSchema, chatAutomationCreateSchema, createChatAttachmentMetadataSchema, chatIssueProposalSchema, convertChatToIssueSchema, chatOperationProposalSchema, resolveChatOperationProposalSchema, updateChatConversationUserStateSchema, updateMessengerThreadUserStateSchema, createMessengerCustomGroupSchema, createMessengerCustomGroupWithEntriesSchema, updateMessengerCustomGroupSchema, reorderMessengerCustomGroupsSchema, assignMessengerCustomGroupEntrySchema, reorderMessengerCustomGroupEntriesSchema;
+var chatConversationStatusSchema, chatIssueCreationModeSchema, chatMessageRoleSchema, chatMessageKindSchema, chatMessageStatusSchema, chatContextEntityTypeSchema, createChatContextLinkSchema, createChatConversationSchema, setChatProjectContextSchema, updateChatConversationSchema, forkChatConversationSchema, addChatMessageSchema, chatQueuedMessagePayloadSchema, createChatQueuedMessageSchema, updateChatQueuedMessageSchema, cancelChatQueuedMessageSchema, steerChatQueuedMessageSchema, chatRichReferenceDisplaySchema, chatIssueIdentifierSchema, chatAskUserIdentifierSchema, chatAskUserOptionSchema, chatAskUserQuestionSchema, chatAskUserRequestSchema, chatIssueRichReferenceSchema, chatIssueCommentRichReferenceSchema, chatRichReferenceSchema, chatRichReferencesSchema, chatAutomationCreateSchema, createChatAttachmentMetadataSchema, chatIssueProposalSchema, convertChatToIssueSchema, chatOperationProposalSchema, resolveChatOperationProposalSchema, updateChatConversationUserStateSchema, updateMessengerThreadUserStateSchema, createMessengerCustomGroupSchema, createMessengerCustomGroupWithEntriesSchema, updateMessengerCustomGroupSchema, reorderMessengerCustomGroupsSchema, assignMessengerCustomGroupEntrySchema, reorderMessengerCustomGroupEntriesSchema;
 var init_chat = __esm({
   "../packages/shared/dist/validators/chat.js"() {
     "use strict";
@@ -817,9 +824,39 @@ var init_chat = __esm({
       primaryIssueId: z4.string().uuid().optional().nullable(),
       resolvedAt: z4.string().datetime().optional().nullable()
     });
+    forkChatConversationSchema = z4.object({
+      sourceMessageId: z4.string().uuid().optional().nullable(),
+      title: z4.string().trim().min(1).max(200).optional()
+    });
     addChatMessageSchema = z4.object({
       body: z4.string().trim().min(1).max(2e4),
-      editUserMessageId: z4.string().uuid().optional().nullable()
+      editUserMessageId: z4.string().uuid().optional().nullable(),
+      queuedMessageId: z4.string().uuid().optional().nullable()
+    });
+    chatQueuedMessagePayloadSchema = z4.object({
+      body: z4.string().trim().min(1).max(2e4),
+      attachmentIds: z4.array(z4.string().uuid()).optional().default([]),
+      projectId: z4.string().uuid().optional().nullable(),
+      skillRefs: z4.array(z4.string().trim().min(1).max(240)).optional().default([]),
+      accessMode: z4.string().trim().min(1).max(120).optional().nullable(),
+      model: z4.string().trim().min(1).max(120).optional().nullable(),
+      effort: z4.string().trim().min(1).max(120).optional().nullable(),
+      metadata: z4.record(z4.unknown()).optional().nullable()
+    });
+    createChatQueuedMessageSchema = z4.object({
+      clientMutationId: z4.string().trim().min(1).max(120),
+      expectedGenerationId: z4.string().uuid().optional().nullable(),
+      payload: chatQueuedMessagePayloadSchema
+    });
+    updateChatQueuedMessageSchema = z4.object({
+      version: z4.number().int().positive(),
+      payload: chatQueuedMessagePayloadSchema
+    });
+    cancelChatQueuedMessageSchema = z4.object({
+      version: z4.number().int().positive().optional()
+    });
+    steerChatQueuedMessageSchema = z4.object({
+      expectedActiveGenerationId: z4.string().uuid().optional().nullable()
     });
     chatRichReferenceDisplaySchema = z4.enum(["card", "inline"]);
     chatIssueIdentifierSchema = z4.string().trim().min(1).max(64).regex(/^[A-Z0-9][A-Z0-9-]*$/i);
@@ -978,6 +1015,7 @@ var init_chat = __esm({
       name: z4.string().trim().min(1).max(80).optional(),
       icon: z4.string().trim().min(1).max(24).optional().nullable(),
       collapsed: z4.boolean().optional(),
+      pinned: z4.boolean().optional(),
       sortOrder: z4.number().int().min(0).optional()
     });
     reorderMessengerCustomGroupsSchema = z4.object({
@@ -1771,7 +1809,7 @@ var init_agent = __esm({
 
 // ../packages/shared/dist/validators/agent-integration.js
 import { z as z13 } from "zod";
-var agentIntegrationProviderSchema, agentIntegrationStatusSchema, agentIntegrationTransportSchema, agentIntegrationProviderRegionSchema, agentIntegrationChatTypeSchema, agentIntegrationDropReasonSchema, agentIntegrationOutboundStatusSchema, createAgentIntegrationSchema, feishuEventHeaderSchema, feishuSenderIdSchema, feishuMessageMentionSchema, feishuMessageSchema, feishuEventSchema, mockFeishuInboundEventSchema;
+var agentIntegrationProviderSchema, agentIntegrationStatusSchema, agentIntegrationTransportSchema, agentIntegrationProviderRegionSchema, agentIntegrationChatTypeSchema, agentIntegrationDropReasonSchema, agentIntegrationOutboundStatusSchema, createAgentIntegrationSchema, connectAgentIntegrationSchema, feishuEventHeaderSchema, feishuSenderIdSchema, feishuMessageMentionSchema, feishuMessageSchema, feishuEventSchema, mockFeishuInboundEventSchema;
 var init_agent_integration = __esm({
   "../packages/shared/dist/validators/agent-integration.js"() {
     "use strict";
@@ -1795,9 +1833,11 @@ var init_agent_integration = __esm({
       installerUserId: z13.string().min(1).optional().nullable(),
       manageUrl: z13.string().url().optional().nullable()
     });
+    connectAgentIntegrationSchema = createAgentIntegrationSchema.omit({ agentId: true });
     feishuEventHeaderSchema = z13.object({
       event_id: z13.string().min(1).optional(),
       app_id: z13.string().min(1).optional(),
+      token: z13.string().min(1).optional(),
       create_time: z13.string().min(1).optional()
     }).passthrough();
     feishuSenderIdSchema = z13.object({
@@ -1824,6 +1864,11 @@ var init_agent_integration = __esm({
       message: feishuMessageSchema.optional()
     }).passthrough();
     mockFeishuInboundEventSchema = z13.object({
+      type: z13.string().min(1).optional(),
+      token: z13.string().min(1).optional(),
+      challenge: z13.string().min(1).optional(),
+      mockVerificationToken: z13.string().min(1).optional(),
+      mockEncryptKey: z13.string().min(1).optional(),
       eventId: z13.string().min(1).optional(),
       appId: z13.string().min(1).optional(),
       botOpenId: z13.string().min(1).optional().nullable(),
@@ -2978,6 +3023,7 @@ var init_api = __esm({
       secrets: `${API_PREFIX}/secrets`,
       costs: `${API_PREFIX}/costs`,
       activity: `${API_PREFIX}/activity`,
+      agentRuns: `${API_PREFIX}/agent-runs`,
       dashboard: `${API_PREFIX}/dashboard`,
       sidebarBadges: `${API_PREFIX}/sidebar-badges`,
       invites: `${API_PREFIX}/invites`,
@@ -3036,6 +3082,19 @@ var init_project_url_key = __esm({
   }
 });
 
+// ../packages/shared/dist/short-refs.js
+var SHORT_REF_PREFIX_BY_KIND, SHORT_REF_KIND_BY_PREFIX;
+var init_short_refs = __esm({
+  "../packages/shared/dist/short-refs.js"() {
+    "use strict";
+    SHORT_REF_PREFIX_BY_KIND = {
+      agent: "agt",
+      issue_comment: "cmt"
+    };
+    SHORT_REF_KIND_BY_PREFIX = Object.fromEntries(Object.entries(SHORT_REF_PREFIX_BY_KIND).map(([kind, prefix]) => [prefix, kind]));
+  }
+});
+
 // ../packages/shared/dist/token-usage.js
 var init_token_usage = __esm({
   "../packages/shared/dist/token-usage.js"() {
@@ -3240,6 +3299,7 @@ var init_dist = __esm({
   "../packages/shared/dist/index.js"() {
     "use strict";
     init_constants();
+    init_agent_run();
     init_observability();
     init_workspace_backup();
     init_validators();
@@ -3251,6 +3311,7 @@ var init_dist = __esm({
     init_organization_url_key();
     init_project_mentions();
     init_project_url_key();
+    init_short_refs();
     init_token_usage();
     init_issue_activity();
     init_config_schema();
@@ -7015,7 +7076,7 @@ function printOutput(data, opts = {}) {
 }
 function formatInlineRecord(record, opts = {}) {
   const displayRecord = shouldShowFullIds(opts.fullIds) ? record : toCliShortIdOutput(record);
-  const keyOrder = ["identifier", "id", "name", "status", "priority", "title", "action"];
+  const keyOrder = ["identifier", "shortRef", "id", "name", "status", "priority", "title", "action"];
   const seen = /* @__PURE__ */ new Set();
   const parts = [];
   for (const key of keyOrder) {
@@ -7272,7 +7333,7 @@ var RUDDER_AGENT_OPERATING_CONTRACT = [
   "- `library:projects/<project-key>/...` is the Rudder product locator for those files, not the Markdown link syntax and not a reason to route ordinary local edits through the CLI.",
   '- When you create or update a durable Library file, always include a user-visible Markdown link to that file in your final chat reply or issue comment. Use `rudder library file ref "$RUDDER_PROJECT_LIBRARY_PATH/<relative-file>" --json` and paste the returned `markdownLink`; do not pass the absolute `$RUDDER_PROJECT_LIBRARY_ROOT/...` path to `ref`, and do not hand-write `library-entry://...` or `library-file://...` links.',
   '- If `$RUDDER_PROJECT_LIBRARY_ROOT` is unset or inaccessible, use `rudder library file get/put "$RUDDER_PROJECT_LIBRARY_PATH/<relative-file>"` as the remote or restricted runtime fallback.',
-  "- Use `/tmp` only for transient scratch files and temporary verification files; do not put durable work product there.",
+  "- Use `$RUDDER_RUNTIME_TMPDIR` for transient scratch files and temporary verification files when it is set; otherwise use `/tmp`. Do not put durable work product there.",
   "- Local trusted runtimes may expose the host operator home as `$RUDDER_OPERATOR_HOME`; use it only when a local skill or script intentionally needs operator-owned desktop app or CLI state. Do not replace `$HOME` with it.",
   "",
   "When you create or copy a skill under `$AGENT_HOME/skills/<slug>/`, check the agent's Skills snapshot before claiming it will load in future runs. If it is installed but not enabled, say exactly that future runs will not load it until enabled, and offer to enable it with `rudder agent skills enable <agent-id> <selection-ref>` when you have permission.",
@@ -7302,7 +7363,7 @@ var RUDDER_AGENT_OPERATING_CONTRACT = [
   "",
   "You MUST use the `para-memory-files` skill for all memory operations: storing facts, writing daily notes, creating entities, running weekly synthesis, recalling past context, and managing shared work notes. The skill defines your three-layer memory system (knowledge graph, daily notes, tacit knowledge), the PARA folder structure, atomic fact schemas, memory decay rules, and recall conventions.",
   "",
-  "Keep stable preferences and operating lessons in `$AGENT_HOME/instructions/MEMORY.md`. Use `$AGENT_HOME/memory/YYYY-MM-DD.md` for daily notes and `$AGENT_HOME/life/` for structured long-term memory; those files are not auto-loaded.",
+  "Keep stable preferences and operating lessons in `$AGENT_HOME/instructions/MEMORY.md`. Use `$AGENT_HOME/memory/YYYY-MM-DD.md` for daily notes and `$AGENT_HOME/life/` for structured long-term memory. Rudder injects bounded today/yesterday daily-memory excerpts in the startup context bundle; open the files directly when you need full detail.",
   "",
   "Invoke it whenever you need to remember, retrieve, or organize anything.",
   "",
@@ -7326,9 +7387,9 @@ var RUDDER_AGENT_HEARTBEAT_INSTRUCTION = [
   "1. Identify yourself and inspect wake context, including `RUDDER_TASK_ID`, `RUDDER_WAKE_REASON`, `RUDDER_WAKE_COMMENT_ID`, and `RUDDER_APPROVAL_ID` when present.",
   "2. Local Planning Check:",
   "   ",
-  "   1. Read today's plan from `$AGENT_HOME/memory/YYYY-MM-DD.md` under \"## Today's Plan\". You need to clearly know your work plan for today, and work according to the plan.",
-  "   2. Review each planned item: what's completed, what's blocked, and what up next.",
-  "   3. Record progress updates in the daily notes.",
+  "- Read today's plan from `$AGENT_HOME/memory/YYYY-MM-DD.md` under \"## Today's Plan\". You need to clearly know your work plan for today, and work according to the plan.",
+  "- Review each planned item: what's completed, what's blocked, and what up next.",
+  "- Record progress updates in the daily notes.",
   "   ",
   "3.Then handle approval follow-up: read the approval and linked issues, then close resolved work or comment on what remains.",
   "4. Inspect your Rudder inbox. Prioritize reviewer rows in `in_review` or `blocked`, then assignee `in_progress`, then assignee `todo`. Do not look for unassigned work.",
@@ -7446,9 +7507,9 @@ var AGENT_CLI_CAPABILITIES = [
   },
   {
     id: "agent.get",
-    command: "rudder agent get <agent-id-or-shortname>",
+    command: "rudder agent get <agent-id-or-shortname-or-agt-ref>",
     category: "agent",
-    description: "Read one agent by id or shortname.",
+    description: "Read one agent by id, shortname, or agt_<uuid-prefix> short ref.",
     mutating: false,
     contract: "compat",
     requiresOrgId: false,
@@ -7602,9 +7663,9 @@ var AGENT_CLI_CAPABILITIES = [
   },
   {
     id: "issue.context",
-    command: "rudder issue context <issue>",
+    command: "rudder issue context <issue> [--wake-comment-id <comment-id-or-cmt-ref>]",
     category: "issue",
-    description: "Read the compact heartbeat context for an issue.",
+    description: "Read the compact heartbeat context for an issue; wake comments may be addressed by full id or cmt_<uuid-prefix>.",
     mutating: false,
     contract: "agent-v1",
     requiresOrgId: false,
@@ -7638,9 +7699,9 @@ var AGENT_CLI_CAPABILITIES = [
   },
   {
     id: "issue.comments.list",
-    command: "rudder issue comments list <issue>",
+    command: "rudder issue comments list <issue> [--after <comment-id-or-cmt-ref>]",
     category: "issue",
-    description: "List issue comments, optionally only newer comments after a cursor.",
+    description: "List issue comments, optionally only newer comments after a full comment id or cmt_<uuid-prefix> with --after.",
     mutating: false,
     contract: "agent-v1",
     requiresOrgId: false,
@@ -7650,9 +7711,9 @@ var AGENT_CLI_CAPABILITIES = [
   },
   {
     id: "issue.comments.get",
-    command: "rudder issue comments get <issue> <comment-id>",
+    command: "rudder issue comments get <issue> <comment-id-or-cmt-ref>",
     category: "issue",
-    description: "Read one issue comment by id.",
+    description: "Read one issue comment by full id or cmt_<uuid-prefix> scoped to the issue.",
     mutating: false,
     contract: "agent-v1",
     requiresOrgId: false,
@@ -8613,6 +8674,7 @@ function registerAgentCommands(program) {
         for (const row of rows) {
           console.log(
             formatInlineRecord({
+              shortRef: row.shortRef,
               id: row.id,
               name: row.name,
               role: row.role,
@@ -11514,7 +11576,7 @@ function registerIssueCommands(program) {
   );
   const comments = issue.command("comments").description("Issue comment operations");
   addCommonClientOptions(
-    comments.command("list").description(getAgentCliCapabilityById("issue.comments.list").description).argument("<issueId>", "Issue ID").option("--after <commentId>", "Only return comments after this comment ID").option("--order <order>", "Comment ordering (asc or desc)", "desc").action(async (issueId, opts) => {
+    comments.command("list").description(getAgentCliCapabilityById("issue.comments.list").description).argument("<issueId>", "Issue ID").option("--after <commentId>", "Only return comments after this full comment ID or cmt_<uuid-prefix>").option("--order <order>", "Comment ordering (asc or desc)", "desc").action(async (issueId, opts) => {
       try {
         const ctx = resolveCommandContext(opts);
         const params = new URLSearchParams();
@@ -11531,7 +11593,7 @@ function registerIssueCommands(program) {
     })
   );
   addCommonClientOptions(
-    comments.command("get").description(getAgentCliCapabilityById("issue.comments.get").description).argument("<issueId>", "Issue ID").argument("<commentId>", "Comment ID").action(async (issueId, commentId, opts) => {
+    comments.command("get").description(getAgentCliCapabilityById("issue.comments.get").description).argument("<issueId>", "Issue ID").argument("<commentId>", "Full comment ID or cmt_<uuid-prefix>").action(async (issueId, commentId, opts) => {
       try {
         const ctx = resolveCommandContext(opts);
         const row = await ctx.api.get(`/api/issues/${issueId}/comments/${commentId}`);
@@ -13766,6 +13828,7 @@ function createByteProgress(label, options = {}) {
 init_version();
 var DEFAULT_DESKTOP_RELEASE_REPO = "Undertone0809/rudder";
 var DESKTOP_UPDATE_QUIT_ARG = "--rudder-update-quit";
+var DESKTOP_UPDATE_FORCE_ARG = "--rudder-update-force";
 var STABLE_SEMVER_RE = /^[0-9]+\.[0-9]+\.[0-9]+$/;
 var CANARY_SEMVER_RE = /^[0-9]+\.[0-9]+\.[0-9]+-canary\.[0-9]+$/;
 var CLI_REGISTRY_LATEST_URL = "https://registry.npmjs.org/@rudderhq%2fcli/latest";
@@ -13849,7 +13912,7 @@ function createDesktopProgressFactory() {
 async function waitForDesktopApplySignal() {
   process.stdin.setEncoding("utf8");
   process.stdin.resume();
-  await new Promise((resolve, reject) => {
+  return await new Promise((resolve, reject) => {
     let buffer = "";
     const cleanup = () => {
       process.stdin.off("data", onData);
@@ -13860,9 +13923,15 @@ async function waitForDesktopApplySignal() {
       buffer += chunk;
       const lines = buffer.split(/\r?\n/);
       buffer = lines.pop() ?? "";
-      if (lines.some((line) => line.trim() === "apply")) {
+      const commands = lines.map((line) => line.trim());
+      if (commands.includes("force-apply")) {
+        cleanup();
+        resolve({ force: true });
+        return;
+      }
+      if (commands.includes("apply")) {
         cleanup();
-        resolve();
+        resolve({ force: false });
       }
     };
     const onEnd = () => {
@@ -14575,14 +14644,6 @@ function isInstalledDesktopCurrent(metadata, releaseTag, assetName, assetChecksu
     metadata && metadata.releaseTag === releaseTag && metadata.assetName === assetName && metadata.assetChecksum === assetChecksum
   );
 }
-function buildForceQuitCommand(target) {
-  if (target.platform === "windows") return { command: "taskkill.exe", args: ["/IM", `${DESKTOP_APP_NAME}.exe`, "/T", "/F"] };
-  return { command: "pkill", args: ["-x", DESKTOP_APP_NAME] };
-}
-function forceQuitDesktopProcesses(target) {
-  const command = buildForceQuitCommand(target);
-  spawnSync3(command.command, command.args, { stdio: "ignore" });
-}
 function forceQuitDesktopProcess(pid, target) {
   if (target.platform === "windows") {
     spawnSync3("taskkill.exe", ["/PID", String(pid), "/T", "/F"], { stdio: "ignore" });
@@ -14593,8 +14654,35 @@ function forceQuitDesktopProcess(pid, target) {
   } catch {
   }
 }
-function isRunningInsideDesktopExecutable() {
-  return path21.basename(process.execPath).toLowerCase().startsWith(DESKTOP_APP_NAME.toLowerCase());
+function quotePowerShellString(value) {
+  return `'${value.replaceAll("'", "''")}'`;
+}
+function findDesktopExecutablePids(executablePath, target) {
+  if (target.platform === "windows") {
+    const result2 = spawnSync3("powershell.exe", [
+      "-NoProfile",
+      "-Command",
+      `Get-CimInstance Win32_Process | Where-Object { $_.ExecutablePath -eq ${quotePowerShellString(executablePath)} } | Select-Object -ExpandProperty ProcessId`
+    ], {
+      encoding: "utf8",
+      stdio: ["ignore", "pipe", "ignore"]
+    });
+    if (result2.status !== 0) return [];
+    return result2.stdout.split(/\r?\n/).map((line) => Number.parseInt(line.trim(), 10)).filter((pid) => Number.isInteger(pid) && pid > 0 && pid !== process.pid);
+  }
+  const result = spawnSync3("ps", ["-eo", "pid=,args="], {
+    encoding: "utf8",
+    stdio: ["ignore", "pipe", "ignore"]
+  });
+  if (result.status !== 0) return [];
+  return result.stdout.split(/\r?\n/).flatMap((line) => {
+    const match = line.match(/^\s*(\d+)\s+(.+)$/);
+    if (!match) return [];
+    const pid = Number.parseInt(match[1], 10);
+    const commandLine = match[2];
+    const matchesExecutable = commandLine === executablePath || commandLine.startsWith(`${executablePath} `);
+    return matchesExecutable && pid !== process.pid ? [pid] : [];
+  });
 }
 async function waitForUpdateQuitResponse(responsePath, timeoutMs = 8e3) {
   const startedAt = Date.now();
@@ -14606,10 +14694,13 @@ async function waitForUpdateQuitResponse(responsePath, timeoutMs = 8e3) {
   }
   return null;
 }
-async function requestDesktopQuit(executablePath, target) {
+async function requestDesktopQuit(executablePath, target, options = {}) {
   if (!await pathExists2(executablePath)) return { ok: true, status: "not_running" };
   const responsePath = path21.join(tmpdir(), `rudder-update-quit-${process.pid}-${Date.now()}.json`);
-  const result = spawnSync3(executablePath, [`${DESKTOP_UPDATE_QUIT_ARG}=${responsePath}`], {
+  const result = spawnSync3(executablePath, [
+    `${DESKTOP_UPDATE_QUIT_ARG}=${responsePath}`,
+    ...options.forceUpdate ? [DESKTOP_UPDATE_FORCE_ARG] : []
+  ], {
     stdio: "ignore",
     timeout: 5e3
   });
@@ -14617,7 +14708,7 @@ async function requestDesktopQuit(executablePath, target) {
     return null;
   }
   try {
-    return await waitForUpdateQuitResponse(responsePath);
+    return await waitForUpdateQuitResponse(responsePath, options.responseTimeoutMs);
   } finally {
     await rm2(responsePath, { force: true });
   }
@@ -14646,6 +14737,12 @@ async function waitForProcessExit(pid, timeoutMs = 2e4, intervalMs = 250) {
   }
   return !processExists(pid);
 }
+async function waitForProcessesExit(pids, waitForExit) {
+  const uniquePids = [...new Set(pids)];
+  if (uniquePids.length === 0) return true;
+  const results = await Promise.all(uniquePids.map((pid) => waitForExit(pid)));
+  return results.every(Boolean);
+}
 async function removePathWithRetry(targetPath, attempts = 5) {
   for (let attempt = 0; attempt < attempts; attempt += 1) {
     try {
@@ -14658,50 +14755,98 @@ async function removePathWithRetry(targetPath, attempts = 5) {
   return false;
 }
 async function prepareForDesktopReplace(paths, target, options = {}) {
-  const forceQuit = options.forceQuitDesktopProcesses ?? forceQuitDesktopProcesses;
   const forceQuitPid = options.forceQuitDesktopProcess ?? forceQuitDesktopProcess;
   const waitForExit = options.waitForDesktopProcessExit ?? waitForProcessExit;
+  const findPids = options.findDesktopExecutablePids ?? findDesktopExecutablePids;
+  async function forceQuitPidAndConfirm(pid) {
+    forceQuitPid(pid, target);
+    await delay2(options.updateQuitForceDelayMs ?? UPDATE_QUIT_FORCE_DELAY_MS);
+    if (!await waitForExit(pid)) {
+      throw new Error(`Rudder Desktop process ${pid} did not exit after force-quit fallback. Close Rudder and rerun start.`);
+    }
+  }
+  async function forceQuitPidsAndConfirm(pids) {
+    const uniquePids = [...new Set(pids)];
+    for (const pid of uniquePids) {
+      forceQuitPid(pid, target);
+    }
+    await delay2(options.updateQuitForceDelayMs ?? UPDATE_QUIT_FORCE_DELAY_MS);
+    if (!await waitForProcessesExit(uniquePids, waitForExit)) {
+      throw new Error(`Rudder Desktop process${uniquePids.length === 1 ? "" : "es"} ${uniquePids.join(", ")} did not exit after force-quit fallback. Close Rudder and rerun start.`);
+    }
+  }
+  let quitPid = null;
+  let managedExecutablePids = [];
   const hasManagedExecutable = await pathExists2(paths.executablePath);
   if (hasManagedExecutable) {
-    let quitResponse = await requestDesktopQuit(paths.executablePath, target);
-    while (quitResponse && !quitResponse.ok && quitResponse.status === "active_runs" && options.waitForActiveRuns) {
+    managedExecutablePids = findPids(paths.executablePath, target);
+    const requestQuit = () => requestDesktopQuit(paths.executablePath, target, {
+      forceUpdate: options.forceUpdate,
+      responseTimeoutMs: options.updateQuitResponseTimeoutMs
+    });
+    let quitResponse = await requestQuit();
+    while (quitResponse && !quitResponse.ok && quitResponse.status === "active_runs" && options.waitForActiveRuns && !options.forceUpdate) {
       p15.log.warn(
         `Rudder Desktop has ${quitResponse.totalRuns} active run${quitResponse.totalRuns === 1 ? "" : "s"}; waiting before replacing Desktop.`
       );
       await delay2(options.activeRunPollIntervalMs ?? 15e3);
-      quitResponse = await requestDesktopQuit(paths.executablePath, target);
+      quitResponse = await requestQuit();
     }
     if (quitResponse && !quitResponse.ok && quitResponse.status === "active_runs") {
+      if (!options.forceUpdate) {
+        throw new Error(
+          `Rudder Desktop has ${quitResponse.totalRuns} active run${quitResponse.totalRuns === 1 ? "" : "s"}. Stop active work, then rerun start.`
+        );
+      }
       throw new Error(
-        `Rudder Desktop has ${quitResponse.totalRuns} active run${quitResponse.totalRuns === 1 ? "" : "s"}. Stop active work, then rerun start.`
+        `Rudder Desktop still has ${quitResponse.totalRuns} active run${quitResponse.totalRuns === 1 ? "" : "s"} after the force-update request. Stop active work, then rerun start.`
       );
     }
-    const quitPid = readUpdateQuitPid(quitResponse);
+    if (quitResponse && !quitResponse.ok && quitResponse.status === "failed") {
+      throw new Error(quitResponse.message);
+    }
+    quitPid = readUpdateQuitPid(quitResponse);
     if (quitPid) {
       p15.log.info(`Waiting for existing Rudder Desktop process ${quitPid} to exit before replacing it.`);
       if (!await waitForExit(quitPid)) {
         p15.log.warn(`Rudder Desktop process ${quitPid} did not exit in time; attempting force-quit fallback.`);
-        forceQuitPid(quitPid, target);
-        await delay2(options.updateQuitForceDelayMs ?? UPDATE_QUIT_FORCE_DELAY_MS);
+        await forceQuitPidAndConfirm(quitPid);
       }
     } else if (isLegacyUnconfirmedUpdateQuit(quitResponse)) {
       const graceMs = options.legacyUpdateQuitGraceMs ?? LEGACY_UPDATE_QUIT_GRACE_MS;
       p15.log.warn(
-        `Existing Rudder Desktop acknowledged update quit without a process id; waiting ${Math.ceil(graceMs / 1e3)}s before force-quit fallback.`
+        `Existing Rudder Desktop acknowledged update quit without a process id; waiting ${Math.ceil(graceMs / 1e3)}s before replacement.`
       );
       await delay2(graceMs);
-      forceQuit(target);
-      await delay2(options.updateQuitForceDelayMs ?? UPDATE_QUIT_FORCE_DELAY_MS);
+      if (managedExecutablePids.length > 0 && !await waitForProcessesExit(managedExecutablePids, waitForExit)) {
+        p15.log.warn(
+          `Existing Rudder Desktop did not exit after acknowledging update quit; attempting path-scoped force-quit for process${managedExecutablePids.length === 1 ? "" : "es"} ${managedExecutablePids.join(", ")}.`
+        );
+        await forceQuitPidsAndConfirm(managedExecutablePids);
+      }
+    } else if (!quitResponse) {
+      if (options.forceUpdate && managedExecutablePids.length > 0) {
+        p15.log.warn(
+          `Existing Rudder Desktop did not respond to the update quit request; attempting path-scoped force-quit for process${managedExecutablePids.length === 1 ? "" : "es"} ${managedExecutablePids.join(", ")}.`
+        );
+        await forceQuitPidsAndConfirm(managedExecutablePids);
+      } else {
+        throw new Error("Existing Rudder Desktop did not respond to the update quit request. Close Rudder and rerun start.");
+      }
     } else {
       await delay2(options.updateQuitForceDelayMs ?? UPDATE_QUIT_FORCE_DELAY_MS);
     }
-  } else if (!isRunningInsideDesktopExecutable()) {
-    forceQuit(target);
   }
   const replacePath = target.platform === "windows" ? paths.installRoot : paths.appPath;
   if (await removePathWithRetry(replacePath)) return;
-  forceQuit(target);
-  await delay2(options.updateQuitForceDelayMs ?? UPDATE_QUIT_FORCE_DELAY_MS);
+  if (!quitPid) {
+    if (managedExecutablePids.length > 0) {
+      await forceQuitPidsAndConfirm(managedExecutablePids);
+      if (await removePathWithRetry(replacePath, 6)) return;
+    }
+    throw new Error(`Failed to replace existing Rudder Desktop at ${replacePath}. Close Rudder and rerun start.`);
+  }
+  await forceQuitPidAndConfirm(quitPid);
   if (await removePathWithRetry(replacePath, 6)) return;
   throw new Error(`Failed to replace existing Rudder Desktop at ${replacePath}. Close Rudder and rerun start.`);
 }
@@ -15034,22 +15179,26 @@ async function startCommand(opts) {
           () => assertChecksumMatch(cachedAsset.path, expectedChecksum),
           desktopProgressJson ? "verifying_checksum" : null
         );
+        let applySignal = null;
         if (desktopProgressJson && opts.desktopWaitForApply === true) {
           writeDesktopProgress({
             phase: "ready_to_install",
             message: "Desktop update is downloaded and verified.",
             percent: 100
           });
-          await waitForDesktopApplySignal();
+          applySignal = await waitForDesktopApplySignal();
           writeDesktopProgress({
             phase: "preparing_restart",
-            message: "Applying Desktop update..."
+            message: applySignal.force ? "Applying Desktop update and quitting active runs..." : "Applying Desktop update..."
           });
         }
         await runStartPhase(
           "Replacing existing Rudder Desktop if needed...",
           "Existing Desktop install is ready for replacement.",
-          () => prepareForDesktopReplace(installPaths, target, { waitForActiveRuns: opts.waitForActiveRuns === true }),
+          () => prepareForDesktopReplace(installPaths, target, {
+            waitForActiveRuns: opts.waitForActiveRuns === true,
+            forceUpdate: applySignal?.force === true
+          }),
           desktopProgressJson ? opts.waitForActiveRuns === true ? "waiting_for_active_runs" : "preparing_restart" : null
         );
         await runStartPhase(