From 888be71639f5c29f9b31ae0a177e7777f4ef7423 Mon Sep 17 00:00:00 2001
From: Harry <xh001x@hotmail.com>
Date: Wed, 7 Jan 2026 11:15:52 +0800
Subject: [PATCH] feat: command node output variables

---
 web/app/components/workflow/block-icon.tsx    |  3 +-
 web/app/components/workflow/constants.ts      | 20 +++++++++++++
 .../nodes/_base/components/variable/utils.ts  | 26 +++++++++++++++++
 .../workflow/nodes/command/panel.tsx          | 28 +++++++++++++++++++
 web/i18n/en-US/workflow.json                  |  4 +++
 5 files changed, 80 insertions(+), 1 deletion(-)

diff --git a/web/app/components/workflow/block-icon.tsx b/web/app/components/workflow/block-icon.tsx
index 67ab961725..9f9dbdbc83 100644
--- a/web/app/components/workflow/block-icon.tsx
+++ b/web/app/components/workflow/block-icon.tsx
@@ -25,6 +25,7 @@ import {
   TemplatingTransform,
   VariableX,
   WebhookLine,
+  WindowCursor,
 } from '@/app/components/base/icons/src/vender/workflow'
 import { cn } from '@/utils/classnames'
 import { BlockEnum } from './types'
