@togglhq/cli 1.5.19 → 1.5.21

package/LICENSE

@@ -0,0 +1,6 @@
+Copyright (c) Toggl. All rights reserved.
+
+This software is proprietary to Toggl. Installation and use are permitted only
+under applicable Toggl product terms, agreements, and policies.
+
+See https://toggl.com/legal/ for current legal terms and policies.

package/README.md

@@ -1,21 +1,13 @@
 # @toggl/cli
 
-Command-line interface for [Toggl Focus](https://focus.toggl.com). Published publicly as **`@togglhq/cli`** on **npmjs.org**. Internal builds publish as **`@toggl/cli-internal`** on GitHub Packages.
+Command-line interface for [Toggl 2.0](https://focus.toggl.com).
 
 ## Installation
 
-From npm (no GitHub token):
-
 ```bash
 npm install -g @togglhq/cli
 ```
 
-Or from GitHub Packages (Toggl staff): configure your `.npmrc` with a GitHub Packages token, then:
-
-```bash
-npm install -g @toggl/cli-internal
-```
-
 Or run without installing:
 
 ```bash
@@ -55,13 +47,13 @@ The active profile controls both the account and environment for later commands.
 
 ## Agent skill setup
 
-`@toggl/cli` ships a `toggl-cli` agent skill under `skills/toggl-cli`. Install it with:
+`@togglhq/cli` ships a `toggl-cli` agent skill under `skills/toggl-cli`. Install it with:
 
 ```bash
 toggl skill setup
 ```
 
-This delegates to the [`skills`](https://www.npmjs.com/package/skills) CLI, listed as a **dependency** of `@toggl/cli` (no separate install). Interactive agent/scope prompts come from that CLI.
+This delegates to the [`skills`](https://www.npmjs.com/package/skills) CLI, listed as a **dependency** of `@togglhq/cli` (no separate install). Interactive agent/scope prompts come from that CLI.
 
 After upgrading the CLI, refresh the skill install:
 
@@ -78,7 +70,7 @@ toggl skill setup --agent cursor codex --copy --yes
 
 ## Command shape
 
-Generated Focus commands look like:
+Generated Toggl 2.0 commands look like:
 
 ```
 toggl [global flags] <group> … <subcommand> [flags]
@@ -297,3 +289,7 @@ TOGGL_DEBUG=1 toggl tasks list
 ```
 
 Prints schema validation warnings from API responses to stderr.
+
+## License
+
+Proprietary Toggl software. See [LICENSE](LICENSE) and [Toggl legal terms](https://toggl.com/legal/).

package/build/index.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { n as CommanderError, t as createProgram } from "./program-BwnVUFVS.js";
+import { n as CommanderError, t as createProgram } from "./program-Bz9wasNE.js";
 //#region src/index.ts
 try {
 	await createProgram({ enableUpdateNotification: true }).parseAsync(process.argv);

package/build/{program-BwnVUFVS.js → program-Bz9wasNE.js}

@@ -2,7 +2,7 @@ import { createRequire } from "node:module";
 import { exec, spawn } from "node:child_process";
 import * as path$1 from "node:path";
 import path, { basename, dirname, extname, join } from "node:path";
-import * as fs from "node:fs";
+import * as fs$1 from "node:fs";
 import { readFileSync } from "node:fs";
 import process$1 from "node:process";
 import { fileURLToPath } from "node:url";
@@ -11,7 +11,7 @@ import { stripVTControlCharacters, styleText } from "node:util";
 import * as readline from "node:readline";
 import * as os from "node:os";
 import * as crypto from "node:crypto";
-import * as fs$1 from "node:fs/promises";
+import * as fs from "node:fs/promises";
 import { mkdir, readFile, stat, writeFile } from "node:fs/promises";
 import { createInterface } from "node:readline/promises";
 import * as http from "node:http";
@@ -5203,82 +5203,14 @@ var dist_default = createPrompt((config, done) => {
 	].filter(Boolean).join("\n").trimEnd()}${cursorHide}`;
 });
 //#endregion
