@withone/cli 1.33.0 → 1.34.0

package/README.md

@@ -98,7 +98,7 @@ one flow validate welcome-customer
 one flow execute welcome-customer -i email=jane@example.com
 ```
 
-Workflows live under `.one/flows/<key>/flow.json` with an optional `lib/` subfolder for `.mjs` code modules — create new flows in this folder layout. (The legacy single-file layout `.one/flows/<key>.flow.json` is deprecated but still loads for backward compatibility.) Flows support conditions, loops, while loops, parallel steps, transforms, sub-flows, pagination, bash steps, and external `.mjs` code modules. Run `one guide flows` for the full reference.
+Workflows live under `.one/flows/<key>/flow.json` with an optional `lib/` subfolder for `.mjs` code modules — create new flows in this folder layout. Flows can be organized into subdirectory groups: `.one/flows/<group>/<key>/flow.json`. Reference them as `group/key` or just the bare key if unique. (The legacy single-file layout `.one/flows/<key>.flow.json` is deprecated but still loads for backward compatibility.) Flows support conditions, loops, while loops, parallel steps, transforms, sub-flows, pagination, bash steps, and external `.mjs` code modules. Run `one guide flows` for the full reference.
 
 ## How it works
 
@@ -357,12 +357,15 @@ In agent mode (`--agent`), the JSON response includes the guide content and an `
 
 ### `one flow create [key]`
 
