@forloop-cc/forloop-cli 0.2.3 → 0.2.5

package/README.md

@@ -8,7 +8,6 @@ Command-line interface for the [ForLoop](https://forloop.cc) AI development plat
 - [Installation](#installation)
 - [Quick Start](#quick-start)
 - [Authentication](#authentication)
-- [Environments](#environments)
 - [Commands](#commands)
   - [Sprint Operations](#sprint-operations)
   - [Story Operations](#story-operations)
@@ -63,7 +62,7 @@ npm install -g @forloop-cc/forloop-cli
 
 ```bash
 forloop --version
-# Output: forloop 0.2.1
+# Output: forloop 0.2.4
 ```
 
 ---
@@ -129,10 +128,6 @@ forloop auth logout          # Remove saved token
 
 ---
 
----
-
-## Commands
-
 ### Sprint Operations
 
 Work with sprints — the containers that hold your stories and track development cycles.
@@ -141,11 +136,14 @@ Work with sprints — the containers that hold your stories and track developmen
 # List all sprints you have access to
 forloop sprint list
 forloop sprint list --org-id 1
+forloop sprint list --include-system-org    # Include system organization sprints
+forloop sprint list --output json           # Structured JSON output
 
 # Get sprint details, including all stories
 forloop sprint get --id 66
 forloop sprint get --id 66 --no-stories     # Exclude stories
 forloop sprint get --id 66 --no-files       # Exclude files
+forloop sprint get --id 66 --output json    # Structured JSON output
 
 # Create a new sprint
 forloop sprint create \
@@ -193,6 +191,7 @@ forloop story create \
 # Read story details, including developer comments
 forloop story get --id 229
 forloop story get --id 229 --no-comments
+forloop story get --id 229 --output json     # Structured JSON output
 
 # Update a story
 forloop story update --id 229 --status in_progress
@@ -210,7 +209,11 @@ Templates define the structure of your stories. List available templates to see
 
 ```bash
 forloop template list
-# Output shows: Basic Task, Basic Note, Schedule Meeting, New Folder
+# Built-in templates: Basic Task (basic-task), Basic Note (basic-note)
+# Server templates: Schedule Meeting (schedule-meeting), New Folder (doc-folder)
+
+# JSON output:
+forloop template list --output json
 ```
 
 ### Agent Operations
@@ -220,6 +223,7 @@ Interact with ForLoop's AI agents — check their progress, trigger new work, an
 ```bash
 # See what AI agents have discussed in the past
 forloop agent history --sprint 66 --limit 20
+forloop agent history --sprint 66 --output json
 
 # Check if a developer task is running, completed, or failed
 forloop agent developer-status --sprint 66
@@ -241,9 +245,11 @@ Organizations group sprints and control access for teams.
 # List organizations you belong to
 forloop org list
 forloop org list --owned-only    # Only orgs you own
+forloop org list --output json    # Structured JSON output
 
 # View organization details
 forloop org get --id 1
+forloop org get --id 1 --output json
 
 # Create an organization (requires Team or Enterprise tier)
 forloop org create \
@@ -261,14 +267,15 @@ Check your profile, limits, and usage.
 ```bash
 # View your profile
 forloop user profile
-# Output: User: TOSHI WORKSHOP JP, Email: ..., Tier: free
+forloop user profile --output json
 
 # Check your quota limits and current usage
 forloop user quotas
-# Output: Stories used: 23/100, Storage used: 17KB/3GB, etc.
+forloop user quotas --output json
 
 # Check quota usage for a specific organization
 forloop org quotas --org-id 1
+forloop org quotas --org-id 1 --output json
 ```
 
 ### File Operations
@@ -282,6 +289,7 @@ forloop file upload --path ./mockup.png --sprint 66 --folder designs
 
 # List all files in a sprint
 forloop file list --sprint 66
+forloop file list --sprint 66 --output json
 
 # Generate a download link
 forloop file download --id 84

package/dist/forloop

@@ -912,7 +912,6 @@ function createAuthStatusCommand() {
       } else {
         console.log("Not authenticated");
         console.log("Run: forloop auth login --api-key <token>");
-        process.exit(1);
       }
     }
   });
@@ -929,6 +928,25 @@ function createAuthLogoutCommand() {
   });
 }
 
+// src/output/formatter.ts
+function print(config, data, label) {
+  if (config.output === "json") {
+    console.log(JSON.stringify(data, null, 2));
+  } else if (typeof data === "string") {
+    if (label && !config.quiet) console.log(label);
+    console.log(data);
+  } else {
+    if (label && !config.quiet) console.log(label);
+    console.log(JSON.stringify(data, null, 2));
+  }
+}
+function formatError(message, format) {
+  if (format === "json") {
+    return JSON.stringify({ error: { message } }, null, 2);
+  }
+  return `Error: ${message}`;
+}
+
 // src/commands/story.ts
 function createStoryCommands() {
   return {
@@ -945,7 +963,7 @@ async function getClient() {
     console.error("Error: No API token configured. Run: forloop auth login --api-key <token>");
     process.exit(1);
   }
-  const client = new ForLoopAPIClient({ token, baseUrl: config.apiUrl });
+  const client = new ForLoopAPIClient({ token, baseUrl: config.apiUrl, timeout: 3e4 });
   return { client };
 }
 function createStoryCreateCommand() {
@@ -967,7 +985,7 @@ function createStoryCreateCommand() {
       'forloop story create --title "Meeting notes" --sprint 1 --type basic-note',
       'forloop story create --title "Design Docs" --sprint 1'
     ],
-    async run(_config, flags) {
+    async run(config, flags) {
       const resolved = await getClient();
       if (!resolved) return;
       const { client } = resolved;
@@ -1007,7 +1025,7 @@ function createStoryCreateCommand() {
             points: flags.points
           })
         });
-        console.log(`Story created: #${story.id} - ${story.title} (${story.type})`);
+        print(config, story, `Story created: #${story.id} - ${story.title} (${story.type})`);
       } else {
         const story = await client.createStory({
           title: flags.title,
@@ -1017,7 +1035,7 @@ function createStoryCreateCommand() {
           priority: flags.priority || "medium",
           status: "todo"
         });
-        console.log(`Doc folder created: #${story.id} - ${story.title}`);
+        print(config, story, `Doc folder created: #${story.id} - ${story.title}`);
       }
     }
   });
@@ -1032,7 +1050,7 @@ function createStoryGetCommand() {
       { flag: "--no-comments", description: "Exclude comments" }
     ],
     examples: ["forloop story get --id 123"],
-    async run(_config, flags) {
+    async run(config, flags) {
       const resolved = await getClient();
       if (!resolved) return;
       const { client } = resolved;
@@ -1042,28 +1060,7 @@ function createStoryGetCommand() {
         process.exit(1);
       }
       const story = await client.getStory(storyId, { includeComments: !flags.noComments });
-      const lines = [
-        `Story #${story.id}: ${story.title}`,
-        `Sprint: #${story.sprint?.id || "N/A"} ${story.sprint?.title || ""}`,
-        `Status: ${story.status}`,
-        `Priority: ${story.priority}`,
-        `Type: ${story.type}`
-      ];
-      if (story.points) lines.push(`Points: ${story.points}`);
-      if (story.assignee) lines.push(`Assignee: ${story.assignee.name || story.assignee.email || "Unknown"}`);
-      if (story.assigneeAgentKey) lines.push(`Agent: ${story.assigneeAgentKey}`);
-      if (story.description) {
-        lines.push("", "Description:", story.description);
-      }
-      if (!flags.noComments && story.comments?.length) {
-        lines.push("", `--- Comments (${story.comments.length}) ---`);
-        for (const comment of story.comments) {
-          const author = comment.authorAgentKey || comment.user?.name || "Unknown";
-          lines.push(`  ${author}: ${comment.content || comment.body || ""}`);
-          if (comment.artifacts?.length) lines.push(`  Artifacts: ${comment.artifacts.join(", ")}`);
-        }
-      }
-      console.log(lines.join("\n"));
+      print(config, story);
     }
   });
 }
@@ -1081,7 +1078,7 @@ function createStoryUpdateCommand() {
       { flag: "--points <n>", description: "Story points (0-10)", type: "number" }
     ],
     examples: ["forloop story update --id 123 --status in_progress"],
-    async run(_config, flags) {
+    async run(config, flags) {
       const resolved = await getClient();
       if (!resolved) return;
       const { client } = resolved;
@@ -1101,7 +1098,7 @@ function createStoryUpdateCommand() {
         process.exit(1);
       }
       const story = await client.updateStory(storyId, data);
-      console.log(`Story #${story.id} updated successfully.`);
+      print(config, story, `Story #${story.id} updated successfully.`);
     }
   });
 }
@@ -1115,7 +1112,7 @@ function createStoryDeleteCommand() {
       { flag: "--confirm", description: "Confirm deletion" }
     ],
     examples: ["forloop story delete --id 123 --confirm"],
-    async run(_config, flags) {
+    async run(config, flags) {
       if (!flags.confirm) {
         console.error("Error: --confirm is required to permanently delete a story.");
         process.exit(1);
@@ -1124,7 +1121,7 @@ function createStoryDeleteCommand() {
       if (!resolved) return;
       const { client } = resolved;
       await client.deleteStory(flags.id);
-      console.log(`Story #${flags.id} deleted successfully.`);
+      print(config, { deleted: flags.id }, `Story #${flags.id} deleted successfully.`);
     }
   });
 }
@@ -1146,12 +1143,9 @@ async function getClient2() {
     console.error("Error: No API token configured. Run: forloop auth login --api-key <token>");
     process.exit(1);
   }
-  const client = new ForLoopAPIClient({ token, baseUrl: config.apiUrl });
+  const client = new ForLoopAPIClient({ token, baseUrl: config.apiUrl, timeout: 3e4 });
   return { client };
 }
