@actionway/cli-dev 0.0.0-dev.32821683196.320940b928ff → 0.0.0-dev.32848766753.0e740c8908f1

package/assets/skill/actionway/SKILL.md

@@ -71,7 +71,7 @@ Right after a successful `actionway init`, run `actionway account wallet` once a
 - [Image Search](references/capabilities/image-search.md) (`web.image.search`) — Find visually similar or relevant existing images on the public web.
 - [Fetch URL](references/capabilities/fetch.md) (`web.fetch`) — Fetch a supported URL as text, Markdown, or bounded raw content.
 - [Search Stock Media](references/capabilities/stock-search.md) (`stock-media.search`) — Search one or more supported stock-media providers.
-- [Download Stock Media](references/capabilities/stock-download.md) (`stock-media.download`) — Download a selected stock-media result.
+- [Download Stock Media](references/capabilities/stock-download.md) (`stock-media.download`) — Authorize a selected stock-media result for local download.
 - [Knowledge Search](references/capabilities/knowledge-search.md) (`knowledge.search`) — Search curated domain libraries for audio, visual, voice, writing, or meme references.
 
 **Live data**

package/assets/skill/actionway/references/capabilities/income-statement.md

@@ -7,6 +7,6 @@ Get standardized annual or quarterly company income statements.
 
 ## Indicative price
 
-free
+$0.01
 
 Prices are indicative catalog values refreshed with each skill release. Before calling, Inspect the chosen variant: Inspect's input Schema and USD quote are authoritative.

package/assets/skill/actionway/references/capabilities/market-quote.md

@@ -7,6 +7,6 @@ Get the latest available market quote for one or more comma-separated symbols.
 
 ## Indicative price
 
-free
+$0.01
 
 Prices are indicative catalog values refreshed with each skill release. Before calling, Inspect the chosen variant: Inspect's input Schema and USD quote are authoritative.

package/assets/skill/actionway/references/capabilities/search-securities.md

@@ -7,6 +7,6 @@ Search stocks and other market securities by name or symbol.
 
 ## Indicative price
 
-free
+$0.01
 
 Prices are indicative catalog values refreshed with each skill release. Before calling, Inspect the chosen variant: Inspect's input Schema and USD quote are authoritative.

package/assets/skill/actionway/references/capabilities/stock-download.md

@@ -1,6 +1,6 @@
 # Download Stock Media (`stock-media.download`)
 
-Download a selected stock-media result.
+Authorize a selected stock-media result for local download.
 
 - Users ask for it as: download a selected stock-media item; download stock image; download stock video.
 - Takes url, structured-data → returns image, video. Runs synchronously.

package/dist/index.js