@@ -45,7 +46,7 @@ const DEFAULT_ICON_MAP: Record<BlockEnum, React.ComponentType<{ className: strin
   [BlockEnum.Start]: Home,
   [BlockEnum.LLM]: Llm,
   [BlockEnum.Code]: Code,
-  [BlockEnum.Command]: Code,
+  [BlockEnum.Command]: WindowCursor,
   [BlockEnum.End]: End,
   [BlockEnum.IfElse]: IfElse,
   [BlockEnum.HttpRequest]: Http,
diff --git a/web/app/components/workflow/constants.ts b/web/app/components/workflow/constants.ts
index 4d95db7fcf..04846ca98e 100644
--- a/web/app/components/workflow/constants.ts
+++ b/web/app/components/workflow/constants.ts
@@ -116,6 +116,7 @@ export const SUPPORT_OUTPUT_VARS_NODE = [
   BlockEnum.KnowledgeRetrieval,
   BlockEnum.Code,
   BlockEnum.TemplateTransform,
+  BlockEnum.Command,
   BlockEnum.HttpRequest,
   BlockEnum.Tool,
   BlockEnum.VariableAssigner,
@@ -166,6 +167,25 @@ export const TEMPLATE_TRANSFORM_OUTPUT_STRUCT: Var[] = [
   },
 ]
 
+export const COMMAND_OUTPUT_STRUCT: Var[] = [
+  {
+    variable: 'stdout',
+    type: VarType.string,
+  },
+  {
+    variable: 'stderr',
+    type: VarType.string,
+  },
+  {
+    variable: 'exit_code',
+    type: VarType.number,
+  },
+  {
+    variable: 'pid',
+    type: VarType.string,
+  },
+]
+
 export const QUESTION_CLASSIFIER_OUTPUT_STRUCT = [
   {
     variable: 'class_name',
diff --git a/web/app/components/workflow/nodes/_base/components/variable/utils.ts b/web/app/components/workflow/nodes/_base/components/variable/utils.ts
index 9f77be0ce2..5a6b1b3bce 100644
--- a/web/app/components/workflow/nodes/_base/components/variable/utils.ts
+++ b/web/app/components/workflow/nodes/_base/components/variable/utils.ts
@@ -1,6 +1,7 @@
 import type { AgentNodeType } from '../../../agent/types'
 import type { AnswerNodeType } from '../../../answer/types'
 import type { CodeNodeType } from '../../../code/types'
+import type { CommandNodeType } from '../../../command/types'
 import type { DocExtractorNodeType } from '../../../document-extractor/types'
 import type { EndNodeType } from '../../../end/types'
 import type { HttpNodeType } from '../../../http/types'
@@ -38,6 +39,7 @@ import { isArray } from 'es-toolkit/compat'
 import { produce } from 'immer'
 import {
   AGENT_OUTPUT_STRUCT,
+  COMMAND_OUTPUT_STRUCT,
   FILE_STRUCT,
   getGlobalVars,
   HTTP_REQUEST_OUTPUT_STRUCT,
@@ -435,6 +437,11 @@ const formatItem = (
       break
     }
 
+    case BlockEnum.Command: {
+      res.vars = COMMAND_OUTPUT_STRUCT
+      break
+    }
+
     case BlockEnum.QuestionClassifier: {
       res.vars = QUESTION_CLASSIFIER_OUTPUT_STRUCT
       break
@@ -1744,6 +1751,20 @@ export const updateNodeVars = (
         }
         break
       }
+      case BlockEnum.Command: {
+        const payload = data as CommandNodeType
+        payload.command = replaceOldVarInText(
+          payload.command,
+          oldVarSelector,
+          newVarSelector,
+        )
+        payload.working_directory = replaceOldVarInText(
+          payload.working_directory,
+          oldVarSelector,
+          newVarSelector,
+        )
+        break
+      }
       case BlockEnum.QuestionClassifier: {
         const payload = data as QuestionClassifierNodeType
         if (
@@ -2035,6 +2056,11 @@ export const getNodeOutputVars = (
       break
     }
 
+    case BlockEnum.Command: {
+      varsToValueSelectorList(COMMAND_OUTPUT_STRUCT, [id], res)
+      break
+    }
+
     case BlockEnum.QuestionClassifier: {
       varsToValueSelectorList(QUESTION_CLASSIFIER_OUTPUT_STRUCT, [id], res)
       break
diff --git a/web/app/components/workflow/nodes/command/panel.tsx b/web/app/components/workflow/nodes/command/panel.tsx
index f70f3b9dfc..ee60c99649 100644
--- a/web/app/components/workflow/nodes/command/panel.tsx
+++ b/web/app/components/workflow/nodes/command/panel.tsx
@@ -5,6 +5,7 @@ import * as React from 'react'
 import { useTranslation } from 'react-i18next'
 import Field from '@/app/components/workflow/nodes/_base/components/field'
 import Input from '@/app/components/workflow/nodes/_base/components/input-support-select-var'
+import OutputVars, { VarItem } from '@/app/components/workflow/nodes/_base/components/output-vars'
 import Split from '@/app/components/workflow/nodes/_base/components/split'
 import useAvailableVarList from '@/app/components/workflow/nodes/_base/hooks/use-available-var-list'
 import useConfig from './use-config'
@@ -64,6 +65,33 @@ const Panel: FC<NodePanelProps<CommandNodeType>> = ({
           />
         </Field>
       </div>
+      <Split />
+      <div>
+        <OutputVars>
+          <>
+            <VarItem
+              name="stdout"
+              type="string"
+              description={t(`${i18nPrefix}.outputVars.stdout`, { ns: 'workflow' })}
+            />
+            <VarItem
+              name="stderr"
+              type="string"
+              description={t(`${i18nPrefix}.outputVars.stderr`, { ns: 'workflow' })}
+            />
+            <VarItem
+              name="exit_code"
+              type="number"
+              description={t(`${i18nPrefix}.outputVars.exitCode`, { ns: 'workflow' })}
+            />
+            <VarItem
+              name="pid"
+              type="number"
+              description={t(`${i18nPrefix}.outputVars.pid`, { ns: 'workflow' })}
+            />
+          </>
+        </OutputVars>
+      </div>
     </div>
   )
 }
diff --git a/web/i18n/en-US/workflow.json b/web/i18n/en-US/workflow.json
index 8846039bbf..10299ddec3 100644
--- a/web/i18n/en-US/workflow.json
+++ b/web/i18n/en-US/workflow.json
@@ -410,6 +410,10 @@
   "nodes.code.syncFunctionSignature": "Sync function signature to code",
   "nodes.command.command": "Command",
   "nodes.command.commandPlaceholder": "Enter the command to execute, e.g., ls -la",
+  "nodes.command.outputVars.exitCode": "Exit code of the command",
+  "nodes.command.outputVars.pid": "Process ID of the command",
+  "nodes.command.outputVars.stderr": "Standard error from command execution",
+  "nodes.command.outputVars.stdout": "Standard output from command execution",
   "nodes.command.seconds": "seconds",
   "nodes.command.timeout": "Timeout",
   "nodes.command.workingDirectory": "Working Directory",