-function formatDate(dateString) {
-  return new Date(dateString).toLocaleDateString("en-US", { year: "numeric", month: "short", day: "numeric" });
-}
 function createSprintGetCommand() {
   return defineCommand({
     name: "sprint get",
@@ -1163,7 +1157,7 @@ function createSprintGetCommand() {
       { flag: "--no-files", description: "Exclude files from response" }
     ],
     examples: ["forloop sprint get --id 456", "forloop sprint get --id 456 --no-files"],
-    async run(_config, flags) {
+    async run(config, flags) {
       const resolved = await getClient2();
       if (!resolved) return;
       const { client } = resolved;
@@ -1176,20 +1170,7 @@ function createSprintGetCommand() {
         includeStories: !flags.noStories,
         includeFiles: !flags.noFiles
       });
-      const lines = [
-        `Sprint #${sprint.id}: ${sprint.title}`,
-        `Status: ${sprint.status}`,
-        `Period: ${formatDate(sprint.startDate)} - ${formatDate(sprint.endDate)}`,
-        `Stories: ${sprint.stories?.length || 0}`
-      ];
-      if (sprint.stories?.length) {
-        lines.push("", "Stories:", "");
-        for (const story of sprint.stories) {
-          const icons = { todo: "[ ]", in_progress: "[>]", done: "[x]", blocked: "[!]" };
-          lines.push(`  ${icons[story.status] || "[?]"} #${story.id} ${story.title} (${story.status})`);
-        }
-      }
-      console.log(lines.join("\n"));
+      print(config, sprint);
     }
   });
 }
