donebear 0.4.4 → 0.5.1

package/dist/cli.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-import { a as toCliError, d as DEFAULT_APP_URL, f as DEFAULT_OAUTH_CALLBACK_PATH, i as EXIT_CODES, l as CONFIG_DIR, n as setCurrentWorkspace, o as AUTH_FILE_PATH, p as DEFAULT_OAUTH_CALLBACK_PORT, r as CliError, s as CLI_NAME, t as ensureLocalContext, x as DONEBEAR_TOKEN_ENV } from "./context-store-BbZMKY0F.mjs";
-import { n as readStdin, t as promptForValue } from "./prompt-B66eG-Zm.mjs";
+import { S as DONEBEAR_TOKEN_ENV, _ as DONEBEAR_API_URL_ENV, a as SyncMutationRejectedError, c as CLI_NAME, f as DEFAULT_APP_URL, i as EXIT_CODES, m as DEFAULT_OAUTH_CALLBACK_PORT, n as setCurrentWorkspace, o as toCliError, p as DEFAULT_OAUTH_CALLBACK_PATH, r as CliError, s as AUTH_FILE_PATH, t as ensureLocalContext, u as CONFIG_DIR } from "./context-store-CdRuvvVL.mjs";
+import { n as readStdin, t as promptForValue } from "./prompt-Bv9qkjNw.mjs";
 import { createRequire } from "node:module";
 import { mkdir, readFile, rm, writeFile } from "node:fs/promises";
 import { basename, join, resolve } from "node:path";
@@ -14,8 +14,8 @@ import { accessSync, constants, existsSync, readdirSync, statSync } from "node:f
 import { config } from "dotenv";
 import { Command, InvalidArgumentError } from "commander";
 import { createHash, randomBytes, randomUUID } from "node:crypto";
+import { fileURLToPath, pathToFileURL } from "node:url";
 import { createServer } from "node:http";
-import { fileURLToPath } from "node:url";
 import Database from "better-sqlite3";
 //#region \0rolldown/runtime.js
 var __create = Object.create;
@@ -35,7 +35,7 @@ var __copyProps = (to, from, except, desc) => {
 	}
 	return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule || !__hasOwnProp.call(mod, "default") ? __defProp(target, "default", {
 	value: mod,
 	enumerable: true
 }) : target, mod));
@@ -104,9 +104,7 @@ const writeOutput = (context, data) => {
 		case "json":
 			writeJson(result);
 			break;
-		default:
-			writeJson(result);
-			break;
+		default: writeJson(result);
 	}
 	if (context.copy) copyToClipboard(JSON.stringify(result, null, 2));
 };
