@mulmoclaude/core 5.3.0 → 5.5.0

package/dist/feeds/server/index.cjs

@@ -4,8 +4,8 @@ const require_dist = require("../../dist-Gj7ygaW2.cjs");
 const require_root = require("../../root-BvwBUcol.cjs");
 const require_itemId = require("../../itemId-CGT2J7YK.cjs");
 const require_project = require("../../project-C1ep9pvo.cjs");
-const require_discovery = require("../../discovery-CDXYswtw.cjs");
-const require_server = require("../../server-DfYwSX8b.cjs");
+const require_discovery = require("../../discovery-B79IxEM6.cjs");
+const require_server = require("../../server-BUbU9G-J.cjs");
 const require_feeds_paths = require("../paths.cjs");
 const require_ingestTypes = require("../../ingestTypes-DsVH9BYy.cjs");
 const require_notifier = require("../../notifier-B65Mvngb.cjs");

package/dist/feeds/server/index.js

@@ -2,8 +2,8 @@ import { a as isErrorWithCode, l as isUnknownArray, s as isRecord$1 } from "../.
 import { t as canonicalRoot } from "../../root-BcS4-Kge.js";
 import { G as INGEST_KINDS, W as FEED_SCHEDULES } from "../../itemId-4P9S_ehz.js";
 import { t as mergeIntoExisting } from "../../project-B0j_Vf_Q.js";
-import { W as resolveDataDir, _t as createForwardingLogger, d as storeFor, k as listItems, n as discoverCollections, q as safeSlugName, vt as createHostSlot } from "../../discovery-B_64PBZU.js";
-import { F as buildCollectionActionSeedPrompt, I as promptPathsFor, z as readSkillTemplate } from "../../server-7POrhHKv.js";
+import { W as resolveDataDir, _t as createForwardingLogger, d as storeFor, k as listItems, n as discoverCollections, q as safeSlugName, vt as createHostSlot } from "../../discovery-DIGau7M8.js";
+import { F as buildCollectionActionSeedPrompt, I as promptPathsFor, z as readSkillTemplate } from "../../server-DZ7Cq7s_.js";
 import { FEEDS_DIR, feedDir, feedStatePath, feedsRoot, ingestStateDir, ingestStatePath } from "../paths.js";
 import { n as DEFAULT_FEED_MAX_ITEMS, r as isFeedSchedule, t as AGENT_INGEST_KIND } from "../../ingestTypes-GkG7bJdB.js";
 import { d as publish, n as clear } from "../../notifier-vAp5t6wL.js";

package/dist/google/collectionPush.d.ts

@@ -39,6 +39,13 @@ export interface CalendarCollectionPushResult {
     deletedInGoogle: number;
     /** Records that cannot be pushed as they stand, each with the reason. */
     skipped: string[];
+    /** Deletions the sweep left standing in Google, each with the reason.
+     *
+     *  NOT merged into `skipped`: that list means "this push did not do what you
+     *  asked", and a refused deletion is "it was deliberately not deleted" while
+     *  the rest of the run carried. Merging them made one refusal hide every
+     *  successful create and update from the caller (#3272). */
+    keptInGoogle: string[];
     errors: string[];
     /** Records whose local edit did NOT reach Google and would be destroyed by
      *  the pull that follows an automatic push (#2620).
@@ -108,9 +115,28 @@ type PushOutcome = {
     message: string;
 };
 export type PushOutcomeKind = PushOutcome["kind"];
+/** One record's push, kept with the id so the pull can be told which records to
+ *  leave alone. */
+export interface PushAttempt {
+    eventId: string;
+    outcome: PushOutcome;
+}
 /** Whether this outcome leaves a local edit that only exists locally, so the
  *  pull must not overwrite the record and the baseline must not advance. */
 export declare const isUnpushed: (kind: PushOutcomeKind) => boolean;
+/** The whole report one run produces, from what each record's push did and what
+ *  the delete sweep did.
+ *
+ *  A sweep's refusal goes to `keptInGoogle`, NEVER to `skipped`: that list means
+ *  "this push did not do what you asked", and a refusal means "the event was
+ *  deliberately left standing" while the rest of the run carried. Merged, one
+ *  refusal took the caller's problem branch and hid every create and update
+ *  (#3272).
+ *
+ *  Exported because it is pure — a list of attempts and a sweep, no workspace,
+ *  grant or clock — so the separation above is something a test drives rather
+ *  than argues. */
+export declare function pushResultFrom(slug: string, attempts: readonly PushAttempt[], deletes: DeleteSweep): CalendarCollectionPushResult;
 /** Record ids whose local value no longer matches the baseline — edits that have
  *  not reached Google.
  *
@@ -133,6 +159,9 @@ export declare function unsentLocalEdits(collection: LoadedCollection, workspace
 export interface DeleteSweep {
     seen: number;
     deleted: string[];
+    /** Deletions left standing in Google, each with the reason. Reported apart
+     *  from the push's own `skipped` on the result: that list means "could not be
+     *  sent", and a refusal means "deliberately left alone" (#3272). */
     skipped: string[];
     errors: string[];
 }