@@ -1203,23 +1184,15 @@ function createSprintListCommand() {
       { flag: "--include-system-org", description: "Include system organization sprints" }
     ],
     examples: ["forloop sprint list", "forloop sprint list --org-id 1"],
-    async run(_config, flags) {
+    async run(config, flags) {
       const resolved = await getClient2();
       if (!resolved) return;
       const { client } = resolved;
       const params = {};
       if (flags.orgId) params.organizationId = String(flags.orgId);
+      if (flags.includeSystemOrg) params.includeSystemOrg = "true";
       const sprints = await client.listSprints(params);
-      if (!sprints.length) {
-        console.log("No sprints found.");
-        return;
-      }
-      const lines = ["Sprints:", ""];
-      for (const sprint of sprints) {
-        const orgInfo = sprint.organizationName ? ` (${sprint.organizationName})` : "";
-        lines.push(`  #${sprint.id} ${sprint.title}${orgInfo} - ${sprint.status}`);
-      }
-      console.log(lines.join("\n"));
+      print(config, sprints);
     }
   });
 }
@@ -1237,7 +1210,7 @@ function createSprintCreateCommand() {
       { flag: "--org-id <id>", description: "Organization ID", type: "number" }
     ],
     examples: ['forloop sprint create --title "Sprint 15" --start-date 2026-06-09 --end-date 2026-06-23'],
