@softr/cli 0.1.0 → 0.1.1-se21216.7

package/README.md

@@ -49,7 +49,7 @@ ones. A workflow directory remembers the target it was pulled from.
 | `workspaces`                                                     | The workspaces the stored token reaches, with your role in each and the default one. Commands that take `--workspace` default to `SOFTR_WORKSPACE_ID` when it is set, else to your only or default workspace.                                                      |
 | `integrations [--workspace <id>] [--type <TYPE>]`                | List the workspace's connected integrations (id, name, type, account, auth kind) from the studio API; the id goes into a node's `integrationId` input. Inside a workflow directory the workspace is the workflow's; `--type` filters. Credentials are never shown. |
 
-Every command accepts `--json`. `SOFTR_TOKEN` overrides the stored token; `SOFTR_WORKSPACE_ID` is the default workspace.
+Every command accepts `--json`. `SOFTR_TOKEN` overrides the stored token; `SOFTR_WORKSPACE_ID` is the default workspace; `SOFTR_APP_ID` links the workflows `init` creates to that application.
 
 ## Workflows
 
@@ -133,10 +133,10 @@ node still on 1.0.0 or 1.1.0 keeps its synchronous runtime without `fetch`, and
 
 | Command                                                                                                                                | What it does                                                                                                                                                                                                                                                                                                                                                                                                          |
 | -------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `workflows list [--workspace <id>]`                                                                                                    | List the workflows you can access, one table per workspace. A workspace whose listing fails is reported at the end and skipped.                                                                                                                                                                                                                                                                                       |
+| `workflows list [--workspace <id>] [--app <id>]`                                                                                       | List the workflows you can access, one table per workspace; `--app` keeps only those linked to that application. A workspace whose listing fails is reported at the end and skipped.                                                                                                                                                                                                                                  |
 | `workflows pull [<workflowId>] [--dir <path>] [--force]`                                                                               | Download a workflow into a directory (new `./<title-slug>/` by default). Without an id, list what you can pull.                                                                                                                                                                                                                                                                                                       |
 | `workflows push [--dir <path>] [--dry-run] [--force]`                                                                                  | Inline `@@` references and code files, save as a new draft. Sends nothing when the files match the last sync, and refuses when the server copy changed since then (`--force` overrides both). Warns about placeholders that no saved test data backs.                                                                                                                                                                 |
-| `workflows init <title> [--workspace <id>] [--trigger <TYPE>] [--dir <path>]`                                                          | Create a workflow on the server with one trigger (default `WEBHOOK`) and the local directory for it.                                                                                                                                                                                                                                                                                                                  |
+| `workflows init <title> [--workspace <id>] [--app <id>] [--trigger <TYPE>] [--dir <path>]`                                             | Create a workflow on the server with one trigger (default `WEBHOOK`) and the local directory for it; `--app` links it to an application, so the studio lists it with that app.                                                                                                                                                                                                                                        |
 | `workflows upgrade [<nodeId>...] [--dir <path>]`                                                                                       | Move nodes on an older version of their type to the current one (CUSTOM_CODE 1.0.0 and 1.1.0 become 1.2.0: the integrations list is added, the code file keeps its body and gets the new header). Every command that touches a workflow lists such nodes in a note.                                                                                                                                                   |
 | `workflows add <TYPE> [--id <id>] [--after <nodeId>] [--in-loop <loopId>] [--to <actionId>] [--lang JAVASCRIPT\|PYTHON] [--title <t>]` | Append an action after a node (default: the only node without a successor) and the path to it, or append a trigger (`--to` connects it). Custom code gets `actions/<id>.js\|py` with an empty function. Comments in the config survive.                                                                                                                                                                               |
 | `workflows replace <nodeId> <TYPE>`                                                                                                    | Give a node another type of the same kind: id, title and paths stay, inputs start from the new template.                                                                                                                                                                                                                                                                                                              |

package/dist/cli.mjs

@@ -6098,9 +6098,9 @@ var SoftrApiError = class extends Error {
   body;
   hint;
 };