package/dist/google/index.cjs

@@ -7,7 +7,7 @@ const require_root = require("../root-BvwBUcol.cjs");
 const require_utils_fetch = require("../utils/fetch.cjs");
 const require_itemId = require("../itemId-CGT2J7YK.cjs");
 const require_project = require("../project-C1ep9pvo.cjs");
-const require_discovery = require("../discovery-CDXYswtw.cjs");
+const require_discovery = require("../discovery-B79IxEM6.cjs");
 const require_paths = require("../paths-C8-jxR0s.cjs");
 let node_fs = require("node:fs");
 let node_path = require("node:path");
@@ -2034,9 +2034,22 @@ var UNPUSHED_KINDS = ["conflict", "error"];
 /** Whether this outcome leaves a local edit that only exists locally, so the
 *  pull must not overwrite the record and the baseline must not advance. */
 var isUnpushed = (kind) => UNPUSHED_KINDS.includes(kind);
-function tally(slug, attempts, deletes) {
+/** The whole report one run produces, from what each record's push did and what
+*  the delete sweep did.
+*
+*  A sweep's refusal goes to `keptInGoogle`, NEVER to `skipped`: that list means
+*  "this push did not do what you asked", and a refusal means "the event was
+*  deliberately left standing" while the rest of the run carried. Merged, one
+*  refusal took the caller's problem branch and hid every create and update
+*  (#3272).
+*
+*  Exported because it is pure — a list of attempts and a sweep, no workspace,
+*  grant or clock — so the separation above is something a test drives rather
+*  than argues. */
+function pushResultFrom(slug, attempts, deletes) {
 	const outcomes = attempts.map((attempt) => attempt.outcome);
 	const count = (kind) => outcomes.filter((outcome) => outcome.kind === kind).length;
+	const messagesOf = (kind) => outcomes.flatMap((outcome) => outcome.kind === kind ? [outcome.message] : []);
 	return {
 		slug,
 		created: count("created"),
@@ -2044,8 +2057,9 @@ function tally(slug, attempts, deletes) {
 		conflicts: count("conflict"),
 		localDeletes: deletes.seen,
 		deletedInGoogle: deletes.deleted.length,
-		skipped: [...outcomes.flatMap((outcome) => outcome.kind === "skipped" ? [outcome.message] : []), ...deletes.skipped],
-		errors: [...outcomes.flatMap((outcome) => outcome.kind === "error" ? [outcome.message] : []), ...deletes.errors],
+		skipped: messagesOf("skipped"),
+		keptInGoogle: [...deletes.skipped],
+		errors: [...messagesOf("error"), ...deletes.errors],
 		unpushedIds: attempts.filter((attempt) => isUnpushed(attempt.outcome.kind)).map((attempt) => attempt.eventId)
 	};
 }
@@ -2175,7 +2189,7 @@ async function pushCollectionNow(collection, workspaceRoot, deps = liveDeps) {
 		});
 		await saveCalendarShadow(calendarId, pushedShadow([outcome]), workspaceRoot);
 	}
-	const result = tally(slug, attempts, await sweepDeletes(locallyDeletedIds(shadow, records.map((record) => fieldText(record[schema.primaryKey]))), schema.googleCalendar?.propagateDeletes === true, {
+	const result = pushResultFrom(slug, attempts, await sweepDeletes(locallyDeletedIds(shadow, records.map((record) => fieldText(record[schema.primaryKey]))), schema.googleCalendar?.propagateDeletes === true, {
 		fetchEvent: (eventId) => (deps.fetchEvent ?? getCalendarEvent)(accessToken, {
 			calendarId,
 			eventId
@@ -2315,7 +2329,7 @@ function pullableEvents(events, unpushed) {
 *  A conflict or an error means that record now diverges from Google until
 *  someone resolves it, which must not be silent. */
 function reportAutoPush(slug, result) {
-	const { created, updated, conflicts, skipped, errors, unpushedIds } = result;
+	const { created, updated, conflicts, skipped, keptInGoogle, errors, unpushedIds } = result;
 	if (created + updated > 0) log.info("google", "auto-pushed local calendar edits", {
 		slug,
 		created,
@@ -2330,6 +2344,10 @@ function reportAutoPush(slug, result) {
 		slug,
 		skipped
 	});
+	if (keptInGoogle.length > 0) log.warn("google", "deletions the auto push left standing in Google", {
+		slug,
+		keptInGoogle
+	});
 	if (errors.length > 0) log.warn("google", "auto push errors", {
 		slug,
 		errors
@@ -3264,6 +3282,7 @@ exports.pullableEvents = pullableEvents;
 exports.pushAndProtect = pushAndProtect;
 exports.pushCalendarForCollection = pushCalendarForCollection;
 exports.pushCollectionNow = pushCollectionNow;
+exports.pushResultFrom = pushResultFrom;
 exports.pushableMap = pushableMap;
 exports.readDriveFile = readDriveFile;
 exports.releaseOrphanedCalendarToken = releaseOrphanedCalendarToken;