-    async run(_config, flags) {
+    async run(config, flags) {
       const resolved = await getClient2();
       if (!resolved) return;
       const { client } = resolved;
@@ -1253,8 +1226,7 @@ function createSprintCreateCommand() {
         isPrivate: flags.private === true,
         organizationId: flags.orgId
       });
-      console.log(`Sprint created: #${sprint.id} - ${sprint.title}`);
-      console.log(`Period: ${formatDate(sprint.startDate)} - ${formatDate(sprint.endDate)}`);
+      print(config, sprint, `Sprint created: #${sprint.id} - ${sprint.title}`);
     }
   });
 }
@@ -1272,7 +1244,7 @@ function createSprintUpdateCommand() {
       { flag: "--private", description: "Set visibility to private" }
     ],
     examples: ['forloop sprint update --id 456 --title "Updated Sprint"'],
-    async run(_config, flags) {
+    async run(config, flags) {
       const resolved = await getClient2();
       if (!resolved) return;
       const { client } = resolved;
@@ -1287,7 +1259,7 @@ function createSprintUpdateCommand() {
         process.exit(1);
       }
       const sprint = await client.updateSprint(flags.id, updateData);
-      console.log(`Sprint #${sprint.id} updated successfully.`);
+      print(config, sprint, `Sprint #${sprint.id} updated successfully.`);
     }
   });
 }
@@ -1301,7 +1273,7 @@ function createSprintDeleteCommand() {
       { flag: "--confirm", description: "Confirm deletion" }
     ],
     examples: ["forloop sprint delete --id 456 --confirm"],
-    async run(_config, flags) {
+    async run(config, flags) {
       if (!flags.confirm) {
         console.error("Error: --confirm is required to permanently delete a sprint.");
         process.exit(1);
@@ -1309,21 +1281,13 @@ function createSprintDeleteCommand() {
       const resolved = await getClient2();
       if (!resolved) return;
       const { client } = resolved;
-      await client.deleteSprint(flags.id);
-      console.log(`Sprint #${flags.id} deleted successfully.`);
+      const result = await client.deleteSprint(flags.id);
+      print(config, result, `Sprint #${flags.id} deleted successfully.`);
     }
   });
 }
 
 // src/commands/org.ts
