@toloka-platform/sdk 0.1.0-preview.7 → 0.1.0-preview.9

package/src/cli/program.ts

@@ -19,6 +19,8 @@ import { authStatus, login, logout } from "./auth";
 import type { AuthPrompt } from "./auth";
 import { commandNameFromArgv, createCliAnalytics } from "./analytics";
 import type { CliAnalytics, CliAnalyticsCommandOutcome } from "./analytics";
+import type { AutoUpdateHooks } from "./auto-update";
+import { maybeAutoUpdate } from "./auto-update";
 import { PRODUCTION_BASE_URL, resolveInternalBaseUrl, resolveTolokaConfig } from "./config";
 import type { TolokaEnvironment } from "./config";
 import {
@@ -27,6 +29,7 @@ import {
   requireStoredCredentials,
 } from "./credentials";
 import type { StoredCredentials } from "./credentials";
+import { getCliSetting, readCliSettings, setCliSetting } from "./settings";
 import {
   generateDatasetFieldDeclarations,
   listProjectDatasets,
@@ -269,7 +272,8 @@ export function createProgram(context: ProgramContext): CreatedProgram {
       commandNames.includes("help") ||
       commandNames.includes("report") ||
       commandNames.includes("url") ||
-      commandNames.includes("version")
+      commandNames.includes("version") ||
+      commandNames.includes("config")
     )
       return;
     const sourceRoot = await resolveSourceRoot(globals(), context.io);
@@ -283,6 +287,29 @@ export function createProgram(context: ProgramContext): CreatedProgram {
     .description("print the current CLI version")
     .action(() => context.io.stdout(SDK_VERSION));
 
+  const config = program.command("config").description("read and write machine CLI settings");
+  config
+    .command("get")
+    .argument("[name]", "setting name; omit to print every setting")
+    .description("print a CLI setting, or every setting")
+    .action(async (name?: string) => {
+      const settings = await readCliSettings(context.environment);
+      context.io.stdout(getCliSetting(settings, name).output);
+    });
+  config
+    .command("set")
+    .argument("<name>", "setting name")
+    .argument("<value>", "setting value")
+    .description("write a CLI setting for this machine")
+    .action(async (name: string, value: string) => {
+      const result = await setCliSetting(context.environment, name, value);
+      context.io.stdout(result.output);
+    });
+  config.action(async () => {
+    const settings = await readCliSettings(context.environment);
+    context.io.stdout(getCliSetting(settings, undefined).output);
+  });
+
   program
     .command("login")
     .description("store an API key for this machine after verifying it")
@@ -1127,7 +1154,16 @@ export async function runTolokaCli(
   injectedClient?: PotatoClient,
   analytics?: CliAnalytics,
   runChecks?: typeof checkProject,
+  autoUpdate?: AutoUpdateHooks,
 ): Promise<number> {
+  const autoUpdateResult = await maybeAutoUpdate({
+    argv,
+    environment,
+    io,
+    ...(autoUpdate === undefined ? {} : { hooks: autoUpdate }),
+  });
+  if (autoUpdateResult.status === "reexec") return autoUpdateResult.exitCode;
+
   const activeAnalytics =
     environment[CHECK_RESULT_FILE_ENV] === undefined
       ? (analytics ?? createCliAnalytics({ environment }))

package/src/cli/settings.ts

@@ -0,0 +1,93 @@
+import { chmod, readFile, writeFile } from "node:fs/promises";
+import { join } from "node:path";
+import { isFalseyFlag, isTruthyFlag } from "./boolean-flag";
+import type { CliEnvironment } from "./credentials";
+import { configDirectory, preparePrivateFilePath } from "./credentials";
+
+export const AUTO_UPDATE_SETTING = "auto-update";
+
+export type CliSettings = {
+  readonly autoUpdate: boolean;
+};
+
+export const DEFAULT_CLI_SETTINGS: CliSettings = {
+  autoUpdate: true,
+};
+
+export class SettingsError extends Error {
+  constructor(message: string, options?: { readonly cause?: unknown }) {
+    super(message, options);
+    this.name = "SettingsError";
+  }
+}
+
+export const settingsPath = (environment: CliEnvironment = process.env): string =>
+  join(configDirectory(environment), "settings.json");
+
+const asSettings = (payload: unknown): CliSettings => {
+  const autoUpdate =
+    typeof payload === "object" && payload !== null
+      ? Reflect.get(payload, "autoUpdate")
+      : undefined;
+  if (typeof autoUpdate !== "boolean") return DEFAULT_CLI_SETTINGS;
+  return { autoUpdate };
+};
+
+export async function readCliSettings(
+  environment: CliEnvironment = process.env,
+): Promise<CliSettings> {
+  try {
+    return asSettings(JSON.parse(await readFile(settingsPath(environment), "utf8")));
+  } catch {
+    return DEFAULT_CLI_SETTINGS;
+  }
+}
+
+export async function writeCliSettings(
+  settings: CliSettings,
+  environment: CliEnvironment = process.env,
+): Promise<string> {
+  const path = settingsPath(environment);
+  await preparePrivateFilePath(path);
+  await writeFile(path, `${JSON.stringify({ autoUpdate: settings.autoUpdate }, null, 2)}\n`, {
+    mode: 0o600,
+  });
+  await chmod(path, 0o600);
+  return path;
+}
+
+export const parseBooleanSetting = (value: string): boolean => {
+  if (isTruthyFlag(value)) return true;
+  if (isFalseyFlag(value)) return false;
+  throw new SettingsError(`Expected a boolean (true or false), got ${JSON.stringify(value)}.`);
+};
+
+export const formatCliSettings = (settings: CliSettings): string =>
+  `${AUTO_UPDATE_SETTING}=${settings.autoUpdate}`;
+
+export const getCliSetting = (
+  settings: CliSettings,
+  name: string | undefined,
+): { readonly output: string } => {
+  if (name === undefined || name.length === 0) return { output: formatCliSettings(settings) };
+  if (name !== AUTO_UPDATE_SETTING) {
+    throw new SettingsError(`Unknown setting "${name}". Known settings: ${AUTO_UPDATE_SETTING}.`);
+  }
+  return { output: String(settings.autoUpdate) };
+};
+
+export async function setCliSetting(
+  environment: CliEnvironment,
+  name: string,
+  value: string,
+): Promise<{ readonly output: string; readonly settings: CliSettings }> {
+  if (name !== AUTO_UPDATE_SETTING) {
+    throw new SettingsError(`Unknown setting "${name}". Known settings: ${AUTO_UPDATE_SETTING}.`);
+  }
+  const settings = { autoUpdate: parseBooleanSetting(value) };
+  await writeCliSettings(settings, environment);
+  return {
+    settings,
+    output: `Set ${AUTO_UPDATE_SETTING} to ${settings.autoUpdate}.`,
+  };
+}

package/src/cli/skill.ts

@@ -2,11 +2,9 @@ import { assert } from "es-toolkit";
 import { createHash } from "node:crypto";
 import { copyFile, mkdir, mkdtemp, readFile, realpath, rename, rm, stat } from "node:fs/promises";
 import { dirname, join } from "node:path";
-import { fileURLToPath } from "node:url";
 import { assertSafeDestination, entryStats, hasErrorCode } from "./file-system";
 import { formatCliError } from "./format-error";
 
-export const BUNDLED_SKILL_CATALOG_ROOT = fileURLToPath(new URL("../../skills", import.meta.url));
 export const SKILL_CATALOG_MANIFEST = "catalog.json";
 export const SKILL_INSTALL_ROOT = ".agents/skills";
 export const SKILL_ENTRY_POINT = "SKILL.md";
@@ -133,15 +131,16 @@ export async function resolveBundledSkillCatalogRoot(
   const runtimeRoot =
     entry === undefined ? undefined : await findSkillCatalogRootAbove(dirname(entry));
   if (runtimeRoot !== undefined) return runtimeRoot;
+  const workingDirectoryRoot = await findSkillCatalogRootAbove(process.cwd());
   const searched =
     entry === undefined
       ? "process.argv[1] names no runtime entry"
       : `none exists between ${entry} and the filesystem root`;
   assert(
-    await isFileAt(join(BUNDLED_SKILL_CATALOG_ROOT, SKILL_CATALOG_MANIFEST)),
-    `Cannot locate the bundled skill catalog. An installed @toloka-platform/sdk must ship ${SKILL_CATALOG_DIRECTORY}/${SKILL_CATALOG_MANIFEST} in a directory above its runtime entry, but ${searched}, and the source checkout catalog ${BUNDLED_SKILL_CATALOG_ROOT} is absent. Reinstall @toloka-platform/sdk.`,
+    workingDirectoryRoot !== undefined,
+    `Cannot locate the bundled skill catalog. An installed @toloka-platform/sdk must ship ${SKILL_CATALOG_DIRECTORY}/${SKILL_CATALOG_MANIFEST} in a directory above its runtime entry, but ${searched}, and no ${SKILL_CATALOG_DIRECTORY}/${SKILL_CATALOG_MANIFEST} exists above ${process.cwd()} either. Reinstall @toloka-platform/sdk.`,
   );
-  return BUNDLED_SKILL_CATALOG_ROOT;
+  return workingDirectoryRoot;
 }
 
 const loadBundledSkillCatalog = async (): Promise<SkillCatalog> =>

package/src/importer.ts

@@ -220,7 +220,7 @@ function formatSource(value: unknown, depth = 0): string {
   return `{\n${properties}\n${indentation(depth)}}`;
 }
 
-function transformFieldProxy(
+function transformFieldReference(
   reference: { id: string; optional: boolean },
   fieldReference: FieldReference,
 ): unknown {
@@ -276,10 +276,10 @@ function authoringSettings(node: GraphNode, fieldReference: FieldReference): unk
       return {
         ...settings,
         started: startedFieldProxies.output.map((reference) =>
-          transformFieldProxy(reference, fieldReference),
+          transformFieldReference(reference, fieldReference),
         ),
         completed: completedFieldProxies.input.map((reference) =>
-          transformFieldProxy(reference, fieldReference),
+          transformFieldReference(reference, fieldReference),
         ),
       };
     }
@@ -287,14 +287,12 @@ function authoringSettings(node: GraphNode, fieldReference: FieldReference): unk
       const { fieldProxies, ...settings } = node.settings;
       return {
         ...settings,
-        fieldProxies: {
-          input: fieldProxies.input.map((reference) =>
-            transformFieldProxy(reference, fieldReference),
-          ),
-          output: fieldProxies.output.map((reference) =>
-            transformFieldProxy(reference, fieldReference),
-          ),
-        },
+        input: fieldProxies.input.map((reference) =>
+          transformFieldReference(reference, fieldReference),
+        ),
+        output: fieldProxies.output.map((reference) =>
+          transformFieldReference(reference, fieldReference),
+        ),
       };
     }
     case "generation": {
@@ -322,11 +320,9 @@ function authoringSettings(node: GraphNode, fieldReference: FieldReference): unk
             field: fieldReference(fieldProxyId),
           })),
         })),
-        fieldProxies: {
-          input: fieldProxies.input.map((reference) =>
-            transformFieldProxy(reference, fieldReference),
-          ),
-        },
+        input: fieldProxies.input.map((reference) =>
+          transformFieldReference(reference, fieldReference),
+        ),
       };
     }
     case "quorum": {

package/openapi/gen/models/datasetItemDuplicateOfSubmissionId.ts

@@ -1,2 +0,0 @@
-
-export type DatasetItemDuplicateOfSubmissionId = string | null;