-Create a workflow from a JSON definition. New workflows are always saved to the folder layout at `.one/flows/<key>/flow.json` (with a `lib/` subfolder scaffolded for code modules). The legacy `.one/flows/<key>.flow.json` single-file layout is deprecated; existing legacy files continue to load and run unchanged for backward compatibility.
+Create a workflow from a JSON definition. New workflows are always saved to the folder layout at `.one/flows/<key>/flow.json` (with a `lib/` subfolder scaffolded for code modules). Use `group/key` to place flows in a subdirectory group (e.g. `.one/flows/research/company-research/flow.json`). The legacy `.one/flows/<key>.flow.json` single-file layout is deprecated; existing legacy files continue to load and run unchanged for backward compatibility.
 
 ```bash
 # From a --definition flag
 one flow create welcome-customer --definition '{"key":"welcome-customer","name":"Welcome","version":"1","inputs":{},"steps":[]}'
 
+# Create in a subdirectory group
+one flow create research/company-research --definition @flow.json
+
 # From stdin
 cat flow.json | one flow create
 

package/dist/{chunk-T7LTS2IE.js → chunk-HZP7NT4K.js}

@@ -1042,7 +1042,7 @@ async function executeSubflowStep(step, context, api, permissions, allowedAction
   if (flowStack.includes(resolvedKey)) {
     throw new Error(`Circular flow detected: ${[...flowStack, resolvedKey].join(" \u2192 ")}`);
   }
-  const { loadFlowWithMeta: loadFlowWithMeta2 } = await import("./flow-runner-6IFPWOS4.js");
+  const { loadFlowWithMeta: loadFlowWithMeta2 } = await import("./flow-runner-TNI7YWVY.js");
   const { flow: subFlow, rootDir: subRootDir } = loadFlowWithMeta2(resolvedKey);
   const subContext = await executeFlow(
     subFlow,
@@ -1847,7 +1847,18 @@ Workflows live in \`.one/flows/\` (relative to your current working directory \u
 - **Folder layout (REQUIRED for new flows)** \u2014 \`.one/flows/<key>/flow.json\`, with an optional \`lib/\` subfolder for JavaScript modules. This is like a skill: the folder groups the JSON spec with any JavaScript modules it needs, so the whole flow is shareable. **Always create new flows in this layout.**
 - **Single-file layout (DEPRECATED)** \u2014 \`.one/flows/<key>.flow.json\`. Still loads and runs for backward compatibility, but is deprecated. Do not create new flows in this layout. When editing an existing single-file flow, migrate it to the folder layout: move \`<key>.flow.json\` to \`<key>/flow.json\` and extract any non-trivial \`code.source\` blocks into \`<key>/lib/*.mjs\` modules.
 
-When resolving a flow by key, the CLI checks the folder layout first, then the deprecated legacy file. The \`loadFlow\` helper in agent integrations behaves the same.
+**Subdirectory groups** \u2014 Flows can be organized into subdirectories: \`.one/flows/<group>/<key>/flow.json\`. For example:
+\`\`\`
+.one/flows/
+  research/
+    company-research/flow.json
+    competitor-research/flow.json
+  deal-ops/
+    deal-log/flow.json
+\`\`\`
+Reference grouped flows with \`group/key\` (e.g. \`one flow execute research/company-research\`) or just the bare key if it's unique (e.g. \`one flow execute company-research\`). Create grouped flows with \`one flow create research/company-research --definition ...\`. \`flow list\` shows the group prefix.
+
+When resolving a flow by key, the CLI checks the folder layout first, then the deprecated legacy file, then scans group subdirectories. The \`loadFlow\` helper in agent integrations behaves the same.
 
 ## Before you execute a flow you did NOT author \u2014 READ THIS
 
@@ -1872,19 +1883,21 @@ A good description is one paragraph. If a flow's description doesn't tell you ho
 ## Commands
 
 \`\`\`bash
-one --agent flow create <key> --definition '<json>'   # Create (or --definition @file.json)
-one --agent flow create <key> --definition @flow.json  # Create from file
-one --agent flow list                                  # List
-one --agent flow validate <key>                        # Validate
-one --agent flow execute <key> -i name=value           # Execute
-one --agent flow execute <key> --dry-run --mock        # Test with mock data
-one --agent flow execute <key> --allow-bash            # Enable bash steps
-one --agent flow runs [flowKey]                        # List past runs
-one --agent flow resume <runId>                        # Resume failed run
-one --agent flow scaffold [template]                   # Generate a starter template
+one --agent flow create <key> --definition '<json>'              # Create (or --definition @file.json)
+one --agent flow create <key> --definition @flow.json            # Create from file
+one --agent flow create <group/key> --definition '<json>'        # Create in a subdirectory group
+one --agent flow list                                            # List (shows group prefixes)
+one --agent flow validate <key>                                  # Validate
+one --agent flow execute <key> -i name=value                     # Execute (bare key)
+one --agent flow execute <group/key> -i name=value               # Execute (namespaced key)
+one --agent flow execute <key> --dry-run --mock                  # Test with mock data
+one --agent flow execute <key> --allow-bash                      # Enable bash steps
+one --agent flow runs [flowKey]                                  # List past runs
+one --agent flow resume <runId>                                  # Resume failed run
+one --agent flow scaffold [template]                             # Generate a starter template
 \`\`\`
 
-You can also write the JSON file directly to \`.one/flows/<key>/flow.json\` \u2014 often easier than passing large JSON via --definition. (The legacy \`.one/flows/<key>.flow.json\` single-file location is deprecated; don't use it for new flows.)
+You can also write the JSON file directly to \`.one/flows/<key>/flow.json\` (or \`.one/flows/<group>/<key>/flow.json\` for grouped flows) \u2014 often easier than passing large JSON via --definition. (The legacy \`.one/flows/<key>.flow.json\` single-file location is deprecated; don't use it for new flows.)
 
 ## Code modules (flow \`lib/\` folder)
 
@@ -2501,13 +2514,31 @@ var FlowRunner = class _FlowRunner {
   }
 };
 function resolveFlowPath(keyOrPath) {
-  if (keyOrPath.includes("/") || keyOrPath.includes("\\") || keyOrPath.endsWith(".json")) {
+  if (keyOrPath.endsWith(".json")) {
+    return path2.resolve(keyOrPath);
+  }
+  if (keyOrPath.includes("\\")) {
     return path2.resolve(keyOrPath);
   }
+  if (keyOrPath.includes("/")) {
+    const nestedFolder = path2.resolve(FLOWS_DIR, keyOrPath, "flow.json");
+    if (fs2.existsSync(nestedFolder)) return nestedFolder;
+    const literal = path2.resolve(keyOrPath);
+    if (fs2.existsSync(literal)) return literal;
+    return nestedFolder;
+  }
   const folderPath = path2.resolve(FLOWS_DIR, keyOrPath, "flow.json");
-  const legacyPath = path2.resolve(FLOWS_DIR, `${keyOrPath}.flow.json`);
   if (fs2.existsSync(folderPath)) return folderPath;
+  const legacyPath = path2.resolve(FLOWS_DIR, `${keyOrPath}.flow.json`);
   if (fs2.existsSync(legacyPath)) return legacyPath;
+  const flowsDir = path2.resolve(FLOWS_DIR);
+  if (fs2.existsSync(flowsDir)) {
+    for (const entry of fs2.readdirSync(flowsDir, { withFileTypes: true })) {
+      if (!entry.isDirectory() || entry.name.startsWith(".")) continue;
+      const nested = path2.join(flowsDir, entry.name, keyOrPath, "flow.json");
+      if (fs2.existsSync(nested)) return nested;
+    }
+  }
   return folderPath;
 }
 function getFlowRootDir(flowFilePath) {
@@ -2572,12 +2603,13 @@ function listFlows() {
   if (!fs2.existsSync(flowsDir)) return [];
   const flows = [];
   const seenKeys = /* @__PURE__ */ new Set();
-  const readFlowFile = (filePath) => {
+  const readFlowFile = (filePath, group) => {
     try {
       const content = fs2.readFileSync(filePath, "utf-8");
       const flow = JSON.parse(content);
-      if (seenKeys.has(flow.key)) return;
-      seenKeys.add(flow.key);
+      const nsKey = group ? `${group}/${flow.key}` : flow.key;
+      if (seenKeys.has(nsKey)) return;
+      seenKeys.add(nsKey);
       flows.push({
         key: flow.key,
         name: flow.name,
@@ -2586,6 +2618,7 @@ function listFlows() {
         stepCount: flow.steps.length,
         path: filePath,
         layout: path2.basename(filePath) === "flow.json" ? "folder" : "legacy",
+        group,
         stepTypes: collectStepTypes(flow),
         requiresBash: flowRequiresBash(flow),
         usesCodeModules: flowUsesCodeModules(flow),
@@ -2594,26 +2627,44 @@ function listFlows() {
     } catch {
     }
   };
-  for (const entry of fs2.readdirSync(flowsDir, { withFileTypes: true })) {
-    if (entry.name.startsWith(".")) continue;
-    const full = path2.join(flowsDir, entry.name);
-    if (entry.isDirectory()) {
-      const flowJson = path2.join(full, "flow.json");
-      if (fs2.existsSync(flowJson)) readFlowFile(flowJson);
-    } else if (entry.isFile() && entry.name.endsWith(".flow.json")) {
-      readFlowFile(full);
+  const scanDir = (dir, group) => {
+    for (const entry of fs2.readdirSync(dir, { withFileTypes: true })) {
+      if (entry.name.startsWith(".")) continue;
+      const full = path2.join(dir, entry.name);
+      if (entry.isDirectory()) {
+        const flowJson = path2.join(full, "flow.json");
+        if (fs2.existsSync(flowJson)) {
+          readFlowFile(flowJson, group);
+        } else {
+          if (!group) {
+            scanDir(full, entry.name);
+          }
+        }
+      } else if (entry.isFile() && entry.name.endsWith(".flow.json")) {
+        readFlowFile(full, group);
+      }
     }
-  }
+  };
+  scanDir(flowsDir);
   return flows;
 }
-function saveFlow(flow, outputPath) {
+function saveFlow(flow, outputPath, group) {
   let flowPath;
   if (outputPath) {
     flowPath = path2.resolve(outputPath);
   } else {
-    const legacyPath = path2.resolve(FLOWS_DIR, `${flow.key}.flow.json`);
-    const folderPath = path2.resolve(FLOWS_DIR, flow.key, "flow.json");
-    if (fs2.existsSync(legacyPath) && !fs2.existsSync(folderPath)) {
+    let bareKey = flow.key;
+    let resolvedGroup = group;
+    if (flow.key.includes("/")) {
+      const parts = flow.key.split("/");
+      bareKey = parts.pop();
+      resolvedGroup = resolvedGroup || parts.join("/");
+      flow.key = bareKey;
+    }
+    const basePath = resolvedGroup ? path2.resolve(FLOWS_DIR, resolvedGroup, bareKey) : path2.resolve(FLOWS_DIR, bareKey);
+    const legacyPath = path2.resolve(FLOWS_DIR, `${bareKey}.flow.json`);
+    const folderPath = path2.join(basePath, "flow.json");
+    if (!resolvedGroup && fs2.existsSync(legacyPath) && !fs2.existsSync(folderPath)) {
       flowPath = legacyPath;
     } else {
       flowPath = folderPath;

package/dist/{flow-runner-6IFPWOS4.js → flow-runner-TNI7YWVY.js}

@@ -11,7 +11,7 @@ import {
   saveFlow,
   summarizeFlowInputs,
   walkSteps
-} from "./chunk-T7LTS2IE.js";
+} from "./chunk-HZP7NT4K.js";
 export {
   FlowRunner,
   collectStepTypes,

package/dist/index.js

@@ -19,7 +19,7 @@ import {
   resolveFlowPath,
   saveFlow,
   validateActionInput
-} from "./chunk-T7LTS2IE.js";
+} from "./chunk-HZP7NT4K.js";
 
 // src/index.ts
 import { createRequire as createRequire2 } from "module";
@@ -3463,8 +3463,15 @@ async function flowCreateCommand(key, options) {
   } else {
     error("Interactive workflow creation not yet supported. Use --definition <json> or pipe JSON via stdin.");
   }
+  let group;
   if (key) {
-    flow2.key = key;
+    if (key.includes("/")) {
+      const parts = key.split("/");
+      flow2.key = parts.pop();
+      group = parts.join("/");
+    } else {
+      flow2.key = key;
+    }
   }
   const errors = validateFlow(flow2);
   if (errors.length > 0) {
@@ -3475,7 +3482,7 @@ async function flowCreateCommand(key, options) {
     error(`Validation failed:
 ${errors.map((e) => `  ${e.path}: ${e.message}`).join("\n")}`);
   }
-  const flowPath = saveFlow(flow2, options.output);
+  const flowPath = saveFlow(flow2, options.output, group);
   if (isAgentMode()) {
     json({ created: true, key: flow2.key, path: flowPath });
     return;
@@ -3639,7 +3646,7 @@ async function flowListCommand() {
       { key: "flags", label: "Requires" }
     ],
     flows.map((f) => ({
-      key: f.key,
+      key: f.group ? `${f.group}/${f.key}` : f.key,
       name: f.name,
       layout: f.layout,
       inputCount: String(f.inputCount),
@@ -7720,7 +7727,7 @@ one --agent flow list                                 # List all workflows
 \`\`\`
 
 **Key concepts:**
-- Workflows live at \`.one/flows/<key>/flow.json\` (folder layout \u2014 REQUIRED for new flows). The legacy \`.one/flows/<key>.flow.json\` single-file layout is DEPRECATED but still loads for backward compatibility
+- Workflows live at \`.one/flows/<key>/flow.json\` (folder layout \u2014 REQUIRED for new flows). Flows can be organized into subdirectory groups: \`.one/flows/<group>/<key>/flow.json\`. Reference them as \`group/key\` or just the bare key. The legacy \`.one/flows/<key>.flow.json\` single-file layout is DEPRECATED but still loads for backward compatibility
 - Code steps can reference an external \`.mjs\` module under the flow's \`lib/\` folder (stdin JSON in, stdout JSON out) \u2014 keeps JS out of JSON strings and makes flows shareable
 - 12 step types: action, transform, code, condition, loop, parallel, file-read, file-write, while, flow, paginate, bash
 - Data wiring via selectors: \`$.input.param\`, \`$.steps.stepId.response\`, \`$.loop.item\`
@@ -8697,8 +8704,8 @@ program.name("one").option("--agent", "Machine-readable JSON output (no colors,
 
   Workflows (multi-step):
     one flow list                         List saved workflows
-    one flow create [key]                 Create a workflow from JSON
-    one flow execute <key>                Execute a workflow
+    one flow create [key]                 Create a workflow from JSON (key can be group/key)
+    one flow execute <key>                Execute a workflow (key can be group/key)
     one flow validate <key>               Validate a flow
 
   Data Sync (run "one sync install" first, then "one guide sync" for full reference):

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@withone/cli",
-  "version": "1.33.0",
+  "version": "1.34.0",
   "description": "CLI for managing One",
   "type": "module",
   "files": [