@@ -11460,15 +11460,12 @@ function registerKnowledgeCommands(program2, getTransport2) {
 
 // ../cli-core/src/commands/stock-download.ts
 import { randomUUID as randomUUID3 } from "node:crypto";
-import { mkdir, writeFile } from "node:fs/promises";
+import { mkdir, rename, rm, writeFile } from "node:fs/promises";
 import { dirname, extname, isAbsolute as isAbsolute2 } from "node:path";
 var DEFAULT_DOWNLOAD_DIR = "/workspace/.stock-media";
 var FETCH_TIMEOUT_MS = 6e4;
 var MAX_DOWNLOAD_BYTES = 200 * 1024 * 1024;
 var ASSET_ID_RE = /^([a-z0-9_-]+):([a-zA-Z0-9_.-]+)$/;
-function stockDownloadAvailable() {
-  return false;
-}
 var MIME_TO_EXT = /* @__PURE__ */ new Map([
   ["image/jpeg", "jpg"],
   ["image/jpg", "jpg"],
@@ -11579,7 +11576,7 @@ async function fetchBytes(url) {
     clearTimeout(timer);
   }
 }
-function registerStockDownload(parent) {
+function registerStockDownload(parent, deps) {
   parent.command("download").description("Fetch a stock-media asset (CDN URL from search result) into /workspace and echo full metadata.").addHelpText(
     "after",
     [
@@ -11589,19 +11586,12 @@ function registerStockDownload(parent) {
       "so the local result retains its source and license metadata."
     ].join("\n")
   ).requiredOption("--asset-id <id>", "<provider>:<native_id> from a search result").requiredOption("--url <url>", "direct CDN URL from search result's download_url").option("--to <path>", `absolute path under /workspace (default: ${DEFAULT_DOWNLOAD_DIR}/<provider>-<id>.<ext>)`).option("--metadata-json <json>", "JSON-encoded metadata object from the search result; echoed back in output").action(async (opts) => {
-    if (!stockDownloadAvailable()) {
-      fail({
-        code: "E_CAPABILITY_NOT_AVAILABLE",
-        message: "stock download is deferred until Gateway command-level billing is available",
-        hint: "do not fetch the asset directly as a workaround; wait for the stage-two stock billing integration"
-      });
-    }
     const { provider, nativeId } = parseAssetId(String(opts.assetId));
     const url = String(opts.url);
     try {
       const parsedUrl = new URL(url);
-      if (parsedUrl.protocol !== "https:" && parsedUrl.protocol !== "http:") {
-        fail({ code: "E_SCHEMA", message: `--url must be http(s); got protocol ${parsedUrl.protocol}` });
+      if (parsedUrl.protocol !== "https:") {
+        fail({ code: "E_SCHEMA", message: `--url must use https; got protocol ${parsedUrl.protocol}` });
       }
     } catch (err) {
       if (err.name === "TypeError") {
@@ -11618,7 +11608,22 @@ function registerStockDownload(parent) {
       const defaultPath = `${DEFAULT_DOWNLOAD_DIR}/${provider}-${nativeId}.${ext}`;
       const destination = explicitDestination ?? validateDestination(void 0, defaultPath);
       await mkdir(dirname(destination), { recursive: true });
-      await writeFile(destination, buf);
+      const temporary = `${destination}.actionway-${jobRef}.tmp`;
+      await writeFile(temporary, buf, { flag: "wx" });
+      try {
+        const transport = deps.getTransport();
+        const body = { provider, native_id: nativeId, url, destination, kind: contentType?.startsWith("video/") ? "video" : "image" };
+        if (deps.projectToolCall) {
+          const response = await transport.callTool({ toolRef: "stock-media.download", arguments: body, idempotencyKey: jobRef, confirmation: { kind: "typed-command" } }, { jobRef, retries: 1 });
+          if (response.status !== "completed") throw new StockDownloadError("stock download authorization did not complete");
+        } else {
+          await transport.post("internal/stock/download", body, { jobRef, retries: 1 });
+        }
+        await rename(temporary, destination);
+      } catch (error) {
+        await rm(temporary, { force: true });
+        throw error;
+      }
       ok({
         job_ref: jobRef,
         asset_id: `${provider}:${nativeId}`,
@@ -11900,9 +11905,6 @@ var STOCK_DEFAULT_PROVIDER_ORDER = ["pexels", "pixabay", "openverse"];
 var STOCK_ORIENTATIONS = ["landscape", "portrait", "square"];
 var STOCK_TYPES = ["image", "video"];
 var STOCK_MODES = ["fallback", "fanout"];
-function isStockSearchAvailable() {
-  return false;
-}
 function parsePositiveInt(raw, flag, max) {
   const n = Number(raw);
   if (!Number.isFinite(n) || !Number.isInteger(n) || n < 1 || n > max) {
@@ -11938,88 +11940,15 @@ function parseProviders(csv, type) {
   }
   return enabled;
 }
-function describeProviderFailure(provider, err) {
-  if (err instanceof TransportError) {
-    return {
-      provider,
-      ...err.status !== void 0 ? { status: err.status } : {},
-      reason: `${err.status ?? "transport"}: ${err.message}`
-    };
-  }
-  if (err instanceof Error) return { provider, reason: err.message };
-  return { provider, reason: String(err) };
-}
-function mergeResults(perProvider, limit) {
-  const merged = [];
-  const seen = /* @__PURE__ */ new Set();
-  const cursors = perProvider.map(() => 0);
-  let active = perProvider.filter((arr) => arr.length > 0).length;
-  while (merged.length < limit && active > 0) {
-    active = 0;
-    for (let i = 0; i < perProvider.length; i++) {
-      const arr = perProvider[i];
-      const cursor = cursors[i];
-      if (arr === void 0 || cursor === void 0 || cursor >= arr.length) continue;
-      const r = arr[cursor];
-      cursors[i] = cursor + 1;
-      if (r !== void 0 && !seen.has(r.asset_id)) {
-        seen.add(r.asset_id);
-        merged.push(r);
-        if (merged.length >= limit) break;
-      }
-      if (cursor + 1 < arr.length) active += 1;
-    }
-  }
-  return merged;
-}
-async function searchSequential(enabled, opts, limit, searchFn) {
-  const collected = [];
-  const seen = /* @__PURE__ */ new Set();
-  const queried = [];
-  const failed = [];
-  for (const name of enabled) {
-    queried.push(name);
-    try {
-      const results = await searchFn(name, opts);
-      for (const r of results) {
-        if (!seen.has(r.asset_id)) {
-          seen.add(r.asset_id);
-          collected.push(r);
-          if (collected.length >= limit) break;
-        }
-      }
-    } catch (err) {
-      failed.push(describeProviderFailure(name, err));
-    }
-    if (collected.length >= limit) break;
-  }
-  return { results: collected.slice(0, limit), queried, failed };
-}
-async function searchFanout(enabled, opts, limit, searchFn) {
-  const settled = await Promise.allSettled(enabled.map((n) => searchFn(n, opts)));
-  const perProviderResults = [];
-  const failed = [];
-  for (let i = 0; i < enabled.length; i++) {
-    const r = settled[i];
-    const name = enabled[i];
-    if (r !== void 0 && r.status === "fulfilled") {
-      perProviderResults.push(r.value);
-    } else {
-      perProviderResults.push([]);
-      if (r !== void 0 && name !== void 0) failed.push(describeProviderFailure(name, r.reason));
-    }
-  }
-  return { results: mergeResults(perProviderResults, limit), queried: [...enabled], failed };
-}
-function registerStockSearch(parent, getTransport2) {
+function registerStockSearch(parent, deps) {
   parent.command("search").description(
     "Sequential-fallback search across providers (Pexels -> Pixabay -> Openverse). Use --mode=fanout for parallel."
   ).addHelpText(
     "after",
     [
       "",
-      "Availability:",
-      "  Stage one is fail-closed until Gateway command-level billing orchestration is available.",
+      "Execution:",
+      "  Gateway orchestrates all selected providers and bills the search once.",
       "",
       "Modes:",
       "  fallback (default) - calls Pexels -> Pixabay -> Openverse in order and stops once limit results are collected.",
@@ -12048,13 +11977,6 @@ function registerStockSearch(parent, getTransport2) {
     `search strategy: ${STOCK_MODES.join(" | ")} (default fallback saves API budget)`,
     "fallback"
   ).action(async (opts) => {
-    if (!isStockSearchAvailable()) {
-      fail({
-        code: "E_CAPABILITY_NOT_AVAILABLE",
-        message: "stock search is not available in migration stage one",
-        hint: "Gateway command-level stock billing/orchestration is required before this command can be enabled."
-      });
-    }
     const type = String(opts.type);
     if (!STOCK_TYPES.includes(type)) {
       fail({ code: "E_SCHEMA", message: `--type must be image|video; got ${String(opts.type)}` });
@@ -12071,42 +11993,35 @@ function registerStockSearch(parent, getTransport2) {
     }
     const limit = typeof opts.limit === "number" ? opts.limit : 10;
     const enabled = parseProviders(opts.providers !== void 0 ? String(opts.providers) : void 0, type);
-    const perProviderLimit = mode === "fanout" ? Math.max(1, Math.ceil(limit * 1.5 / enabled.length)) : limit;
     const searchOpts = {
       query: String(opts.query),
       type,
       ...opts.orientation !== void 0 ? { orientation: String(opts.orientation) } : {},
       ...typeof opts.minWidth === "number" ? { minWidth: opts.minWidth } : {},
       ...typeof opts.durationMin === "number" ? { durationMin: opts.durationMin } : {},
-      ...typeof opts.durationMax === "number" ? { durationMax: opts.durationMax } : {},
-      perProviderLimit
+      ...typeof opts.durationMax === "number" ? { durationMax: opts.durationMax } : {}
     };
     const jobRef = randomUUID4();
     try {
-      const transport = getTransport2();
-      const searchFn = (name, o) => {
-        const provider = ALL_PROVIDERS[name];
-        if (!provider) throw new Error(`unknown stock provider: ${name}`);
-        return provider.search(o, transport);
-      };
-      const { results, queried, failed } = mode === "fanout" ? await searchFanout(enabled, searchOpts, limit, searchFn) : await searchSequential(enabled, searchOpts, limit, searchFn);
-      if (results.length === 0 && failed.length > 0 && failed.length === queried.length) {
-        fail({
-          code: "E_BACKEND",
-          message: `all stock-media providers failed for "${String(opts.query)}"`,
-          hint: "check gateway provider routes / quota; see providers_failed for per-provider reason.",
-          extra: { job_ref: jobRef, mode, providers_queried: queried, providers_failed: failed }
-        });
-      }
-      ok({
-        job_ref: jobRef,
+      const transport = deps.getTransport();
+      const body = {
         query: searchOpts.query,
         type,
         mode,
-        results,
-        providers_queried: queried,
-        providers_failed: failed
-      });
+        limit,
+        providers: enabled,
+        ...searchOpts.orientation ? { orientation: searchOpts.orientation } : {},
+        ...searchOpts.minWidth !== void 0 ? { min_width: searchOpts.minWidth } : {},
+        ...searchOpts.durationMin !== void 0 ? { duration_min: searchOpts.durationMin } : {},
+        ...searchOpts.durationMax !== void 0 ? { duration_max: searchOpts.durationMax } : {}
+      };
+      if (deps.projectToolCall) {
+        const response2 = await transport.callTool({ toolRef: "stock-media.search", arguments: body, idempotencyKey: jobRef, confirmation: { kind: "typed-command" } }, { jobRef, retries: 1 });
+        if (response2.status !== "completed") return ok({ ...response2, job_ref: jobRef });
+        return ok({ job_ref: jobRef, ...response2.result });
+      }
+      const response = await transport.post("internal/stock/search", body, { jobRef, retries: 1 });
+      ok({ job_ref: jobRef, ...response });
     } catch (err) {
       if (err instanceof TransportError) {
         fail({ code: err.code, message: err.message, extra: { ...err.extra ?? {}, job_ref: jobRef } });
@@ -12121,10 +12036,11 @@ function registerStockSearch(parent, getTransport2) {
 }
 
 // ../cli-core/src/commands/stock.ts
-function registerStockCommands(program2, getTransport2) {
+function registerStockCommands(program2, depsOrTransport) {
+  const deps = typeof depsOrTransport === "function" ? { getTransport: depsOrTransport } : depsOrTransport;
   const stock = program2.command("stock").description("Search and download public stock media (Pexels / Pixabay / Openverse) for b-roll.");
-  registerStockSearch(stock, getTransport2);
-  registerStockDownload(stock);
+  registerStockSearch(stock, deps);
+  registerStockDownload(stock, deps);
 }
 
 // ../../node_modules/.pnpm/commander@12.1.0/node_modules/commander/esm.mjs
@@ -13993,7 +13909,7 @@ function buildProgram() {
   registerPollCommand(program2, getTransport2);
   registerKnowledgeCommands(program2, getTransport2);
   registerAssetCommands(program2, getTransport2);
-  registerStockCommands(program2, getTransport2);
+  registerStockCommands(program2, actionDeps);
   return program2;
 }
 var invokedAsBin = isDirectExecution(import.meta.url);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@actionway/cli-dev",
-  "version": "0.0.0-dev.32821683196.320940b928ff",
+  "version": "0.0.0-dev.32848766753.0e740c8908f1",
   "description": "Actionway development CLI for dev.actionway.ai",
   "type": "module",
   "bin": {
@@ -19,8 +19,8 @@
     "tsx": "^4.20.0",
     "typescript": "7.0.2",
     "vitest": "^3.2.7",
-    "@actionway/contracts": "0.1.0",
-    "@actionway/cli-core": "0.1.0"
+    "@actionway/cli-core": "0.1.0",
+    "@actionway/contracts": "0.1.0"
   },
   "engines": {
     "node": ">=20"
@@ -36,9 +36,9 @@
   },
   "actionway": {
     "channel": "development",
-    "source_sha": "320940b928ff5d1dd7f858e5b4f5200ed2449c9f",
-    "run_id": 32821683196,
-    "run_url": "https://github.com/PawLogic/actionway/actions/runs/32821683196",
+    "source_sha": "0e740c8908f1097143ccd81e75990c6ab3bb9428",
+    "run_id": 32848766753,
+    "run_url": "https://github.com/PawLogic/actionway/actions/runs/32848766753",
     "gateway_url": "https://dev.actionway.ai"
   }
 }