-//#region src/skill-setup.ts
-function resolveSkillsCliBinImportMeta(metaUrl) {
-	const resolveFn = import.meta.resolve;
-	if (typeof resolveFn !== "function") return;
-	try {
-		return fileURLToPath(resolveFn("skills/bin/cli.mjs", metaUrl));
-	} catch {
-		return;
-	}
-}
-function resolveSkillsCliBinRequire(metaUrl, packageRoot) {
-	try {
-		return createRequire(metaUrl).resolve("skills/bin/cli.mjs", { paths: [packageRoot] });
-	} catch {
-		return;
-	}
-}
-const TOGGL_CLI_SKILL_NAME = "toggl-cli";
-function buildSkillsAddArgs(packageRoot, options) {
-	const args = [
-		"add",
-		packageRoot,
-		"--skill",
-		TOGGL_CLI_SKILL_NAME
-	];
-	const agents = typeof options.agent === "string" ? [options.agent] : options.agent;
-	if (agents?.length) args.push("--agent", ...agents);
-	if (options.global) args.push("--global");
-	if (options.copy) args.push("--copy");
-	if (options.yes) args.push("--yes");
-	return args;
-}
-function resolveCliPackageRoot(metaUrl = import.meta.url) {
-	return fileURLToPath(new URL("..", metaUrl));
-}
-function resolveSkillsCliBin(metaUrl = import.meta.url) {
-	const packageRoot = resolveCliPackageRoot(metaUrl);
-	const legacyBundled = path$1.join(packageRoot, "bundled", "skills-runtime", "node_modules", "skills", "bin", "cli.mjs");
-	return resolveSkillsCliBinImportMeta(metaUrl) ?? resolveSkillsCliBinRequire(metaUrl, packageRoot) ?? legacyBundled;
-}
-async function assertBundledSkillExists(packageRoot) {
-	const skillPath = path$1.join(packageRoot, "skills", TOGGL_CLI_SKILL_NAME, "SKILL.md");
-	await fs$1.access(skillPath);
-}
-async function runSkillSetup(options) {
-	const packageRoot = resolveCliPackageRoot();
-	await assertBundledSkillExists(packageRoot);
-	const skillsBin = resolveSkillsCliBin();
-	try {
-		await fs$1.access(skillsBin);
-	} catch {
-		throw new Error(`Could not find the skills installer at ${skillsBin}. Reinstall @toggl/cli.`);
-	}
-	const args = buildSkillsAddArgs(packageRoot, options);
-	await new Promise((resolve, reject) => {
-		const child = spawn(process.execPath, [skillsBin, ...args], { stdio: "inherit" });
-		child.on("error", reject);
-		child.on("exit", (code, signal) => {
-			if (code === 0) {
-				resolve();
-				return;
-			}
-			const reason = signal ? `signal ${signal}` : `exit code ${code ?? "unknown"}`;
-			reject(/* @__PURE__ */ new Error(`skills ${args.join(" ")} failed with ${reason}`));
-		});
-	});
-}
-//#endregion
 //#region ../cli-core/build/profile-Empu4JWK.js
 const CONFIG_DIR = path$1.join(os.homedir(), ".toggl");
 const CONFIG_FILE = path$1.join(CONFIG_DIR, "focus-tools.json");
 const LEGACY_MCP_CONFIG_FILE = path$1.join(os.homedir(), ".toggl-focus-mcp", "config.json");
 function readJsonFile(filePath) {
-	if (!fs.existsSync(filePath)) return null;
+	if (!fs$1.existsSync(filePath)) return null;
 	try {
-		return JSON.parse(fs.readFileSync(filePath, "utf-8"));
+		return JSON.parse(fs$1.readFileSync(filePath, "utf-8"));
 	} catch (err) {
 		const msg = err instanceof Error ? err.message : String(err);
 		throw new Error(`Failed to read ${filePath}: ${msg}`, { cause: err });
@@ -5286,10 +5218,10 @@ function readJsonFile(filePath) {
 }
 function saveLegacyAuthConfig(config) {
 	const dir = path$1.dirname(LEGACY_MCP_CONFIG_FILE);
-	fs.mkdirSync(dir, { recursive: true });
+	fs$1.mkdirSync(dir, { recursive: true });
 	const tmp = `${LEGACY_MCP_CONFIG_FILE}.${process.pid}.tmp`;
-	fs.writeFileSync(tmp, JSON.stringify(config, null, 2) + "\n", { mode: 384 });
-	fs.renameSync(tmp, LEGACY_MCP_CONFIG_FILE);
+	fs$1.writeFileSync(tmp, JSON.stringify(config, null, 2) + "\n", { mode: 384 });
+	fs$1.renameSync(tmp, LEGACY_MCP_CONFIG_FILE);
 }
 function loadDeveloperToolsConfig() {
 	const config = readJsonFile(CONFIG_FILE);
@@ -5307,10 +5239,10 @@ function loadProfile(scope = "cli", profile) {
 	return legacy;
 }
 function saveDeveloperToolsConfig(config) {
-	fs.mkdirSync(CONFIG_DIR, { recursive: true });
+	fs$1.mkdirSync(CONFIG_DIR, { recursive: true });
 	const tmp = `${CONFIG_FILE}.${process.pid}.tmp`;
-	fs.writeFileSync(tmp, JSON.stringify(config, null, 2) + "\n", { mode: 384 });
-	fs.renameSync(tmp, CONFIG_FILE);
+	fs$1.writeFileSync(tmp, JSON.stringify(config, null, 2) + "\n", { mode: 384 });
+	fs$1.renameSync(tmp, CONFIG_FILE);
 }
 function profileEnvironment(focusApiUrl) {
 	const hostname = new URL(focusApiUrl).hostname;
@@ -12204,7 +12136,7 @@ async function fetchAccessibleWorkspaces(accountsApiUrl, token) {
 	}));
 }
 async function resolveAuthenticatedWorkspace(workspaces, options) {
-	if (workspaces.length === 0) throw new Error("No Focus workspaces found for this account.");
+	if (workspaces.length === 0) throw new Error("No Toggl 2.0 workspaces found for this account.");
 	if (options.explicitWorkspaceId !== void 0) {
 		const match = workspaces.find((w) => w.workspace_id === options.explicitWorkspaceId);
 		if (!match) throw new Error(`Workspace ${options.explicitWorkspaceId} not found. Available: ${workspaces.map((w) => `${w.workspace_id} (${w.workspace_name})`).join(", ")}`);
@@ -12282,6 +12214,13 @@ async function runCliAuthFlow(options = {}) {
 	log(`Profile saved as '${profileName}' in ~/.toggl/focus-tools.json`);
 	return config;
 }
+const PUBLIC_CLI_PACKAGE_NAME = "@togglhq/cli";
+const PUBLIC_MCP_PACKAGE_NAME = "@togglhq/mcp";
+const PUBLIC_CLI_PACKAGE_SPEC = `${PUBLIC_CLI_PACKAGE_NAME}@latest`;
+`${PUBLIC_MCP_PACKAGE_NAME}`;
+function npxMcpAuthCommand() {
+	return `npx ${PUBLIC_MCP_PACKAGE_NAME} auth`;
+}
 async function refreshTokens(accountsApiUrl, refreshToken) {
 	const params = new URLSearchParams({
 		grant_type: "refresh_token",
@@ -12297,7 +12236,7 @@ async function refreshTokens(accountsApiUrl, refreshToken) {
 }
 async function getValidToken(scope = "cli", profile) {
 	const authConfig = loadProfile(scope, profile);
-	if (!authConfig) throw new Error(scope === "cli" ? "Not authenticated. Run `toggl auth` to sign in." : "Not authenticated. Run `npx @toggl/mcp auth` to sign in.");
+	if (!authConfig) throw new Error(scope === "cli" ? "Not authenticated. Run `toggl auth` to sign in." : `Not authenticated. Run \`${npxMcpAuthCommand()}\` to sign in.`);
 	const now = Date.now() / 1e3;
 	if (authConfig.expires_at > now + 60) return authConfig.access_token;
 	const tokens = await refreshTokens(authConfig.accounts_api_url, authConfig.refresh_token);
@@ -12309,7 +12248,7 @@ async function getValidToken(scope = "cli", profile) {
 	if (developerConfig && activeProfile && developerConfig.profiles[activeProfile]) {
 		developerConfig.profiles[activeProfile] = authConfig;
 		saveDeveloperToolsConfig(developerConfig);
-	} else if (fs.existsSync(LEGACY_MCP_CONFIG_FILE)) saveLegacyAuthConfig(authConfig);
+	} else if (fs$1.existsSync(LEGACY_MCP_CONFIG_FILE)) saveLegacyAuthConfig(authConfig);
 	return authConfig.access_token;
 }
 function requireCliDeveloperProfile(profile) {
@@ -12358,6 +12297,99 @@ function switchCliWorkspace(workspaceId, profile) {
 	return target;
 }
 //#endregion
+//#region src/cli-package-manifest.ts
+const pkgJsonPath = path$1.join(path$1.dirname(fileURLToPath(import.meta.url)), "..", "package.json");
+function getPublicPackageName() {
+	return PUBLIC_CLI_PACKAGE_NAME;
+}
+function getPublicPackageSpec() {
+	return PUBLIC_CLI_PACKAGE_SPEC;
+}
+getPublicPackageName();
+getPublicPackageSpec();
+async function readCliPackageManifest() {
+	const raw = await readFile(pkgJsonPath, "utf-8");
+	return JSON.parse(raw);
+}
+async function readCliPackageVersion() {
+	const parsed = await readCliPackageManifest();
+	if (!parsed.version) throw new Error("Missing version in package.json");
+	return parsed.version;
+}
+function isRunningViaNpx() {
+	if (process.env.NPX_CLI_JS) return true;
+	const argv1 = process.argv[1] ?? "";
+	return argv1.includes("_npx") || /[/\\]npx[/\\]/.test(argv1);
+}
+//#endregion
+//#region src/skill-setup.ts
+function resolveSkillsCliBinImportMeta(metaUrl) {
+	const resolveFn = import.meta.resolve;
+	if (typeof resolveFn !== "function") return;
+	try {
+		return fileURLToPath(resolveFn("skills/bin/cli.mjs", metaUrl));
+	} catch {
+		return;
+	}
+}
+function resolveSkillsCliBinRequire(metaUrl, packageRoot) {
+	try {
+		return createRequire(metaUrl).resolve("skills/bin/cli.mjs", { paths: [packageRoot] });
+	} catch {
+		return;
+	}
+}
+const TOGGL_CLI_SKILL_NAME = "toggl-cli";
+function buildSkillsAddArgs(packageRoot, options) {
+	const args = [
+		"add",
+		packageRoot,
+		"--skill",
+		TOGGL_CLI_SKILL_NAME
+	];
+	const agents = typeof options.agent === "string" ? [options.agent] : options.agent;
+	if (agents?.length) args.push("--agent", ...agents);
+	if (options.global) args.push("--global");
+	if (options.copy) args.push("--copy");
+	if (options.yes) args.push("--yes");
+	return args;
+}
+function resolveCliPackageRoot(metaUrl = import.meta.url) {
+	return fileURLToPath(new URL("..", metaUrl));
+}
+function resolveSkillsCliBin(metaUrl = import.meta.url) {
+	const packageRoot = resolveCliPackageRoot(metaUrl);
+	const legacyBundled = path$1.join(packageRoot, "bundled", "skills-runtime", "node_modules", "skills", "bin", "cli.mjs");
+	return resolveSkillsCliBinImportMeta(metaUrl) ?? resolveSkillsCliBinRequire(metaUrl, packageRoot) ?? legacyBundled;
+}
+async function assertBundledSkillExists(packageRoot) {
+	const skillPath = path$1.join(packageRoot, "skills", TOGGL_CLI_SKILL_NAME, "SKILL.md");
+	await fs.access(skillPath);
+}
+async function runSkillSetup(options) {
+	const packageRoot = resolveCliPackageRoot();
+	await assertBundledSkillExists(packageRoot);
+	const skillsBin = resolveSkillsCliBin();
+	try {
+		await fs.access(skillsBin);
+	} catch {
+		throw new Error(`Could not find the skills installer at ${skillsBin}. Reinstall ${getPublicPackageName()}.`);
+	}
+	const args = buildSkillsAddArgs(packageRoot, options);
+	await new Promise((resolve, reject) => {
+		const child = spawn(process.execPath, [skillsBin, ...args], { stdio: "inherit" });
+		child.on("error", reject);
+		child.on("exit", (code, signal) => {
+			if (code === 0) {
+				resolve();
+				return;
+			}
+			const reason = signal ? `signal ${signal}` : `exit code ${code ?? "unknown"}`;
+			reject(/* @__PURE__ */ new Error(`skills ${args.join(" ")} failed with ${reason}`));
+		});
+	});
+}
+//#endregion
 //#region ../focus-queries/dist/attachments/requests.ts
 async function getWorkspaceAttachmentStorage(httpClient, organization_id, workspace_id, signal) {
 	return await httpClient.get(`organizations/${organization_id}/workspaces/${workspace_id}/attachments/storage`, { signal }).json();
@@ -23856,7 +23888,7 @@ const schedulerOverrides = {
 	"focus.scheduler.validate-instructions": { hidden: true }
 };
 const searchOverrides = { "focus.search.search": {
-	description: "Search across Focus entities.",
+	description: "Search across Toggl 2.0 entities.",
 	cli: {
 		group: [],
 		command: "search",
@@ -25464,7 +25496,7 @@ function inputFromScalarFlags(operation, options) {
 	return hasAny ? result : void 0;
 }
 async function readInput(operation, options) {
-	if (options.dataFile) return parseJson(await fs$1.readFile(options.dataFile, "utf-8"), options.dataFile);
+	if (options.dataFile) return parseJson(await fs.readFile(options.dataFile, "utf-8"), options.dataFile);
 	if (options.data === "-") return parseJson(await readStdin(), "stdin");
 	if (options.data) return parseJson(options.data, "--data");
 	const fromFlags = inputFromScalarFlags(operation, options);
@@ -25555,36 +25587,6 @@ function formatHumanOutput(data) {
 	return `${formatValue(data)}\n`;
 }
 //#endregion
-//#region src/cli-package-manifest.ts
-const PUBLIC_PACKAGE_FALLBACK = "@togglhq/cli";
-const pkgJsonPath = path$1.join(path$1.dirname(fileURLToPath(import.meta.url)), "..", "package.json");
-function getPublicPackageName() {
-	try {
-		return JSON.parse(readFileSync(pkgJsonPath, "utf-8")).name ?? "@togglhq/cli";
-	} catch {
-		return PUBLIC_PACKAGE_FALLBACK;
-	}
-}
-function getPublicPackageSpec() {
-	return `${getPublicPackageName()}@latest`;
-}
-getPublicPackageName();
-getPublicPackageSpec();
-async function readCliPackageManifest() {
-	const raw = await readFile(pkgJsonPath, "utf-8");
-	return JSON.parse(raw);
-}
-async function readCliPackageVersion() {
-	const parsed = await readCliPackageManifest();
-	if (!parsed.version) throw new Error("Missing version in package.json");
-	return parsed.version;
-}
-function isRunningViaNpx() {
-	if (process.env.NPX_CLI_JS) return true;
-	const argv1 = process.argv[1] ?? "";
-	return argv1.includes("_npx") || /[/\\]npx[/\\]/.test(argv1);
-}
-//#endregion
 //#region src/update-notification.ts
 const UPDATE_CHECK_CACHE_FILE = path$1.join(CONFIG_DIR, "cli-update-check.json");
 const CACHE_TTL_MS = 1440 * 60 * 1e3;
@@ -25833,7 +25835,7 @@ function outputJson(data, globalOptions) {
 }
 function getClient(options) {
 	const config = loadProfile("cli", options.profile);
-	if (!config) throw new Error("Not authenticated. Run `toggl auth` to sign in, or `npx @toggl/mcp auth` for a shared session.");
+	if (!config) throw new Error(`Not authenticated. Run \`toggl auth\` to sign in, or \`${npxMcpAuthCommand()}\` for a shared session.`);
 	const urls = resolveEnvironmentUrls({
 		focusApiUrl: config.focus_api_url,
 		accountsApiUrl: coalesceAccountsApiUrl(config.focus_api_url, config.accounts_api_url)
@@ -25934,7 +25936,7 @@ function createProgram(programOptions = {}) {
 			process.exitCode = 1;
 		}
 	});
-	workspaceCommand.command("switch").description("Set the active workspace ID used for Focus API calls").argument("[workspace-id]", "Workspace ID to activate (omit to choose interactively)").action(async (workspaceIdArg) => {
+	workspaceCommand.command("switch").description("Set the active workspace ID used for Toggl 2.0 API calls").argument("[workspace-id]", "Workspace ID to activate (omit to choose interactively)").action(async (workspaceIdArg) => {
 		try {
 			const globalOptions = program.opts();
 			const target = switchCliWorkspace(await resolveWorkspaceIdOptional(workspaceIdArg, globalOptions, globalOptions.profile, {
@@ -26022,7 +26024,7 @@ function createProgram(programOptions = {}) {
 		});
 	}
 	registerSkillInstall("setup", ["add"], "Install the packaged toggl-cli skill via the skills CLI (default: symlink so updates track CLI upgrades)");
-	registerSkillInstall("sync", ["update"], "Re-install the toggl-cli skill from this CLI package (run after upgrading @toggl/cli)");
+	registerSkillInstall("sync", ["update"], `Re-install the toggl-cli skill from this CLI package (run after upgrading ${getPublicPackageName()})`);
 	program.addHelpText("after", `
 Common commands:
   toggl auth                     Sign in with your Toggl account
@@ -26080,4 +26082,4 @@ Common commands:
 //#endregion
 export { CommanderError as n, createProgram as t };
 
-//# sourceMappingURL=program-BwnVUFVS.js.map
+//# sourceMappingURL=program-Bz9wasNE.js.map

package/build/program.js

@@ -1,2 +1,2 @@
-import { t as createProgram } from "./program-BwnVUFVS.js";
+import { t as createProgram } from "./program-Bz9wasNE.js";
 export { createProgram };

package/package.json

@@ -1,12 +1,8 @@
 {
   "name": "@togglhq/cli",
-  "version": "1.5.19",
-  "description": "Toggl CLI for Focus API operations.",
+  "version": "1.5.21",
+  "description": "Toggl CLI for Toggl 2.0 API operations.",
   "license": "UNLICENSED",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/toggl/toggl-mcp.git"
-  },
   "type": "module",
   "publishConfig": {
     "registry": "https://registry.npmjs.org",
@@ -31,7 +27,8 @@
     "build/**/*.js",
     "build/**/*.d.ts",
     "skills/**",
-    "README.md"
+    "README.md",
+    "LICENSE"
   ],
   "scripts": {
     "build": "tsdown",

package/skills/toggl-cli/INTERNAL.md

@@ -2,6 +2,17 @@
 
 Install `@toggl/cli-internal` from **GitHub Packages** for internal builds that include staging and MS environment helpers (`toggl-internal` bin).
 
+Configure `~/.npmrc` with a GitHub Packages token (`read:packages`) and Toggl org access:
+
+```
+@toggl:registry=https://npm.pkg.github.com/
+//npm.pkg.github.com/:_authToken=<GH_NPM_TOKEN>
+```
+
+```bash
+npm install -g @toggl/cli-internal
+```
+
 ## Environments
 
 Use production by default. Use these flags only when a Toggl engineer asks for staging or a named MS environment.

package/skills/toggl-cli/SKILL.md

@@ -1,25 +1,25 @@
 ---
 name: toggl-cli
-description: Use the Toggl CLI to work with Toggl Focus tasks, projects, time entries, time blocks, workspaces, authentication, and CLI maintenance from an agent-friendly terminal workflow. Trigger when the user asks to inspect or modify Focus data through the terminal, authenticate Toggl, switch workspaces, install or refresh the Toggl agent skill, update the CLI, or automate Focus workflows.
+description: Use the Toggl CLI to work with Toggl 2.0 tasks, projects, time entries, time blocks, workspaces, authentication, and CLI maintenance from an agent-friendly terminal workflow. Trigger when the user asks to inspect or modify Toggl 2.0 data through the terminal, authenticate Toggl, switch workspaces, install or refresh the Toggl agent skill, update the CLI, or automate Toggl 2.0 workflows.
 ---
 
 # Toggl CLI
 
-Use the `toggl` command when the user wants to inspect or modify Toggl Focus data from the terminal. The CLI is designed for agents: commands are non-interactive when flags are supplied, `--json` gives compact machine-readable responses, validation errors are explicit, and destructive operations require confirmation flags.
+Use the `toggl` command when the user wants to inspect or modify Toggl 2.0 data from the terminal. The CLI is designed for agents: commands are non-interactive when flags are supplied, `--json` gives compact machine-readable responses, validation errors are explicit, and destructive operations require confirmation flags.
 
 ## When to Use
 
 Use this skill when the task involves:
 
-- Listing, reading, creating, updating, or deleting Toggl Focus tasks, projects, time blocks, or time entries.
+- Listing, reading, creating, updating, or deleting Toggl 2.0 tasks, projects, time blocks, or time entries.
 - Managing saved views, custom fields (admin), and task/project attachments (including file upload and download).
 - Finding workspace metadata such as statuses, users, and workspace IDs.
 - Authenticating the Toggl CLI, switching saved profiles, or switching the active workspace.
 - Installing or refreshing the CLI's agent skill (`toggl skill setup`, or `toggl skill sync` after upgrading `@toggl/cli`).
 - Updating a globally installed `@toggl/cli`.
-- Automating a Focus workflow from shell commands.
+- Automating a Toggl 2.0 workflow from shell commands.
 
-Do not use this skill for Toggl Track APIs, raw Focus API calls, or MCP server implementation work unless the user specifically asks to operate through the CLI.
+Do not use this skill for Toggl Track APIs, raw Toggl 2.0 API calls, or MCP server implementation work unless the user specifically asks to operate through the CLI.
 
 ## Operating Rules
 
@@ -43,14 +43,14 @@ Do not use this skill for Toggl Track APIs, raw Focus API calls, or MCP server i
 
 ## Read Next
 
-- Focus concepts, entity hierarchy, and resource relationships: `reference/focus-concepts.md`
+- Toggl 2.0 concepts, entity hierarchy, and resource relationships: `reference/focus-concepts.md`
 - Auth, profiles, and workspaces: `reference/auth-environments-workspaces.md`
 - Command shape, JSON input, output, dates, and safety flags: `reference/command-contract.md`
 - Tasks: `reference/tasks.md`
 - Projects: `reference/projects.md`
 - Time entries: `reference/time-entries.md`
 - Time blocks: `reference/time-blocks.md`
-- Rates and billables (Focus API vs Track): `reference/rates-and-billables.md`
+- Rates and billables (Toggl 2.0 API vs Track): `reference/rates-and-billables.md`
 - Statuses and users: `reference/statuses-users.md`
 - Reports (`get-workload` vs `get-flexq-data`): `reference/reports.md`
 - Common multi-step flows: `workflows/common-workflows.md`

package/skills/toggl-cli/reference/auth-environments-workspaces.md

@@ -23,7 +23,7 @@ toggl auth --code 'https://accounts.toggl.com/focus/cli/auth-code?code=YOUR_CODE
 
 The default `toggl auth` flow still uses `http://localhost:8716/callback` on the same machine and shows a branded success page in the browser tab.
 
-The same flags work for `npx @toggl/mcp auth` when running the MCP package entrypoint outside the MCP host.
+The same flags work for `npx @togglhq/mcp auth` when running the MCP package entrypoint outside the MCP host.
 
 If the account has multiple workspaces, pass the workspace explicitly:
 

package/skills/toggl-cli/reference/focus-concepts.md

@@ -1,10 +1,10 @@
-# Focus Concepts
+# Toggl 2.0 Concepts
 
-Use this file to understand how Toggl Focus entities relate to each other before choosing CLI commands.
+Use this file to understand how Toggl 2.0 entities relate to each other before choosing CLI commands.
 
 ## Mental Model
 
-Toggl Focus is organized around work that happens inside a workspace:
+Toggl 2.0 is organized around work that happens inside a workspace:
 
 ```text
 Environment/Profile
@@ -27,7 +27,7 @@ A profile stores credentials and the selected workspace. Use profiles when the u
 
 ### Workspace
 
-A workspace is the top-level Focus context for projects, tasks, statuses, users, time entries, and time blocks. Most IDs only make sense inside the active workspace.
+A workspace is the top-level context for projects, tasks, statuses, users, time entries, and time blocks. Most IDs only make sense inside the active workspace.
 
 Use workspace commands when the agent needs to list available workspaces, refresh workspace metadata, switch the default workspace, or override the workspace for one command.
 
@@ -63,7 +63,7 @@ Use time entries when the user wants to track work, start a break, stop tracking
 
 A time block represents scheduled or planned work. Time blocks usually belong to a task and have explicit start/end times.
 
-Use time blocks when the user wants to schedule, plan, move, inspect, or delete calendar-like Focus blocks.
+Use time blocks when the user wants to schedule, plan, move, inspect, or delete calendar-like time blocks.
 
 ## Choosing the Right Command
 

package/skills/toggl-cli/reference/projects.md

@@ -1,6 +1,6 @@
 # Projects
 
-Use project commands to list Focus projects, resolve project IDs, create projects, rename projects, and delete projects.
+Use project commands to list projects, resolve project IDs, create projects, rename projects, and delete projects.
 
 ## Commands
 

package/skills/toggl-cli/reference/rates-and-billables.md

@@ -2,12 +2,12 @@
 
 There are **two different systems**. Pick the one that matches where the user is working.
 
-## Focus billable / labor rate schedules (this CLI)
+## Toggl 2.0 billable / labor rate schedules (this CLI)
 
-Workspace and project **billable rate schedules** live under `toggl rates billable …` (nested under `rates`; same endpoints as the former top-level `billable-rates` command). **Labor cost rate** schedules use `toggl rates labor …` when your generated catalog includes them. Typical verbs: upserts, ranged deletes, conflict checks, and reads for workspace/project and per-user overlays (`get-*`, `upsert-*`, `delete-*-range`, `check-*-conflicts`). Use these when the task is **Focus billing configuration** or **Focus API rate data**.
+Workspace and project **billable rate schedules** live under `toggl rates billable …` (nested under `rates`; same endpoints as the former top-level `billable-rates` command). **Labor cost rate** schedules use `toggl rates labor …` when your generated catalog includes them. Typical verbs: upserts, ranged deletes, conflict checks, and reads for workspace/project and per-user overlays (`get-*`, `upsert-*`, `delete-*-range`, `check-*-conflicts`). Use these when the task is **Toggl 2.0 billing configuration** or **Toggl 2.0 API rate data**.
 
 ## Track workspace assignment / Members UI
 
-**Track** exposes member and workspace defaults such as **`track_billable_rate`** (and related assignment flows in the **Members** area of the Track product). That path is **not** the Focus `rates billable` endpoints. If someone is changing rates **only in Track’s member/project assignment UI**, use Track’s APIs or the Track web app — do not assume the Focus CLI commands wrote the same field.
+**Track** exposes member and workspace defaults such as **`track_billable_rate`** (and related assignment flows in the **Members** area of the Track product). That path is **not** the Toggl 2.0 `rates billable` endpoints. If someone is changing rates **only in Track’s member/project assignment UI**, use Track’s APIs or the Track web app — do not assume the Toggl 2.0 CLI commands wrote the same field.
 
-**Rule of thumb:** Focus CLI `rates billable` (and `rates labor` when present) ↔ Focus billing schedules. Track member default rate ↔ Track/Members and Track APIs.
+**Rule of thumb:** Toggl 2.0 CLI `rates billable` (and `rates labor` when present) ↔ Toggl 2.0 billing schedules. Track member default rate ↔ Track/Members and Track APIs.

package/skills/toggl-cli/reference/tasks.md

@@ -1,6 +1,6 @@
 # Tasks
 
-Use task commands for Focus task lookup, creation, updates, and deletion.
+Use task commands for task lookup, creation, updates, and deletion.
 
 ## Commands
 

package/skills/toggl-cli/reference/time-blocks.md

@@ -1,6 +1,6 @@
 # Time Blocks
 
-Use time block commands to inspect, create, update, and delete scheduled Focus blocks.
+Use time block commands to inspect, create, update, and delete scheduled time blocks.
 
 ## Commands