@@ -175,9 +173,10 @@ const tokenize = (input) => {
 	let current = "";
 	let inQuote = false;
 	let quoteChar = "";
-	for (const char of input) if (inQuote) if (char === quoteChar) inQuote = false;
-	else current += char;
-	else if (char === "\"" || char === "'") {
+	for (const char of input) if (inQuote) {
+		if (char === quoteChar) inQuote = false;
+		else current += char;
+	} else if (char === "\"" || char === "'") {
 		inQuote = true;
 		quoteChar = char;
 	} else if (char === " ") {
@@ -229,7 +228,7 @@ const runInteractiveMode = async (context, program) => {
 	rl.close();
 	if (sessionEntries.length > 0) try {
 		const payload = {
-			entries: [...await loadHistory(HISTORY_FILE), ...sessionEntries].slice(-MAX_HISTORY),
+			entries: [...await loadHistory(HISTORY_FILE), ...sessionEntries].slice(-200),
 			version: 1
 		};
 		await mkdir(CONFIG_DIR, {
@@ -366,7 +365,8 @@ const parseAuthFile = (payload) => {
 };
 const readStoredAuthSession = async () => {
 	try {
-		return parseAuthFile(await readFile(AUTH_FILE_PATH, "utf-8")).session;
+		const raw = await readFile(AUTH_FILE_PATH, "utf-8");
+		return parseAuthFile(raw).session;
 	} catch (error) {
 		if (isRecord$1(error) && error.code === "ENOENT") return null;
 		if (error instanceof CliError) throw error;
@@ -393,7 +393,7 @@ const clearStoredAuthSession = async () => {
 //#endregion
 //#region src/supabase.ts
 const resolveSupabaseConfig = () => {
-	const url = readEnvValue("DONEBEAR_SUPABASE_URL") ?? "https://kdarvputxmlxqemisnbh.supabase.co";
+	const url = readEnvValue("DONEBEAR_SUPABASE_URL") ?? "https://auth.donebear.com";
 	return {
 		publishableKey: readEnvValue("DONEBEAR_SUPABASE_PUBLISHABLE_KEY") ?? "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6ImtkYXJ2cHV0eG1seHFlbWlzbmJoIiwicm9sZSI6ImFub24iLCJpYXQiOjE3NzIzNTcyNjcsImV4cCI6MjA4NzkzMzI2N30.A8sDPWNe_1EcCy0-GsUw4h1icxSGz_VDc9E9tPTYEU8",
 		url
@@ -521,6 +521,8 @@ const resolveTokenStatus = (token) => {
 */
 const TASK_FIELDS = {
 	bootstrapFields: [
+		"agentAssigneeId",
+		"revision",
 		"id",
 		"number",
 		"title",
@@ -554,6 +556,7 @@ const TASK_FIELDS = {
 		"repeatNextAt"
 	],
 	insertFields: [
+		"agentAssigneeId",
 		"archivedAt",
 		"assigneeId",
 		"completedAt",
@@ -574,6 +577,7 @@ const TASK_FIELDS = {
 		"repeatStatus",
 		"repeatTemplateId",
 		"repeatType",
+		"revision",
 		"sortOrder",
 		"start",
 		"startBucket",
@@ -586,6 +590,8 @@ const TASK_FIELDS = {
 		"workspaceId"
 	],
 	iosKeys: [
+		"agentAssigneeId",
+		"revision",
 		"id",
 		"number",
 		"title",
@@ -638,11 +644,14 @@ const TASK_FIELDS = {
 		"projectId",
 		"teamId",
 		"assigneeId",
+		"agentAssigneeId",
+		"revision",
 		"headingId",
 		"repeatRule",
 		"repeatTemplateId"
 	],
 	updateFields: [
+		"agentAssigneeId",
 		"title",
 		"description",
 		"sortOrder",
@@ -674,7 +683,7 @@ const TASK_FIELDS = {
 }.readProjection.join("\n");
 //#endregion
 //#region ../../packages/task-logic/src/date-only.ts
-const DATE_ONLY_DAY_MS = 1440 * 60 * 1e3;
+const DATE_ONLY_DAY_MS = 864e5;
 const DATE_ONLY_INPUT_PATTERN = /^(\d{4})-(\d{2})-(\d{2})$/u;
 const isFiniteEpoch$1 = (value) => typeof value === "number" && Number.isFinite(value);
 const isCanonicalDateOnlyEpoch = (value) => value % DATE_ONLY_DAY_MS === 0;
@@ -938,6 +947,71 @@ const createSyncMutateClient = ({ baseUrl, errorMapper = defaultErrorMapper$1, f
 	return { mutate };
 };
 //#endregion
+//#region ../../packages/manage-client/src/bound-task-update.ts
+/** Task fields a bound agent may change through a conditional command. */
+const BOUND_TASK_PATCH_FIELDS = [
+	"archivedAt",
+	"completedAt",
+	"deadlineAt",
+	"description",
+	"headingId",
+	"projectId",
+	"reminderAt",
+	"start",
+	"startBucket",
+	"startDate",
+	"teamId",
+	"title",
+	"todayIndexReferenceDate"
+];
+/**
+* Bound keys write through the conditional Task command; unbound callers
+* retain native sync. Returns false when the caller is not a bound agent.
+*/
+const updateBoundTasks = async (input) => {
+	const noun = input.noun ?? "change";
+	if (!input.token.startsWith("db_")) return false;
+	const workspaceId = input.updates[0]?.task.workspaceId;
+	if (!workspaceId || input.updates.some(({ task }) => task.workspaceId !== workspaceId)) throw new Error("Change tasks in one explicit workspace.");
+	const binding = await input.send(`/api/task-agents/self?workspaceId=${encodeURIComponent(workspaceId)}`);
+	if (binding.workspaceId !== workspaceId || binding.agent === void 0) throw new Error("Task agent binding is unavailable.");
+	if (binding.agent === null) return false;
+	if (binding.agent.disabledAt !== null) throw new Error("This task agent is disabled.");
+	if (input.updates.some(({ task }) => task.agentAssigneeId !== binding.agent?.id)) throw new Error("A task agent can change only tasks assigned to it.");
+	if (input.updates.some(({ task }) => !Number.isInteger(task.revision) || task.revision < 1)) throw new Error("The change requires the original selected task revision.");
+	const allowed = new Set(BOUND_TASK_PATCH_FIELDS);
+	for (const { patch } of input.updates) {
+		const refused = Object.keys(patch).filter((key) => !allowed.has(key));
+		if (refused.length > 0) throw new Error(`A task agent cannot change ${refused.join(", ")}. Hand the task off instead.`);
+	}
+	let changed = 0;
+	for (const { task, patch } of input.updates.filter(({ task: selected }, index, updates) => updates.findIndex((candidate) => candidate.task.id === selected.id) === index)) try {
+		const result = await input.send("/api/task-commands", {
+			expectedRevision: task.revision,
+			kind: "update",
+			operationId: crypto.randomUUID(),
+			patch,
+			taskId: task.id,
+			workspaceId
+		});
+		if (result.kind !== "update" || result.task?.id !== task.id || Object.entries(patch).some(([key, value]) => result.task?.[key] !== value) || result.task.revision !== task.revision + 1) throw new Error("The change has no matching committed receipt; do not retry automatically.");
+		changed += 1;
+	} catch (error) {
+		throw new Error(`${noun[0]?.toUpperCase()}${noun.slice(1)} failed with ${changed} confirmed ${noun}(s). The current request may have an unknown outcome; do not retry automatically. ${error instanceof Error ? error.message : "No response."}`, { cause: error });
+	}
+	return true;
+};
+/** Archive is the one bound write the CLI also drives; it keeps its own wording. */
+const archiveBoundTasks = (input) => updateBoundTasks({
+	noun: "archive",
+	send: input.send,
+	token: input.token,
+	updates: input.tasks.map((task) => ({
+		patch: { archivedAt: input.archivedAt },
+		task
+	}))
+});
+//#endregion
 //#region ../../packages/manage-client/src/index.ts
 const TASKS_QUERY = `
   query DonebearTasks($first: Int!, $after: String, $workspaceId: ID!) {
@@ -976,6 +1050,7 @@ const toInstantEpoch = (value) => {
 	return Number.isFinite(epoch) ? epoch : null;
 };
 const toTaskRecord$1 = (node) => ({
+	agentAssigneeId: node.agentAssigneeId,
 	archivedAt: toInstantEpoch(node.archivedAt),
 	assigneeId: node.assigneeId,
 	completedAt: toInstantEpoch(node.completedAt),
@@ -989,6 +1064,7 @@ const toTaskRecord$1 = (node) => ({
 	projectId: node.projectId,
 	repeatRule: node.repeatRule,
 	repeatTemplateId: node.repeatTemplateId,
+	revision: node.revision,
 	start: node.start,
 	startBucket: node.startBucket,
 	startDate: parseDateOnlyInputToEpoch(node.startDate),
@@ -1389,6 +1465,7 @@ const toTaskRecord = (value) => {
 	if (typeof row.id !== "string" || typeof row.number !== "number" || typeof row.title !== "string") return null;
 	if (typeof row.creatorId !== "string" || typeof row.workspaceId !== "string" || typeof row.start !== "string" || typeof row.startBucket !== "string") return null;
 	return {
+		agentAssigneeId: typeof row.agentAssigneeId === "string" ? row.agentAssigneeId : null,
 		archivedAt: toNullableNumber(row.archivedAt),
 		assigneeId: typeof row.assigneeId === "string" ? row.assigneeId : null,
 		completedAt: toNullableNumber(row.completedAt),
@@ -1402,6 +1479,7 @@ const toTaskRecord = (value) => {
 		projectId: typeof row.projectId === "string" ? row.projectId : null,
 		repeatRule: typeof row.repeatRule === "string" ? row.repeatRule : null,
 		repeatTemplateId: typeof row.repeatTemplateId === "string" ? row.repeatTemplateId : null,
+		revision: typeof row.revision === "number" ? row.revision : 0,
 		start: row.start,
 		startBucket: row.startBucket,
 		startDate: toNullableNumber(row.startDate),
@@ -1550,12 +1628,14 @@ const toTaskAttachmentRecord = (value) => {
 };
 /** A task's comment thread, oldest first. */
 const loadCommentsByTask = async (context, options) => {
-	const rows = await requestNdjson(context, `${options.baseUrl}/sync/batch`, {
-		body: { requests: [{
-			indexedKey: "taskId",
-			keyValue: options.taskId,
-			modelName: "Comment"
-		}] },
+	const url = `${options.baseUrl}/sync/batch`;
+	const body = { requests: [{
+		indexedKey: "taskId",
+		keyValue: options.taskId,
+		modelName: "Comment"
+	}] };
+	const rows = await requestNdjson(context, url, {
+		body,
 		token: options.token
 	});
 	const results = [];
@@ -1566,12 +1646,14 @@ const loadCommentsByTask = async (context, options) => {
 	return results.toSorted((a, b) => (a.createdAt ?? 0) - (b.createdAt ?? 0));
 };
 const loadReadyTaskAttachmentsByTask = async (context, options) => {
-	const rows = await requestNdjson(context, `${options.baseUrl}/sync/batch`, {
-		body: { requests: [{
-			indexedKey: "taskId",
-			keyValue: options.taskId,
-			modelName: "TaskAttachment"
-		}] },
+	const url = `${options.baseUrl}/sync/batch`;
+	const body = { requests: [{
+		indexedKey: "taskId",
+		keyValue: options.taskId,
+		modelName: "TaskAttachment"
+	}] };
+	const rows = await requestNdjson(context, url, {
+		body,
 		token: options.token
 	});
 	const results = [];
@@ -1584,7 +1666,8 @@ const loadReadyTaskAttachmentsByTask = async (context, options) => {
 const resolveApiBaseUrl = (context) => {
 	const fromContext = context.apiUrlOverride?.trim();
 	if (fromContext) return normalizeApiUrl(fromContext);
-	return normalizeApiUrl(readEnvValue("DONEBEAR_API_URL") ?? "https://api.donebear.com");
+	const fromEnv = readEnvValue(DONEBEAR_API_URL_ENV);
+	return normalizeApiUrl(fromEnv ?? "https://api.donebear.com");
 };
 const mapGraphqlFailure = (failure) => {
 	if (failure.type === "http") {
@@ -1620,11 +1703,12 @@ const listWorkspaces = async (_context, options) => await createGraphqlClient({
 	getToken: () => options.token
 }).listWorkspaces();
 const createWorkspace = async (context, options) => {
-	return toWorkspaceRecordFromGraphqlNode((await requestGraphql(context, options.baseUrl, {
+	const data = await requestGraphql(context, options.baseUrl, {
 		query: WORKSPACE_CREATE_MUTATION,
 		token: options.token,
 		variables: { input: options.body }
-	})).workspaceCreate.workspace);
+	});
+	return toWorkspaceRecordFromGraphqlNode(data.workspaceCreate.workspace);
 };
 const joinWorkspace = async (context, options) => {
 	const data = await requestGraphql(context, options.baseUrl, {
@@ -1654,12 +1738,14 @@ const loadTasksByWorkspaceIds = (context, options) => paginateGraphql(context, {
 	variables: { workspaceIds: options.workspaceIds }
 });
 const loadTaskById = async (context, options) => {
-	const rows = await requestNdjson(context, `${options.baseUrl}/sync/batch`, {
-		body: { requests: [{
-			indexedKey: "id",
-			keyValue: options.taskId,
-			modelName: "Task"
-		}] },
+	const url = `${options.baseUrl}/sync/batch`;
+	const body = { requests: [{
+		indexedKey: "id",
+		keyValue: options.taskId,
+		modelName: "Task"
+	}] };
+	const rows = await requestNdjson(context, url, {
+		body,
 		token: options.token
 	});
 	for (const row of rows) {
@@ -1717,12 +1803,14 @@ const loadTeamsByWorkspaceIds = (context, options) => paginateGraphql(context, {
 	variables: { workspaceIds: options.workspaceIds }
 });
 const loadChecklistItemsByTask = async (context, options) => {
-	const rows = await requestNdjson(context, `${options.baseUrl}/sync/batch`, {
-		body: { requests: [{
-			indexedKey: "taskId",
-			keyValue: options.taskId,
-			modelName: "TaskChecklistItem"
-		}] },
+	const url = `${options.baseUrl}/sync/batch`;
+	const body = { requests: [{
+		indexedKey: "taskId",
+		keyValue: options.taskId,
+		modelName: "TaskChecklistItem"
+	}] };
+	const rows = await requestNdjson(context, url, {
+		body,
 		token: options.token
 	});
 	const results = [];
@@ -1742,7 +1830,10 @@ const mapSyncMutateFailure = (failure) => {
 		const exitCode = status === 401 || status === 403 ? EXIT_CODES.AUTH_REQUIRED : EXIT_CODES.ERROR;
 		return new CliError(extractErrorMessage(body), exitCode);
 	}
-	if (failure.type === "mutation") return new CliError(failure.response.results.find((item) => !item.success)?.error ?? "Sync mutation failed", EXIT_CODES.ERROR);
+	if (failure.type === "mutation") {
+		const result = failure.response.results.find((item) => !item.success);
+		return new SyncMutationRejectedError(result?.error ?? "Sync mutation failed", failure.response.results);
+	}
 	if (failure.type === "timeout") return new CliError(`Sync mutation timed out after ${failure.timeoutMs}ms`, EXIT_CODES.ERROR);
 	if (failure.cause instanceof Error) return failure.cause;
 	return new CliError("Sync mutation request failed", EXIT_CODES.ERROR);
@@ -1791,11 +1882,12 @@ const createWorkspaceInvitation = async (context, options) => {
 		role: options.role,
 		workspaceId: options.workspaceId
 	});
-	return toWorkspaceInvitationRecordFromGraphqlNode((await requestGraphql(context, options.baseUrl, {
+	const data = await requestGraphql(context, options.baseUrl, {
 		query: WORKSPACE_INVITATION_CREATE_MUTATION,
 		token: options.token,
 		variables: { input }
-	})).workspaceInvitationCreate.invitation);
+	});
+	return toWorkspaceInvitationRecordFromGraphqlNode(data.workspaceInvitationCreate.invitation);
 };
 const listWorkspaceHistory = async (context, options) => {
 	const variables = omitUndefined({
@@ -1875,6 +1967,56 @@ const requireUserId = async (context, commandContext) => {
 		token: commandContext.token
 	})).id;
 };
+const packageManifest = createRequire(import.meta.url)("../package.json");
+//#endregion
+//#region src/crash-report.ts
+const POSTHOG_HOST = "https://us.i.posthog.com";
+const SHUTDOWN_TIMEOUT_MS = 2e3;
+const buildKey = () => "";
+const hasNodeErrorCode = (error) => [error, error.cause].some((candidate) => typeof candidate === "object" && candidate !== null && "code" in candidate && typeof candidate.code === "string");
+const isCliBug = (error) => (error instanceof TypeError || error instanceof ReferenceError || error instanceof RangeError) && !hasNodeErrorCode(error);
+const crashReportingEnabled = (key, env) => key.length > 0 && ![
+	"1",
+	"true",
+	"yes"
+].includes(env.DO_NOT_TRACK?.trim().toLowerCase() ?? "");
+const REDACTED_MESSAGE = "[message not sent]";
+const WINDOWS_PATH = /^[A-Za-z]:\\/u;
+/** The report as sent: home paths cut to `~`, every exception message gone. */
+const redactCrashReport = (event, home) => {
+	if (!event) return event;
+	const forms = home ? [.../* @__PURE__ */ new Set([
+		home,
+		home.replaceAll("\\", "/"),
+		pathToFileURL(home, { windows: WINDOWS_PATH.test(home) }).pathname
+	])] : [];
+	let json = JSON.stringify(event);
+	for (const form of forms) json = json.replaceAll(JSON.stringify(form).slice(1, -1), "~");
+	const redacted = JSON.parse(json);
+	const exceptions = redacted.properties?.$exception_list;
+	for (const exception of exceptions ?? []) exception.value = REDACTED_MESSAGE;
+	return redacted;
+};
+const reportCrash = async (error) => {
+	const key = buildKey();
+	if (!(isCliBug(error) && crashReportingEnabled(key, process.env))) return;
+	try {
+		const { PostHog } = await import("posthog-node");
+		const home = homedir();
+		const client = new PostHog(key, {
+			before_send: (event) => redactCrashReport(event, home),
+			disableGeoip: true,
+			flushAt: 1,
+			host: POSTHOG_HOST
+		});
+		client.captureException(error, void 0, {
+			cli_version: packageManifest.version,
+			node_version: process.version,
+			os_platform: process.platform
+		});
+		await client.shutdown(SHUTDOWN_TIMEOUT_MS);
+	} catch {}
+};
 //#endregion
 //#region src/options.ts
 const parseOutputFormat = (value) => {
@@ -1964,6 +2106,7 @@ const runWithErrorHandling = async (context, action) => {
 		}
 		if (context.debug && error instanceof Error && typeof error.stack === "string") writeDebug(context, error.stack);
 		process.exitCode = cliError.exitCode;
+		if (cliError.exitCode === EXIT_CODES.ERROR) await reportCrash(error);
 	}
 };
 //#endregion
@@ -2045,8 +2188,9 @@ const runCreate = async (context, label, options) => {
 };
 const runList = async (context) => {
 	const { token } = await requireAuthToken(context);
+	const baseUrl = resolveApiBaseUrl(context);
 	const keys = await listApiKeys(context, {
-		baseUrl: resolveApiBaseUrl(context),
+		baseUrl,
 		token
 	});
 	if (context.json) {
@@ -2068,8 +2212,9 @@ const runList = async (context) => {
 };
 const runRevoke = async (context, keyId) => {
 	const { token } = await requireAuthToken(context);
+	const baseUrl = resolveApiBaseUrl(context);
 	await revokeApiKey(context, {
-		baseUrl: resolveApiBaseUrl(context),
+		baseUrl,
 		keyId,
 		token
 	});
@@ -2159,8 +2304,8 @@ const openUrl = async (url) => {
 //#endregion
 //#region src/command-parsers.ts
 const parsePositiveInteger = (value, label) => {
-	const parsed = Number.parseInt(value, 10);
-	if (!Number.isInteger(parsed) || parsed <= 0) throw new Error(`${label} must be a positive integer`);
+	const parsed = Number(value);
+	if (!/^\d+$/u.test(value) || !Number.isSafeInteger(parsed) || parsed <= 0) throw new Error(`${label} must be a positive integer`);
 	return parsed;
 };
 //#endregion
@@ -2432,7 +2577,8 @@ const parseSignupTimeout = (value) => parsePositiveInteger(value, "Timeout");
 //#endregion
 //#region src/commands/auth.ts
 const runLogin = async (context, options) => {
-	const { authorizeUrl, tokenUrl } = buildOAuthUrls(resolveSupabaseConfig());
+	const config = resolveSupabaseConfig();
+	const { authorizeUrl, tokenUrl } = buildOAuthUrls(config);
 	const clientId = resolveOAuthClientId();
 	const redirectUrl = new URL(`http://127.0.0.1:${options.port}${DEFAULT_OAUTH_CALLBACK_PATH}`);
 	const state = createOAuthState();
@@ -2461,10 +2607,11 @@ const runLogin = async (context, options) => {
 		writeInfo(context, authUrlString);
 	}
 	const authorizationCode = await callbackPromise;
-	const storedSession = tokenResponseToStoredSession(await exchangeAuthorizationCode({
+	const tokenResponse = await exchangeAuthorizationCode({
 		clientId,
 		tokenUrl
-	}, authorizationCode, codeVerifier, redirectUrl.toString()));
+	}, authorizationCode, codeVerifier, redirectUrl.toString());
+	const storedSession = tokenResponseToStoredSession(tokenResponse);
 	await writeStoredAuthSession(storedSession);
 	if (context.json) {
 		writeJson({
@@ -2479,7 +2626,8 @@ const runLogin = async (context, options) => {
 	if (storedSession.user?.email) writeInfo(context, `Signed in as ${storedSession.user.email}`);
 };
 const runStatus = async (context) => {
-	const token = await resolveAuthToken(context, getOptionalSupabaseConfig());
+	const config = getOptionalSupabaseConfig();
+	const token = await resolveAuthToken(context, config);
 	if (!token) {
 		if (context.json) writeJson({
 			authenticated: false,
@@ -2637,7 +2785,7 @@ const parseTaskNumberRef = (value) => {
 	const normalized = value.trim();
 	if (!/^[1-9]\d*$/u.test(normalized)) throw new Error(`Invalid task number "${normalized}". Use the positive number shown on the task.`);
 	const number = Number(normalized);
-	if (!Number.isSafeInteger(number) || number > MAX_TASK_NUMBER) throw new TypeError(`Invalid task number "${normalized}". Number is too large.`);
+	if (!Number.isSafeInteger(number) || number > MAX_TASK_NUMBER) throw new Error(`Invalid task number "${normalized}". Number is too large.`);
 	return number;
 };
 const parseTaskState = (value) => {
@@ -2706,29 +2854,29 @@ const confirmAction = (context, message) => {
 	});
 };
 //#endregion
-//#region ../../node_modules/uuid/dist-node/regex.js
+//#region ../../node_modules/.pnpm/uuid@14.0.2/node_modules/uuid/dist-node/regex.js
 var regex_default = /^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-8][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000|ffffffff-ffff-ffff-ffff-ffffffffffff)$/i;
 //#endregion
-//#region ../../node_modules/uuid/dist-node/validate.js
+//#region ../../node_modules/.pnpm/uuid@14.0.2/node_modules/uuid/dist-node/validate.js
 function validate(uuid) {
 	return typeof uuid === "string" && regex_default.test(uuid);
 }
 //#endregion
-//#region ../../node_modules/uuid/dist-node/parse.js
+//#region ../../node_modules/.pnpm/uuid@14.0.2/node_modules/uuid/dist-node/parse.js
 function parse(uuid) {
 	if (!validate(uuid)) throw TypeError("Invalid UUID");
 	let v;
 	return Uint8Array.of((v = parseInt(uuid.slice(0, 8), 16)) >>> 24, v >>> 16 & 255, v >>> 8 & 255, v & 255, (v = parseInt(uuid.slice(9, 13), 16)) >>> 8, v & 255, (v = parseInt(uuid.slice(14, 18), 16)) >>> 8, v & 255, (v = parseInt(uuid.slice(19, 23), 16)) >>> 8, v & 255, (v = parseInt(uuid.slice(24, 36), 16)) / 1099511627776 & 255, v / 4294967296 & 255, v >>> 24 & 255, v >>> 16 & 255, v >>> 8 & 255, v & 255);
 }
 //#endregion
-//#region ../../node_modules/uuid/dist-node/stringify.js
+//#region ../../node_modules/.pnpm/uuid@14.0.2/node_modules/uuid/dist-node/stringify.js
 const byteToHex = [];
 for (let i = 0; i < 256; ++i) byteToHex.push((i + 256).toString(16).slice(1));
 function unsafeStringify(arr, offset = 0) {
 	return (byteToHex[arr[offset + 0]] + byteToHex[arr[offset + 1]] + byteToHex[arr[offset + 2]] + byteToHex[arr[offset + 3]] + "-" + byteToHex[arr[offset + 4]] + byteToHex[arr[offset + 5]] + "-" + byteToHex[arr[offset + 6]] + byteToHex[arr[offset + 7]] + "-" + byteToHex[arr[offset + 8]] + byteToHex[arr[offset + 9]] + "-" + byteToHex[arr[offset + 10]] + byteToHex[arr[offset + 11]] + byteToHex[arr[offset + 12]] + byteToHex[arr[offset + 13]] + byteToHex[arr[offset + 14]] + byteToHex[arr[offset + 15]]).toLowerCase();
 }
 //#endregion
-//#region ../../node_modules/uuid/dist-node/v35.js
+//#region ../../node_modules/.pnpm/uuid@14.0.2/node_modules/uuid/dist-node/v35.js
 function stringToBytes(str) {
 	str = unescape(encodeURIComponent(str));
 	const bytes = new Uint8Array(str.length);
@@ -2757,14 +2905,14 @@ function v35(version, hash, value, namespace, buf, offset) {
 	return unsafeStringify(bytes);
 }
 //#endregion
-//#region ../../node_modules/uuid/dist-node/sha1.js
+//#region ../../node_modules/.pnpm/uuid@14.0.2/node_modules/uuid/dist-node/sha1.js
 function sha1(bytes) {
 	if (Array.isArray(bytes)) bytes = Buffer.from(bytes);
 	else if (typeof bytes === "string") bytes = Buffer.from(bytes, "utf8");
 	return createHash("sha1").update(bytes).digest();
 }
 //#endregion
-//#region ../../node_modules/uuid/dist-node/v5.js
+//#region ../../node_modules/.pnpm/uuid@14.0.2/node_modules/uuid/dist-node/v5.js
 function v5(value, namespace, buf, offset) {
 	return v35(80, sha1, value, namespace, buf, offset);
 }
@@ -2875,7 +3023,7 @@ const resolveWorkspace = async (context, options) => {
 //#region src/commands/task.ts
 const DEFAULT_TASK_LIST_LIMIT = 20;
 /** The views `--when` can place a task in: the ones with start fields. */
-const ACTIVE_TASK_VIEWS = new Set([
+const ACTIVE_TASK_VIEWS = /* @__PURE__ */ new Set([
 	"inbox",
 	"anytime",
 	"today",
@@ -2883,7 +3031,7 @@ const ACTIVE_TASK_VIEWS = new Set([
 	"someday"
 ]);
 /** The views `--view` can filter a list by, which adds the two read-only ones. */
-const VALID_TASK_VIEWS = new Set([
+const VALID_TASK_VIEWS = /* @__PURE__ */ new Set([
 	...ACTIVE_TASK_VIEWS,
 	"logbook",
 	"trash"
@@ -3173,7 +3321,18 @@ const runTaskMutation = async (context, taskRef, payload) => {
 		taskRef,
 		workspaceRef: payload.workspaceRef
 	});
-	await mutateModel(context, {
+	if (!(payload.action === "ARCHIVE" && !context.dryRun && await archiveBoundTasks({
+		archivedAt: Number(payload.data.archivedAt),
+		send: (path, body) => requestJson(context, `${commandContext.apiBaseUrl}${path}`, {
+			token: commandContext.token,
+			...body === void 0 ? {} : {
+				body,
+				method: "POST"
+			}
+		}),
+		tasks: [task],
+		token: commandContext.token
+	}))) await mutateModel(context, {
 		baseUrl: commandContext.apiBaseUrl,
 		request: {
 			batchId: randomUUID(),
@@ -3183,7 +3342,10 @@ const runTaskMutation = async (context, taskRef, payload) => {
 				clientTxId: randomUUID(),
 				modelId: task.id,
 				modelName: "Task",
-				payload: payload.data
+				payload: {
+					...payload.data,
+					...task.agentAssigneeId ? { expectedRevision: task.revision } : {}
+				}
 			}]
 		},
 		token: commandContext.token
@@ -3213,11 +3375,12 @@ const resolveProjectId = async (context, commandContext, projectRef, workspaceRe
 		token: commandContext.token,
 		workspaceRef
 	});
-	return resolveEntityId(await loadProjectsByWorkspace(context, {
+	const projects = await loadProjectsByWorkspace(context, {
 		baseUrl: commandContext.apiBaseUrl,
 		token: commandContext.token,
 		workspaceId: workspace.id
-	}), projectRef, "Project");
+	});
+	return resolveEntityId(projects, projectRef, "Project");
 };
 const resolveTeamId = async (context, commandContext, teamRef, workspaceRef) => {
 	const { workspace } = await resolveWorkspace(context, {
@@ -3226,11 +3389,12 @@ const resolveTeamId = async (context, commandContext, teamRef, workspaceRef) =>
 		token: commandContext.token,
 		workspaceRef
 	});
-	return resolveEntityId(await loadTeamsByWorkspace(context, {
+	const teams = await loadTeamsByWorkspace(context, {
 		baseUrl: commandContext.apiBaseUrl,
 		token: commandContext.token,
 		workspaceId: workspace.id
-	}), teamRef, "Team");
+	});
+	return resolveEntityId(teams, teamRef, "Team");
 };
 const validateTaskEditOptions = (options) => {
 	if (options.clearDescription && typeof options.description === "string") throw new Error("Use either --description or --clear-description, not both.");
@@ -3273,8 +3437,9 @@ const runTaskEdit = async (context, taskRef, options, workspaceOverride) => {
 	});
 };
 const runTaskRead = async (context, taskRef, options, workspaceOverride) => {
+	const commandContext = await resolveCommandContext(context);
 	const task = await resolveTaskReference(context, {
-		commandContext: await resolveCommandContext(context),
+		commandContext,
 		taskRef,
 		workspaceRef: workspaceOverride ?? normalizeWorkspaceRef(options.workspace)
 	});
@@ -3289,14 +3454,16 @@ const runTaskRead = async (context, taskRef, options, workspaceOverride) => {
 	writeInfo(context, task.description ?? "(empty)");
 };
 const runTaskAppend = async (context, taskRef, text, options, workspaceOverride) => {
+	const commandContext = await resolveCommandContext(context);
+	const newDesc = `${(await resolveTaskReference(context, {
+		commandContext,
+		taskRef,
+		workspaceRef: workspaceOverride ?? normalizeWorkspaceRef(options.workspace)
+	})).description ?? ""}\n${text.trim()}`;
 	await runTaskMutation(context, taskRef, {
 		action: "UPDATE",
 		data: {
-			description: `${(await resolveTaskReference(context, {
-				commandContext: await resolveCommandContext(context),
-				taskRef,
-				workspaceRef: workspaceOverride ?? normalizeWorkspaceRef(options.workspace)
-			})).description ?? ""}\n${text.trim()}`,
+			description: newDesc,
 			updatedAt: Date.now()
 		},
 		successMessage: "Appended",
@@ -3304,15 +3471,17 @@ const runTaskAppend = async (context, taskRef, text, options, workspaceOverride)
 	});
 };
 const runTaskPrepend = async (context, taskRef, text, options, workspaceOverride) => {
+	const commandContext = await resolveCommandContext(context);
 	const existing = (await resolveTaskReference(context, {
-		commandContext: await resolveCommandContext(context),
+		commandContext,
 		taskRef,
 		workspaceRef: workspaceOverride ?? normalizeWorkspaceRef(options.workspace)
 	})).description ?? "";
+	const newDesc = existing.length > 0 ? `${text.trim()}\n${existing}` : text.trim();
 	await runTaskMutation(context, taskRef, {
 		action: "UPDATE",
 		data: {
-			description: existing.length > 0 ? `${text.trim()}\n${existing}` : text.trim(),
+			description: newDesc,
 			updatedAt: Date.now()
 		},
 		successMessage: "Prepended",
@@ -3328,11 +3497,12 @@ const runTaskRandom = async (context, options, workspaceOverride) => {
 		token: commandContext.token,
 		workspaceRef: workspaceOverride ?? normalizeWorkspaceRef(options.workspace)
 	});
-	const filtered = filterTasks(await loadTasksByWorkspace(context, {
+	const tasks = await loadTasksByWorkspace(context, {
 		baseUrl: commandContext.apiBaseUrl,
 		token: commandContext.token,
 		workspaceId: workspace.id
-	}), {
+	});
+	const filtered = filterTasks(tasks, {
 		search: null,
 		state: requestedState,
 		view: null
@@ -3412,7 +3582,10 @@ const runChecklistList = async (context, taskId, workspaceOption) => {
 		return;
 	}
 	writeInfo(context, `Checklist for: ${task.title}`);
-	for (const item of sorted) writeInfo(context, `${item.completedAt === null ? "[ ]" : "[x]"} ${item.id.slice(0, 8)}  ${item.title}`);
+	for (const item of sorted) {
+		const marker = item.completedAt === null ? "[ ]" : "[x]";
+		writeInfo(context, `${marker} ${item.id.slice(0, 8)}  ${item.title}`);
+	}
 };
 const registerTaskSubcommands = (task, workspaceOverride) => {
 	task.command("list").alias("ls").description("List tasks").option("-w, --workspace <workspace>", "Workspace id, slug, or exact name").option("-s, --state <state>", "open|done|archived|all", "open").option("-n, --limit <count>", "Maximum number of tasks", (value) => parsePositiveInteger(value, "Limit"), DEFAULT_TASK_LIST_LIMIT).option("-q, --search <query>", "Filter by title or description").option("-v, --view <view>", "Filter by view (inbox|anytime|today|upcoming|someday|logbook|trash)").addHelpText("after", `
@@ -3598,11 +3771,12 @@ const registerChecklistSubcommands = (checklist) => {
 		const context = contextFromCommand(command);
 		await runWithErrorHandling(context, async () => {
 			const commandContext = await resolveCommandContext(context);
-			const item = await resolveChecklistItemReference(context, commandContext, (await resolveTaskReference(context, {
+			const resolvedTask = await resolveTaskReference(context, {
 				commandContext,
 				taskRef: taskId,
 				workspaceRef: options.workspace?.trim() ?? null
-			})).id, itemId);
+			});
+			const item = await resolveChecklistItemReference(context, commandContext, resolvedTask.id, itemId);
 			const now = Date.now();
 			await mutateModel(context, {
 				baseUrl: commandContext.apiBaseUrl,
@@ -3636,11 +3810,12 @@ const registerChecklistSubcommands = (checklist) => {
 		const context = contextFromCommand(command);
 		await runWithErrorHandling(context, async () => {
 			const commandContext = await resolveCommandContext(context);
-			const item = await resolveChecklistItemReference(context, commandContext, (await resolveTaskReference(context, {
+			const resolvedTask = await resolveTaskReference(context, {
 				commandContext,
 				taskRef: taskId,
 				workspaceRef: options.workspace?.trim() ?? null
-			})).id, itemId);
+			});
+			const item = await resolveChecklistItemReference(context, commandContext, resolvedTask.id, itemId);
 			const now = Date.now();
 			await mutateModel(context, {
 				baseUrl: commandContext.apiBaseUrl,
@@ -3676,11 +3851,12 @@ const registerChecklistSubcommands = (checklist) => {
 			const newTitle = options.title.trim();
 			if (newTitle.length === 0) throw new Error("Checklist item title cannot be empty.");
 			const commandContext = await resolveCommandContext(context);
-			const item = await resolveChecklistItemReference(context, commandContext, (await resolveTaskReference(context, {
+			const resolvedTask = await resolveTaskReference(context, {
 				commandContext,
 				taskRef: taskId,
 				workspaceRef: options.workspace?.trim() ?? null
-			})).id, itemId);
+			});
+			const item = await resolveChecklistItemReference(context, commandContext, resolvedTask.id, itemId);
 			const now = Date.now();
 			await mutateModel(context, {
 				baseUrl: commandContext.apiBaseUrl,
@@ -3714,11 +3890,12 @@ const registerChecklistSubcommands = (checklist) => {
 		const context = contextFromCommand(command);
 		await runWithErrorHandling(context, async () => {
 			const commandContext = await resolveCommandContext(context);
-			const item = await resolveChecklistItemReference(context, commandContext, (await resolveTaskReference(context, {
+			const resolvedTask = await resolveTaskReference(context, {
 				commandContext,
 				taskRef: taskId,
 				workspaceRef: options.workspace?.trim() ?? null
-			})).id, itemId);
+			});
+			const item = await resolveChecklistItemReference(context, commandContext, resolvedTask.id, itemId);
 			await mutateModel(context, {
 				baseUrl: commandContext.apiBaseUrl,
 				request: {
@@ -3773,12 +3950,13 @@ Agent tip: run "donebear spec task add" for full option reference
 		});
 	});
 	registerTaskSubcommands(task, workspaceOverride);
-	registerChecklistSubcommands(task.command("checklist").alias("cl").description("Manage task checklist items").argument("<task-number>", "Workspace-scoped task number").option("-w, --workspace <workspace>", "Workspace id, slug, or exact name").action(async (taskId, options, command) => {
+	const checklist = task.command("checklist").alias("cl").description("Manage task checklist items").argument("<task-number>", "Workspace-scoped task number").option("-w, --workspace <workspace>", "Workspace id, slug, or exact name").action(async (taskId, options, command) => {
 		const context = contextFromCommand(command);
 		await runWithErrorHandling(context, async () => {
 			await runChecklistList(context, taskId, options.workspace);
 		});
-	}));
+	});
+	registerChecklistSubcommands(checklist);
 };
 //#endregion
 //#region src/commands/comment.ts
@@ -3940,11 +4118,12 @@ respond to a teammate's comment, add your own instead.
 		await runWithErrorHandling(context, async () => {
 			const body = await resolveCommentBody(options.body);
 			const commandContext = await resolveCommandContext(context);
-			const existing = await resolveCommentReference(context, commandContext, (await resolveTaskReference(context, {
+			const task = await resolveTaskReference(context, {
 				commandContext,
 				taskRef,
 				workspaceRef: workspaceOverride ?? normalizeWorkspaceRef(options.workspace)
-			})).id, commentRef);
+			});
+			const existing = await resolveCommentReference(context, commandContext, task.id, commentRef);
 			await mutateModel(context, {
 				baseUrl: commandContext.apiBaseUrl,
 				request: {
@@ -3980,11 +4159,12 @@ workspace owner or admin can remove anyone's.
 		const context = contextFromCommand(command);
 		await runWithErrorHandling(context, async () => {
 			const commandContext = await resolveCommandContext(context);
-			const existing = await resolveCommentReference(context, commandContext, (await resolveTaskReference(context, {
+			const task = await resolveTaskReference(context, {
 				commandContext,
 				taskRef,
 				workspaceRef: workspaceOverride ?? normalizeWorkspaceRef(options.workspace)
-			})).id, commentRef);
+			});
+			const existing = await resolveCommentReference(context, commandContext, task.id, commentRef);
 			await mutateModel(context, {
 				baseUrl: commandContext.apiBaseUrl,
 				request: {
@@ -4142,7 +4322,6 @@ Examples:
 		});
 	});
 };
-const packageManifest = createRequire(import.meta.url)("../package.json");
 //#endregion
 //#region src/commands/doctor.ts
 const checkCliVersion = async () => {
@@ -4184,13 +4363,14 @@ const maskToken = (token) => {
 };
 const checkAuth = async (context) => {
 	try {
-		const token = await resolveAuthToken(context, (() => {
+		const config = (() => {
 			try {
 				return resolveSupabaseConfig();
 			} catch {
 				return null;
 			}
-		})());
+		})();
+		const token = await resolveAuthToken(context, config);
 		if (!token) return {
 			message: "No API key or token found",
 			name: "Auth",
@@ -4211,7 +4391,7 @@ const checkAuth = async (context) => {
 };
 const checkWorkspace = async () => {
 	try {
-		const { ensureLocalContext } = await import("./context-store-D8zfa5LS.mjs");
+		const { ensureLocalContext } = await import("./context-store-CG0wdjGM.mjs");
 		const localContext = await ensureLocalContext();
 		if (!localContext.workspaceId) return {
 			message: "No workspace selected (run `donebear workspace use`)",
@@ -4233,7 +4413,10 @@ const checkWorkspace = async () => {
 };
 const detectClaudeDesktop = (home) => {
 	if (process.platform === "darwin") return existsSync(join(home, "Library", "Application Support", "Claude", "claude_desktop_config.json"));
-	if (process.platform === "win32") return existsSync(join(process.env.APPDATA ?? join(home, "AppData", "Roaming"), "Claude", "claude_desktop_config.json"));
+	if (process.platform === "win32") {
+		const appData = process.env.APPDATA ?? join(home, "AppData", "Roaming");
+		return existsSync(join(appData, "Claude", "claude_desktop_config.json"));
+	}
 	return existsSync(join(home, ".config", "claude", "config.json"));
 };
 const detectAgents = () => {
@@ -4648,6 +4831,8 @@ Not on \`task edit\`:
 - completion  \`donebear task done|reopen\`
 - archiving   \`donebear task archive\` (moves to Trash, not a delete)
 
+An API key bound to a task agent archives only its own assigned tasks, using the selected revision. A changed task returns a conflict; reload and review it before retrying. Pass \`-w <workspace>\` to select the intended workspace.
+
 Task numbers are positive integers scoped to the workspace. Projects, teams, and
 labels also resolve by key or name.
 
@@ -4667,7 +4852,10 @@ thing that needs care.
 2. Check for truncation. Results carry a count; if you passed \`--limit\`, you
    are looking at a page, not the set.
 3. Show the user the titles, not the ids, and get agreement before writing.
-4. Then write, one call per task.
+4. Then write, one call per task. Archive writes are not atomic: a later
+   conflict leaves earlier tasks in Trash. Inspect Trash and re-read the failed
+   task before retrying. After a timeout, reconcile current task state first;
+   never retry the whole set blindly.
 
     donebear task list --state open --view today --json --jq "[].{number: number, title: title}"
 
@@ -5141,11 +5329,14 @@ const summarizeThingsImportResult = (result) => {
 		`source: ${result.counts.source.tasks} tasks, ${result.counts.source.projects} projects, ${result.counts.source.headings} headings, ${result.counts.source.areas} areas, ${result.counts.source.tags} tags, ${result.counts.source.checklistItems} checklist items`,
 		`planned: ${result.counts.planned.teams ?? 0} teams, ${result.counts.planned.labels ?? 0} labels, ${result.counts.planned.projects ?? 0} projects, ${result.counts.planned.teamProjects ?? 0} team-project links, ${result.counts.planned.headings ?? 0} headings, ${result.counts.planned.tasks ?? 0} tasks, ${result.counts.planned.taskLabels ?? 0} task-label links, ${result.counts.planned.checklistItems ?? 0} checklist items`
 	];
+	const { leftBehind } = result.counts;
+	if (leftBehind.tasks > 0 || leftBehind.projects > 0) infoLines.push(`left behind (--open-only): ${leftBehind.tasks} to-dos, ${leftBehind.projects} projects`);
 	if (result.dryRun) infoLines.push("dry run: no mutations sent");
 	else infoLines.push(`mutations: ${result.execution.inserted} inserted, ${result.execution.updated} updated, ${result.execution.skipped} skipped across ${result.execution.batches} batch(es)`);
 	return {
 		infoLines,
-		successMessage: result.dryRun ? "Things 3 import dry run complete" : "Things 3 import complete"
+		successMessage: result.dryRun ? "Things 3 import dry run complete" : "Things 3 import complete",
+		warningLines: result.issues.map((issue) => issue.message)
 	};
 };
 //#endregion
@@ -5221,6 +5412,40 @@ const getUtcCalendarDayEndEpoch = (date) => {
 	return Date.UTC(parts.year, parts.month - 1, parts.day, 23, 59, 59, 999);
 };
 //#endregion
+//#region ../../packages/import-core/src/issues.ts
+/**
+* Codes are part of the contract between a provider and the completion report:
+* the UI groups by code, so adding a message variant must not mean adding a
+* code.
+*/
+const ImportIssueCode = {
+	/** The user chose to import without turning areas into teams. */
+	AREAS_NOT_IMPORTED: "areas_not_imported",
+	ASSIGNEE_UNRESOLVED: "assignee_unresolved",
+	ATTACHMENT_NOT_TRANSFERRED: "attachment_not_transferred",
+	DUPLICATE_SOURCE_ID: "duplicate_source_id",
+	FILE_TOO_LARGE: "file_too_large",
+	INVALID_DATE: "invalid_date",
+	INVALID_RECORD: "invalid_record",
+	/** Kept out of the plan because the user asked for open tasks only. */
+	LEFT_BEHIND: "left_behind",
+	MISSING_TITLE: "missing_title",
+	PARENT_NOT_FOUND: "parent_not_found",
+	RECURRENCE_APPROXIMATED: "recurrence_approximated",
+	RECURRENCE_UNSUPPORTED: "recurrence_unsupported",
+	TIMEZONE_UNKNOWN: "timezone_unknown",
+	UNKNOWN_FILE_SHAPE: "unknown_file_shape",
+	UNSUPPORTED_FIELD: "unsupported_field"
+};
+ImportIssueCode.AREAS_NOT_IMPORTED, ImportIssueCode.LEFT_BEHIND;
+const createIssue = (code, message, options = {}) => ({
+	code,
+	field: options.field ?? null,
+	message,
+	severity: options.severity ?? "warning",
+	sourceRecordId: options.sourceRecordId ?? null
+});
+//#endregion
 //#region ../../packages/import-core/src/things/ids.ts
 const THINGS_IMPORT_ID_NAMESPACE = "b1f9f0ac-9f76-54ed-8eb0-7d6d3a0a0a31";
 const createDeterministicImportId = (params) => createDeterministicId(THINGS_IMPORT_ID_NAMESPACE, `things:${params.workspaceId}:${params.modelName}:${params.sourceId}`);
@@ -5240,17 +5465,23 @@ var import_rrule = /* @__PURE__ */ __toESM((/* @__PURE__ */ __commonJSMin(((expo
 		return (() => {
 			"use strict";
 			var __webpack_require__ = {};
-			__webpack_require__.d = (exports$1, definition) => {
-				for (var key in definition) if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports$1, key)) Object.defineProperty(exports$1, key, {
-					enumerable: true,
-					get: definition[key]
-				});
-			};
-			__webpack_require__.o = (obj, prop) => Object.prototype.hasOwnProperty.call(obj, prop);
-			__webpack_require__.r = (exports$2) => {
-				if (typeof Symbol !== "undefined" && Symbol.toStringTag) Object.defineProperty(exports$2, Symbol.toStringTag, { value: "Module" });
-				Object.defineProperty(exports$2, "__esModule", { value: true });
-			};
+			(() => {
+				__webpack_require__.d = (exports$1, definition) => {
+					for (var key in definition) if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports$1, key)) Object.defineProperty(exports$1, key, {
+						enumerable: true,
+						get: definition[key]
+					});
+				};
+			})();
+			(() => {
+				__webpack_require__.o = (obj, prop) => Object.prototype.hasOwnProperty.call(obj, prop);
+			})();
+			(() => {
+				__webpack_require__.r = (exports$2) => {
+					if (typeof Symbol !== "undefined" && Symbol.toStringTag) Object.defineProperty(exports$2, Symbol.toStringTag, { value: "Module" });
+					Object.defineProperty(exports$2, "__esModule", { value: true });
+				};
+			})();
 			var __webpack_exports__ = {};
 			__webpack_require__.r(__webpack_exports__);
 			__webpack_require__.d(__webpack_exports__, {
@@ -5421,7 +5652,7 @@ var import_rrule = /* @__PURE__ */ __toESM((/* @__PURE__ */ __commonJSMin(((expo
 			/**
 			* Number of milliseconds of one day
 			*/
-			var ONE_DAY = 1e3 * 60 * 60 * 24;
+			var ONE_DAY = 864e5;
 			/**
 			* @see: <http://docs.python.org/library/datetime.html#datetime.MAXYEAR>
 			*/
@@ -5656,9 +5887,6 @@ var import_rrule = /* @__PURE__ */ __toESM((/* @__PURE__ */ __commonJSMin(((expo
 				}
 				return to.concat(ar || Array.prototype.slice.call(from));
 			}
-			function __await(v) {
-				return this instanceof __await ? (this.v = v, this) : new __await(v);
-			}
 			const callbackiterresult = function(_super) {
 				__extends(CallbackIterResult, _super);
 				function CallbackIterResult(method, args, iterator) {
@@ -5872,9 +6100,10 @@ var import_rrule = /* @__PURE__ */ __toESM((/* @__PURE__ */ __commonJSMin(((expo
 				ToText.prototype.WEEKLY = function() {
 					var gettext = this.gettext;
 					if (this.options.interval !== 1) this.add(this.options.interval.toString()).add(this.plural(this.options.interval) ? gettext("weeks") : gettext("week"));
-					if (this.byweekday && this.byweekday.isWeekdays) if (this.options.interval === 1) this.add(this.plural(this.options.interval) ? gettext("weekdays") : gettext("weekday"));
-					else this.add(gettext("on")).add(gettext("weekdays"));
-					else if (this.byweekday && this.byweekday.isEveryDay) this.add(this.plural(this.options.interval) ? gettext("days") : gettext("day"));
+					if (this.byweekday && this.byweekday.isWeekdays) {
+						if (this.options.interval === 1) this.add(this.plural(this.options.interval) ? gettext("weekdays") : gettext("weekday"));
+						else this.add(gettext("on")).add(gettext("weekdays"));
+					} else if (this.byweekday && this.byweekday.isEveryDay) this.add(this.plural(this.options.interval) ? gettext("days") : gettext("day"));
 					else {
 						if (this.options.interval === 1) this.add(gettext("week"));
 						if (this.origOptions.bymonth) {
@@ -5985,8 +6214,10 @@ var import_rrule = /* @__PURE__ */ __toESM((/* @__PURE__ */ __commonJSMin(((expo
 					var delimJoin = function(array, delimiter, finalDelimiter) {
 						var list = "";
 						for (var i = 0; i < array.length; i++) {
-							if (i !== 0) if (i === array.length - 1) list += " " + finalDelimiter + " ";
-							else list += delimiter + " ";
+							if (i !== 0) {
+								if (i === array.length - 1) list += " " + finalDelimiter + " ";
+								else list += delimiter + " ";
+							}
 							list += array[i];
 						}
 						return list;
@@ -6196,16 +6427,17 @@ var import_rrule = /* @__PURE__ */ __toESM((/* @__PURE__ */ __commonJSMin(((expo
 						var nth = decodeNTH();
 						var wkd = decodeWKD();
 						var m = decodeM();
-						if (nth) if (wkd) {
-							ttr.nextSymbol();
-							if (!options.byweekday) options.byweekday = [];
-							options.byweekday.push(RRule[wkd].nth(nth));
-						} else {
-							if (!options.bymonthday) options.bymonthday = [];
-							options.bymonthday.push(nth);
-							ttr.accept("day(s)");
-						}
-						else if (wkd) {
+						if (nth) {
+							if (wkd) {
+								ttr.nextSymbol();
+								if (!options.byweekday) options.byweekday = [];
+								options.byweekday.push(RRule[wkd].nth(nth));
+							} else {
+								if (!options.bymonthday) options.bymonthday = [];
+								options.bymonthday.push(nth);
+								ttr.accept("day(s)");
+							}
+						} else if (wkd) {
 							ttr.nextSymbol();
 							if (!options.byweekday) options.byweekday = [];
 							options.byweekday.push(RRule[wkd]);
@@ -6611,9 +6843,7 @@ var import_rrule = /* @__PURE__ */ __toESM((/* @__PURE__ */ __commonJSMin(((expo
 					case RRule.MONTHLY:
 						opts.bymonthday = opts.dtstart.getUTCDate();
 						break;
-					case RRule.WEEKLY:
-						opts.byweekday = [getWeekday(opts.dtstart)];
-						break;
+					case RRule.WEEKLY: opts.byweekday = [getWeekday(opts.dtstart)];
 				}
 				if (isPresent(opts.bymonth) && !isArray(opts.bymonth)) opts.bymonth = [opts.bymonth];
 				if (isPresent(opts.byyearday) && !isArray(opts.byyearday) && isNumber(opts.byyearday)) opts.byyearday = [opts.byyearday];
@@ -6645,14 +6875,15 @@ var import_rrule = /* @__PURE__ */ __toESM((/* @__PURE__ */ __commonJSMin(((expo
 				} else if (isWeekdayStr(opts.byweekday)) {
 					opts.byweekday = [Weekday.fromStr(opts.byweekday).weekday];
 					opts.bynweekday = null;
-				} else if (opts.byweekday instanceof Weekday) if (!opts.byweekday.n || opts.freq > RRule.MONTHLY) {
-					opts.byweekday = [opts.byweekday.weekday];
-					opts.bynweekday = null;
+				} else if (opts.byweekday instanceof Weekday) {
+					if (!opts.byweekday.n || opts.freq > RRule.MONTHLY) {
+						opts.byweekday = [opts.byweekday.weekday];
+						opts.bynweekday = null;
+					} else {
+						opts.bynweekday = [[opts.byweekday.weekday, opts.byweekday.n]];
+						opts.byweekday = null;
+					}
 				} else {
-					opts.bynweekday = [[opts.byweekday.weekday, opts.byweekday.n]];
-					opts.byweekday = null;
-				}
-				else {
 					var byweekday = [];
 					var bynweekday = [];
 					for (var i = 0; i < opts.byweekday.length; i++) {
@@ -7071,12 +7302,13 @@ var import_rrule = /* @__PURE__ */ __toESM((/* @__PURE__ */ __commonJSMin(((expo
 					nwdaymask: []
 				};
 				var ranges = [];
-				if (options.freq === RRule.YEARLY) if (empty(options.bymonth)) ranges = [[0, yearlen]];
-				else for (var j = 0; j < options.bymonth.length; j++) {
-					month = options.bymonth[j];
-					ranges.push(mrange.slice(month - 1, month + 1));
-				}
-				else if (options.freq === RRule.MONTHLY) ranges = [mrange.slice(month - 1, month + 1)];
+				if (options.freq === RRule.YEARLY) {
+					if (empty(options.bymonth)) ranges = [[0, yearlen]];
+					else for (var j = 0; j < options.bymonth.length; j++) {
+						month = options.bymonth[j];
+						ranges.push(mrange.slice(month - 1, month + 1));
+					}
+				} else if (options.freq === RRule.MONTHLY) ranges = [mrange.slice(month - 1, month + 1)];
 				if (empty(ranges)) return result;
 				result.nwdaymask = repeat(0, yearlen);
 				for (var j = 0; j < ranges.length; j++) {
@@ -7115,7 +7347,7 @@ var import_rrule = /* @__PURE__ */ __toESM((/* @__PURE__ */ __commonJSMin(((expo
 				var month = Math.floor((h + l - 7 * m + 114) / 31);
 				var day = (h + l - 7 * m + 114) % 31 + 1;
 				var date = Date.UTC(y, month - 1, day + offset);
-				return [Math.ceil((date - Date.UTC(y, 0, 1)) / (1e3 * 60 * 60 * 24))];
+				return [Math.ceil((date - Date.UTC(y, 0, 1)) / 864e5)];
 			}
 			const iterinfo = function() {
 				function Iterinfo(options) {
@@ -7986,8 +8218,6 @@ var import_rrule = /* @__PURE__ */ __toESM((/* @__PURE__ */ __commonJSMin(((expo
 	});
 })))(), 1);
 const PACKED_DATE_MULTIPLIER = 128;
-const PACKED_DATE_DAY_MASK = 31;
-const PACKED_DATE_MONTH_MASK = 15;
 const PACKED_DATE_MONTH_SHIFT = 5;
 const PACKED_DATE_YEAR_SHIFT = 9;
 const THINGS_REMINDER_HOUR_SCALE = 67108864;
@@ -8008,8 +8238,8 @@ const decodeThingsPackedDateParts = (value) => {
 	if (integer <= 0 || integer % PACKED_DATE_MULTIPLIER !== 0) return null;
 	const packed = integer / PACKED_DATE_MULTIPLIER;
 	const parts = {
-		day: packed % (PACKED_DATE_DAY_MASK + 1),
-		month: Math.trunc(packed / 2 ** PACKED_DATE_MONTH_SHIFT) % (PACKED_DATE_MONTH_MASK + 1),
+		day: packed % 32,
+		month: Math.trunc(packed / 2 ** PACKED_DATE_MONTH_SHIFT) % 16,
 		year: Math.trunc(packed / 2 ** PACKED_DATE_YEAR_SHIFT)
 	};
 	return isValidPackedDate(parts) ? parts : null;
@@ -8046,7 +8276,7 @@ const combineThingsReminderAt = (options) => {
 //#endregion
 //#region ../../packages/import-core/src/things/recurrence.ts
 const { RRule, rrulestr } = typeof import_rrule.RRule === "function" ? import_rrule : import_rrule.default;
-const THINGS_FREQUENCY_TO_RRULE = new Map([
+const THINGS_FREQUENCY_TO_RRULE = /* @__PURE__ */ new Map([
 	[4, "YEARLY"],
 	[8, "MONTHLY"],
 	[16, "DAILY"],
@@ -8061,6 +8291,11 @@ const THINGS_WEEKDAY_TO_RRULE = [
 	"FR",
 	"SA"
 ];
+/**
+* Things writes `ed` as Unix seconds at UTC midnight, and uses 4001-01-01 as
+* "never ends". Anything at or past it is treated as no end date.
+*/
+const THINGS_NEVER_ENDS_SECONDS = 64092211200;
 const parseNumericPlistField = (xml, key) => {
 	const match = new RegExp(`<key>${key}</key>\\s*<(integer|real)>([^<]+)</\\1>`, "u").exec(xml);
 	if (!match?.[2]) return null;
@@ -8096,7 +8331,8 @@ const buildByDayTokens = (definition) => {
 	const tokens = definition.offsets.map((offset) => typeof offset.wd === "number" ? THINGS_WEEKDAY_TO_RRULE[offset.wd] ?? null : null).filter((value) => value !== null);
 	if (tokens.length > 0) return tokens;
 	if (definition.ia === null) return [];
-	return [THINGS_WEEKDAY_TO_RRULE[(/* @__PURE__ */ new Date(definition.ia * 1e3)).getUTCDay()] ?? "MO"];
+	const weekday = (/* @__PURE__ */ new Date(definition.ia * 1e3)).getUTCDay();
+	return [THINGS_WEEKDAY_TO_RRULE[weekday] ?? "MO"];
 };
 const buildMonthDays = (definition) => {
 	const monthDays = definition.offsets.map((offset) => typeof offset.dy === "number" ? Math.trunc(offset.dy) + 1 : null).filter((value) => value !== null && value >= 1);
@@ -8110,6 +8346,10 @@ const buildAnchor = (definition, task, timeZone) => {
 	if (!timeZone) return `DTSTART:${anchor}`;
 	return `DTSTART;TZID=${timeZone}:${anchor}`;
 };
+/**
+* Builds the rule without any end. The end is appended separately because a
+* count has to be resolved against this exact rule first.
+*/
 const buildRepeatRule = (definition, task, timeZone) => {
 	const frequency = definition.fu === null ? null : THINGS_FREQUENCY_TO_RRULE.get(definition.fu) ?? null;
 	if (!frequency) return null;
@@ -8161,21 +8401,77 @@ const parseThingsRecurrenceDefinition = (xml) => {
 	if (definition.ia === null && definition.sr === null && definition.ed === null && definition.rc === null && definition.fu === null && definition.fa === null && definition.tp === null && definition.ts === null && definition.offsets.length === 0) return null;
 	return definition;
 };
+const resolveThingsRepeatEnd = (definition) => {
+	const untilDate = definition.ed !== null && definition.ed < THINGS_NEVER_ENDS_SECONDS ? decodeThingsUnixCalendarDate(definition.ed, null) : null;
+	const count = definition.rc !== null && definition.rc > 0 ? Math.trunc(definition.rc) : null;
+	return untilDate === null && count === null ? null : {
+		count,
+		untilDate
+	};
+};
+/**
+* Date-only epoch of the last occurrence a count allows, counted from the
+* rule's DTSTART, or null when the rule has no DTSTART to count from.
+*
+* COUNT itself is never written: iOS only honours COUNT <= 0, and rrule counts
+* from DTSTART while the rule anchor is Things' `ia`. Resolving the count here
+* against that same anchor and storing the result as UNTIL gives every
+* platform one date to agree on. `instanceCreationCount` is not used: it
+* counts instances Things has already made from that same anchor, so it does
+* not change which occurrence is last. It would matter only if `ia` had moved
+* since the count began, and nothing in the database records that.
+*/
+const resolveLastOccurrenceDate = (repeatRule, count) => {
+	const parsed = parseRRule(`${repeatRule};COUNT=${count}`);
+	if (!parsed?.origOptions.dtstart) return null;
+	const last = parsed.all().at(-1);
+	return last ? normalizeOccurrenceEpoch(last, getRuleTimeZone(parsed)) : null;
+};
+/**
+* The last day a fixed repeat may land on, from Things' end date and count
+* together (whichever comes first), or null when neither can be resolved.
+*/
+const resolveFixedUntilDate = (repeatRule, end) => {
+	const lastByCount = end.count === null ? null : resolveLastOccurrenceDate(repeatRule, end.count);
+	if (end.count !== null && lastByCount === null) return null;
+	const candidates = [end.untilDate, lastByCount].filter((value) => value !== null);
+	return candidates.length > 0 ? Math.min(...candidates) : null;
+};
+/**
+* UNTIL as the end of that calendar day. rrule compares it against the rule's
+* wall-clock occurrences, so this admits the last day in the rule's own zone,
+* and iOS reads only the date digits, so both stop on the same day.
+*
+* With a TZID the time is local, written without `Z`, because that is how
+* rrule serializes it and so how manage-api's `canonicalizeRepeatRule` stores
+* it. Writing `Z` there would have the server rewrite the rule on insert.
+*/
+const formatUntil = (untilDate, timeZone) => {
+	const day = formatDateOnlyEpoch(untilDate);
+	return day ? `UNTIL=${day.replaceAll("-", "")}T235959${timeZone ? "" : "Z"}` : null;
+};
 const isThingsRepeatTemplateTask = (task) => task.recurrenceRuleRaw !== null && task.repeatTemplateSourceId === null;
 const isThingsRepeatInstanceTask = (task) => task.repeatTemplateSourceId !== null;
-const resolveThingsRepeatTemplateFields = (task, timeZone) => {
+const resolveThingsRepeatTemplateFields = (task, timeZone, today) => {
 	if (!isThingsRepeatTemplateTask(task)) return null;
 	const recurrence = parseThingsRecurrenceDefinition(task.recurrenceRuleRaw);
 	if (!recurrence) return null;
 	const repeatTimeZone = resolveTimeZoneOrNull(timeZone);
-	const repeatRule = buildRepeatRule(recurrence, task, repeatTimeZone);
-	if (!repeatRule) return null;
-	const currentInstanceDate = decodeThingsPackedCalendarDate(task.nextInstanceStartDate, repeatTimeZone) ?? decodeThingsPackedCalendarDate(task.startDate, repeatTimeZone) ?? decodeThingsUnixCalendarDate(recurrence.ia, repeatTimeZone) ?? decodeThingsUnixSeconds(recurrence.ia);
+	const openRule = buildRepeatRule(recurrence, task, repeatTimeZone);
+	if (!openRule) return null;
 	const repeatType = recurrence.tp === 1 ? "after_completion" : "fixed";
+	const end = resolveThingsRepeatEnd(recurrence);
+	const untilDate = end && repeatType === "fixed" ? resolveFixedUntilDate(openRule, end) : null;
+	const until = untilDate === null ? null : formatUntil(untilDate, repeatTimeZone);
+	const repeatRule = until ? `${openRule};${until}` : openRule;
+	const currentInstanceDate = decodeThingsPackedCalendarDate(task.nextInstanceStartDate, repeatTimeZone) ?? decodeThingsPackedCalendarDate(task.startDate, repeatTimeZone) ?? decodeThingsUnixCalendarDate(recurrence.ia, repeatTimeZone) ?? decodeThingsUnixSeconds(recurrence.ia);
+	const ended = untilDate !== null && (untilDate < today || currentInstanceDate !== null && currentInstanceDate > untilDate);
 	return {
 		currentInstanceDate,
+		droppedEnd: until ? null : end,
+		ended,
 		recurrence,
-		repeatNextAt: repeatType === "fixed" ? calculateNextOccurrence(repeatRule, currentInstanceDate) : null,
+		repeatNextAt: repeatType === "fixed" && !ended ? calculateNextOccurrence(repeatRule, currentInstanceDate) : null,
 		repeatRule,
 		repeatStatus: task.instanceCreationPaused || recurrence.ts === 1 ? "paused" : "active",
 		repeatType
@@ -8281,11 +8577,15 @@ const buildReminderAt = (task, startDate) => combineThingsReminderAt({
 	reminderTime: task.reminderTime,
 	startDate
 });
-const pickArchivedAt = (task) => {
+/**
+* `fallback` is the import time. A trashed task with no dates of its own must
+* still get an `archivedAt`, or it lands outside Trash.
+*/
+const pickArchivedAt = (task, fallback) => {
 	const updatedAt = decodeThingsUnixSeconds(task.userModificationDate);
 	const completedAt = decodeThingsUnixSeconds(task.stopDate);
 	const createdAt = decodeThingsUnixSeconds(task.creationDate);
-	if (task.trashed || task.status === 2) return updatedAt ?? completedAt ?? createdAt;
+	if (task.trashed || task.status === 2) return updatedAt ?? completedAt ?? createdAt ?? fallback;
 	return null;
 };
 const pickCompletedAt = (task) => {
@@ -8438,7 +8738,7 @@ const buildTagTitleMap = (tags) => {
 const buildChecklistMutation = (options) => {
 	const sourceId = options.sourceId ?? options.item.uuid;
 	const title = normalizeTitle(options.item.title, `Checklist item ${options.item.uuid.slice(0, 8)}`);
-	const safeTitle = title.length > MAX_CHECKLIST_TITLE_LENGTH ? `${title.slice(0, MAX_CHECKLIST_TITLE_LENGTH - 3)}...` : title;
+	const safeTitle = title.length > MAX_CHECKLIST_TITLE_LENGTH ? `${title.slice(0, 497)}...` : title;
 	return {
 		modelId: createDeterministicImportId({
 			modelName: "TaskChecklistItem",
@@ -8568,7 +8868,7 @@ const buildProjectActions = (ctx, sourceProjects) => {
 			modelId: projectId,
 			modelName: "Project",
 			payload: {
-				archivedAt: pickArchivedAt(project),
+				archivedAt: pickArchivedAt(project, ctx.createdAtFallback),
 				color: null,
 				completedAt: pickCompletedAt(project),
 				createdAt: decodeThingsUnixSeconds(project.creationDate) ?? ctx.createdAtFallback,
@@ -8646,7 +8946,7 @@ const buildHeadingActions = (ctx, sourceHeadings) => {
 			modelId: headingId,
 			modelName: "ProjectHeading",
 			payload: {
-				archivedAt: pickArchivedAt(heading),
+				archivedAt: pickArchivedAt(heading, ctx.createdAtFallback),
 				createdAt: decodeThingsUnixSeconds(heading.creationDate) ?? ctx.createdAtFallback,
 				projectId: parentProjectId,
 				sortOrder: sortValue(heading.sortIndex, headings.length),
@@ -8717,7 +9017,7 @@ const pushTaskMutation = (ctx, tasks, taskLabels, checklistItems, mutationOption
 		modelId: mutationOptions.taskId,
 		modelName: "Task",
 		payload: {
-			archivedAt: pickArchivedAt(mutationOptions.task),
+			archivedAt: pickArchivedAt(mutationOptions.task, ctx.createdAtFallback),
 			assigneeId: null,
 			completedAt: pickCompletedAt(mutationOptions.task),
 			createdAt,
@@ -8757,8 +9057,22 @@ const pushTaskMutation = (ctx, tasks, taskLabels, checklistItems, mutationOption
 	});
 	return createdAt;
 };
+/**
+* The repeat is imported without its end, so it keeps going. Name the task in
+* the preview rather than let the user find out when it comes back.
+*/
+const buildRepeatEndIssue = (task, end, repeatType) => {
+	const title = normalizeTitle(task.title, `Task ${task.uuid.slice(0, 8)}`);
+	const until = formatDateOnlyEpoch(end.untilDate);
+	const thingsEnd = until ? `stops repeating on ${until} in Things` : `repeats ${end.count} ${end.count === 1 ? "time" : "times"} in Things`;
+	const outcome = repeatType === "after_completion" ? "In Done Bear it repeats after each completion with no end, so stop it by hand when you're done." : "That end won't carry over, so it keeps repeating in Done Bear.";
+	return createIssue(ImportIssueCode.RECURRENCE_APPROXIMATED, `"${title}" ${thingsEnd}. ${outcome}`, {
+		field: "repeatRule",
+		sourceRecordId: task.uuid
+	});
+};
 const planRepeatTemplateTask = (ctx, task, taskId, openRepeatInstanceTemplateIds, tasks, taskLabels, checklistItems) => {
-	const repeatTemplate = resolveThingsRepeatTemplateFields(task, ctx.timeZone);
+	const repeatTemplate = resolveThingsRepeatTemplateFields(task, ctx.timeZone, ctx.todayDateOnly);
 	if (!repeatTemplate) {
 		pushTaskMutation(ctx, tasks, taskLabels, checklistItems, {
 			sourceId: task.uuid,
@@ -8767,6 +9081,8 @@ const planRepeatTemplateTask = (ctx, task, taskId, openRepeatInstanceTemplateIds
 		});
 		return;
 	}
+	const archived = pickArchivedAt(task, ctx.createdAtFallback) !== null;
+	if (repeatTemplate.droppedEnd && !archived) ctx.issues.push(buildRepeatEndIssue(task, repeatTemplate.droppedEnd, repeatTemplate.repeatType));
 	pushTaskMutation(ctx, tasks, taskLabels, checklistItems, {
 		repeat: {
 			repeatInstanceDate: null,
@@ -8780,7 +9096,7 @@ const planRepeatTemplateTask = (ctx, task, taskId, openRepeatInstanceTemplateIds
 		task,
 		taskId
 	});
-	if (pickCompletedAt(task) !== null || pickArchivedAt(task) !== null || openRepeatInstanceTemplateIds.has(task.uuid)) return;
+	if (pickCompletedAt(task) !== null || archived || repeatTemplate.ended || openRepeatInstanceTemplateIds.has(task.uuid)) return;
 	const currentInstanceTaskId = createDeterministicImportId({
 		modelName: "Task",
 		sourceId: `${task.uuid}:current-instance`,
@@ -8819,7 +9135,7 @@ const buildTaskActions = (ctx, sourceTasks) => {
 		if (todayComparison !== 0) return todayComparison;
 		return a.uuid.localeCompare(b.uuid);
 	});
-	const openRepeatInstanceTemplateIds = new Set(sourceTasks.filter(isThingsRepeatInstanceTask).filter((task) => pickCompletedAt(task) === null && pickArchivedAt(task) === null).map((task) => task.repeatTemplateSourceId).filter((value) => typeof value === "string"));
+	const openRepeatInstanceTemplateIds = new Set(sourceTasks.filter(isThingsRepeatInstanceTask).filter((task) => pickCompletedAt(task) === null && pickArchivedAt(task, ctx.createdAtFallback) === null).map((task) => task.repeatTemplateSourceId).filter((value) => typeof value === "string"));
 	for (const task of sortedSourceTasks) ctx.taskIdBySourceId.set(task.uuid, createDeterministicImportId({
 		modelName: "Task",
 		sourceId: task.uuid,
@@ -8862,6 +9178,45 @@ const buildTaskActions = (ctx, sourceTasks) => {
 		tasks
 	};
 };
+/**
+* Still to do in Things: not completed (status 3), not canceled (status 2),
+* not in the Trash. Canceled and trashed items would arrive in Done Bear's
+* Trash anyway, and someone asking for open items does not want them.
+*/
+const isThingsItemOpen = (task) => !task.trashed && task.status !== 2 && task.status !== 3;
+/**
+* Decides, once and here, what `openOnly` keeps:
+*
+* - To-dos: only open ones. That includes repeat templates (the rule lives on
+*   them) and open repeat instances; completed instances are the Logbook
+*   history of a repeat and are left behind. An open instance whose template
+*   is left behind keeps its date but loses the link, since the template is
+*   not written.
+* - Projects: an open project always comes; a finished one comes only when an
+*   open to-do still lives in it (directly or under one of its headings), and
+*   keeps its finished state. Its headings follow it.
+* - Checklist items follow their to-do, ticked ones included: they are part of
+*   an open to-do's state and do not count as tasks.
+* - Areas and tags are not filtered.
+*/
+const selectOpenOnly = (sourceProjects, sourceHeadings, sourceTasks) => {
+	const tasks = sourceTasks.filter(isThingsItemOpen);
+	const projectIdByHeadingId = new Map(sourceHeadings.map((heading) => [heading.uuid, heading.projectId]));
+	const projectIdsWithOpenTasks = /* @__PURE__ */ new Set();
+	for (const task of tasks) {
+		const projectId = task.projectId ?? (task.headingId === null ? null : projectIdByHeadingId.get(task.headingId) ?? null);
+		if (projectId !== null) projectIdsWithOpenTasks.add(projectId);
+	}
+	const projects = sourceProjects.filter((project) => isThingsItemOpen(project) || projectIdsWithOpenTasks.has(project.uuid));
+	return {
+		leftBehind: {
+			projects: sourceProjects.length - projects.length,
+			tasks: sourceTasks.length - tasks.length
+		},
+		projects,
+		tasks
+	};
+};
 const buildThingsImportPlan = (options) => {
 	const { snapshot, workspaceId, existingLabelsByTitle } = options;
 	const ctx = {
@@ -8875,6 +9230,7 @@ const buildThingsImportPlan = (options) => {
 		existingLabelIdByTitle: existingLabelsByTitle ?? /* @__PURE__ */ new Map(),
 		existingTeamIdByName: options.existingTeamsByName ?? /* @__PURE__ */ new Map(),
 		headingIdBySourceId: /* @__PURE__ */ new Map(),
+		issues: [],
 		metadataMode: options.metadataMode,
 		projectIdBySourceId: /* @__PURE__ */ new Map(),
 		projectKeyCandidates: buildUniqueKeys(snapshot.tasks.filter((task) => classifyTaskKind(task) === "project"), {
@@ -8901,9 +9257,17 @@ const buildThingsImportPlan = (options) => {
 	const sourceProjects = snapshot.tasks.filter((task) => classifyTaskKind(task) === "project");
 	const sourceHeadings = snapshot.tasks.filter((task) => classifyTaskKind(task) === "heading");
 	const sourceTasks = snapshot.tasks.filter((task) => classifyTaskKind(task) === "task");
-	const { projectMemberships, projects, teamProjects } = buildProjectActions(ctx, sourceProjects);
+	const selected = options.openOnly ? selectOpenOnly(sourceProjects, sourceHeadings, sourceTasks) : {
+		leftBehind: {
+			projects: 0,
+			tasks: 0
+		},
+		projects: sourceProjects,
+		tasks: sourceTasks
+	};
+	const { projectMemberships, projects, teamProjects } = buildProjectActions(ctx, selected.projects);
 	const headings = buildHeadingActions(ctx, sourceHeadings);
-	const { tasks, taskLabels, checklistItems } = buildTaskActions(ctx, sourceTasks);
+	const { tasks, taskLabels, checklistItems } = buildTaskActions(ctx, selected.tasks);
 	const phases = [
 		{
 			items: teams,
@@ -8948,6 +9312,7 @@ const buildThingsImportPlan = (options) => {
 	];
 	return {
 		counts: {
+			leftBehind: selected.leftBehind,
 			planned: Object.fromEntries(phases.map((phase) => [phase.name, phase.items.length])),
 			source: {
 				areaTagLinks: snapshot.areaTags.length,
@@ -8961,6 +9326,7 @@ const buildThingsImportPlan = (options) => {
 			}
 		},
 		databasePath: snapshot.databasePath,
+		issues: ctx.issues,
 		phases,
 		taskColumns: snapshot.taskColumns
 	};
@@ -9251,7 +9617,7 @@ const loadThingsDatabase = (databaseUrl) => {
 //#endregion
 //#region src/import/things-runner.ts
 const WORKSPACE_SCOPED_MODELS = SYNC_CONTENT_MODELS;
-const INSERT_ONLY_MODELS = new Set([
+const INSERT_ONLY_MODELS = /* @__PURE__ */ new Set([
 	"TaskLabel",
 	"TeamProject",
 	"TeamMembership",
@@ -9384,6 +9750,24 @@ const buildTransactions = (phaseItems, options) => {
 		updated
 	};
 };
+const PLAN_LIMIT_PATTERN = /plan includes up to|upgrade to add more/iu;
+const LIMITED_MODELS = ["Task", "Team"];
+/**
+* Turns a batch the server partly refused for the plan limit into one clear
+* stop: how many tasks and teams landed before it, and what to do next. Any
+* other refusal is passed through unchanged.
+*/
+const explainPlanLimitStop = (error, context) => {
+	if (!(error instanceof SyncMutationRejectedError) || !error.results.some((result) => !result.success && PLAN_LIMIT_PATTERN.test(result.error ?? ""))) return error;
+	const landed = new Map(context.landed);
+	const accepted = new Set(error.results.filter((result) => result.success).map((r) => r.clientTxId));
+	for (const tx of context.batch) if (tx.action === "INSERT" && accepted.has(tx.clientTxId)) landed.set(tx.modelName, (landed.get(tx.modelName) ?? 0) + 1);
+	const parts = LIMITED_MODELS.filter((model) => (context.planned.get(model) ?? 0) > 0).map((model) => {
+		const noun = model === "Task" ? "tasks" : "teams";
+		return `${landed.get(model) ?? 0} of ${context.planned.get(model) ?? 0} ${noun}`;
+	});
+	return new CliError(`Import stopped: the workspace reached its plan limit. Imported ${parts.join(" and ")} before it stopped.`, EXIT_CODES.ERROR, "Upgrade the workspace, or run again with --open-only (and --skip-teams if the team limit was hit). A re-run skips what already landed.");
+};
 const executeImportPlan = async (options, plan, rowsByModel) => {
 	const execution = {
 		batches: 0,
@@ -9392,25 +9776,37 @@ const executeImportPlan = async (options, plan, rowsByModel) => {
 		updated: 0
 	};
 	const existingIds = buildExistingIds(rowsByModel);
-	for (const phase of plan.phases) {
-		const prepared = buildTransactions(phase.items, {
-			clientId: options.commandContext.localContext.clientId,
-			existingIds
-		});
-		execution.inserted += prepared.inserted;
-		execution.updated += prepared.updated;
-		execution.skipped += prepared.skipped;
-		const transactionBatches = chunk(prepared.transactions, options.batchSize);
+	const prepared = plan.phases.map((phase) => buildTransactions(phase.items, {
+		clientId: options.commandContext.localContext.clientId,
+		existingIds
+	}));
+	const planned = /* @__PURE__ */ new Map();
+	for (const tx of prepared.flatMap((phase) => phase.transactions)) if (tx.action === "INSERT") planned.set(tx.modelName, (planned.get(tx.modelName) ?? 0) + 1);
+	const landed = /* @__PURE__ */ new Map();
+	for (const phasePrepared of prepared) {
+		execution.inserted += phasePrepared.inserted;
+		execution.updated += phasePrepared.updated;
+		execution.skipped += phasePrepared.skipped;
+		const transactionBatches = chunk(phasePrepared.transactions, options.batchSize);
 		for (const transactionBatch of transactionBatches) {
 			if (transactionBatch.length === 0) continue;
-			await mutateModel(options.context, {
-				baseUrl: options.commandContext.apiBaseUrl,
-				request: {
-					batchId: randomUUID(),
-					transactions: transactionBatch
-				},
-				token: options.commandContext.token
-			});
+			try {
+				await mutateModel(options.context, {
+					baseUrl: options.commandContext.apiBaseUrl,
+					request: {
+						batchId: randomUUID(),
+						transactions: transactionBatch
+					},
+					token: options.commandContext.token
+				});
+			} catch (error) {
+				throw explainPlanLimitStop(error, {
+					batch: transactionBatch,
+					landed,
+					planned
+				});
+			}
+			for (const tx of transactionBatch) if (tx.action === "INSERT") landed.set(tx.modelName, (landed.get(tx.modelName) ?? 0) + 1);
 			execution.batches += 1;
 		}
 	}
@@ -9454,6 +9850,7 @@ const runThingsImport = async (options) => {
 		existingLabelsByTitle: existingState.existingLabelIdsByTitle,
 		existingTeamsByName: existingState.existingTeamIdsByName,
 		metadataMode: options.metadataMode,
+		openOnly: options.openOnly,
 		skipTeams: options.skipTeams,
 		snapshot,
 		timeZone: resolveLocalTimeZone(),
@@ -9469,6 +9866,7 @@ const runThingsImport = async (options) => {
 			skipped: 0,
 			updated: 0
 		},
+		issues: plan.issues,
 		taskColumns: plan.taskColumns,
 		workspace: options.workspace
 	};
@@ -9479,6 +9877,7 @@ const runThingsImport = async (options) => {
 		databasePath: plan.databasePath,
 		dryRun: false,
 		execution,
+		issues: plan.issues,
 		taskColumns: plan.taskColumns,
 		workspace: options.workspace
 	};
@@ -9508,6 +9907,7 @@ const runThingsImportCommand = async (context, options, workspaceOverride) => {
 		databaseUrl: options.databaseUrl,
 		dryRun: context.dryRun,
 		metadataMode,
+		openOnly: options.openOnly,
 		skipTeams: options.skipTeams,
 		workspace
 	});
@@ -9519,9 +9919,10 @@ const runThingsImportCommand = async (context, options, workspaceOverride) => {
 	const summary = summarizeThingsImportResult(result);
 	writeSuccess(context, summary.successMessage);
 	for (const line of summary.infoLines) writeInfo(context, line);
+	for (const line of summary.warningLines) writeWarning(context, line);
 };
 const registerImportCommands = (program, workspaceOverride) => {
-	program.command("import").description("Import external data into Done Bear").command("things").description("Import a Things 3 SQLite export").option("--database-url <database-url>", "Path, file:// URL, sqlite:// URL, .thingsdatabase bundle, or ThingsData-* directory").option("-w, --workspace <workspace>", "Workspace id, slug, or exact name").option("--skip-teams", "Skip importing Things Areas as Teams and TeamProject links", false).option("--metadata-mode <mode>", "How to preserve Things-only metadata: note|none", "none").option("--batch-size <count>", "Maximum sync mutations per batch", (value) => parsePositiveInteger(value, "Batch size"), 100).addHelpText("after", `
+	program.command("import").description("Import external data into Done Bear").command("things").description("Import a Things 3 SQLite export").option("--database-url <database-url>", "Path, file:// URL, sqlite:// URL, .thingsdatabase bundle, or ThingsData-* directory").option("-w, --workspace <workspace>", "Workspace id, slug, or exact name").option("--skip-teams", "Skip importing Things Areas as Teams and TeamProject links", false).option("--open-only", "Import only open to-dos; leave completed, canceled and trashed ones behind", false).option("--metadata-mode <mode>", "How to preserve Things-only metadata: note|none", "none").option("--batch-size <count>", "Maximum sync mutations per batch", (value) => parsePositiveInteger(value, "Batch size"), 100).addHelpText("after", `
 Examples:
   donebear import things --dry-run --json
   donebear import things --database-url ~/Backups/Things\\ Database.thingsdatabase --json
@@ -9529,6 +9930,7 @@ Examples:
 
 Notes:
   --database-url accepts a copied Things 3 export bundle, a direct main.sqlite path, or a ThingsData-* directory.
+  --open-only leaves the Logbook behind. Completed to-dos count toward the Free plan's task limit.
   --metadata-mode note preserves Things-only fields in task/project/team descriptions using a structured appendix.
 `).action(async (options, command) => {
 		const context = contextFromCommand(command);
@@ -9601,11 +10003,15 @@ const runLabelList = async (context, options) => {
 	}
 	writeInfo(context, `${scopeLabel(scope)} (${sorted.length} label(s))`);
 	for (const labelRecord of sorted) writeInfo(context, `${labelRecord.id.slice(0, 8)}  ${labelRecord.title}`);
-	if (context.copy) copyToClipboard(sorted.map((l) => `${l.id.slice(0, 8)}  ${l.title}`).join("\n"));
+	if (context.copy) {
+		const text = sorted.map((l) => `${l.id.slice(0, 8)}  ${l.title}`).join("\n");
+		copyToClipboard(text);
+	}
 };
 const runLabelShow = async (context, labelRef, options) => {
+	const commandContext = await resolveCommandContext(context);
 	const label = await resolveLabel(context, {
-		commandContext: await resolveCommandContext(context),
+		commandContext,
 		labelRef,
 		workspaceRef: normalizeWorkspaceRef(options.workspace)
 	});
@@ -9888,7 +10294,7 @@ const runProjectList = async (context, options) => {
 		token: commandContext.token,
 		workspaceRef: normalizeWorkspaceRef(options.workspace)
 	});
-	const filtered = filterProjects(sortProjectsByUpdatedDesc(scope.mode === "all" ? await loadProjectsByWorkspaceIds(context, {
+	const allProjects = scope.mode === "all" ? await loadProjectsByWorkspaceIds(context, {
 		baseUrl: commandContext.apiBaseUrl,
 		token: commandContext.token,
 		workspaceIds: scope.workspaces.map((w) => w.id)
@@ -9896,7 +10302,8 @@ const runProjectList = async (context, options) => {
 		baseUrl: commandContext.apiBaseUrl,
 		token: commandContext.token,
 		workspaceId: scope.workspace.id
-	})), requestedStatus);
+	});
+	const filtered = filterProjects(sortProjectsByUpdatedDesc(allProjects), requestedStatus);
 	if (context.json) {
 		writeOutput(context, {
 			...scopeJsonFields(scope),
@@ -9935,11 +10342,15 @@ const runProjectList = async (context, options) => {
 		const suffix = target ? `  due ${target}` : "";
 		writeInfo(context, `${project.id.slice(0, 8)}  [${project.key}]  ${project.name}  (${status})${suffix}`);
 	}
-	if (context.copy) copyToClipboard(filtered.map((p) => `${p.id.slice(0, 8)}  [${p.key}]  ${p.name}  (${getProjectStatus(p)})`).join("\n"));
+	if (context.copy) {
+		const text = filtered.map((p) => `${p.id.slice(0, 8)}  [${p.key}]  ${p.name}  (${getProjectStatus(p)})`).join("\n");
+		copyToClipboard(text);
+	}
 };
 const runProjectShow = async (context, projectRef, options) => {
+	const commandContext = await resolveCommandContext(context);
 	const { project, workspace } = await resolveProjectReference(context, {
-		commandContext: await resolveCommandContext(context),
+		commandContext,
 		projectRef,
 		workspaceRef: normalizeWorkspaceRef(options.workspace)
 	});
@@ -9971,7 +10382,7 @@ const resolveProjectName = async (context, rawName) => {
 		const trimmed = rawName.trim();
 		if (trimmed.length > 0) return trimmed;
 	}
-	const { promptForValue } = await import("./prompt--P7Y1FBL.mjs");
+	const { promptForValue } = await import("./prompt-ujp1V6r9.mjs");
 	const prompted = await promptForValue(context, "Project name");
 	if (prompted) return prompted;
 	throw new CliError("Project name is required.", EXIT_CODES.VALIDATION, "Provide a name: donebear project add \"My project\"");
@@ -10216,10 +10627,7 @@ const runProjectMembershipChange = async (context, projectRef, options) => {
 		case "already_member":
 			writeInfo(context, `Already in project: ${project.name}`);
 			break;
-		case "not_a_member":
-			writeInfo(context, `Not in project: ${project.name}`);
-			break;
-		default: break;
+		case "not_a_member": writeInfo(context, `Not in project: ${project.name}`);
 	}
 };
 const registerProjectCommands = (program, workspaceOverride) => {
@@ -10354,7 +10762,7 @@ const runSearch = async (context, query, options, workspaceOverride) => {
 		token: commandContext.token,
 		workspaceRef: workspaceOverride ?? normalizeWorkspaceRef(options.workspace)
 	});
-	const filtered = filterTasks(scope.mode === "all" ? await loadTasksByWorkspaceIds(context, {
+	const tasks = scope.mode === "all" ? await loadTasksByWorkspaceIds(context, {
 		baseUrl: commandContext.apiBaseUrl,
 		token: commandContext.token,
 		workspaceIds: scope.workspaces.map((w) => w.id)
@@ -10362,7 +10770,8 @@ const runSearch = async (context, query, options, workspaceOverride) => {
 		baseUrl: commandContext.apiBaseUrl,
 		token: commandContext.token,
 		workspaceId: scope.workspace.id
-	}), {
+	});
+	const filtered = filterTasks(tasks, {
 		search: trimmedQuery,
 		state: requestedState,
 		view: null
@@ -10965,6 +11374,10 @@ const COMMAND_SPECS = {
 				enum: ["note", "none"],
 				type: "string"
 			},
+			"--open-only": {
+				description: "Import only open to-dos; completed, canceled and trashed ones are left behind",
+				type: "boolean"
+			},
 			"--skip-teams": {
 				description: "Skip importing Things Areas as Teams and TeamProject links",
 				type: "boolean"
@@ -11893,7 +12306,7 @@ const runToday = async (context, options, workspaceOverride) => {
 		token: commandContext.token,
 		workspaceRef: workspaceOverride ?? normalizeWorkspaceRef(options.workspace)
 	});
-	const todayTasks = filterToday(scope.mode === "all" ? await loadTasksByWorkspaceIds(context, {
+	const tasks = scope.mode === "all" ? await loadTasksByWorkspaceIds(context, {
 		baseUrl: commandContext.apiBaseUrl,
 		token: commandContext.token,
 		workspaceIds: scope.workspaces.map((w) => w.id)
@@ -11901,7 +12314,8 @@ const runToday = async (context, options, workspaceOverride) => {
 		baseUrl: commandContext.apiBaseUrl,
 		token: commandContext.token,
 		workspaceId: scope.workspace.id
-	}));
+	});
+	const todayTasks = filterToday(tasks);
 	const limited = todayTasks.slice(0, options.limit);
 	if (context.json) {
 		writeOutput(context, {
@@ -12026,7 +12440,10 @@ const runWorkspaceList = async (context) => {
 		return;
 	}
 	writeInfo(context, "Workspaces:");
-	for (const workspace of workspaces) writeInfo(context, `${workspace.id === commandContext.localContext.workspaceId ? "*" : " "} ${workspace.id}  ${workspace.name}${workspace.urlKey ? ` (${workspace.urlKey})` : ""}  role=${workspace.role}`);
+	for (const workspace of workspaces) {
+		const marker = workspace.id === commandContext.localContext.workspaceId ? "*" : " ";
+		writeInfo(context, `${marker} ${workspace.id}  ${workspace.name}${workspace.urlKey ? ` (${workspace.urlKey})` : ""}  role=${workspace.role}`);
+	}
 };
 const runWorkspaceCurrent = async (context) => {
 	const commandContext = await resolveCommandContext(context);
@@ -12053,10 +12470,11 @@ const runWorkspaceCurrent = async (context) => {
 };
 const runWorkspaceUse = async (context, reference) => {
 	const commandContext = await resolveCommandContext(context);
-	const selected = findWorkspace(reference, await listWorkspaces(context, {
+	const workspaces = await listWorkspaces(context, {
 		baseUrl: commandContext.apiBaseUrl,
 		token: commandContext.token
-	}));
+	});
+	const selected = findWorkspace(reference, workspaces);
 	if (!selected) throw new Error(`Workspace "${reference}" not found. Run \`donebear workspace list\`.`);
 	await setCurrentWorkspace(selected.id);
 	if (context.json) {
@@ -12411,7 +12829,8 @@ const main = async () => {
 	const hasUserArgs = processedArgv.length <= 2;
 	const isTTY = process.stdin.isTTY === true;
 	if (hasUserArgs && isTTY) {
-		await runInteractiveMode(contextFromArgv(processedArgv), program);
+		const ttyContext = contextFromArgv(processedArgv);
+		await runInteractiveMode(ttyContext, program);
 		return;
 	}
 	await program.parseAsync(processedArgv);