@mulmoclaude/core 1.13.0 → 1.14.0

package/dist/google/index.d.ts

@@ -7,12 +7,12 @@ export { brokerBaseUrl, brokerExchange, brokerRefresh, brokerStart, type BrokerS
 export { authorizeGoogle, commitLinkedTokens, getGoogleAccessToken, unlinkGoogle, waitForAuthCode, GOOGLE_AUTH_CANCELLED, GOOGLE_CALENDAR_SCOPE, GOOGLE_CALENDARLIST_SCOPE, GOOGLE_TASKS_SCOPE, GOOGLE_DRIVE_FILE_SCOPE, GOOGLE_SCOPES, type AuthorizeGoogleOptions, type RevokeFetch, } from './auth.js';
 export { createGoogleAuthFlow, googleAuthFlow, type GoogleAuthFlow, type GoogleAuthFlowStatus } from './authFlow.js';
 export { googleApiError, isGoogleApiError, GoogleApiError, DEFAULT_LIST_MAX_RESULTS, HTTP_FORBIDDEN, MAX_LIST_RESULTS } from './apiClient.js';
-export { buildEventPatch, calendarApiError, collectCalendarPages, createCalendarEvent, deleteCalendarEvent, getCalendarColors, canonicalCalendarId, listCalendarEvents, listCalendars, syncCalendarEvents, toCalendarSummary, toEventSummary, updateCalendarEvent, getCalendar, getCalendarEvent, resolveEventSpan, CANCELLED_EVENT_STATUS, HTTP_CONFLICT, HTTP_PRECONDITION_FAILED, type CalendarColorEntry, type CalendarColors, type CalendarEventInput, type CalendarEventSpan, type CalendarEventSummary, type CalendarEventTime, type CalendarListPage, type CalendarSummary, type CalendarSyncResult, type DeleteCalendarEventInput, type FetchedCalendarEvent, type ListEventsInput, type SyncEventsInput, type UpdateCalendarEventInput, } from './calendar.js';
+export { buildEventPatch, calendarApiError, collectCalendarPages, createCalendarEvent, deleteCalendarEvent, getCalendarColors, canonicalCalendarId, listCalendarEvents, listCalendars, syncCalendarEvents, toCalendarMeta, toCalendarSummary, toEventSummary, updateCalendarEvent, getCalendarEvent, getCalendarMeta, resolveEventSpan, CANCELLED_EVENT_STATUS, HTTP_CONFLICT, HTTP_PRECONDITION_FAILED, type CalendarColorEntry, type CalendarColors, type CalendarEventInput, type CalendarEventSpan, type CalendarEventSummary, type CalendarEventTime, type CalendarListPage, type CalendarMeta, type CalendarSummary, type CalendarSyncResult, type DeleteCalendarEventInput, type FetchedCalendarEvent, type ListEventsInput, type SyncEventsInput, type UpdateCalendarEventInput, } from './calendar.js';
 export { calendarSyncStatePath, claimCalendarSyncIfDue, clearCalendarLastSyncedAt, clearCalendarSyncToken, loadCalendarLastSyncedAt, loadCalendarSyncToken, saveCalendarSyncToken, } from './calendarSyncStore.js';
 export { calendarSyncDueWindowMs, isCalendarSyncDue } from './calendarSyncDue.js';
 export { stateLockPath, withCalendarStateLock, liveLockClock, type LockClock } from './calendarStateLock.js';
 export { calendarPushStatePath, clearCalendarShadow, loadCalendarShadow, mergeShadow, saveCalendarShadow, toShadowEvent, type ShadowEvent, } from './calendarPushState.js';
-export { isDeniedAccessRole, isUnpushed, locallyEditedIds, pushCalendarForCollection, pushCollectionNow, unsentLocalEdits, type PushOutcomeKind, type CalendarCollectionPushResult, type CalendarPushDeps, type CalendarPushOutcome, type CalendarWriteTarget, } from './collectionPush.js';
+export { isDeniedAccessRole, isUnpushed, locallyEditedIds, pushCalendarForCollection, pushCollectionNow, reportedAccessRole, unsentLocalEdits, type PushOutcomeKind, type CalendarCollectionPushResult, type CalendarPushDeps, type CalendarPushOutcome, type CalendarWriteTarget, } from './collectionPush.js';
 export { toGoogleEventTime, zoneSuffixOf } from './pushDateTime.js';
 export { baselineRecord, bySourceField, conflictingFields, fieldText, isClientSettableEventId, locallyChangedFields, locallyDeletedIds, mayAdoptExisting, planRecord, pushableMap, PUSHABLE_SOURCE_FIELDS, type PushableSourceField, type RecordPlan, } from './pushPlan.js';
 export { toCollectionDateTime } from './collectionDateTime.js';

package/dist/google/index.js

@@ -1,10 +1,10 @@
-import { t as errorMessage } from "../dist-DP1FTGnO.js";
+import { i as hasStringProp, t as errorMessage } from "../dist-D8zokgGo.js";
 import { t as truncate } from "../text-CjDbP2O1.js";
 import { t as writeFileAtomic } from "../atomic-DPpdrJzO.js";
 import { fetchWithTimeout } from "../utils/fetch.js";
-import { l as parseIsoDate, u as parseIsoDateTime } from "../calendarGrid-CrGxeCOG.js";
-import { t as mergeIntoExisting } from "../project-B9NSyr6L.js";
-import { J as getWorkspaceRoot, d as storeFor, et as createForwardingLogger, n as discoverCollections, tt as createHostSlot } from "../discovery-D-ZJ6a6z.js";
+import { l as parseIsoDate, u as parseIsoDateTime } from "../calendarGrid-DivcNKkX.js";
+import { t as mergeIntoExisting } from "../project-B0j_Vf_Q.js";
+import { J as getWorkspaceRoot, d as storeFor, et as createForwardingLogger, n as discoverCollections, tt as createHostSlot } from "../discovery-D6p4ITNR.js";
 import { promises } from "node:fs";
 import path, { join } from "node:path";
 import { randomBytes, randomUUID } from "node:crypto";
@@ -589,6 +589,7 @@ var CALENDAR_LIST_PAGE_SIZE = 250;
 var MAX_CALENDAR_LIST_PAGES = 40;
 var EVENT_SYNC_PAGE_SIZE = 2500;
 var MAX_EVENT_SYNC_PAGES = 200;
+var CALENDAR_META_PAGE_SIZE = 1;
 var HTTP_GONE = 410;
 var EVENT_ABSENT_STATUSES = [404, HTTP_GONE];
 /** An `If-Match` write whose etag no longer matches — someone else changed the
@@ -800,20 +801,34 @@ async function collectCalendarPages(fetchPage, maxPages = MAX_CALENDAR_LIST_PAGE
 	}
 	return calendars;
 }
-/** The calendars the user has added/subscribed to (primary + secondary +
-*  shared), each with its id, name and colour, following pagination. Needs the
-*  calendar-list read scope (GOOGLE_CALENDARLIST_SCOPE). */
-/** One calendar's own resource, addressed by id rather than looked up in the
-*  user's list.
+var toCalendarMeta = (value) => {
+	const record = asRecord(value);
+	return {
+		timeZone: stringField(record, "timeZone"),
+		accessRole: stringField(record, "accessRole")
+	};
+};
+/** One calendar's zone and the caller's role on it, read by id rather than
+*  looked up in the user's list.
 *
 *  `calendarList` only holds calendars the user has ADDED; a calendar shared
-*  with them can be readable and writable by id without appearing there. This is
-*  how a push learns such a calendar's `timeZone`. Note the resource carries no
-*  `accessRole` — that is a calendarList property — so reachability here says
-*  nothing about writability. */
-async function getCalendar(accessToken, calendarId) {
-	return toCalendarSummary(await googleRequest(CALENDAR_API_LABEL, accessToken, `${CALENDAR_BASE_URL}/calendars/${encodeURIComponent(canonicalCalendarId(calendarId))}`));
+*  with them can be readable and writable by id without appearing there, and a
+*  push still needs its zone to send an offset-less `dateTime`.
+*
+*  Deliberately `events.list` and NOT `calendars.get`: the latter takes only
+*  full-calendar scopes (`calendar`, `calendar.readonly`, `calendar.calendars*`)
+*  and this app asks for none of them, so it answers 403 for every account it
+*  links (#2735). The events list carries the same `timeZone` — plus the
+*  `accessRole` the calendar resource does not have — under `calendar.events`,
+*  which the push already holds because it writes with it. Only the envelope is
+*  read; the one event asked for is the smallest page Google will serve. */
+async function getCalendarMeta(accessToken, calendarId) {
+	const params = new URLSearchParams({ maxResults: String(CALENDAR_META_PAGE_SIZE) });
+	return toCalendarMeta(await googleRequest(CALENDAR_API_LABEL, accessToken, `${eventsUrl(calendarId)}?${params.toString()}`));
 }
+/** The calendars the user has added/subscribed to (primary + secondary +
+*  shared), each with its id, name and colour, following pagination. Needs the
+*  calendar-list read scope (GOOGLE_CALENDARLIST_SCOPE). */
 async function listCalendars(accessToken) {
 	return collectCalendarPages(async (pageToken) => {
 		const params = new URLSearchParams({ maxResults: String(CALENDAR_LIST_PAGE_SIZE) });
@@ -864,9 +879,7 @@ async function readLockRaw(lockPath) {
 function parseLock(raw) {
 	try {
 		const parsed = JSON.parse(raw);
-		if (typeof parsed !== "object" || parsed === null) return null;
-		const { holder } = parsed;
-		return typeof holder === "string" ? { holder } : null;
+		return hasStringProp(parsed, "holder") ? { holder: parsed.holder } : null;
 	} catch {
 		return null;
 	}
@@ -1365,7 +1378,7 @@ var PUSHABLE_SOURCE_FIELDS = [
 	"description",
 	"location"
 ];
-var isPushableSource = (source) => PUSHABLE_SOURCE_FIELDS.includes(source);
+var isPushableSource = (source) => PUSHABLE_SOURCE_FIELDS.some((field) => field === source);
 /** The subset of a schema's `map` a push can act on: collection field → event field. */
 function pushableMap(map) {
 	return Object.fromEntries(Object.entries(map).filter((entry) => isPushableSource(entry[1])));
@@ -1487,21 +1500,28 @@ function locallyDeletedIds(shadow, presentIds) {
 var WRITABLE_ACCESS_ROLES = ["owner", "writer"];
 /** Whether to refuse the whole push before touching a single event.
 *
-*  Only on POSITIVE evidence of a non-writable role. An unlisted calendar is
-*  unknown and must fall through: hard-denying it would block the feature
-*  outright for a calendar the user can in fact write to. Those attempts surface
-*  Google's own 403 per record if the write really is not allowed. */
+*  Only on POSITIVE evidence of a non-writable role. A calendar whose role
+*  neither source reported is unknown and must fall through: hard-denying it
+*  would block the feature outright for a calendar the user can in fact write
+*  to. Those attempts surface Google's own 403 per record if the write really is
+*  not allowed. */
 var isDeniedAccessRole = (accessRole) => accessRole !== null && !WRITABLE_ACCESS_ROLES.includes(accessRole);
+/** A role Google left blank is UNKNOWN, not a denial. `isDeniedAccessRole`
+*  refuses every role it does not recognise — `""` included — so passing an
+*  unreported one straight through would refuse a calendar Google simply said
+*  nothing about. */
+var reportedAccessRole = (accessRole) => accessRole || null;
 /** Resolve the calendar a schema names, for its writability and its timezone.
 *
-*  The list is consulted first because only it reports `accessRole`, which is
-*  what lets a read-only calendar be refused with the real reason instead of an
-*  opaque per-event 403. `"primary"` is matched on the `primary` flag, not the
-*  id — the primary calendar's own id is the account's email address, which never
-*  equals the literal the schema declares.
+*  The list is consulted first because it answers for every added calendar in
+*  one call the push already makes. `"primary"` is matched on the `primary`
+*  flag, not the id — the primary calendar's own id is the account's email
+*  address, which never equals the literal the schema declares.
 *
-*  A calendar absent from the list is NOT denied: it is fetched by id for its
-*  timezone and its role left unknown. A 404 there means the calendar really is
+*  A calendar absent from the list is NOT denied: `calendarList` holds only the
+*  calendars the user has added, so one shared with write access can be missing
+*  from it (Codex review). It is asked about itself instead, which reports the
+*  same zone AND the real role. A 404 there means the calendar is genuinely
 *  unreachable, and propagates as a `failed` outcome. */
 async function liveCalendarMeta(accessToken, calendarId) {
 	const key = canonicalCalendarId(calendarId);
@@ -1511,10 +1531,13 @@ async function liveCalendarMeta(accessToken, calendarId) {
 		accessRole: listed.accessRole,
 		timeZone: listed.timeZone
 	};
-	const direct = await getCalendar(accessToken, calendarId);
-	log.info("google", "calendar is not in the user's list — pushing without an up-front role check", { calendarId: key });
+	const direct = await getCalendarMeta(accessToken, calendarId);
+	log.info("google", "calendar is not in the user's list — role read from the calendar itself", {
+		calendarId: key,
+		accessRole: direct.accessRole
+	});
 	return {
-		accessRole: null,
+		accessRole: reportedAccessRole(direct.accessRole),
 		timeZone: direct.timeZone
 	};
 }
@@ -1699,9 +1722,9 @@ async function createOrAdopt(ctx, eventId, record) {
 }
 /** A 403 on a write is a permissions answer, but `googleApiError` appends the
 *  "is the API enabled for the Cloud project?" hint to every 403 — true for a
-*  disabled API, misleading here. Reached when the up-front role check could not
-*  run because the calendar is not in the user's list, which is exactly when the
-*  user needs the real reason. */
+*  disabled API, misleading here. Reached when the up-front gate let the push
+*  through on an unknown role, which is exactly when the user needs the real
+*  reason. */
 function writeFailure(eventId, error) {
 	if (isGoogleApiError(error) && error.status === 403) return {
 		kind: "skipped",
@@ -2672,6 +2695,6 @@ async function deleteDriveFile(accessToken, input) {
 	await googleRequest(DRIVE_API_LABEL, accessToken, `${DRIVE_FILES_URL}/${encodeURIComponent(input.fileId)}`, { method: "DELETE" });
 }
 //#endregion
-export { CANCELLED_EVENT_STATUS, DEFAULT_LIST_MAX_RESULTS, GOOGLE_AUTH_CANCELLED, GOOGLE_CALENDARLIST_SCOPE, GOOGLE_CALENDAR_SCOPE, GOOGLE_CALENDAR_SYNC_TASK_ID, GOOGLE_DRIVE_FILE_SCOPE, GOOGLE_SCOPES, GOOGLE_TASKS_SCOPE, GoogleApiError, HTTP_CONFLICT, HTTP_FORBIDDEN, HTTP_PRECONDITION_FAILED, MAX_LIST_RESULTS, PROTECTION_UNKNOWN, PUSHABLE_SOURCE_FIELDS, allUnpushed, anySyncedCollectionSurvives, applyPlanFor, assertSafeMimeType, authorizeGoogle, baselineRecord, brokerBaseUrl, brokerExchange, brokerRefresh, brokerStart, buildEventPatch, buildMultipartBody, buildTaskPatch, bySourceField, calendarApiError, calendarPushStatePath, calendarSyncDueWindowMs, calendarSyncStatePath, canonicalCalendarId, canonicalTaskListId, claimCalendarSyncIfDue, classifyDelete, classifyWrite, clearCalendarLastSyncedAt, clearCalendarShadow, clearCalendarSyncToken, clientSecretPresence, collectCalendarPages, commitLinkedTokens, completeTask, configureGoogleHost, conflictingFields, createCalendarEvent, createDriveFile, createGoogleAuthFlow, createTask, deleteCalendarEvent, deleteDriveFile, deleteGoogleTokens, deleteTask, fieldText, findClientSecretPath, getCalendar, getCalendarColors, getCalendarEvent, getGoogleAccessToken, googleApiError, googleAuthFlow, googleCalendarSyncTaskDef, googleConfigDir, googleSecretsDir, googleTokenPath, groupByCalendar, heldBack, isCalendarSyncDue, isClientSettableEventId, isDeniedAccessRole, isGoogleApiError, isIsoDateTimeWithOffset, isTextMimeType, isUnpushed, legacyGoogleTokenPath, listCalendarEvents, listCalendars, listDriveFiles, listTaskLists, listTasks, liveLockClock, loadCalendarLastSyncedAt, loadCalendarShadow, loadCalendarSyncToken, loadClientSecret, loadGoogleTokens, locallyChangedFields, locallyDeletedIds, locallyEditedIds, mayAdoptExisting, mergeGoogleTokens, mergeIntoExisting, mergeShadow, orphanedCalendarId, pickBoundary, planRecord, pullProtectionFor, pullableEvents, pushAndProtect, pushCalendarForCollection, pushCollectionNow, pushableMap, readDriveFile, releaseOrphanedCalendarToken, resolveEventSpan, saveCalendarShadow, saveCalendarSyncToken, saveGoogleTokens, shadowUpdates, stateLockPath, syncCalendarEvents, syncCalendarForCollection, syncCalendarGroup, syncDueCalendarCollections, syncNewCalendarCollections, toCalendarSummary, toCollectionDateTime, toCollectionRecord, toDriveFileSummary, toEventSummary, toGoogleEventTime, toShadowEvent, toTaskListSummary, toTaskSummary, uncompleteTask, unlinkGoogle, unpushedFor, unsentEditGuard, unsentLocalEdits, unsyncedGroups, updateCalendarEvent, updateTask, waitForAuthCode, withCalendarLock, withCalendarStateLock, withKeyedLock, zoneSuffixOf };
+export { CANCELLED_EVENT_STATUS, DEFAULT_LIST_MAX_RESULTS, GOOGLE_AUTH_CANCELLED, GOOGLE_CALENDARLIST_SCOPE, GOOGLE_CALENDAR_SCOPE, GOOGLE_CALENDAR_SYNC_TASK_ID, GOOGLE_DRIVE_FILE_SCOPE, GOOGLE_SCOPES, GOOGLE_TASKS_SCOPE, GoogleApiError, HTTP_CONFLICT, HTTP_FORBIDDEN, HTTP_PRECONDITION_FAILED, MAX_LIST_RESULTS, PROTECTION_UNKNOWN, PUSHABLE_SOURCE_FIELDS, allUnpushed, anySyncedCollectionSurvives, applyPlanFor, assertSafeMimeType, authorizeGoogle, baselineRecord, brokerBaseUrl, brokerExchange, brokerRefresh, brokerStart, buildEventPatch, buildMultipartBody, buildTaskPatch, bySourceField, calendarApiError, calendarPushStatePath, calendarSyncDueWindowMs, calendarSyncStatePath, canonicalCalendarId, canonicalTaskListId, claimCalendarSyncIfDue, classifyDelete, classifyWrite, clearCalendarLastSyncedAt, clearCalendarShadow, clearCalendarSyncToken, clientSecretPresence, collectCalendarPages, commitLinkedTokens, completeTask, configureGoogleHost, conflictingFields, createCalendarEvent, createDriveFile, createGoogleAuthFlow, createTask, deleteCalendarEvent, deleteDriveFile, deleteGoogleTokens, deleteTask, fieldText, findClientSecretPath, getCalendarColors, getCalendarEvent, getCalendarMeta, getGoogleAccessToken, googleApiError, googleAuthFlow, googleCalendarSyncTaskDef, googleConfigDir, googleSecretsDir, googleTokenPath, groupByCalendar, heldBack, isCalendarSyncDue, isClientSettableEventId, isDeniedAccessRole, isGoogleApiError, isIsoDateTimeWithOffset, isTextMimeType, isUnpushed, legacyGoogleTokenPath, listCalendarEvents, listCalendars, listDriveFiles, listTaskLists, listTasks, liveLockClock, loadCalendarLastSyncedAt, loadCalendarShadow, loadCalendarSyncToken, loadClientSecret, loadGoogleTokens, locallyChangedFields, locallyDeletedIds, locallyEditedIds, mayAdoptExisting, mergeGoogleTokens, mergeIntoExisting, mergeShadow, orphanedCalendarId, pickBoundary, planRecord, pullProtectionFor, pullableEvents, pushAndProtect, pushCalendarForCollection, pushCollectionNow, pushableMap, readDriveFile, releaseOrphanedCalendarToken, reportedAccessRole, resolveEventSpan, saveCalendarShadow, saveCalendarSyncToken, saveGoogleTokens, shadowUpdates, stateLockPath, syncCalendarEvents, syncCalendarForCollection, syncCalendarGroup, syncDueCalendarCollections, syncNewCalendarCollections, toCalendarMeta, toCalendarSummary, toCollectionDateTime, toCollectionRecord, toDriveFileSummary, toEventSummary, toGoogleEventTime, toShadowEvent, toTaskListSummary, toTaskSummary, uncompleteTask, unlinkGoogle, unpushedFor, unsentEditGuard, unsentLocalEdits, unsyncedGroups, updateCalendarEvent, updateTask, waitForAuthCode, withCalendarLock, withCalendarStateLock, withKeyedLock, zoneSuffixOf };
 
 //# sourceMappingURL=index.js.map