Fix scriptflow execution and add CLI commands (#2157)

hillary-mutisya · web-flow · commit 9575cd22b635 · 2026-04-08T04:09:24.000Z
- Fix NetworkAccess bool/string parameter mismatch between Node.js and PowerShell - Fix JSON array parsing in scriptHost.ps1 - Document ConstrainedLanguage mode restrictions in reasoning prompts - Add @ScriptFlow list/run/delete/show commands
diff --git a/ts/packages/agents/scriptflow/flows/listFiles.flow.json b/ts/packages/agents/scriptflow/flows/listFiles.flow.json
@@ -20,19 +20,24 @@
       "id": "execute",
       "type": "script",
       "language": "powershell",
-      "body": "param([string]$Path = '.', [string]$Filter = '*')\nGet-ChildItem -Path $Path -Filter $Filter | Format-Table Name, Length, LastWriteTime -AutoSize",
+      "body": "param([string]$Path = '.', [string]$Filter = '*')\nGet-ChildItem -Path $Path -Filter $Filter | ForEach-Object { \"{0,-50} {1,15:N0} bytes  {2}\" -f $_.Name, $_.Length, $_.LastWriteTime }",
       "parameters": {
         "Path": "${path}",
         "Filter": "${filter}"
       },
       "sandbox": {
         "allowedCmdlets": [
           "Get-ChildItem",
-          "Format-Table",
+          "ForEach-Object",
           "Select-Object",
           "Sort-Object"
         ],
-        "allowedPaths": ["$env:USERPROFILE", "$PWD", "$env:TEMP"],
+        "allowedPaths": [
+          "$env:USERPROFILE",
+          "$env:USERPROFILE\\Downloads",
+          "$PWD",
+          "$env:TEMP"
+        ],
         "allowedModules": ["Microsoft.PowerShell.Management"],
         "maxExecutionTime": 30,
         "networkAccess": false
diff --git a/ts/packages/agents/scriptflow/samples/listFiles.recipe.json b/ts/packages/agents/scriptflow/samples/listFiles.recipe.json
@@ -21,8 +21,8 @@
   ],
   "script": {
     "language": "powershell",
-    "body": "param([string]$Path = '.', [string]$Filter = '*')\nGet-ChildItem -Path $Path -Filter $Filter | Format-Table Name, Length, LastWriteTime -AutoSize",
-    "expectedOutputFormat": "table"
+    "body": "param([string]$Path = '.', [string]$Filter = '*')\nGet-ChildItem -Path $Path -Filter $Filter | ForEach-Object { \"{0,-50} {1,15:N0} bytes  {2}\" -f $_.Name, $_.Length, $_.LastWriteTime }",
+    "expectedOutputFormat": "text"
   },
   "grammarPatterns": [
     {
@@ -49,11 +49,16 @@
   "sandbox": {
     "allowedCmdlets": [
       "Get-ChildItem",
-      "Format-Table",
+      "ForEach-Object",
       "Select-Object",
       "Sort-Object"
     ],
-    "allowedPaths": ["$env:USERPROFILE", "$PWD", "$env:TEMP"],
+    "allowedPaths": [
+      "$env:USERPROFILE",
+      "$env:USERPROFILE\\Downloads",
+      "$PWD",
+      "$env:TEMP"
+    ],
     "allowedModules": ["Microsoft.PowerShell.Management"],
     "maxExecutionTime": 30,
     "networkAccess": false
diff --git a/ts/packages/agents/scriptflow/scripts/scriptHost.ps1 b/ts/packages/agents/scriptflow/scripts/scriptHost.ps1
@@ -18,7 +18,7 @@ param(
 
     [string]$AllowedModulesJson = '[]',
 
-    [bool]$NetworkAccess = $false,
+    [string]$NetworkAccess = "false",
 
     [int]$TimeoutSeconds = 30
 )
@@ -28,8 +28,19 @@ $ErrorActionPreference = 'Stop'
 try {
     $allowedCmdlets = $AllowedCmdletsJson | ConvertFrom-Json
     $params = $ParametersJson | ConvertFrom-Json
-    $AllowedPaths = @($AllowedPathsJson | ConvertFrom-Json)
-    $AllowedModules = @($AllowedModulesJson | ConvertFrom-Json)
+    # Parse allowed paths - must handle array properly to avoid PowerShell array unwrapping issues
+    $parsedPaths = $AllowedPathsJson | ConvertFrom-Json
+    if ($parsedPaths -is [array]) {
+        $AllowedPaths = $parsedPaths
+    } else {
+        $AllowedPaths = @($parsedPaths)
+    }
+    $parsedModules = $AllowedModulesJson | ConvertFrom-Json
+    if ($parsedModules -is [array]) {
+        $AllowedModules = $parsedModules
+    } else {
+        $AllowedModules = @($parsedModules)
+    }
 
     # Expand environment variable references in allowed paths
     # (e.g. "$env:USERPROFILE" → "C:\Users\name")
@@ -72,8 +83,11 @@ try {
         }
     }
 
+    # Convert NetworkAccess string to boolean (handles "true"/"false"/"1"/"0"/"$true"/"$false")
+    $networkAccessBool = $NetworkAccess -match '^(true|1|\$true)$'
+
     # Network access enforcement
-    if (-not $NetworkAccess) {
+    if (-not $networkAccessBool) {
         # Define network-capable cmdlets that require networkAccess=true
         $NetworkCmdlets = @(
             'Invoke-WebRequest',
diff --git a/ts/packages/agents/scriptflow/src/actionHandler.mts b/ts/packages/agents/scriptflow/src/actionHandler.mts
@@ -15,6 +15,7 @@ import {
 } from "@typeagent/agent-sdk/helpers/action";
 import {
     type CommandHandler,
+    type CommandHandlerNoParams,
     type CommandHandlerTable,
     getCommandInterface,
 } from "@typeagent/agent-sdk/helpers/command";
@@ -610,6 +611,12 @@ class ImportScriptHandler implements CommandHandler {
                 implicitQuotes: true,
             },
         },
+        flags: {
+            actionName: {
+                description: "Override the generated action name",
+                type: "string",
+            },
+        },
     } as const;
     public async run(
         context: ActionContext<ScriptFlowAgentContext>,
@@ -643,11 +650,16 @@ class ImportScriptHandler implements CommandHandler {
         }
 
         const analyzer = new ScriptAnalyzer();
-        const recipe = await analyzer.analyze(scriptContent, resolvedPath);
+        const overrideName = params.flags.actionName;
+        const recipe = await analyzer.analyze(
+            scriptContent,
+            resolvedPath,
+            overrideName,
+        );
 
         if (store.hasFlow(recipe.actionName)) {
             throw new Error(
-                `A flow named '${recipe.actionName}' already exists. Delete it first or use a different name.`,
+                `A flow named '${recipe.actionName}' already exists. Delete it first or use --actionName to specify a different name.`,
             );
         }
 
@@ -663,9 +675,227 @@ class ImportScriptHandler implements CommandHandler {
     }
 }
 
+class ListHandler implements CommandHandlerNoParams {
+    public readonly description = "List all registered script flows";
+    public async run(context: ActionContext<ScriptFlowAgentContext>) {
+        const store = _agentStore;
+        if (!store) {
+            throw new Error("Script flow store not available");
+        }
+        const entries = store.listFlows();
+        if (entries.length === 0) {
+            context.actionIO.setDisplay("No script flows registered.");
+            return;
+        }
+        const lines = entries.map(
+            (e) =>
+                `  ${e.actionName}: ${e.description} [usage: ${e.usageCount}]${e.source === "seed" ? " (sample)" : ""}`,
+        );
+        context.actionIO.setDisplay(
+            `Script flows (${entries.length}):\n${lines.join("\n")}`,
+        );
+    }
+}
+
+class RunHandler implements CommandHandler {
+    public readonly description = "Execute a script flow by name";
+    public readonly parameters = {
+        args: {
+            flowName: {
+                description: "Name of the script flow to execute",
+            },
+        },
+        flags: {
+            flowParametersJson: {
+                description:
+                    'JSON string of parameters, e.g. \'{"path":"C:\\\\Users"}\'',
+                type: "string",
+            },
+        },
+    } as const;
+    public async run(
+        context: ActionContext<ScriptFlowAgentContext>,
+        params: ParsedCommandParams<typeof this.parameters>,
+    ) {
+        const store = _agentStore;
+        if (!store) {
+            throw new Error("Script flow store not available");
+        }
+
+        const flowName = params.args.flowName;
+        if (!flowName) {
+            throw new Error("Missing required argument: flowName");
+        }
+
+        const flow = await store.getFlow(flowName);
+        if (!flow) {
+            throw new Error(
+                `Unknown script flow '${flowName}'. Use '@scriptflow list' to see available flows.`,
+            );
+        }
+
+        const script = await store.getScript(flowName);
+        if (!script) {
+            throw new Error(`Script not found for flow: ${flowName}`);
+        }
+
+        let flowParameters: Record<string, unknown> = {};
+        if (params.flags.flowParametersJson) {
+            try {
+                flowParameters = JSON.parse(params.flags.flowParametersJson);
+            } catch {
+                throw new Error(
+                    `Invalid JSON in --flowParametersJson: ${params.flags.flowParametersJson}`,
+                );
+            }
+        }
+
+        expandEnvVarsInParams(flowParameters, flow.parameters);
+        const pathError = validatePathParameters(
+            flowParameters,
+            flow.parameters,
+        );
+        if (pathError) {
+            throw new Error(pathError);
+        }
+        const validationError = validateParameterRules(
+            flowParameters,
+            flow.parameters,
+        );
+        if (validationError) {
+            throw new Error(validationError);
+        }
+
+        const result = await executeFlowScript(flow, script, flowParameters);
+        if (result.error !== undefined) {
+            throw new Error(String(result.error));
+        }
+
+        await store.recordUsage(flowName);
+        if ("displayContent" in result && result.displayContent) {
+            const content = result.displayContent;
+            const text =
+                typeof content === "string"
+                    ? content
+                    : "content" in content
+                      ? content.content
+                      : String(content);
+            context.actionIO.setDisplay(text);
+        }
+    }
+}
+
+class DeleteHandler implements CommandHandler {
+    public readonly description = "Delete a script flow by name";
+    public readonly parameters = {
+        args: {
+            name: {
+                description: "Name of the script flow to delete",
+            },
+        },
+    } as const;
+    public async run(
+        context: ActionContext<ScriptFlowAgentContext>,
+        params: ParsedCommandParams<typeof this.parameters>,
+    ) {
+        const store = _agentStore;
+        if (!store) {
+            throw new Error("Script flow store not available");
+        }
+
+        const name = params.args.name;
+        if (!name) {
+            throw new Error("Missing required argument: name");
+        }
+
+        const deleted = await store.deleteFlow(name);
+        if (!deleted) {
+            throw new Error(`Script flow not found: ${name}`);
+        }
+
+        await context.sessionContext.reloadAgentSchema();
+        context.actionIO.setDisplay(`Deleted script flow: ${name}`);
+    }
+}
+
+class ShowHandler implements CommandHandler {
+    public readonly description = "Show details of a script flow";
+    public readonly parameters = {
+        args: {
+            flowName: {
+                description: "Name of the script flow to show",
+            },
+        },
+    } as const;
+    public async run(
+        context: ActionContext<ScriptFlowAgentContext>,
+        params: ParsedCommandParams<typeof this.parameters>,
+    ) {
+        const store = _agentStore;
+        if (!store) {
+            throw new Error("Script flow store not available");
+        }
+
+        const flowName = params.args.flowName;
+        if (!flowName) {
+            throw new Error("Missing required argument: flowName");
+        }
+
+        const flow = await store.getFlow(flowName);
+        if (!flow) {
+            throw new Error(
+                `Unknown script flow '${flowName}'. Use '@scriptflow list' to see available flows.`,
+            );
+        }
+
+        const script = await store.getScript(flowName);
+        const entries = store.listFlows();
+        const entry = entries.find((e) => e.actionName === flowName);
+
+        const paramLines = flow.parameters.map(
+            (p) =>
+                `    ${p.name} (${p.type}${p.required ? ", required" : ""}): ${p.description}${p.default !== undefined ? ` [default: ${p.default}]` : ""}`,
+        );
+        const grammarLines = flow.grammarPatterns.map(
+            (g) => `    "${g.pattern}"${g.isAlias ? " (alias)" : ""}`,
+        );
+        const cmdletList = flow.sandbox.allowedCmdlets.join(", ");
+
+        const output = [
+            `Flow: ${flow.actionName}`,
+            `Description: ${flow.description}`,
+            `Display Name: ${flow.displayName}`,
+            `Source: ${flow.source?.type ?? "unknown"}`,
+            `Usage Count: ${entry?.usageCount ?? 0}`,
+            "",
+            "Parameters:",
+            paramLines.length > 0 ? paramLines.join("\n") : "    (none)",
+            "",
+            "Grammar Patterns:",
+            grammarLines.length > 0 ? grammarLines.join("\n") : "    (none)",
+            "",
+            "Sandbox:",
+            `    Cmdlets: ${cmdletList || "(none)"}`,
+            `    Timeout: ${flow.sandbox.maxExecutionTime}s`,
+            `    Network: ${flow.sandbox.networkAccess ? "allowed" : "blocked"}`,
+            "",
+            "Script:",
+            "```powershell",
+            script ?? "(script not found)",
+            "```",
+        ];
+
+        context.actionIO.setDisplay(output.join("\n"));
+    }
+}
+
 const handlers: CommandHandlerTable = {
     description: "ScriptFlow commands",
     commands: {
+        list: new ListHandler(),
+        run: new RunHandler(),
+        delete: new DeleteHandler(),
+        show: new ShowHandler(),
         import: new ImportScriptHandler(),
     },
 };
diff --git a/ts/packages/agents/scriptflow/src/execution/powershellRunner.mts b/ts/packages/agents/scriptflow/src/execution/powershellRunner.mts
@@ -55,7 +55,7 @@ export async function executeScript(
         "-AllowedCmdletsJson",
         JSON.stringify(request.sandbox.allowedCmdlets),
         "-NetworkAccess",
-        String(request.sandbox.networkAccess),
+        request.sandbox.networkAccess ? "true" : "false",
         "-TimeoutSeconds",
         String(request.sandbox.maxExecutionTime),
     ];
diff --git a/ts/packages/dispatcher/dispatcher/src/context/appAgentManager.ts b/ts/packages/dispatcher/dispatcher/src/context/appAgentManager.ts
@@ -1238,10 +1238,11 @@ export class AppAgentManager implements ActionConfigProvider {
             return;
         }
 
-        // Unload cached schema files so they get reloaded from disk
+        // Unload cached schema files and semantic map entries so they get reloaded
         for (const schemaName of this.actionConfigs.keys()) {
             if (getAppAgentName(schemaName) === appAgentName) {
                 this.actionSchemaFileCache.unloadActionSchemaFile(schemaName);
+                this.actionSemanticMap?.removeActionSchemaFile(schemaName);
             }
         }
 
diff --git a/ts/packages/dispatcher/dispatcher/src/reasoning/claude.ts b/ts/packages/dispatcher/dispatcher/src/reasoning/claude.ts

Original file line number	Diff line number	Diff line change
`@@ -1238,10 +1238,11 @@ export class AppAgentManager implements ActionConfigProvider {`
`1238`	`1238`	`return;`
`1239`	`1239`	`}`
`1240`	`1240`
`1241`		`- // Unload cached schema files so they get reloaded from disk`
	`1241`	`+ // Unload cached schema files and semantic map entries so they get reloaded`
`1242`	`1242`	`for (const schemaName of this.actionConfigs.keys()) {`
`1243`	`1243`	`if (getAppAgentName(schemaName) === appAgentName) {`
`1244`	`1244`	`this.actionSchemaFileCache.unloadActionSchemaFile(schemaName);`
	`1245`	`+ this.actionSemanticMap?.removeActionSchemaFile(schemaName);`
`1245`	`1246`	`}`
`1246`	`1247`	`}`
`1247`	`1248`