-function createOrgCommands() {
-  return {
-    "org list": createOrgListCommand(),
-    "org get": createOrgGetCommand(),
-    "org create": createOrgCreateCommand(),
-    "org update": createOrgUpdateCommand()
-  };
-}
 async function getClient3() {
   const config = getConfig();
   const token = await getToken();
@@ -1331,7 +1295,15 @@ async function getClient3() {
     console.error("Error: No API token configured. Run: forloop auth login --api-key <token>");
     process.exit(1);
   }
-  return { client: new ForLoopAPIClient({ token, baseUrl: config.apiUrl }) };
+  return { client: new ForLoopAPIClient({ token, baseUrl: config.apiUrl, timeout: 3e4 }) };
+}
+function createOrgCommands() {
+  return {
+    "org list": createOrgListCommand(),
+    "org get": createOrgGetCommand(),
+    "org create": createOrgCreateCommand(),
+    "org update": createOrgUpdateCommand()
+  };
 }
 function createOrgListCommand() {
   return defineCommand({
@@ -1341,12 +1313,16 @@ function createOrgListCommand() {
     options: [
       { flag: "--owned-only", description: "List only organizations you own" }
     ],
-    examples: ["forloop org list", "forloop org list --owned-only"],
-    async run(_config, flags) {
+    examples: ["forloop org list", "forloop org list --owned-only", "forloop org list --output json"],
+    async run(config, flags) {
       const resolved = await getClient3();
       if (!resolved) return;
       const { client } = resolved;
       const orgs = flags.ownedOnly ? await client.getOwnedOrganizations() : await client.listOrganizations();
+      if (config.output === "json") {
+        print(config, orgs);
+        return;
+      }
       if (!orgs.length) {
         console.log("No organizations found.");
         return;
@@ -1368,19 +1344,16 @@ function createOrgGetCommand() {
     options: [
       { flag: "--id <number>", description: "Organization ID", required: true, type: "number" }
     ],
-    examples: ["forloop org get --id 1"],
-    async run(_config, flags) {
+    examples: ["forloop org get --id 1", "forloop org get --id 1 --output json"],
+    async run(config, flags) {
       if (!flags.id) {
         console.error("Error: --id is required");
         process.exit(1);
       }
       const resolved = await getClient3();
       if (!resolved) return;
-      const { client } = resolved;
-      const org = await client.getOrganization(flags.id);
-      console.log(`Organization #${org.id}: ${org.name}`);
-      console.log(`Type: ${org.type || "user"}`);
-      if (org.description) console.log(`Description: ${org.description}`);
+      const org = await resolved.client.getOrganization(flags.id);
+      print(config, org);
     }
   });
 }
@@ -1394,19 +1367,18 @@ function createOrgCreateCommand() {
       { flag: "--description <text>", description: "Organization description" }
     ],
     examples: ['forloop org create --name "My Team" --description "Engineering team"'],
-    async run(_config, flags) {
+    async run(config, flags) {
       if (!flags.name) {
         console.error("Error: --name is required");
         process.exit(1);
       }
       const resolved = await getClient3();
       if (!resolved) return;
-      const { client } = resolved;
-      const org = await client.createOrganization({
+      const org = await resolved.client.createOrganization({
         name: flags.name,
         description: flags.description
       });
-      console.log(`Organization created: #${org.id} - ${org.name}`);
+      print(config, org, `Organization created: #${org.id} - ${org.name}`);
     }
   });
 }
@@ -1421,19 +1393,18 @@ function createOrgUpdateCommand() {
       { flag: "--description <text>", description: "New description" }
     ],
     examples: ['forloop org update --id 1 --name "New Name"'],
-    async run(_config, flags) {
+    async run(config, flags) {
       if (!flags.id) {
         console.error("Error: --id is required");
         process.exit(1);
       }
       const resolved = await getClient3();
       if (!resolved) return;
-      const { client } = resolved;
-      const org = await client.updateOrganization(flags.id, {
+      const org = await resolved.client.updateOrganization(flags.id, {
         name: flags.name,
         description: flags.description
       });
-      console.log(`Organization #${org.id} updated successfully.`);
+      print(config, org, `Organization #${org.id} updated successfully.`);
     }
   });
 }
@@ -1447,30 +1418,41 @@ function createTemplateCommands() {
 function createTemplateListCommand() {
   return defineCommand({
     name: "template list",
-    description: "List available story templates",
+    description: "List available story templates (basic-task, basic-note, schedule-meeting, doc-folder)",
     usage: "forloop template list",
-    examples: ["forloop template list"],
-    async run(_config) {
-      const config = getConfig();
+    examples: ["forloop template list", "forloop template list --output json"],
+    async run(config) {
+      const apiConfig = getConfig();
       const token = await getToken();
       if (!token) {
         console.error("Error: No API token configured.");
         process.exit(1);
       }
-      const client = new ForLoopAPIClient({ token, baseUrl: config.apiUrl });
+      const client = new ForLoopAPIClient({ token, baseUrl: apiConfig.apiUrl, timeout: 3e4 });
       const templates = await client.listTemplates();
       const active = templates.filter((t) => !t.deletedAt);
+      if (config.output === "json") {
+        print(config, active);
+        return;
+      }
       if (!active.length) {
         console.log("No templates found.");
         return;
       }
+      const builtIn = [
+        { name: "Basic Task", slug: "basic-task", description: "Standard task with title, description, priority, and story points", fields: [] },
+        { name: "Basic Note", slug: "basic-note", description: "Simple note with title and description", fields: [] }
+      ];
+      const allTemplates = [...builtIn, ...active];
       const lines = ["Available Templates:", ""];
-      for (const t of active) {
-        const fields = JSON.parse(t.fields);
-        const fieldNames = fields.map((f) => f.label).join(", ");
-        lines.push(`  ${t.name} (slug: ${t.slug})`);
+      for (const t of allTemplates) {
+        const fields = t.fields && typeof t.fields === "string" ? JSON.parse(t.fields) : Array.isArray(t.fields) ? t.fields : [];
+        const fieldNames = Array.isArray(fields) ? fields.map((f) => f.label || f).join(", ") : "";
+        const isBuiltIn = builtIn.some((b) => b.slug === t.slug);
+        const badge = isBuiltIn ? " (built-in)" : "";
+        lines.push(`  ${t.name} (slug: ${t.slug})${badge}`);
         lines.push(`    ${t.description}`);
-        lines.push(`    Fields: ${fieldNames}`);
+        if (fieldNames) lines.push(`    Fields: ${fieldNames}`);
         lines.push("");
       }
       console.log(lines.join("\n"));
@@ -1493,7 +1475,7 @@ async function getClient4() {
     console.error("Error: No API token configured.");
     process.exit(1);
   }
-  return { client: new ForLoopAPIClient({ token, baseUrl: config.apiUrl }) };
+  return { client: new ForLoopAPIClient({ token, baseUrl: config.apiUrl, timeout: 3e4 }) };
 }
 function createAgentHistoryCommand() {
   return defineCommand({
@@ -1505,7 +1487,7 @@ function createAgentHistoryCommand() {
       { flag: "--limit <n>", description: "Number of messages (max 200, default 50)", type: "number" }
     ],
     examples: ["forloop agent history --sprint 1 --limit 20"],
-    async run(_config, flags) {
+    async run(config, flags) {
       const resolved = await getClient4();
       if (!resolved) return;
       const { client } = resolved;
@@ -1515,21 +1497,7 @@ function createAgentHistoryCommand() {
         sprintId,
         limit: flags.limit || 50
       });
-      const messages = history.messages || [];
-      if (!messages.length) {
-        console.log("No conversation history found.");
-        return;
-      }
-      console.log(`Conversation History (${history.total || messages.length} total):`);
-      for (const msg of messages) {
-        const preview = (msg.userMessage || "").substring(0, 80);
-        console.log(`  ${preview}${preview.length >= 80 ? "..." : ""}`);
-        if (msg.agentResponse) {
-          const resp = msg.agentResponse.substring(0, 100);
-          console.log(`    -> ${resp}${msg.agentResponse.length > 100 ? "..." : ""}`);
-        }
-        console.log("");
-      }
+      print(config, history);
     }
   });
 }
@@ -1605,13 +1573,6 @@ function createDeveloperStatusCommand() {
 }
 
 // src/commands/user.ts
-function createUserCommands() {
-  return {
-    "user profile": createUserProfileCommand(),
-    "user quotas": createUserQuotasCommand(),
-    "org quotas": createOrgQuotasCommand()
-  };
-}
 async function getClient5() {
   const config = getConfig();
   const token = await getToken();
@@ -1619,22 +1580,26 @@ async function getClient5() {
     console.error("Error: No API token configured.");
     process.exit(1);
   }
-  return { client: new ForLoopAPIClient({ token, baseUrl: config.apiUrl }) };
+  return { client: new ForLoopAPIClient({ token, baseUrl: config.apiUrl, timeout: 3e4 }) };
+}
+function createUserCommands() {
+  return {
+    "user profile": createUserProfileCommand(),
+    "user quotas": createUserQuotasCommand(),
+    "org quotas": createOrgQuotasCommand()
+  };
 }
 function createUserProfileCommand() {
   return defineCommand({
     name: "user profile",
     description: "Get current user profile",
     usage: "forloop user profile",
-    examples: ["forloop user profile"],
-    async run(_config) {
+    examples: ["forloop user profile", "forloop user profile --output json"],
+    async run(config) {
       const resolved = await getClient5();
       if (!resolved) return;
-      const { client } = resolved;
-      const profile = await client.getUserProfile();
-      console.log(`User: ${profile.name || profile.email || "Unknown"}`);
-      console.log(`Email: ${profile.email}`);
-      if (profile.tier) console.log(`Tier: ${profile.tier}`);
+      const profile = await resolved.client.getUserProfile();
+      print(config, profile, "User Profile:");
     }
   });
 }
@@ -1643,14 +1608,12 @@ function createUserQuotasCommand() {
     name: "user quotas",
     description: "Check user quota limits",
     usage: "forloop user quotas",
-    examples: ["forloop user quotas"],
-    async run(_config) {
+    examples: ["forloop user quotas", "forloop user quotas --output json"],
+    async run(config) {
       const resolved = await getClient5();
       if (!resolved) return;
-      const { client } = resolved;
-      const quotas = await client.getUserQuotas();
-      console.log("User Quotas:");
-      console.log(JSON.stringify(quotas, null, 2));
+      const quotas = await resolved.client.getUserQuotas();
+      print(config, quotas, "User Quotas:");
     }
   });
 }
@@ -1662,18 +1625,16 @@ function createOrgQuotasCommand() {
     options: [
       { flag: "--org-id <id>", description: "Organization ID", required: true, type: "number" }
     ],
-    examples: ["forloop org quotas --org-id 1"],
-    async run(_config, flags) {
+    examples: ["forloop org quotas --org-id 1", "forloop org quotas --org-id 1 --output json"],
+    async run(config, flags) {
       if (!flags.orgId) {
         console.error("Error: --org-id is required");
         process.exit(1);
       }
       const resolved = await getClient5();
       if (!resolved) return;
-      const { client } = resolved;
-      const quotas = await client.getOrganizationQuotas(flags.orgId);
-      console.log("Organization Quotas:");
-      console.log(JSON.stringify(quotas, null, 2));
+      const quotas = await resolved.client.getOrganizationQuotas(flags.orgId);
+      print(config, quotas, "Organization Quotas:");
     }
   });
 }
@@ -1696,7 +1657,7 @@ async function getClient6() {
     console.error("Error: No API token configured.");
     process.exit(1);
   }
-  return { client: new ForLoopAPIClient({ token, baseUrl: config.apiUrl }) };
+  return { client: new ForLoopAPIClient({ token, baseUrl: config.apiUrl, timeout: 3e4 }) };
 }
 var mimeTypes = {
   ".png": "image/png",
@@ -1727,10 +1688,11 @@ function createFileUploadCommand() {
       { flag: "--path <path>", description: "Local file path", required: true },
       { flag: "--sprint <id>", description: "Target sprint ID", required: true, type: "number" },
       { flag: "--description <text>", description: "File description" },
-      { flag: "--folder <text>", description: "S3 folder within sprint" }
+      { flag: "--folder <text>", description: "S3 folder within sprint" },
+      { flag: "--story-id <id>", description: "Link file to a story (e.g., doc_folder story)", type: "number" }
     ],
     examples: ["forloop file upload --path ./report.pdf --sprint 1 --folder docs"],
-    async run(_config, flags) {
+    async run(config, flags) {
       const resolved = await getClient6();
       if (!resolved) return;
       const { client } = resolved;
@@ -1764,10 +1726,12 @@ function createFileUploadCommand() {
         originalName: fileName,
         fileType: contentType,
         size: fileContent.length,
-        folder: flags.folder
+        folder: flags.folder,
+        x: 0,
+        y: 0,
+        storyId: flags.storyId
       });
-      console.log(`File uploaded: ${fileName} (${formatSize(fileContent.length)})`);
-      console.log(`URL: ${complete.url}`);
+      print(config, { fileName, size: fileContent.length, url: complete.url, fileId: complete.id }, `File uploaded: ${fileName} (${formatSize(fileContent.length)})`);
     }
   });
 }
@@ -1780,23 +1744,12 @@ function createFileListCommand() {
       { flag: "--sprint <id>", description: "Sprint ID", required: true, type: "number" }
     ],
     examples: ["forloop file list --sprint 1"],
-    async run(_config, flags) {
+    async run(config, flags) {
       const resolved = await getClient6();
       if (!resolved) return;
       const { client } = resolved;
       const files = await client.getSprintFiles(flags.sprint);
-      if (!files.length) {
-        console.log("No files found.");
-        return;
-      }
-      const lines = [`Files in Sprint #${flags.sprint}:`, ""];
-      for (const file of files) {
-        lines.push(`  ${file.originalName || file.filename}`);
-        lines.push(`    Size: ${formatSize(file.size)} | Type: ${file.fileType}`);
-        lines.push(`    URL: ${file.url}`);
-        lines.push("");
-      }
-      console.log(lines.join("\n"));
+      print(config, files, `Files in Sprint #${flags.sprint}:`);
     }
   });
 }
@@ -1868,7 +1821,7 @@ function createFolderCreateCommand() {
         console.error("Error: No API token configured.");
         process.exit(1);
       }
-      const client = new ForLoopAPIClient({ token, baseUrl: config.apiUrl });
+      const client = new ForLoopAPIClient({ token, baseUrl: config.apiUrl, timeout: 3e4 });
       const story = await client.createStory({
         title: flags.title,
         description: flags.description,
@@ -1900,7 +1853,7 @@ async function getClient7() {
     console.error("Error: No API token configured.");
     process.exit(1);
   }
-  return { client: new ForLoopAPIClient({ token, baseUrl: config.apiUrl }) };
+  return { client: new ForLoopAPIClient({ token, baseUrl: config.apiUrl, timeout: 3e4 }) };
 }
 function createSyncAivyFolderCommand() {
   return defineCommand({
@@ -1949,7 +1902,7 @@ function createAivyDocGetCommand() {
       { flag: "--title <text>", description: 'Doc folder title (default: "forloop Aivy doc")' }
     ],
     examples: ["forloop sync aivy-doc-get --sprint 1"],
-    async run(_config, flags) {
+    async run(config, flags) {
       const resolved = await getClient7();
       if (!resolved) return;
       const { client } = resolved;
@@ -1963,9 +1916,9 @@ function createAivyDocGetCommand() {
       const stories = Array.isArray(sprint?.stories) ? sprint.stories : [];
       const existing = stories.find((s) => s.type === "doc_folder" && s.title?.toLowerCase() === title.toLowerCase());
       if (existing?.id) {
-        console.log(`Doc folder: #${existing.id} "${existing.title}" (Sprint #${resolution.sprintId})`);
+        print(config, { docFolderId: existing.id, exists: true, title: existing.title, sprintId: resolution.sprintId }, `Doc folder: #${existing.id} "${existing.title}" (Sprint #${resolution.sprintId})`);
       } else {
-        console.log(`Doc folder not found. Run: forloop sync aivy-folder --sprint ${resolution.sprintId}`);
+        print(config, { exists: false, sprintId: resolution.sprintId }, `Doc folder not found. Run: forloop sync aivy-folder --sprint ${resolution.sprintId}`);
       }
     }
   });
@@ -2028,6 +1981,7 @@ function createLocalToS3Command() {
       { flag: "--path <path>", description: "Local file path", required: true },
       { flag: "--sprint <id>", description: "Target sprint ID", type: "number" },
       { flag: "--folder <text>", description: "Remote folder (e.g., project/plans)" },
+      { flag: "--story-id <id>", description: "Link file to a story (e.g., doc_folder story)", type: "number" },
       { flag: "--delete", description: "Delete remote file instead of uploading" }
     ],
     examples: ["forloop sync local-to-s3 --path ~/.forloop/sprint-1/plan/plan.md --sprint 1"],
@@ -2066,7 +2020,10 @@ function createLocalToS3Command() {
         originalName: fileName,
         fileType: contentType,
         size: fileBuf.length,
-        folder
+        folder,
+        x: 0,
+        y: 0,
+        storyId: flags.storyId
       });
       console.log(`Synced: ${fileName} -> Sprint #${resolution.sprintId}`);
     }
@@ -2332,14 +2289,6 @@ var registry = new CommandRegistry({
   "agent sprint": agentDeveloperSprintCmd
 });
 
-// src/output/formatter.ts
-function formatError(message, format) {
-  if (format === "json") {
-    return JSON.stringify({ error: { message } }, null, 2);
-  }
-  return `\u274C ${message}`;
-}
-
 // src/errors/handler.ts
 function handleError(error) {
   const isJson = process.argv.includes("--output=json");
@@ -2362,7 +2311,7 @@ Tip: ${suggestion}
 }
 
 // src/main.ts
-var CLI_VERSION = "0.2.3";
+var CLI_VERSION = "0.2.4";
 process.on("SIGINT", () => {
   process.stderr.write("\nInterrupted. Exiting.\n");
   process.exit(130);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forloop-cc/forloop-cli",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "description": "Command-line interface for the ForLoop AI development platform",
   "type": "module",
   "license": "MIT",