-function hintFor(status) {
+function hintFor(status, client) {
   if (status === 401 || status === 403) {
-    return "The token was not accepted: revoked, from another environment, missing access to this workflow, or its statements do not grant this action. Run: softr login";
+    return client.kind === "proxy" ? "The target refused the request: no access to this workflow, or its credential is gone." : "The token was not accepted: revoked, from another environment, missing access to this workflow, or its statements do not grant this action. Run: softr login";
   }
   if (status === 409) {
     return "The workflow changed on the server since the last pull. Pull again with --force, then re-apply your edits.";
@@ -6108,7 +6108,7 @@ function hintFor(status) {
   return void 0;
 }
 function authHeaders(client) {
-  return { Authorization: `Bearer ${client.token}` };
+  return client.kind === "proxy" ? {} : { Authorization: `Bearer ${client.token}` };
 }
 async function send(client, service, method, path13, body) {
   const init = {
@@ -6129,7 +6129,7 @@ async function send(client, service, method, path13, body) {
     `${method} ${path13} failed with status ${response.status}${text ? `: ${text}` : ""}`,
     response.status,
     text,
-    hintFor(response.status)
+    hintFor(response.status, client)
   );
 }
 async function apiRequest(client, method, path13, body) {
@@ -14397,8 +14397,8 @@ function updateWorkflow(client, workflowId, body) {
 function getWorkflowOutputs(client, workflowId) {
   return apiRequest(client, "GET", `/v1/workflows/${workflowId}/outputs`);
 }
-function listWorkflows(client, workspaceId) {
-  const query = new URLSearchParams({ workspaceId, limit: "500" });
+function listWorkflows(client, workspaceId, applicationId) {
+  const query = new URLSearchParams({ workspaceId, ...applicationId ? { applicationId } : {}, limit: "500" });
   return apiRequest(client, "GET", `/v1/workflows?${query}`);
 }
 function testAction(client, workflowId, hierarchyPath2, mode) {
@@ -14514,7 +14514,7 @@ function normalizeUrl(value, source) {
   } catch {
     throw new CliError(`${source} is not a valid URL: ${value}`);
   }
-  return url.origin;
+  return `${url.origin}${url.pathname.replace(/\/+$/, "")}`;
 }
 function resolveTarget(remembered) {
   const pick = (envVar, rememberedValue, fallback) => {
@@ -14547,6 +14547,8 @@ function tokenKind(token) {
 
 // src/config/credentials.ts
 var TOKEN_ENV_VAR = "SOFTR_TOKEN";
+var AUTH_ENV_VAR = "SOFTR_AUTH";
+var PROXY_AUTH = "proxy";
 var REFRESH_MARGIN_MS = 5 * 60 * 1e3;
 function credentialsPath() {
   return path6.join(homedir(), ".softr", "credentials.json");
@@ -14611,6 +14613,9 @@ async function refreshedAccessToken(target, stored) {
   }
 }
 async function authenticatedClient(target) {
+  if (process.env[AUTH_ENV_VAR] === PROXY_AUTH) {
+    return { target, kind: "proxy" };
+  }
   const fromEnv = process.env[TOKEN_ENV_VAR];
   if (fromEnv) {
     return { target, token: fromEnv, kind: tokenKind(fromEnv) };
@@ -14720,7 +14725,7 @@ function toRow(workflow, workspace) {
     updatedAt: workflow.updatedAt ?? null
   };
 }
-async function collectWorkflows(client, workspaceId) {
+async function collectWorkflows(client, workspaceId, applicationId) {
   const workspaces = await listWorkspaces(client);
   const selected = workspaceId ? workspaces.filter((workspace) => workspace.id === workspaceId) : workspaces;
   if (workspaceId && !selected.length) {
@@ -14732,7 +14737,7 @@ async function collectWorkflows(client, workspaceId) {
   const listing = { workspaces: [], workflows: [], failures: [] };
   for (const workspace of selected) {
     try {
-      const page = await listWorkflows(client, workspace.id);
+      const page = await listWorkflows(client, workspace.id, applicationId);
       listing.workspaces.push({ id: workspace.id, name: workspace.name });
       listing.workflows.push(...page.items.map((workflow) => toRow(workflow, workspace)));
     } catch (error) {
@@ -14783,16 +14788,16 @@ ${workflowTable(rows)}` : `${heading}
   }
   return blocks.join("\n\n");
 }
-async function emitWorkflowList(options, client, workspaceId, human) {
-  const listing = await collectWorkflows(client, workspaceId);
+async function emitWorkflowList(options, client, workspaceId, human, applicationId) {
+  const listing = await collectWorkflows(client, workspaceId, applicationId);
   emit(options, [human, renderWorkflows(listing)].filter(Boolean).join("\n\n"), { ...listing });
 }
 function registerList(program3) {
-  program3.command("list").description("List the workflows you can access, grouped by workspace").option("--workspace <id>", "only this workspace (default: $SOFTR_WORKSPACE_ID when set)").action(async (opts, command) => {
+  program3.command("list").description("List the workflows you can access, grouped by workspace").option("--workspace <id>", "only this workspace (default: $SOFTR_WORKSPACE_ID when set)").option("--app <id>", "only the workflows linked to this application").action(async (opts, command) => {
     const options = globalOptions(command);
     const target = resolveTarget(await readState(process.cwd()));
     const client = await authenticatedClient(target);
-    await emitWorkflowList(options, client, opts.workspace ?? process.env["SOFTR_WORKSPACE_ID"]);
+    await emitWorkflowList(options, client, opts.workspace ?? process.env["SOFTR_WORKSPACE_ID"], void 0, opts.app);
   });
 }
 
@@ -15263,58 +15268,62 @@ function registerInit(program3) {
   program3.command("init").description("Create a new workflow with one trigger, on the server and as a local directory").argument("<title>", "the workflow title").option(
     "--workspace <id>",
     "workspace to create it in (default: $SOFTR_WORKSPACE_ID, else your only or default workspace)"
-  ).option("--trigger <TYPE>", 'trigger type from "spec" (default WEBHOOK)', "WEBHOOK").option("--dir <path>", "directory to create (default: ./<title-slug>)").action(async (title, opts, command) => {
-    const options = globalOptions(command);
-    const cwd = process.cwd();
-    const dir = path10.resolve(cwd, opts.dir ?? slug(title));
-    if (await configExists(dir)) {
-      throw new CliError(`${path10.join(dir, CONFIG_FILE_NAME)} already exists.`, "Pick another --dir or title.");
-    }
-    const trigger = findCatalogEntry(opts.trigger, "trigger");
-    const target = resolveTarget();
-    const client = await authenticatedClient(target);
-    const workspaceId = await resolveWorkspace(client, opts.workspace ?? process.env["SOFTR_WORKSPACE_ID"]);
-    const created = await createWorkflow(client, {
-      workspaceId,
-      applicationId: null,
-      title,
-      thumbnail: null,
-      triggers: [{ id: TRIGGER_ID, type: trigger.type, version: trigger.version, inputs: trigger.template }],
-      actions: [],
-      paths: [],
-      // Like the studio: the author's time zone, so schedules and waits mean what they read.
-      configuration: { timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone || "UTC" }
-    });
-    const workflow = await getWorkflow(client, created.id);
-    const config = { $schema: SCHEMA_POINTER, ...toLocalConfig(workflow) };
-    const configFile = await writeConfig(dir, config);
-    await writeSchemaFile(dir);
-    const syncedHash = definitionHash((await packWorkflow(config, dir)).packed);
-    await writeState(dir, {
-      ...target,
-      workflowId: created.id,
-      version: workflow.version,
-      draft: workflow.draft,
-      syncedHash
-    });
-    const studioUrl = `${target.studioUrl}/workflow/${created.id}`;
-    emit(
-      options,
-      `Created "${title}" (${created.id}) with a ${trigger.type} trigger "${TRIGGER_ID}" in workspace ${workspaceId}.
+  ).option("--app <id>", "application to link the workflow to (default: $SOFTR_APP_ID when set)").option("--trigger <TYPE>", 'trigger type from "spec" (default WEBHOOK)', "WEBHOOK").option("--dir <path>", "directory to create (default: ./<title-slug>)").action(
+    async (title, opts, command) => {
+      const options = globalOptions(command);
+      const cwd = process.cwd();
+      const dir = path10.resolve(cwd, opts.dir ?? slug(title));
+      if (await configExists(dir)) {
+        throw new CliError(`${path10.join(dir, CONFIG_FILE_NAME)} already exists.`, "Pick another --dir or title.");
+      }
+      const trigger = findCatalogEntry(opts.trigger, "trigger");
+      const target = resolveTarget();
+      const client = await authenticatedClient(target);
+      const workspaceId = await resolveWorkspace(client, opts.workspace ?? process.env["SOFTR_WORKSPACE_ID"]);
+      const applicationId = opts.app ?? process.env["SOFTR_APP_ID"] ?? null;
+      const created = await createWorkflow(client, {
+        workspaceId,
+        applicationId,
+        title,
+        thumbnail: null,
+        triggers: [{ id: TRIGGER_ID, type: trigger.type, version: trigger.version, inputs: trigger.template }],
+        actions: [],
+        paths: [],
+        // Like the studio: the author's time zone, so schedules and waits mean what they read.
+        configuration: { timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone || "UTC" }
+      });
+      const workflow = await getWorkflow(client, created.id);
+      const config = { $schema: SCHEMA_POINTER, ...toLocalConfig(workflow) };
+      const configFile = await writeConfig(dir, config);
+      await writeSchemaFile(dir);
+      const syncedHash = definitionHash((await packWorkflow(config, dir)).packed);
+      await writeState(dir, {
+        ...target,
+        workflowId: created.id,
+        version: workflow.version,
+        draft: workflow.draft,
+        syncedHash
+      });
+      const studioUrl = `${target.studioUrl}/workflow/${created.id}`;
+      emit(
+        options,
+        `Created "${title}" (${created.id}) with a ${trigger.type} trigger "${TRIGGER_ID}" in workspace ${workspaceId}${applicationId ? `, linked to application ${applicationId}` : ""}.
   ${path10.relative(cwd, configFile)}
 ${studioUrl}
 Next: softr workflows add <TYPE> --dir ${path10.relative(cwd, dir) || "."} (see "spec" for the types), then push and test.`,
-      {
-        workflowId: created.id,
-        workspaceId,
-        title,
-        triggerId: TRIGGER_ID,
-        triggerType: trigger.type,
-        dir,
-        studioUrl
-      }
-    );
-  });
+        {
+          workflowId: created.id,
+          workspaceId,
+          applicationId,
+          title,
+          triggerId: TRIGGER_ID,
+          triggerType: trigger.type,
+          dir,
+          studioUrl
+        }
+      );
+    }
+  );
 }
 
 // src/commands/integrations.ts
@@ -15542,6 +15551,11 @@ function registerLogin(program3) {
   ).option("--no-browser", "browser login, but print the URL instead of opening it (for remote shells and agents)").action(async (opts, command) => {
     const options = globalOptions(command);
     const target = resolveTarget();
+    if (process.env[AUTH_ENV_VAR] === "proxy") {
+      throw new CliError(
+        `Login is not needed: the target authenticates the requests itself ($${AUTH_ENV_VAR}=proxy).`
+      );
+    }
     const token = (opts.token ?? process.env[TOKEN_ENV_VAR] ?? "").trim();
     const saved = token ? pastedToken(token) : opts.browser ? await interactiveLogin(target) : await browserLogin(target, true);
     const identity = await identify({ target, token: saved.token, kind: saved.kind });
@@ -15561,6 +15575,14 @@ function registerLogin(program3) {
     const options = globalOptions(command);
     const target = resolveTarget();
     const client = await authenticatedClient(target);
+    if (client.kind === "proxy") {
+      emit(
+        options,
+        `Requests to ${targetHost(target)} carry no token: the target authenticates them itself ($${AUTH_ENV_VAR}=proxy).`,
+        { kind: "proxy", host: targetHost(target) }
+      );
+      return;
+    }
     const identity = await identify(client);
     const stored = process.env[TOKEN_ENV_VAR] ? void 0 : await storedToken(target);
     const expiry = stored?.expiresAt ? ` Expires ${stored.expiresAt.slice(0, 16).replace("T", " ")} UTC.` : "";
@@ -16672,7 +16694,7 @@ Pass --workspace <id> to a command, or set SOFTR_WORKSPACE_ID, to work in one of
 // package.json
 var package_default = {
   name: "@softr/cli",
-  version: "0.1.0",
+  version: "0.1.1-se21216.7",
   description: "The Softr command line: build, test and publish Softr workflows from local files; more Softr APIs to come",
   keywords: [
     "softr",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@softr/cli",
-  "version": "0.1.0",
+  "version": "0.1.1-se21216.7",
   "description": "The Softr command line: build, test and publish Softr workflows from local files; more Softr APIs to come",
   "keywords": [
     "softr",