@wayai/cli 0.3.234 → 0.3.235

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/index.js CHANGED
@@ -6504,13 +6504,13 @@ var init_chunk_BEOHBREG = __esm({
6504
6504
  }
6505
6505
  });
6506
6506
 
6507
- // ../../packages/core/dist/chunk-OWAAYKPB.js
6507
+ // ../../packages/core/dist/chunk-AMHCCKZ3.js
6508
6508
  function declaresReview(schema) {
6509
6509
  return typeof schema === "object" && schema !== null && schema[REVIEW_DECLARATION_KEY] !== void 0;
6510
6510
  }
6511
- var TOOLSET_SLUG_PATTERN, REKOR_STRUCTURAL_ID_PATTERN, baseEnvironmentSchema, toolsetFileToolSchema, toolsetSurfaceSchema, toolsetConnectionBindingSchema, rekorToolsetToolsSchema, rekorBoundAttestation, rekorResolvedToolsetSchema, REVIEW_DECLARATION_KEY, resolvedRecordTypeSchema, reviewWritersSchema, sharedScopeSchema, resolvedFileToolSchema, rekorToolsetFileSchema, rekorToolsetFileListSchema, rekorToolsetFileGetSchema, rekorToolsetFilePutSchema, TOOLSET_CUSTOMER_FACING_REFUSAL_MARK, TOOLSET_CUSTOMER_FACING_REFUSAL;
6512
- var init_chunk_OWAAYKPB = __esm({
6513
- "../../packages/core/dist/chunk-OWAAYKPB.js"() {
6511
+ var TOOLSET_SLUG_PATTERN, REKOR_STRUCTURAL_ID_PATTERN, baseEnvironmentSchema, toolsetFileToolSchema, toolsetSurfaceSchema, toolsetConnectionBindingSchema, rekorToolsetToolsSchema, rekorBoundAttestation, rekorResolvedToolsetSchema, REVIEW_DECLARATION_KEY, resolvedRecordTypeSchema, reviewWritersSchema, sharedScopeSchema, resolvedFileToolSchema, rekorToolsetFileSchema, rekorToolsetFileUrlAnswerSchema, rekorToolsetFileListSchema, rekorToolsetFileGetSchema, rekorToolsetFilePutSchema, TOOLSET_CUSTOMER_FACING_REFUSAL_MARK, TOOLSET_CUSTOMER_FACING_REFUSAL;
6512
+ var init_chunk_AMHCCKZ3 = __esm({
6513
+ "../../packages/core/dist/chunk-AMHCCKZ3.js"() {
6514
6514
  "use strict";
6515
6515
  init_chunk_BEOHBREG();
6516
6516
  init_chunk_DHPUPI4Y();
@@ -6527,7 +6527,9 @@ var init_chunk_OWAAYKPB = __esm({
6527
6527
  list: external_exports.string().min(1).optional(),
6528
6528
  get: external_exports.string().min(1).optional(),
6529
6529
  put: external_exports.string().min(1).optional(),
6530
- delete: external_exports.string().min(1).optional()
6530
+ delete: external_exports.string().min(1).optional(),
6531
+ get_url: external_exports.string().min(1).optional(),
6532
+ put_url: external_exports.string().min(1).optional()
6531
6533
  })
6532
6534
  });
6533
6535
  toolsetSurfaceSchema = external_exports.object({
@@ -6550,8 +6552,8 @@ var init_chunk_OWAAYKPB = __esm({
6550
6552
  */
6551
6553
  unclassified_tools: external_exports.boolean().optional(),
6552
6554
  /**
6553
- * Any of its file tools writes: an operation other than `list` and `get` (`put`, `delete`, or one
6554
- * the data product adds later), or an entry this side cannot read. Absent on a surface recorded
6555
+ * Any of its file tools writes: an operation other than `list`, `get` and `get_url` (`put`, `delete`,
6556
+ * `put_url`, or one the data product adds later), or an entry this side cannot read. Absent on a surface recorded
6555
6557
  * before it was, which the customer-facing rule reads as writing until the connection's next tool
6556
6558
  * sync or token save records it.
6557
6559
  */
@@ -6684,6 +6686,14 @@ var init_chunk_OWAAYKPB = __esm({
6684
6686
  version: external_exports.number().int().min(1),
6685
6687
  content_type: external_exports.string().optional()
6686
6688
  }).passthrough();
6689
+ rekorToolsetFileUrlAnswerSchema = external_exports.object({
6690
+ data: external_exports.object({
6691
+ url: external_exports.string(),
6692
+ expires_at: external_exports.string(),
6693
+ path: external_exports.string(),
6694
+ content_sha256: external_exports.string()
6695
+ }).passthrough()
6696
+ });
6687
6697
  rekorToolsetFileListSchema = external_exports.object({ data: external_exports.array(rekorToolsetFileSchema) });
6688
6698
  rekorToolsetFileGetSchema = external_exports.object({
6689
6699
  data: rekorToolsetFileSchema.extend({
@@ -6693,7 +6703,7 @@ var init_chunk_OWAAYKPB = __esm({
6693
6703
  });
6694
6704
  rekorToolsetFilePutSchema = external_exports.object({ data: rekorToolsetFileSchema });
6695
6705
  TOOLSET_CUSTOMER_FACING_REFUSAL_MARK = "A customer-facing agent (a pilot, pilot specialist or pilot advisor) can use a toolset only when it exposes files alone: no record, composite or relationship tools, and neither sql_query nor batch";
6696
- TOOLSET_CUSTOMER_FACING_REFUSAL = `${TOOLSET_CUSTOMER_FACING_REFUSAL_MARK}, nor a file put or delete, nor a write of a reviewed record type \u2014 unless the toolset is customer-scoped, which admits its record, composite and relationship tools, since each of their calls reaches only the conversation's customer and shared records, or they only read approved records of reviewed shared record types`;
6706
+ TOOLSET_CUSTOMER_FACING_REFUSAL = `${TOOLSET_CUSTOMER_FACING_REFUSAL_MARK}, nor a file put, delete or put_url, nor a write of a reviewed record type \u2014 unless the toolset is customer-scoped, which admits its record, composite and relationship tools, since each of their calls reaches only the conversation's customer and shared records, or they only read approved records of reviewed shared record types`;
6697
6707
  }
6698
6708
  });
6699
6709
 
@@ -13416,10 +13426,10 @@ var init_chunk_3HSB6J4J = __esm({
13416
13426
  }
13417
13427
  });
13418
13428
 
13419
- // ../../packages/core/dist/chunk-XCDUP42J.js
13429
+ // ../../packages/core/dist/chunk-6IKFJ3GW.js
13420
13430
  var COMMUNITIES_PER_ORG_MAX, COMMUNITY_NAME_MAX_LENGTH, COMMUNITY_REGISTRY_CLOSED_REASON, COMMUNITY_MEMBERS_MAX, COMMUNITY_ADMISSIONS, COMMUNITY_ACCESS_MAX, COMMUNITY_ACCESS_ADD_MAX, COMMUNITY_ACCESS_FULL_REASON, COMMUNITY_JOIN_SOURCE_MAX_LENGTH, COMMUNITY_JOIN_FLOW_TOKEN_MAX_LENGTH, COMMUNITY_ROOMS_MAX, COMMUNITY_ROOM_NAME_MAX_LENGTH, COMMUNITY_MESSAGE_MAX_LENGTH, COMMUNITY_MESSAGES_PAGE_SIZE, COMMUNITY_ATTACHMENT_URLS_MAX, COMMUNITY_POST_TITLE_MAX_LENGTH, COMMUNITY_POST_SEARCH_MAX_LENGTH, COMMUNITY_MEMBER_STATUSES, COMMUNITY_RULES_MAX_LENGTH, COMMUNITY_SLOW_MODE_MAX_SECONDS, COMMUNITY_COURSES_LABEL_MAX_LENGTH, COMMUNITY_LIVE_TICKET_PREFIX, COMMUNITY_STATS_DAYS, communityNameSchema, adminCreateCommunityBody, communityIdParam, communityJoinTokenSchema, communityJoinSourceSchema, communityJoinPreviewQuery, communityJoinBody, communityRoomKindSchema, communityRoomNameSchema, communityRoomIdParam, communityMessageIdParam, communityRoomCreateBody, communityRoomUpdateBody, communityMessagesQuery, communityMessageBodySchema, communityPostTitleSchema, communityAttachmentUploadSchema, communitySendBody, communityEditBody, communityPostIdParam, communityPostsQuery, communityAnswerBody, communityReadBody, communityAttachmentUrlsBody, communityPersonParam, communityOrgParam, communityPeopleQuery, communityCoursesLabelSchema, communityAdmissionSchema, communitySettingsBody, communityAccessEmailSchema, communityAccessAddBody, communityAccessQuery, communityAccessIdParam, communityBanBody, communityLockBody, communityPinBody, communityModLogQuery, communityReportsQuery, communityReportIdParam, communityLiveTicketSchema, communityLiveQuery, communityMuteBody, communityEmailUnsubscribeTokenSchema, communityEmailUnsubscribeQuery;
13421
- var init_chunk_XCDUP42J = __esm({
13422
- "../../packages/core/dist/chunk-XCDUP42J.js"() {
13431
+ var init_chunk_6IKFJ3GW = __esm({
13432
+ "../../packages/core/dist/chunk-6IKFJ3GW.js"() {
13423
13433
  "use strict";
13424
13434
  init_chunk_6J742GLA();
13425
13435
  init_chunk_ZVXO3XL6();
@@ -13496,12 +13506,13 @@ var init_chunk_XCDUP42J = __esm({
13496
13506
  communityCoursesLabelSchema = external_exports.string().trim().max(COMMUNITY_COURSES_LABEL_MAX_LENGTH);
13497
13507
  communityAdmissionSchema = external_exports.enum(COMMUNITY_ADMISSIONS);
13498
13508
  communitySettingsBody = external_exports.object({
13509
+ name: communityNameSchema.optional(),
13499
13510
  rules: external_exports.string().trim().max(COMMUNITY_RULES_MAX_LENGTH).nullable().optional().transform((rules) => rules === "" ? null : rules),
13500
13511
  slow_mode_seconds: external_exports.number().int().min(0).max(COMMUNITY_SLOW_MODE_MAX_SECONDS).optional(),
13501
13512
  courses_label: communityCoursesLabelSchema.optional(),
13502
13513
  admission: communityAdmissionSchema.optional()
13503
13514
  }).strict().refine(
13504
- (b) => b.rules !== void 0 || b.slow_mode_seconds !== void 0 || b.courses_label !== void 0 || b.admission !== void 0,
13515
+ (b) => b.name !== void 0 || b.rules !== void 0 || b.slow_mode_seconds !== void 0 || b.courses_label !== void 0 || b.admission !== void 0,
13505
13516
  "nothing to change"
13506
13517
  );
13507
13518
  communityAccessEmailSchema = external_exports.string().trim().toLowerCase().max(CONTACT_EMAIL_MAX).email();
@@ -13524,7 +13535,7 @@ var init_chunk_XCDUP42J = __esm({
13524
13535
  }
13525
13536
  });
13526
13537
 
13527
- // ../../packages/core/dist/chunk-3KYTITOR.js
13538
+ // ../../packages/core/dist/chunk-ZLJP22IA.js
13528
13539
  function parseCommunityLessonVideoUrl(url) {
13529
13540
  const parts = /^https?:\/\/([^/?#]+)([^?#]*)(?:\?([^#]*))?(?:#.*)?$/i.exec(url.trim());
13530
13541
  if (!parts) return null;
@@ -13550,10 +13561,10 @@ function communityLessonVideoWatchUrl(video) {
13550
13561
  }
13551
13562
  }
13552
13563
  var COMMUNITY_COURSES_MAX, COMMUNITY_COURSE_MODULES_MAX, COMMUNITY_COURSE_LESSONS_MAX, COMMUNITY_LESSONS_MAX, COMMUNITY_COURSE_TITLE_MAX_LENGTH, COMMUNITY_COURSE_DESCRIPTION_MAX_LENGTH, COMMUNITY_LESSON_BODY_MAX_LENGTH, COMMUNITY_LESSON_LINKS_MAX, COMMUNITY_LESSON_URL_MAX_LENGTH, YOUTUBE_ID, YOUTUBE_HOSTS, YOUTU_BE, YOUTUBE_ID_PATH, communityCourseIdParam, communityCourseModuleIdParam, communityLessonIdParam, communityCourseTitleSchema, communityCourseDescriptionSchema, communityCoursePositionSchema, communityLessonVideoUrlSchema, communityLessonLinkSchema, communityLessonLinksSchema, communityLessonBodySchema, communityCourseCreateBody, communityCourseUpdateBody, communityModuleCreateBody, communityModuleUpdateBody, communityLessonCreateBody, communityLessonUpdateBody;
13553
- var init_chunk_3KYTITOR = __esm({
13554
- "../../packages/core/dist/chunk-3KYTITOR.js"() {
13564
+ var init_chunk_ZLJP22IA = __esm({
13565
+ "../../packages/core/dist/chunk-ZLJP22IA.js"() {
13555
13566
  "use strict";
13556
- init_chunk_XCDUP42J();
13567
+ init_chunk_6IKFJ3GW();
13557
13568
  init_chunk_HZ6CADSY();
13558
13569
  init_zod();
13559
13570
  COMMUNITY_COURSES_MAX = 20;
@@ -15076,7 +15087,7 @@ var init_contracts = __esm({
15076
15087
  init_chunk_Y7CFCYX4();
15077
15088
  init_chunk_5DGHIY7L();
15078
15089
  init_chunk_N4FMK4UY();
15079
- init_chunk_OWAAYKPB();
15090
+ init_chunk_AMHCCKZ3();
15080
15091
  init_chunk_BEOHBREG();
15081
15092
  init_chunk_IPDOHAZ5();
15082
15093
  init_chunk_YUZFHVB2();
@@ -15099,8 +15110,8 @@ var init_contracts = __esm({
15099
15110
  init_chunk_VHQED53I();
15100
15111
  init_chunk_TY6K2EWO();
15101
15112
  init_chunk_JDJ4EUOL();
15102
- init_chunk_3KYTITOR();
15103
- init_chunk_XCDUP42J();
15113
+ init_chunk_ZLJP22IA();
15114
+ init_chunk_6IKFJ3GW();
15104
15115
  init_chunk_6J742GLA();
15105
15116
  init_chunk_ZVXO3XL6();
15106
15117
  init_chunk_YULHXJ5M();
@@ -22783,6 +22794,9 @@ function settingsContent(settings) {
22783
22794
  admission: settings.admission ?? DEFAULT_ADMISSION
22784
22795
  };
22785
22796
  }
22797
+ function nameContent(name) {
22798
+ return { name: toLf(name).trim() };
22799
+ }
22786
22800
  function roomContent(room) {
22787
22801
  return { name: toLf(room.name).trim(), archived: room.archived };
22788
22802
  }
@@ -22849,7 +22863,7 @@ function localName(name, id, taken, fallback) {
22849
22863
  const withPrefix = `${slug}--${id.slice(0, 8)}`;
22850
22864
  return taken.has(withPrefix) ? `${slug}--${id}` : withPrefix;
22851
22865
  }
22852
- var REV_VERSION, DEFAULT_ADMISSION, settingsRev, joinLinkRev, roomRev, courseRev, moduleRev, lessonRev;
22866
+ var REV_VERSION, DEFAULT_ADMISSION, settingsRev, joinLinkRev, nameRev, roomRev, courseRev, moduleRev, lessonRev;
22853
22867
  var init_model = __esm({
22854
22868
  "src/communities/model.ts"() {
22855
22869
  "use strict";
@@ -22865,6 +22879,7 @@ var init_model = __esm({
22865
22879
  ...c.admission === DEFAULT_ADMISSION ? [] : [c.admission]
22866
22880
  ]);
22867
22881
  joinLinkRev = (communityId, c) => rev(["join_link", communityId, c.enabled]);
22882
+ nameRev = (communityId, c) => rev(["name", communityId, c.name]);
22868
22883
  roomRev = (roomId, c) => rev(["room", roomId, c.name, c.archived]);
22869
22884
  courseRev = (courseId, c) => rev(["course", courseId, c.title, c.description, c.published]);
22870
22885
  moduleRev = (moduleId, c) => rev(["module", moduleId, c.title]);
@@ -23265,6 +23280,11 @@ function readCommunityFolder(folder) {
23265
23280
  problems2.push(`${COMMUNITY_FILE}: community_id must be the community's id (a UUID)`);
23266
23281
  }
23267
23282
  if (typeof doc.name !== "string") problems2.push(`${COMMUNITY_FILE}: name must be text`);
23283
+ else {
23284
+ const parsed = communityNameSchema.safeParse(doc.name);
23285
+ if (!parsed.success) problems2.push(`name: ${contractProblem(parsed.error)}`);
23286
+ }
23287
+ const nameRev2 = optionalString(doc, "name_rev", COMMUNITY_FILE, problems2);
23268
23288
  const settings = isMapping(doc.settings) ? doc.settings : null;
23269
23289
  if (!settings) problems2.push(`${COMMUNITY_FILE}: settings must be a mapping`);
23270
23290
  else unknownKeys(settings, SETTINGS_KEYS, `${COMMUNITY_FILE} settings`, problems2);
@@ -23291,6 +23311,7 @@ ${problems2.map((p) => ` - ${p}`).join("\n")}`);
23291
23311
  return {
23292
23312
  community_id: communityId,
23293
23313
  name: doc.name,
23314
+ ...nameRev2 === void 0 ? {} : { name_rev: nameRev2 },
23294
23315
  settings: {
23295
23316
  ...settingsRev2 === void 0 ? {} : { rev: settingsRev2 },
23296
23317
  slow_mode_seconds: slowMode,
@@ -23395,6 +23416,7 @@ function renderCommunityYaml(files) {
23395
23416
  const doc = {
23396
23417
  community_id: files.community_id,
23397
23418
  name: files.name,
23419
+ ...files.name_rev ? { name_rev: files.name_rev } : {},
23398
23420
  settings: {
23399
23421
  ...files.settings.rev ? { rev: files.settings.rev } : {},
23400
23422
  slow_mode_seconds: files.settings.slow_mode_seconds,
@@ -23456,7 +23478,7 @@ var init_files = __esm({
23456
23478
  init_utils();
23457
23479
  init_model();
23458
23480
  init_course_files();
23459
- TOP_KEYS = ["community_id", "name", "settings", "join_link_enabled", "join_link_rev", "rooms", "courses", "synced"];
23481
+ TOP_KEYS = ["community_id", "name", "name_rev", "settings", "join_link_enabled", "join_link_rev", "rooms", "courses", "synced"];
23460
23482
  SETTINGS_KEYS = ["rev", "slow_mode_seconds", "courses_label", "admission"];
23461
23483
  ROOM_KEYS = ["key", "id", "rev", "name", "kind", "archived"];
23462
23484
  }
@@ -24844,6 +24866,11 @@ function planSync(files, server) {
24844
24866
  const id = files.community_id;
24845
24867
  const fileSettings = fileSettingsContent(files);
24846
24868
  const settingsSide = serverSettings(id, server.settings);
24869
+ const fileName = nameContent(files.name);
24870
+ const serverName = nameContent(server.community.name);
24871
+ const nameServerRev = nameRev(id, serverName);
24872
+ const nameFileRev = nameRev(id, fileName);
24873
+ const nameState = files.name_rev === void 0 && nameFileRev === nameServerRev ? "converged" : classify(files.name_rev ?? nameFileRev, nameFileRev, nameServerRev);
24847
24874
  const joinLinkServerRev = joinLinkRev(id, { enabled: server.joinLink.enabled });
24848
24875
  const byId = new Map(server.rooms.map((room) => [room.room_id, room]));
24849
24876
  const rooms = [];
@@ -24864,6 +24891,12 @@ function planSync(files, server) {
24864
24891
  }
24865
24892
  const tracked = new Set(files.rooms.map((room) => room.id));
24866
24893
  return {
24894
+ name: {
24895
+ state: nameState,
24896
+ file: fileName.name,
24897
+ server: serverName.name,
24898
+ serverRev: nameServerRev
24899
+ },
24867
24900
  settings: {
24868
24901
  state: classify(files.settings.rev, settingsRev(id, fileSettings), settingsSide.rev),
24869
24902
  file: fileSettings,
@@ -24917,9 +24950,6 @@ function joinLinkChange(from, to) {
24917
24950
  }
24918
24951
  function pushProblems(files, server, plan) {
24919
24952
  const problems2 = unknownIdProblems(plan);
24920
- if (files.name !== server.community.name) {
24921
- problems2.push(`name: a community's name cannot change from the files (it is ${show(server.community.name)})`);
24922
- }
24923
24953
  for (const room of plan.rooms) {
24924
24954
  if (room.kind === "existing" && room.entry.kind !== room.server.kind) {
24925
24955
  problems2.push(`room ${room.entry.key}: kind cannot change once a room exists (it is ${room.server.kind})`);
@@ -24961,6 +24991,10 @@ function takeRoom(entry, room) {
24961
24991
  entry.archived = room.archived;
24962
24992
  entry.kind = room.kind;
24963
24993
  }
24994
+ function takeName(files, name) {
24995
+ files.name = name;
24996
+ files.name_rev = nameRev(files.community_id, nameContent(name));
24997
+ }
24964
24998
  function takeSettings(files, settings) {
24965
24999
  const { content, rev: rev2 } = serverSettings(files.community_id, settings);
24966
25000
  files.settings = {
@@ -24988,6 +25022,19 @@ function pushPhases(files, plan, remote, save, courses) {
24988
25022
  }
24989
25023
  function communityWrites(files, plan, remote, save) {
24990
25024
  const writes = [];
25025
+ if (plan.name.state === "local") {
25026
+ const name = plan.name.file;
25027
+ writes.push({
25028
+ label: "name",
25029
+ requests: 1,
25030
+ apply: async () => {
25031
+ const answered = (await remote.updateSettings({ name })).name;
25032
+ if (answered === void 0) throw expected("the server answered no name: it may be mid-deploy, push again in a moment");
25033
+ takeName(files, answered);
25034
+ save();
25035
+ }
25036
+ });
25037
+ }
24991
25038
  if (plan.settings.state === "local") {
24992
25039
  const body = settingsPatch(files, plan.settings.server);
24993
25040
  writes.push({
@@ -25059,6 +25106,10 @@ function communityWrites(files, plan, remote, save) {
25059
25106
  }
25060
25107
  function refreshConverged(files, plan) {
25061
25108
  let refreshed = 0;
25109
+ if (plan.name.state === "converged") {
25110
+ files.name_rev = plan.name.serverRev;
25111
+ refreshed++;
25112
+ }
25062
25113
  if (plan.settings.state === "converged") {
25063
25114
  files.settings.rev = plan.settings.serverRev;
25064
25115
  refreshed++;
@@ -25078,7 +25129,8 @@ function refreshConverged(files, plan) {
25078
25129
  }
25079
25130
  function pushListing(plan, courses) {
25080
25131
  const listing = emptyListing();
25081
- const { settings, joinLink } = plan;
25132
+ const { name, settings, joinLink } = plan;
25133
+ if (name.state === "local") listing.changes.push(`~ name: ${show(name.server)} \u2192 ${show(name.file)}`);
25082
25134
  if (settings.state === "local") {
25083
25135
  listing.changes.push(`~ settings: ${settingsChanges(settings.server, settings.file).join("; ")}`);
25084
25136
  if (settings.server.admission !== settings.file.admission) listing.changes.push(` ${admissionChange(settings.file.admission)}`);
@@ -25096,6 +25148,7 @@ function pushListing(plan, courses) {
25096
25148
  }
25097
25149
  }
25098
25150
  const named = (state) => [
25151
+ ...name.state === state ? ["name"] : [],
25099
25152
  ...settings.state === state ? ["settings"] : [],
25100
25153
  ...joinLink.state === state ? ["join link"] : [],
25101
25154
  ...plan.rooms.flatMap((room) => room.kind === "existing" && room.state === state ? [`room ${room.entry.key}`] : [])
@@ -25238,6 +25291,7 @@ function courseSaver(root, folder, community) {
25238
25291
  function changedSince(before, after) {
25239
25292
  const id = before.community.community_id;
25240
25293
  const changed = [];
25294
+ if (before.community.name !== after.community.name) changed.push("name");
25241
25295
  if (serverSettings(id, before.settings).rev !== serverSettings(id, after.settings).rev) changed.push("settings");
25242
25296
  if (before.joinLink.enabled !== after.joinLink.enabled || before.joinLink.url !== after.joinLink.url) {
25243
25297
  changed.push("join link");
@@ -25274,6 +25328,7 @@ function filesFromServer(server) {
25274
25328
  courses: [],
25275
25329
  unlistedCourses: []
25276
25330
  };
25331
+ takeName(files, server.community.name);
25277
25332
  takeSettings(files, server.settings);
25278
25333
  takeJoinLink(files, server.joinLink.enabled);
25279
25334
  addUntracked(files, server.rooms);
@@ -25287,11 +25342,12 @@ function pullMerge(files, server, plan, theirs) {
25287
25342
  if (state === "local") listing.kept.push(what);
25288
25343
  if (state === "conflict" && !theirs) listing.conflicts.push(what);
25289
25344
  };
25290
- if (files.name !== server.community.name) {
25291
- listing.changes.push(`~ name: ${show(files.name)} \u2192 ${show(server.community.name)}`);
25292
- files.name = server.community.name;
25345
+ const { name, settings, joinLink } = plan;
25346
+ if (takes(name.state)) {
25347
+ listing.changes.push(`~ name: ${show(files.name)} \u2192 ${show(name.server)}`);
25348
+ takeName(files, server.community.name);
25293
25349
  }
25294
- const { settings, joinLink } = plan;
25350
+ note(name.state, "name");
25295
25351
  if (takes(settings.state)) {
25296
25352
  listing.changes.push(`~ settings: ${settingsChanges(settings.file, settings.server).join("; ")}`);
25297
25353
  takeSettings(files, server.settings);
@@ -37389,7 +37445,7 @@ var init_batch = __esm({
37389
37445
  var init_rekor_toolset = __esm({
37390
37446
  "../../packages/core/dist/contracts/rekor-toolset.js"() {
37391
37447
  "use strict";
37392
- init_chunk_OWAAYKPB();
37448
+ init_chunk_AMHCCKZ3();
37393
37449
  init_chunk_BEOHBREG();
37394
37450
  init_chunk_DHPUPI4Y();
37395
37451
  }