@togglhq/cli 1.8.0 → 1.8.2

package/build/cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { a as CommanderError, i as shutdownCliTelemetry, n as captureCliException, r as initCliTelemetry, t as createProgram } from "./program-B6EuV2vO.js";
+import { a as CommanderError, i as shutdownCliTelemetry, n as captureCliException, r as initCliTelemetry, t as createProgram } from "./program-B0eN4WNv.js";
 import { readFileSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";

package/build/index.js

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

package/build/{program-B6EuV2vO.js → program-B0eN4WNv.js}

@@ -10604,24 +10604,6 @@ async function createTimeEntryWithOrg(httpClient, organization_id, workspace_id,
 		json: data
 	}).json();
 }
-async function getTimeEntriesRangeWithOrgClassic(httpClient, organization_id, workspace_id, { date_from, date_to, task_id, status_id, type, page, per_page, order_by, archived, time_block_id, include_taskless }, signal) {
-	return await httpClient.get(`organizations/${organization_id}/workspaces/${workspace_id}/time-entries`, {
-		signal,
-		searchParams: buildSearchParams$3({
-			date_from,
-			date_to,
-			task_id,
-			status_id,
-			type,
-			page,
-			per_page,
-			order_by,
-			archived,
-			time_block_id,
-			include_taskless
-		})
-	}).json();
-}
 async function createTasklessTimeEntryWithOrg(httpClient, organization_id, workspace_id, data, signal) {
 	return await httpClient.post(`organizations/${organization_id}/workspaces/${workspace_id}/time-entries`, {
 		signal,
@@ -10972,7 +10954,7 @@ async function deleteMyWorkingHours(httpClient, organization_id, data, signal) {
 	return response.json();
 }
 //#endregion
-//#region ../cli-core/build/focus-client-B2l1BZIW.js
+//#region ../cli-core/build/focus-client-D9oJPY4f.js
 /** Request header the API reads to attribute traffic to MCP or CLI. */
 const TOGGL_CLIENT_HEADER = "X-Toggl-Client";
 /** Headers that attribute a raw `fetch` to MCP or CLI (FocusClient sets these itself). */
@@ -11000,6 +10982,20 @@ function normalizeDateFrom(value) {
 function normalizeDateTo(value) {
 	return DATE_ONLY_RE.test(value) ? `${value}T23:59:59Z` : value;
 }
+function timeEntryProjectId(entry) {
+	if (typeof entry.project_id === "number") return entry.project_id;
+	if (typeof entry.project?.id === "number") return entry.project.id;
+	if (typeof entry.task?.project_id === "number") return entry.task.project_id;
+}
+function filterTimeEntriesByProjectId(entries, projectId) {
+	return entries.filter((entry) => timeEntryProjectId(entry) === projectId);
+}
+function parseOptionalBoolean(value) {
+	if (value === void 0 || value === "") return void 0;
+	if (typeof value === "boolean") return value;
+	if (value === "true") return true;
+	if (value === "false") return false;
+}
 const MAX_UPLOAD_BYTES = 20 * 1024 * 1024;
 const MIME_BY_EXTENSION = {
 	".png": "image/png",
@@ -11556,16 +11552,53 @@ var FocusClient = class {
 		const date_from = normalizeDateFrom(rawFrom);
 		const date_to = normalizeDateTo(rawTo);
 		const type = params.type;
-		const response = await this.run("listTimeEntries", () => getTimeEntriesRangeWithOrgClassic(this.http, this.organizationIdNum, this.workspaceIdNum, {
+		const include_taskless = parseOptionalBoolean(params.include_taskless) ?? true;
+		const projectId = parseOptionalInt(params.project_id);
+		const task_id = parseOptionalInt(params.task_id);
+		const time_block_id = parseOptionalInt(params.time_block_id);
+		const requestedPage = parseOptionalInt(params.page) ?? 1;
+		const requestedPerPage = parseOptionalInt(params.per_page);
+		const fetchPage = (page, per_page) => this.run("listTimeEntries", () => this.http.get(`organizations/${this.organizationIdNum}/workspaces/${this.workspaceIdNum}/time-entries`, { searchParams: buildSearchParams$2({
 			date_from,
 			date_to,
-			task_id: parseOptionalInt(params.task_id),
-			time_block_id: parseOptionalInt(params.time_block_id),
+			task_id,
+			time_block_id,
 			type,
-			page: parseOptionalInt(params.page),
-			per_page: parseOptionalInt(params.per_page)
-		}));
-		return this.softValidateResponse("listTimeEntries", PaginatedTimeEntryWithTasksSchema, response);
+			page,
+			per_page,
+			include_taskless,
+			project_id: projectId
+		}) }).json());
+		if (projectId === void 0) {
+			const response = await fetchPage(requestedPage, requestedPerPage);
+			return this.softValidateResponse("listTimeEntries", PaginatedTimeEntryWithTasksSchema, response);
+		}
+		const perPage = requestedPerPage ?? 50;
+		const needed = requestedPage * perPage;
+		const matched = [];
+		const apiPerPage = 100;
+		const maxApiPages = 50;
+		let truncated = false;
+		for (let apiPage = 1; apiPage <= maxApiPages; apiPage += 1) {
+			const response = await fetchPage(apiPage, apiPerPage);
+			const validated = this.softValidateResponse("listTimeEntries", PaginatedTimeEntryWithTasksSchema, response);
+			if (!validated.ok) return validated;
+			const pageRows = validated.data.data;
+			matched.push(...filterTimeEntriesByProjectId(pageRows, projectId));
+			if (pageRows.length < apiPerPage) break;
+			if (matched.length >= needed) break;
+			if (apiPage === maxApiPages) truncated = true;
+		}
+		const start = (requestedPage - 1) * perPage;
+		return {
+			ok: true,
+			data: {
+				page: requestedPage,
+				per_page: perPage,
+				data: matched.slice(start, start + perPage),
+				...truncated ? { truncated: true } : {}
+			}
+		};
 	}
 	async startTracking(payload) {
 		const input = validatePayload(TimeEntryStartTrackingPayloadSchema, payload, "startTracking payload");
@@ -12618,6 +12651,51 @@ function switchCliWorkspace(workspaceId, profile) {
 	saveDeveloperToolsConfig(dev);
 	return target;
 }
+const CLI_GENERIC_ERROR_CATEGORY = "cli.command_error";
+const MCP_GENERIC_ERROR_CATEGORY = "mcp.tool_error";
+const ERROR_CATEGORY_SET = new Set([
+	"cli.validation_error",
+	"cli.api_error",
+	CLI_GENERIC_ERROR_CATEGORY,
+	"mcp.validation_error",
+	"mcp.api_error",
+	"mcp.auth_error",
+	MCP_GENERIC_ERROR_CATEGORY
+]);
+function isDeclaredErrorCategory(value) {
+	return typeof value === "string" && ERROR_CATEGORY_SET.has(value);
+}
+function firstToolResultText(source) {
+	if (!source || typeof source !== "object") return null;
+	const content = source.content;
+	if (!Array.isArray(content)) return null;
+	const first = content[0];
+	if (first?.type === "text" && typeof first.text === "string") return first.text;
+	return null;
+}
+function errorTextForClassification(source) {
+	if (source instanceof Error) return source.message;
+	if (typeof source === "string") return source;
+	const toolText = firstToolResultText(source);
+	if (toolText !== null) return toolText;
+	return "";
+}
+function classifyCli(message) {
+	if (message.startsWith("Invalid input:") || message.startsWith("Invalid input ")) return "cli.validation_error";
+	if (/^\d{3}:\s/.test(message)) return "cli.api_error";
+	return CLI_GENERIC_ERROR_CATEGORY;
+}
+function classifyMcp(message) {
+	if (message.startsWith("Invalid input:") || message.startsWith("Invalid input ")) return "mcp.validation_error";
+	if (message.startsWith("API Error (")) return "mcp.api_error";
+	if (message.startsWith("Authentication failed:") || message.startsWith("Not authenticated.")) return "mcp.auth_error";
+	return MCP_GENERIC_ERROR_CATEGORY;
+}
+function classifyErrorCategory(client, source) {
+	const message = errorTextForClassification(source);
+	if (isDeclaredErrorCategory(message) && message.startsWith(`${client}.`)) return message;
+	return client === "cli" ? classifyCli(message) : classifyMcp(message);
+}
 /**
 * Exception messages are the one channel `sendDefaultPii: false` does not cover,
 * and this repo's errors put user data in them: validation failures embed the
@@ -12629,15 +12707,14 @@ function switchCliWorkspace(workspaceId, profile) {
 * Shared between the CLI and the public MCP build so the two cannot drift.
 */
 /**
-* Fixed categories are `<surface>.<snake_case>` — anchored at both ends, because
-* a prefix test would pass anything that merely *starts* that way. A real message
-* like `cli.ts:12: unexpected token "secret"` begins with `cli.` and would
-* otherwise sail through unredacted.
+* Fixed categories are the seven declared `<surface>.<snake_case>` values, not
+* a `cli|mcp` prefix regex. A prefix or regex test would pass a caught message
+* like `cli.customer_name`. A real filename message such as
+* `cli.ts:12: unexpected token "secret"` would also begin with `cli.`.
 */
-const SAFE_CATEGORY_PATTERN = /^(?:cli|mcp)\.[a-z][a-z0-9_]*$/;
 const REDACTED_SENTRY_MESSAGE = "redacted";
 function isSafeSentryMessage(value) {
-	return typeof value === "string" && SAFE_CATEGORY_PATTERN.test(value);
+	return isDeclaredErrorCategory(value);
 }
 /**
 * Replace every exception message that is not a known category, and any top-level
@@ -12719,7 +12796,7 @@ function normalizeAction(action) {
 /** Strict allowlist — never accept args/results. */
 function captureToolInvocation(event) {
 	if (!enabled || !apiKey) return;
-	const task = sendCapture(TOOL_INVOCATION_EVENT, {
+	const properties = {
 		tool_name: event.toolName,
 		action: normalizeAction(event.action),
 		outcome: event.outcome,
@@ -12727,7 +12804,9 @@ function captureToolInvocation(event) {
 		client,
 		session_id: sessionId,
 		package_version: packageVersion
-	}, event.distinctId).finally(() => {
+	};
+	if (event.outcome === "error") properties.error_category = classifyErrorCategory(client, event.error);
+	const task = sendCapture(TOOL_INVOCATION_EVENT, properties, event.distinctId).finally(() => {
 		pending.delete(task);
 	});
 	pending.add(task);
@@ -12910,7 +12989,7 @@ async function runSkillSetup(options) {
 	});
 }
 //#endregion
-//#region ../operations/build/validation-v3-RQf0k.js
+//#region ../operations/build/validation-CbrghKZi.js
 const optionalNumber = /* @__PURE__ */ optional$1(/* @__PURE__ */ number$2());
 const perPageField = (max) => /* @__PURE__ */ optional$1(/* @__PURE__ */ pipe$2(/* @__PURE__ */ number$2(), /* @__PURE__ */ integer(), /* @__PURE__ */ minValue$1(1), /* @__PURE__ */ maxValue$1(max), /* @__PURE__ */ description$1(`Results per page (1-${max})`)));
 const perPageSchema = perPageField(100);
@@ -12936,9 +13015,11 @@ const timeBlockListSchema = /* @__PURE__ */ object$2({
 const timeEntryListSchema = /* @__PURE__ */ object$2({
 	date_from: dateField("Range start — date-only (e.g. '2025-01-01') or RFC3339 datetime. Date-only is expanded to T00:00:00Z."),
 	date_to: dateField("Range end — date-only (e.g. '2025-01-07') or RFC3339 datetime. Date-only is expanded to T23:59:59Z."),
+	project_id: /* @__PURE__ */ optional$1(/* @__PURE__ */ pipe$2(/* @__PURE__ */ number$2(), /* @__PURE__ */ description$1("Filter to entries on this project (task-linked or taskless)"))),
 	task_id: /* @__PURE__ */ optional$1(/* @__PURE__ */ pipe$2(/* @__PURE__ */ number$2(), /* @__PURE__ */ description$1("Filter by task ID"))),
 	time_block_id: /* @__PURE__ */ optional$1(/* @__PURE__ */ pipe$2(/* @__PURE__ */ number$2(), /* @__PURE__ */ description$1("Filter by time block ID"))),
 	type: /* @__PURE__ */ optional$1(/* @__PURE__ */ pipe$2(/* @__PURE__ */ picklist$1(["activity", "break"]), /* @__PURE__ */ description$1("Filter by entry type"))),
+	include_taskless: /* @__PURE__ */ optional$1(/* @__PURE__ */ pipe$2(/* @__PURE__ */ boolean$1(), /* @__PURE__ */ description$1("Include entries tracked on a project without a task. Defaults to true when omitted."))),
 	page: /* @__PURE__ */ optional$1(/* @__PURE__ */ pipe$2(/* @__PURE__ */ number$2(), /* @__PURE__ */ description$1("Page number"))),
 	per_page: perPageSchema
 });
@@ -13901,20 +13982,31 @@ const timeBlockOverrides = {
 };
 const timeEntryOverrides = {
 	"focus.time-entries.list": {
-		agentGuidance: "Returns tracked time entries in a date range. Requires date_from and date_to. Accepts date-only strings (YYYY-MM-DD) or RFC3339 datetimes — date-only is automatically expanded: date_from to T00:00:00Z, date_to to T23:59:59Z. Includes task and project context.",
-		examples: [{
-			description: "List time entries for a week (date-only, expanded to full-day range)",
-			data: {
-				date_from: "2025-01-01",
-				date_to: "2025-01-07"
-			}
-		}, {
-			description: "List time entries with explicit RFC3339 timestamps",
-			data: {
-				date_from: "2025-01-01T00:00:00Z",
-				date_to: "2025-01-07T23:59:59Z"
+		agentGuidance: "Returns tracked time entries in a date range, including taskless entries (tracked on a project with no task). Requires date_from and date_to. Accepts date-only strings (YYYY-MM-DD) or RFC3339 datetimes — date-only is automatically expanded: date_from to T00:00:00Z, date_to to T23:59:59Z. Optional project_id keeps only entries on that project (sent to the API; client also scans up to 50 list pages of 100, then slices page/per_page; not a full workspace scan). If truncated is true, more unfiltered rows exist than were scanned — narrow date_from/date_to. Pass include_taskless:false to hide taskless rows. Includes task and project context.",
+		examples: [
+			{
+				description: "List time entries for a week (date-only, expanded to full-day range)",
+				data: {
+					date_from: "2025-01-01",
+					date_to: "2025-01-07"
+				}
+			},
+			{
+				description: "List time entries with explicit RFC3339 timestamps",
+				data: {
+					date_from: "2025-01-01T00:00:00Z",
+					date_to: "2025-01-07T23:59:59Z"
+				}
+			},
+			{
+				description: "List time entries for one project, including taskless rows",
+				data: {
+					date_from: "2025-01-01",
+					date_to: "2025-01-07",
+					project_id: 42
+				}
 			}
-		}]
+		]
 	},
 	"focus.time-entries.start": {
 		agentGuidance: "type defaults to 'activity' if omitted; pass type:'break' to start a break. Optionally provide task_id, project_id, description, and time_block_id. Only one timer can be active at a time — stops the current one if running.",
@@ -14006,6 +14098,10 @@ const userOverrides = {
 		}]
 	}
 };
+const versionOverrides = { "focus.version.service": {
+	description: "MCP package version plus the Focus API service revision.",
+	agentGuidance: "mcp.package is this published MCP package version (e.g. 1.8.0). focus_api is the Focus API process revision (git SHA / build number) — it does not change when you update the npm MCP package."
+} };
 const dateRangeDay = /* @__PURE__ */ pipe$2(/* @__PURE__ */ string$1(), /* @__PURE__ */ regex(/^\d{4}-\d{2}-\d{2}$/, "must be YYYY-MM-DD"));
 const TimeOffMeUpdateInputSchema = /* @__PURE__ */ intersect([/* @__PURE__ */ object$2({ timeoff_id: /* @__PURE__ */ number$2() }), PublicMeEntryRequestSchema]);
 const emptySchema = /* @__PURE__ */ object$2({});
@@ -24035,6 +24131,7 @@ const focusOperationOverrides = {
 	...readOnlyPostOverrides,
 	...timeBlockOverrides,
 	...timeEntryOverrides,
+	...versionOverrides,
 	...statusOverrides,
 	...userOverrides,
 	...tagOverrides,
@@ -24981,6 +25078,7 @@ function envEnabled(raw) {
 }
 let sentryEnabled = false;
 let productAnalyticsEnabled = false;
+let lastCommandError;
 function initCliTelemetry(packageVersion) {
 	productAnalyticsEnabled = initProductAnalytics({
 		client: "cli",
@@ -25014,17 +25112,17 @@ function initCliTelemetry(packageVersion) {
 */
 function recordCliCommand(commandName, action, success) {
 	if (!productAnalyticsEnabled) return;
+	const error = success ? void 0 : lastCommandError;
+	lastCommandError = void 0;
 	captureToolInvocation({
 		toolName: commandName,
 		action,
-		outcome: success ? "success" : "error"
+		outcome: success ? "success" : "error",
+		error
 	});
 }
 function classifyCliSentryError(error) {
-	const message = error instanceof Error ? error.message : String(error);
-	if (message.startsWith("Invalid input:") || message.startsWith("Invalid input ")) return "cli.validation_error";
-	if (/^\d{3}:\s/.test(message)) return "cli.api_error";
-	return "cli.command_error";
+	return classifyErrorCategory("cli", error);
 }
 function toSentrySafeCliError(error) {
 	const category = classifyCliSentryError(error);
@@ -25034,6 +25132,7 @@ function toSentrySafeCliError(error) {
 	return safe;
 }
 function captureCliException(error) {
+	lastCommandError = error;
 	if (!sentryEnabled) return;
 	const category = classifyCliSentryError(error);
 	Sentry.withScope((scope) => {
@@ -25048,6 +25147,7 @@ async function shutdownCliTelemetry() {
 	if (tasks.length > 0) await Promise.allSettled(tasks);
 	sentryEnabled = false;
 	productAnalyticsEnabled = false;
+	lastCommandError = void 0;
 }
 //#endregion
 //#region src/output.ts
@@ -25624,4 +25724,4 @@ Common commands:
 //#endregion
 export { CommanderError as a, shutdownCliTelemetry as i, captureCliException as n, initCliTelemetry as r, createProgram as t };
 
-//# sourceMappingURL=program-B6EuV2vO.js.map
+//# sourceMappingURL=program-B0eN4WNv.js.map

package/build/program.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@togglhq/cli",
-  "version": "1.8.0",
+  "version": "1.8.2",
   "description": "Toggl CLI for Toggl 2.0 API operations.",
   "license": "UNLICENSED",
   "type": "module",