@bonginkan/maria-lite 6.3.1 → 6.3.2

package/README.md

@@ -1,4 +1,4 @@
-MARIA-LITE (v6.3.1)
+MARIA-LITE (v6.3.2)
 ===================
 
 MARIA-LITE is a lightweight, standalone CLI build of MARIA OS focused on a smaller runtime surface while preserving API compatibility with `@bonginkan/maria`.
@@ -43,7 +43,7 @@ Notes:
 - Clone commands write under `artifacts/<role>-clone/` when `--apply` (or implicit apply is enabled).
 
 ## Version
-This package is published as `6.3.1`.
+This package is published as `6.3.2`.
 
 ## Extensions (Enterprise)
 
@@ -126,6 +126,20 @@ Append creator-provided knowledge to common context:
 
 ## Release Notes
 
+### v6.3.2 (2026/03)
+
+#### Features
+
+- Improved /gcal Admin resource management (buildings & rooms) output and handling.
+- Enhanced /resource-manager with clearer tables and create flows for buildings/resources.
+
+#### Bug fixes
+
+- More consistent Google Admin API error reporting across /gcal and /resource-manager.
+- Improved floor parsing for building creation (numeric counts or comma-separated).
+
+---
+
 ### v6.3.1 (2026/03)
 
 #### Features

package/dist/cli.cjs

@@ -97578,7 +97578,7 @@ function resolvePackageJsonNearEntrypoint() {
 }
 function resolveMariaLiteVersionInfo() {
   const fallbackName = EXPECTED_PKG_NAME;
-  const fallbackVersion = String(process.env.MARIA_LITE_VERSION || "").trim() || "6.3.1";
+  const fallbackVersion = String(process.env.MARIA_LITE_VERSION || "").trim() || "6.3.2";
   const near = resolvePackageJsonNearEntrypoint();
   if (near) {
     const name = fallbackName;
@@ -256284,6 +256284,161 @@ var init_phone_routes = __esm({
   }
 });
 
+// services/google/admin-resources.ts
+async function adminFetch(token, url, init) {
+  const headers = {
+    Authorization: `Bearer ${token}`,
+    ...init?.headers || {}
+  };
+  return fetch(url, { ...init, headers });
+}
+function slugify2(name, prefix) {
+  return name.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "").slice(0, 40) || `${prefix}-${Date.now()}`;
+}
+function parseFloorNames(raw) {
+  const trimmed = raw.trim();
+  if (!trimmed) return [];
+  const n = Number(trimmed);
+  if (!isNaN(n) && n > 0 && Number.isInteger(n)) {
+    return Array.from({ length: n }, (_, i2) => String(i2 + 1));
+  }
+  return trimmed.split(",").map((f3) => f3.trim()).filter(Boolean);
+}
+function toBuilding(raw) {
+  return {
+    buildingId: String(raw.buildingId || ""),
+    buildingName: String(raw.buildingName || ""),
+    description: String(raw.description || ""),
+    floorNames: Array.isArray(raw.floorNames) ? raw.floorNames.map(String) : []
+  };
+}
+function toResource(raw) {
+  return {
+    resourceId: String(raw.resourceId || ""),
+    resourceEmail: String(raw.resourceEmail || ""),
+    resourceName: String(raw.resourceName || ""),
+    resourceType: String(raw.resourceType || ""),
+    capacity: Number(raw.capacity || 0),
+    buildingId: String(raw.buildingId || ""),
+    floorName: String(raw.floorName || ""),
+    userVisibleDescription: String(raw.userVisibleDescription || ""),
+    resourceDescription: String(raw.resourceDescription || ""),
+    generatedResourceName: String(raw.generatedResourceName || "")
+  };
+}
+async function parseErrorText(res) {
+  return res.text().catch(() => "");
+}
+function apiError(status, errText) {
+  if (status === 403) return { ok: false, error: "permission_denied", status };
+  if (status === 404) return { ok: false, error: "not_found", status };
+  return { ok: false, error: `Admin SDK: ${status} ${errText.slice(0, 200)}`, status };
+}
+async function listBuildingsRaw(token, signal) {
+  const res = await adminFetch(token, `${ADMIN_RESOURCES_BASE}/buildings?maxResults=500`, signal ? { signal } : void 0);
+  if (!res.ok) return apiError(res.status, await parseErrorText(res));
+  const data = await res.json();
+  const items = Array.isArray(data.buildings) ? data.buildings : [];
+  return { ok: true, data: items.map(toBuilding) };
+}
+async function createBuildingRaw(token, params, signal) {
+  const buildingId = params.buildingId || slugify2(params.name, "bld");
+  const body = { buildingId, buildingName: params.name };
+  if (params.description) body.description = params.description;
+  if (params.floorNames) {
+    body.floorNames = params.floorNames;
+  } else if (params.floors) {
+    body.floorNames = parseFloorNames(params.floors);
+  }
+  const res = await adminFetch(token, `${ADMIN_RESOURCES_BASE}/buildings`, {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify(body),
+    ...signal ? { signal } : {}
+  });
+  if (!res.ok) return apiError(res.status, await parseErrorText(res));
+  return { ok: true, data: toBuilding(await res.json()) };
+}
+async function updateBuildingRaw(token, buildingId, body, signal) {
+  const res = await adminFetch(
+    token,
+    `${ADMIN_RESOURCES_BASE}/buildings/${encodeURIComponent(buildingId)}`,
+    { method: "PATCH", headers: { "Content-Type": "application/json" }, body: JSON.stringify(body), ...signal ? { signal } : {} }
+  );
+  if (!res.ok) return apiError(res.status, await parseErrorText(res));
+  return { ok: true, data: toBuilding(await res.json()) };
+}
+async function listResourcesRaw(token, opts, signal) {
+  let url = `${ADMIN_RESOURCES_BASE}/calendars?maxResults=500`;
+  if (opts?.buildingId) {
+    url += `&query=buildingId="${encodeURIComponent(opts.buildingId)}"`;
+  }
+  const res = await adminFetch(token, url, signal ? { signal } : void 0);
+  if (!res.ok) return apiError(res.status, await parseErrorText(res));
+  const data = await res.json();
+  let items = Array.isArray(data.items) ? data.items : [];
+  if (opts?.capacity && opts.capacity > 0) {
+    items = items.filter((r2) => Number(r2.capacity || 0) >= opts.capacity);
+  }
+  return { ok: true, data: items.map(toResource) };
+}
+async function getResourceRaw(token, resourceId, signal) {
+  const res = await adminFetch(
+    token,
+    `${ADMIN_RESOURCES_BASE}/calendars/${encodeURIComponent(resourceId)}`,
+    signal ? { signal } : void 0
+  );
+  if (!res.ok) return apiError(res.status, await parseErrorText(res));
+  return { ok: true, data: toResource(await res.json()) };
+}
+async function createResourceRaw(token, params, signal) {
+  const body = {
+    resourceName: params.name,
+    resourceType: params.resourceType || "CONFERENCE_ROOM"
+  };
+  if (params.resourceId) body.resourceId = params.resourceId;
+  if (params.buildingId) body.buildingId = params.buildingId;
+  if (params.capacity) body.capacity = params.capacity;
+  if (params.floorName) body.floorName = params.floorName;
+  if (params.description) body.resourceDescription = params.description;
+  const res = await adminFetch(token, `${ADMIN_RESOURCES_BASE}/calendars`, {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify(body),
+    ...signal ? { signal } : {}
+  });
+  if (!res.ok) return apiError(res.status, await parseErrorText(res));
+  return { ok: true, data: toResource(await res.json()) };
+}
+async function updateResourceRaw(token, resourceId, body, signal) {
+  const res = await adminFetch(
+    token,
+    `${ADMIN_RESOURCES_BASE}/calendars/${encodeURIComponent(resourceId)}`,
+    { method: "PATCH", headers: { "Content-Type": "application/json" }, body: JSON.stringify(body), ...signal ? { signal } : {} }
+  );
+  if (!res.ok) return apiError(res.status, await parseErrorText(res));
+  return { ok: true, data: toResource(await res.json()) };
+}
+async function fetchExistingBuildingIds(token, signal) {
+  const ids = /* @__PURE__ */ new Set();
+  try {
+    const result = await listBuildingsRaw(token, signal);
+    if (result.ok && result.data) {
+      for (const b of result.data) {
+        if (b.buildingId) ids.add(b.buildingId);
+      }
+    }
+  } catch {
+  }
+  return ids;
+}
+var ADMIN_RESOURCES_BASE;
+var init_admin_resources = __esm({
+  "services/google/admin-resources.ts"() {
+    ADMIN_RESOURCES_BASE = "https://admin.googleapis.com/admin/directory/v1/customer/my_customer/resources";
+  }
+});
+
 // services/desktop/routes/calendar-api-routes.ts
 async function getToken2() {
   const mgr = new GoogleOAuthManager();
@@ -256293,13 +256448,6 @@ function notConnected2(res) {
   respondJson2(res, 200, { ok: false, error: "not_connected" });
   return true;
 }
-async function gFetch2(token, url, init) {
-  const headers = {
-    Authorization: `Bearer ${token}`,
-    ...init?.headers || {}
-  };
-  return fetch(url, { ...init, headers });
-}
 function resolveProjectId2() {
   return process.env.GCLOUD_PROJECT || process.env.GOOGLE_CLOUD_PROJECT || process.env.FIREBASE_PROJECT_ID || process.env.GCP_PROJECT_ID || "";
 }
@@ -256357,28 +256505,9 @@ function buildRrule(type2, count, until) {
   return rule;
 }
 async function fetchResources(token, buildingId, minCapacity) {
-  let url = `${ADMIN_RESOURCES_BASE}/calendars?maxResults=500`;
-  if (buildingId) {
-    url += `&query=buildingId="${encodeURIComponent(buildingId)}"`;
-  }
-  const apiRes = await gFetch2(token, url);
-  if (!apiRes.ok) return [];
-  const data = await apiRes.json();
-  const items = Array.isArray(data.items) ? data.items : [];
-  const resources = items.map((item) => ({
-    resourceId: String(item.resourceId || ""),
-    resourceEmail: String(item.resourceEmail || ""),
-    resourceName: String(item.resourceName || ""),
-    resourceType: String(item.resourceType || ""),
-    capacity: Number(item.capacity || 0),
-    buildingId: String(item.buildingId || ""),
-    floorName: String(item.floorName || ""),
-    userVisibleDescription: String(item.userVisibleDescription || "")
-  }));
-  if (minCapacity != null && minCapacity > 0) {
-    return resources.filter((r2) => r2.capacity >= minCapacity);
-  }
-  return resources;
+  const result = await listResourcesRaw(token, { buildingId, capacity: minCapacity });
+  if (!result.ok || !result.data) return [];
+  return result.data;
 }
 function findSlots(params) {
   const {
@@ -256538,19 +256667,9 @@ async function handleCalendarApiRoute(method, pathname, req, res) {
   if (method === "GET" && pathname === "/api/calendar/buildings") {
     const token = await getToken2();
     if (!token) return notConnected2(res);
-    const apiRes = await gFetch2(token, `${ADMIN_RESOURCES_BASE}/buildings?maxResults=500`);
-    if (!apiRes.ok) {
-      return respondJson2(res, 200, { ok: false, error: `Admin SDK: ${apiRes.status}` }), true;
-    }
-    const data = await apiRes.json();
-    const items = Array.isArray(data.buildings) ? data.buildings : [];
-    const buildings = items.map((b) => ({
-      buildingId: String(b.buildingId || ""),
-      buildingName: String(b.buildingName || ""),
-      description: String(b.description || ""),
-      floorNames: Array.isArray(b.floorNames) ? b.floorNames : []
-    }));
-    return respondJson2(res, 200, { ok: true, buildings }), true;
+    const result = await listBuildingsRaw(token);
+    if (!result.ok) return respondJson2(res, 200, { ok: false, error: result.error }), true;
+    return respondJson2(res, 200, { ok: true, buildings: result.data }), true;
   }
   if (method === "POST" && pathname === "/api/calendar/buildings") {
     const token = await getToken2();
@@ -256559,44 +256678,21 @@ async function handleCalendarApiRoute(method, pathname, req, res) {
     if (!reqBody) return respondJson2(res, 400, { ok: false, error: "Request body is required" }), true;
     const buildingName = String(reqBody.buildingName || "").trim();
     if (!buildingName) return respondJson2(res, 400, { ok: false, error: "buildingName is required" }), true;
-    const buildingId = String(reqBody.buildingId || "").trim() || buildingName.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "").slice(0, 40) || `bld-${Date.now()}`;
-    const body = { buildingId, buildingName };
-    if (reqBody.description) body.description = String(reqBody.description).trim();
-    if (reqBody.floorNames) {
-      if (Array.isArray(reqBody.floorNames)) {
-        body.floorNames = reqBody.floorNames.map(String);
-      } else {
-        const raw = String(reqBody.floorNames).trim();
-        const n = Number(raw);
-        if (!isNaN(n) && n > 0 && Number.isInteger(n)) {
-          body.floorNames = Array.from({ length: n }, (_, i2) => String(i2 + 1));
-        } else {
-          body.floorNames = raw.split(",").map((f3) => f3.trim()).filter(Boolean);
-        }
-      }
-    }
-    const apiRes = await gFetch2(token, `${ADMIN_RESOURCES_BASE}/buildings`, {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify(body)
+    const buildingId = String(reqBody.buildingId || "").trim() || slugify2(buildingName, "bld");
+    const floorNames = reqBody.floorNames ? Array.isArray(reqBody.floorNames) ? reqBody.floorNames.map(String) : void 0 : void 0;
+    const floors = !floorNames && reqBody.floorNames ? String(reqBody.floorNames).trim() : void 0;
+    const result = await createBuildingRaw(token, {
+      name: buildingName,
+      buildingId,
+      description: reqBody.description ? String(reqBody.description).trim() : void 0,
+      floorNames: floorNames || void 0,
+      floors: floors || void 0
     });
-    if (!apiRes.ok) {
-      const errText = await apiRes.text().catch(() => "");
-      if (apiRes.status === 403) {
-        return respondJson2(res, 403, { ok: false, error: "permission_denied", message: "Google Workspace admin privileges required" }), true;
-      }
-      return respondJson2(res, 200, { ok: false, error: `Admin SDK: ${apiRes.status} ${errText}` }), true;
+    if (!result.ok) {
+      if (result.status === 403) return respondJson2(res, 403, { ok: false, error: "permission_denied", message: "Google Workspace admin privileges required" }), true;
+      return respondJson2(res, 200, { ok: false, error: result.error }), true;
     }
-    const created = await apiRes.json();
-    return respondJson2(res, 200, {
-      ok: true,
-      building: {
-        buildingId: String(created.buildingId || ""),
-        buildingName: String(created.buildingName || ""),
-        description: String(created.description || ""),
-        floorNames: Array.isArray(created.floorNames) ? created.floorNames : []
-      }
-    }), true;
+    return respondJson2(res, 200, { ok: true, building: result.data }), true;
   }
   if (method === "POST" && pathname === "/api/calendar/resources") {
     const token = await getToken2();
@@ -256605,41 +256701,21 @@ async function handleCalendarApiRoute(method, pathname, req, res) {
     if (!reqBody) return respondJson2(res, 400, { ok: false, error: "Request body is required" }), true;
     const resourceName = String(reqBody.resourceName || "").trim();
     if (!resourceName) return respondJson2(res, 400, { ok: false, error: "resourceName is required" }), true;
-    const resourceId = String(reqBody.resourceId || "").trim() || resourceName.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "").slice(0, 40) || `res-${Date.now()}`;
-    const body = {
+    const resourceId = String(reqBody.resourceId || "").trim() || slugify2(resourceName, "res");
+    const result = await createResourceRaw(token, {
+      name: resourceName,
       resourceId,
-      resourceName,
-      resourceType: String(reqBody.resourceType || "CONFERENCE_ROOM").trim()
-    };
-    if (reqBody.buildingId) body.buildingId = String(reqBody.buildingId).trim();
-    if (reqBody.capacity) body.capacity = Math.max(0, Number(reqBody.capacity) || 0);
-    if (reqBody.floorName) body.floorName = String(reqBody.floorName).trim();
-    if (reqBody.resourceDescription) body.resourceDescription = String(reqBody.resourceDescription).trim();
-    const apiRes = await gFetch2(token, `${ADMIN_RESOURCES_BASE}/calendars`, {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify(body)
+      buildingId: reqBody.buildingId ? String(reqBody.buildingId).trim() : void 0,
+      capacity: reqBody.capacity ? Math.max(0, Number(reqBody.capacity) || 0) : void 0,
+      resourceType: String(reqBody.resourceType || "CONFERENCE_ROOM").trim(),
+      floorName: reqBody.floorName ? String(reqBody.floorName).trim() : void 0,
+      description: reqBody.resourceDescription ? String(reqBody.resourceDescription).trim() : void 0
     });
-    if (!apiRes.ok) {
-      const errText = await apiRes.text().catch(() => "");
-      if (apiRes.status === 403) {
-        return respondJson2(res, 403, { ok: false, error: "permission_denied", message: "Google Workspace admin privileges required" }), true;
-      }
-      return respondJson2(res, 200, { ok: false, error: `Admin SDK: ${apiRes.status} ${errText}` }), true;
+    if (!result.ok) {
+      if (result.status === 403) return respondJson2(res, 403, { ok: false, error: "permission_denied", message: "Google Workspace admin privileges required" }), true;
+      return respondJson2(res, 200, { ok: false, error: result.error }), true;
     }
-    const created = await apiRes.json();
-    return respondJson2(res, 200, {
-      ok: true,
-      resource: {
-        resourceId: String(created.resourceId || ""),
-        resourceEmail: String(created.resourceEmail || ""),
-        resourceName: String(created.resourceName || ""),
-        capacity: Number(created.capacity || 0),
-        buildingId: String(created.buildingId || ""),
-        resourceType: String(created.resourceType || ""),
-        floorName: String(created.floorName || "")
-      }
-    }), true;
+    return respondJson2(res, 200, { ok: true, resource: result.data }), true;
   }
   if (method === "PATCH" && pathname.startsWith("/api/calendar/buildings/")) {
     const buildingId = decodeURIComponent(pathname.slice("/api/calendar/buildings/".length));
@@ -256667,31 +256743,13 @@ async function handleCalendarApiRoute(method, pathname, req, res) {
     if (Object.keys(body).length === 0) {
       return respondJson2(res, 400, { ok: false, error: "No fields to update" }), true;
     }
-    const apiRes = await gFetch2(token, `${ADMIN_RESOURCES_BASE}/buildings/${encodeURIComponent(buildingId)}`, {
-      method: "PATCH",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify(body)
-    });
-    if (!apiRes.ok) {
-      const errText = await apiRes.text().catch(() => "");
-      if (apiRes.status === 403) {
-        return respondJson2(res, 403, { ok: false, error: "permission_denied", message: "Google Workspace admin privileges required" }), true;
-      }
-      if (apiRes.status === 404) {
-        return respondJson2(res, 404, { ok: false, error: "Building not found" }), true;
-      }
-      return respondJson2(res, 200, { ok: false, error: `Admin SDK: ${apiRes.status} ${errText}` }), true;
+    const result = await updateBuildingRaw(token, buildingId, body);
+    if (!result.ok) {
+      if (result.status === 403) return respondJson2(res, 403, { ok: false, error: "permission_denied", message: "Google Workspace admin privileges required" }), true;
+      if (result.status === 404) return respondJson2(res, 404, { ok: false, error: "Building not found" }), true;
+      return respondJson2(res, 200, { ok: false, error: result.error }), true;
     }
-    const updated = await apiRes.json();
-    return respondJson2(res, 200, {
-      ok: true,
-      building: {
-        buildingId: String(updated.buildingId || ""),
-        buildingName: String(updated.buildingName || ""),
-        description: String(updated.description || ""),
-        floorNames: Array.isArray(updated.floorNames) ? updated.floorNames : []
-      }
-    }), true;
+    return respondJson2(res, 200, { ok: true, building: result.data }), true;
   }
   if (method === "PATCH" && pathname.startsWith("/api/calendar/resources/")) {
     const resourceId = decodeURIComponent(pathname.slice("/api/calendar/resources/".length));
@@ -256710,34 +256768,13 @@ async function handleCalendarApiRoute(method, pathname, req, res) {
     if (Object.keys(body).length === 0) {
       return respondJson2(res, 400, { ok: false, error: "No fields to update" }), true;
     }
-    const apiRes = await gFetch2(token, `${ADMIN_RESOURCES_BASE}/calendars/${encodeURIComponent(resourceId)}`, {
-      method: "PATCH",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify(body)
-    });
-    if (!apiRes.ok) {
-      const errText = await apiRes.text().catch(() => "");
-      if (apiRes.status === 403) {
-        return respondJson2(res, 403, { ok: false, error: "permission_denied", message: "Google Workspace admin privileges required" }), true;
-      }
-      if (apiRes.status === 404) {
-        return respondJson2(res, 404, { ok: false, error: "Resource not found" }), true;
-      }
-      return respondJson2(res, 200, { ok: false, error: `Admin SDK: ${apiRes.status} ${errText}` }), true;
+    const result = await updateResourceRaw(token, resourceId, body);
+    if (!result.ok) {
+      if (result.status === 403) return respondJson2(res, 403, { ok: false, error: "permission_denied", message: "Google Workspace admin privileges required" }), true;
+      if (result.status === 404) return respondJson2(res, 404, { ok: false, error: "Resource not found" }), true;
+      return respondJson2(res, 200, { ok: false, error: result.error }), true;
     }
-    const updated = await apiRes.json();
-    return respondJson2(res, 200, {
-      ok: true,
-      resource: {
-        resourceId: String(updated.resourceId || ""),
-        resourceEmail: String(updated.resourceEmail || ""),
-        resourceName: String(updated.resourceName || ""),
-        capacity: Number(updated.capacity || 0),
-        buildingId: String(updated.buildingId || ""),
-        resourceType: String(updated.resourceType || ""),
-        floorName: String(updated.floorName || "")
-      }
-    }), true;
+    return respondJson2(res, 200, { ok: true, resource: result.data }), true;
   }
   if (method === "POST" && pathname === "/api/calendar/slots") {
     const token = await getToken2();
@@ -256788,7 +256825,7 @@ async function handleCalendarApiRoute(method, pathname, req, res) {
       timeZone: tz,
       items: allTargets.map((e2) => ({ id: e2 }))
     };
-    const fbRes = await gFetch2(token, `${CALENDAR_API_BASE}/freeBusy`, {
+    const fbRes = await adminFetch(token, `${CALENDAR_API_BASE}/freeBusy`, {
       method: "POST",
       headers: { "Content-Type": "application/json" },
       body: JSON.stringify(fbBody)
@@ -256864,7 +256901,7 @@ async function handleCalendarApiRoute(method, pathname, req, res) {
       timeZone: tz,
       items: targets.map((e2) => ({ id: e2 }))
     };
-    const fbRes = await gFetch2(token, `${CALENDAR_API_BASE}/freeBusy`, {
+    const fbRes = await adminFetch(token, `${CALENDAR_API_BASE}/freeBusy`, {
       method: "POST",
       headers: { "Content-Type": "application/json" },
       body: JSON.stringify(fbBody)
@@ -256926,7 +256963,7 @@ async function handleCalendarApiRoute(method, pathname, req, res) {
           timeZone: DEFAULT_TIMEZONE,
           items: [{ id: calendarId }]
         };
-        const fbRes = await gFetch2(token, `${CALENDAR_API_BASE}/freeBusy`, {
+        const fbRes = await adminFetch(token, `${CALENDAR_API_BASE}/freeBusy`, {
           method: "POST",
           headers: { "Content-Type": "application/json" },
           body: JSON.stringify(fbBody)
@@ -256968,7 +257005,7 @@ async function handleCalendarApiRoute(method, pathname, req, res) {
     if (rrule) {
       eventBody.recurrence = [rrule];
     }
-    const createRes = await gFetch2(
+    const createRes = await adminFetch(
       token,
       `${CALENDAR_API_BASE}/calendars/${encodeURIComponent(calendarId)}/events`,
       {
@@ -257043,7 +257080,7 @@ async function handleCalendarApiRoute(method, pathname, req, res) {
       const msg = err instanceof Error ? err.message : String(err);
       if (calendarEventId) {
         try {
-          await gFetch2(
+          await adminFetch(
             token,
             `${CALENDAR_API_BASE}/calendars/${encodeURIComponent(calendarId)}/events/${encodeURIComponent(calendarEventId)}`,
             { method: "DELETE" }
@@ -257100,7 +257137,7 @@ async function handleCalendarApiRoute(method, pathname, req, res) {
     if (!token) return notConnected2(res);
     const calendarId = String(data.resourceCalendarId || "") || "primary";
     const eventId = String(data.calendarEventId);
-    const instancesRes = await gFetch2(
+    const instancesRes = await adminFetch(
       token,
       `${CALENDAR_API_BASE}/calendars/${encodeURIComponent(calendarId)}/events/${encodeURIComponent(eventId)}/instances?maxResults=50`
     );
@@ -257150,7 +257187,7 @@ async function handleCalendarApiRoute(method, pathname, req, res) {
       }
       const upsertToken = await getToken2();
       if (!upsertToken) return notConnected2(res);
-      const eventRes = await gFetch2(
+      const eventRes = await adminFetch(
         upsertToken,
         `${CALENDAR_API_BASE}/calendars/${encodeURIComponent(calendarIdForUpsert)}/events/${encodeURIComponent(gcalEventId)}`
       );
@@ -257203,7 +257240,7 @@ async function handleCalendarApiRoute(method, pathname, req, res) {
           timeZone: DEFAULT_TIMEZONE,
           items: [{ id: calendarId }]
         };
-        const fbRes = await gFetch2(token, `${CALENDAR_API_BASE}/freeBusy`, {
+        const fbRes = await adminFetch(token, `${CALENDAR_API_BASE}/freeBusy`, {
           method: "POST",
           headers: { "Content-Type": "application/json" },
           body: JSON.stringify(fbBody)
@@ -257250,7 +257287,7 @@ async function handleCalendarApiRoute(method, pathname, req, res) {
       if (resourceEmail && resourceEmail !== String(data.resourceCalendarId || "")) {
         patchBody.attendees = [{ email: resourceEmail, resource: true }];
       }
-      const patchRes = await gFetch2(
+      const patchRes = await adminFetch(
         token,
         `${CALENDAR_API_BASE}/calendars/${encodeURIComponent(calendarId)}/events/${encodeURIComponent(calendarEventId)}`,
         { method: "PATCH", headers: { "Content-Type": "application/json" }, body: JSON.stringify(patchBody) }
@@ -257303,7 +257340,7 @@ async function handleCalendarApiRoute(method, pathname, req, res) {
       }
       const upsertToken = await getToken2();
       if (!upsertToken) return notConnected2(res);
-      const eventRes = await gFetch2(
+      const eventRes = await adminFetch(
         upsertToken,
         `${CALENDAR_API_BASE}/calendars/${encodeURIComponent(gcalCalendarId)}/events/${encodeURIComponent(gcalEventId)}`
       );
@@ -257355,7 +257392,7 @@ async function handleCalendarApiRoute(method, pathname, req, res) {
       }
       if (token) {
         try {
-          await gFetch2(
+          await adminFetch(
             token,
             `${CALENDAR_API_BASE}/calendars/${encodeURIComponent(calendarId)}/events/${encodeURIComponent(instanceEventId)}`,
             { method: "DELETE" }
@@ -257379,7 +257416,7 @@ async function handleCalendarApiRoute(method, pathname, req, res) {
       }
       if (token && calendarEventId) {
         try {
-          const instanceRes = await gFetch2(
+          const instanceRes = await adminFetch(
             token,
             `${CALENDAR_API_BASE}/calendars/${encodeURIComponent(calendarId)}/events/${encodeURIComponent(instanceEventId)}`
           );
@@ -257390,7 +257427,7 @@ async function handleCalendarApiRoute(method, pathname, req, res) {
               const cutoffDate = new Date(instanceStart);
               cutoffDate.setDate(cutoffDate.getDate() - 1);
               const untilStr = cutoffDate.toISOString().replace(/[-:]/g, "").split(".")[0] + "Z";
-              const parentRes = await gFetch2(
+              const parentRes = await adminFetch(
                 token,
                 `${CALENDAR_API_BASE}/calendars/${encodeURIComponent(calendarId)}/events/${encodeURIComponent(calendarEventId)}`
               );
@@ -257404,7 +257441,7 @@ async function handleCalendarApiRoute(method, pathname, req, res) {
                   );
                   return [...parts, `UNTIL=${untilStr}`].join(";");
                 });
-                await gFetch2(
+                await adminFetch(
                   token,
                   `${CALENDAR_API_BASE}/calendars/${encodeURIComponent(calendarId)}/events/${encodeURIComponent(calendarEventId)}`,
                   {
@@ -257436,7 +257473,7 @@ async function handleCalendarApiRoute(method, pathname, req, res) {
     } else {
       if (calendarEventId && token) {
         try {
-          await gFetch2(
+          await adminFetch(
             token,
             `${CALENDAR_API_BASE}/calendars/${encodeURIComponent(calendarId)}/events/${encodeURIComponent(calendarEventId)}`,
             { method: "DELETE" }
@@ -257581,7 +257618,7 @@ async function handleCalendarApiRoute(method, pathname, req, res) {
     try {
       const calendarFetches = Array.from(byCalendar.keys()).map(async (calendarId) => {
         const eventsUrl = `${CALENDAR_API_BASE}/calendars/${encodeURIComponent(calendarId)}/events?timeMin=${encodeURIComponent(timeMin)}&timeMax=${encodeURIComponent(timeMax)}&singleEvents=true&orderBy=startTime&maxResults=250`;
-        const eventsRes = await gFetch2(token, eventsUrl);
+        const eventsRes = await adminFetch(token, eventsUrl);
         if (!eventsRes.ok) {
           console.warn(
             `GCal events.list failed for calendar ${calendarId}: ${eventsRes.status}`
@@ -257748,13 +257785,13 @@ async function handleCalendarApiRoute(method, pathname, req, res) {
   }
   return false;
 }
-var ADMIN_RESOURCES_BASE, CALENDAR_API_BASE, DEFAULT_WORK_START_HOUR, DEFAULT_WORK_END_HOUR, DEFAULT_DURATION_MINUTES, DEFAULT_RESERVATION_LIMIT, SLOT_STEP_MS, DEFAULT_BUFFER_MINUTES, TOP_SLOT_COUNT, DEFAULT_TIMEZONE, _firestoreInstance2, _firestoreInitPromise2, VALID_RECURRENCE_TYPES;
+var CALENDAR_API_BASE, DEFAULT_WORK_START_HOUR, DEFAULT_WORK_END_HOUR, DEFAULT_DURATION_MINUTES, DEFAULT_RESERVATION_LIMIT, SLOT_STEP_MS, DEFAULT_BUFFER_MINUTES, TOP_SLOT_COUNT, DEFAULT_TIMEZONE, _firestoreInstance2, _firestoreInitPromise2, VALID_RECURRENCE_TYPES;
 var init_calendar_api_routes = __esm({
   "services/desktop/routes/calendar-api-routes.ts"() {
     init_desktop_server_helpers();
     init_google_oauth();
     init_date_tz();
-    ADMIN_RESOURCES_BASE = "https://admin.googleapis.com/admin/directory/v1/customer/my_customer/resources";
+    init_admin_resources();
     CALENDAR_API_BASE = "https://www.googleapis.com/calendar/v3";
     DEFAULT_WORK_START_HOUR = 9;
     DEFAULT_WORK_END_HOUR = 18;
@@ -263703,12 +263740,8 @@ async function findMeetingSlots(token, required, optional, durationMin, dateFrom
   if (extra?.resourceId) {
     resourceCalendarIds = [extra.resourceId];
     try {
-      const adminBaseUrl = "https://admin.googleapis.com/admin/directory/v1/customer/my_customer/resources/calendars";
       const qParams = new URLSearchParams({ maxResults: "5", query: `resourceEmail="${extra.resourceId}"` });
-      const rRes = await fetch(`${adminBaseUrl}?${qParams}`, {
-        headers: { Authorization: `Bearer ${token}` },
-        ...signal ? { signal } : {}
-      });
+      const rRes = await adminFetch(token, `${ADMIN_RESOURCES_BASE}/calendars?${qParams}`, signal ? { signal } : void 0);
       if (rRes.ok) {
         const rData = await rRes.json();
         const items = Array.isArray(rData.items) ? rData.items : [];
@@ -263722,25 +263755,12 @@ async function findMeetingSlots(token, required, optional, durationMin, dateFrom
     }
   } else if (extra?.buildingId || extra?.capacity) {
     try {
-      const adminBaseUrl = "https://admin.googleapis.com/admin/directory/v1/customer/my_customer/resources/calendars";
-      const params = new URLSearchParams({ maxResults: "200" });
-      if (extra?.buildingId) params.set("query", `buildingId="${extra.buildingId}"`);
-      const rRes = await fetch(`${adminBaseUrl}?${params}`, {
-        headers: { Authorization: `Bearer ${token}` },
-        ...signal ? { signal } : {}
-      });
-      if (rRes.ok) {
-        const rData = await rRes.json();
-        const items = Array.isArray(rData.items) ? rData.items : [];
-        const filtered = items.filter((r2) => {
-          if (extra?.capacity && typeof r2.capacity === "number" && r2.capacity < extra.capacity) return false;
-          return true;
-        });
-        resourceCalendarIds = filtered.map((r2) => String(r2.resourceEmail || "")).filter(Boolean);
-        for (const r2 of items) {
-          const email = String(r2.resourceEmail || "");
-          const name = String(r2.resourceName || r2.generatedResourceName || "");
-          if (email && name) resourceNameMap[email] = name;
+      const result = await listResourcesRaw(token, { buildingId: extra?.buildingId, capacity: extra?.capacity }, signal);
+      if (result.ok && result.data) {
+        resourceCalendarIds = result.data.map((r2) => r2.resourceEmail).filter(Boolean);
+        for (const r2 of result.data) {
+          const name = r2.resourceName || r2.generatedResourceName || "";
+          if (r2.resourceEmail && name) resourceNameMap[r2.resourceEmail] = name;
         }
       }
     } catch {
@@ -264122,46 +264142,17 @@ function formatImportSummary(results, totalRecords, isDryRun) {
   }
   return lines;
 }
-async function fetchExistingBuildingIds(token, signal) {
-  const ids = /* @__PURE__ */ new Set();
-  try {
-    const res = await fetch(`${ADMIN_RESOURCES_BASE2}/buildings?maxResults=200`, {
-      headers: { Authorization: `Bearer ${token}` },
-      ...signal ? { signal } : {}
-    });
-    if (res.ok) {
-      const data = await res.json();
-      const buildings = Array.isArray(data.buildings) ? data.buildings : [];
-      for (const b of buildings) {
-        if (typeof b.buildingId === "string" && b.buildingId) {
-          ids.add(b.buildingId);
-        }
-      }
-    }
-  } catch {
-  }
-  return ids;
-}
-async function listResources(token, buildingId, signal) {
-  const params = new URLSearchParams({ maxResults: "200" });
-  if (buildingId) params.set("query", `buildingId="${buildingId}"`);
-  const res = await fetch(`${ADMIN_RESOURCES_BASE2}/calendars?${params}`, {
-    headers: { Authorization: `Bearer ${token}` },
-    ...signal ? { signal } : {}
-  });
-  if (!res.ok) {
-    const err = await res.text().catch(() => "");
-    return { text: `Admin API error: ${res.status} ${err.slice(0, 200)}`, json: { ok: false, error: res.status } };
-  }
-  const data = await res.json();
-  const items = Array.isArray(data.items) ? data.items : [];
+async function fmtListResources(token, buildingId, signal) {
+  const result = await listResourcesRaw(token, { buildingId }, signal);
+  if (!result.ok) return { text: `Admin API error: ${result.error}`, json: { ok: false, error: result.error } };
+  const items = result.data;
   if (items.length === 0) {
     const filter = buildingId ? ` (building: ${buildingId})` : "";
     return { text: `No resource calendars found${filter}.`, json: { ok: true, resources: [] } };
   }
   const lines = [`${items.length} resource calendar(s):`, ""];
   for (const r2 of items) {
-    const cap = typeof r2.capacity === "number" ? ` (capacity: ${r2.capacity})` : "";
+    const cap = r2.capacity ? ` (capacity: ${r2.capacity})` : "";
     const bld = r2.buildingId ? ` [building: ${r2.buildingId}]` : "";
     lines.push(`  ${r2.resourceName || r2.generatedResourceName || "Unnamed"}${cap}${bld}`);
     lines.push(`    ID: ${r2.resourceId}`);
@@ -264172,22 +264163,16 @@ async function listResources(token, buildingId, signal) {
   }
   return { text: lines.join("\n"), json: { ok: true, resources: items } };
 }
-async function getResource(token, resourceId, signal) {
-  const res = await fetch(`${ADMIN_RESOURCES_BASE2}/calendars/${encodeURIComponent(resourceId)}`, {
-    headers: { Authorization: `Bearer ${token}` },
-    ...signal ? { signal } : {}
-  });
-  if (!res.ok) {
-    const err = await res.text().catch(() => "");
-    return { text: `Admin API error: ${res.status} ${err.slice(0, 200)}`, json: { ok: false, error: res.status } };
-  }
-  const r2 = await res.json();
+async function fmtGetResource(token, resourceId, signal) {
+  const result = await getResourceRaw(token, resourceId, signal);
+  if (!result.ok) return { text: `Admin API error: ${result.error}`, json: { ok: false, error: result.error } };
+  const r2 = result.data;
   const lines = [
     `Resource: ${r2.resourceName || r2.generatedResourceName || "Unnamed"}`,
     `  ID: ${r2.resourceId}`,
     `  Email: ${r2.resourceEmail || "N/A"}`,
     `  Type: ${r2.resourceType || "N/A"}`,
-    typeof r2.capacity === "number" ? `  Capacity: ${r2.capacity}` : "",
+    r2.capacity ? `  Capacity: ${r2.capacity}` : "",
     r2.buildingId ? `  Building: ${r2.buildingId}` : "",
     r2.floorName ? `  Floor: ${r2.floorName}` : "",
     r2.resourceDescription ? `  Description: ${r2.resourceDescription}` : "",
@@ -264195,26 +264180,10 @@ async function getResource(token, resourceId, signal) {
   ].filter(Boolean);
   return { text: lines.join("\n"), json: { ok: true, resource: r2 } };
 }
-async function createResource(token, params, signal) {
-  const body = {
-    resourceName: params.name,
-    resourceType: params.resourceType || "CONFERENCE_ROOM"
-  };
-  if (params.buildingId) body.buildingId = params.buildingId;
-  if (params.capacity) body.capacity = params.capacity;
-  if (params.floorName) body.floorName = params.floorName;
-  if (params.description) body.resourceDescription = params.description;
-  const res = await fetch(`${ADMIN_RESOURCES_BASE2}/calendars`, {
-    method: "POST",
-    headers: { Authorization: `Bearer ${token}`, "Content-Type": "application/json" },
-    body: JSON.stringify(body),
-    ...signal ? { signal } : {}
-  });
-  if (!res.ok) {
-    const err = await res.text().catch(() => "");
-    return { text: `Admin API create error: ${res.status} ${err.slice(0, 200)}`, json: { ok: false, error: res.status } };
-  }
-  const r2 = await res.json();
+async function fmtCreateResource(token, params, signal) {
+  const result = await createResourceRaw(token, params, signal);
+  if (!result.ok) return { text: `Admin API create error: ${result.error}`, json: { ok: false, error: result.error } };
+  const r2 = result.data;
   return {
     text: `Created resource: "${r2.resourceName}" (id=${r2.resourceId}, email=${r2.resourceEmail})`,
     json: { ok: true, created: true, resource: r2 }
@@ -264295,9 +264264,9 @@ async function bulkImportResources(token, filePath4, signal, dryRun = false) {
     if (rec.floor || rec.floorName) body.floorName = rec.floor || rec.floorName;
     if (rec.description || rec.resourceDescription) body.resourceDescription = rec.description || rec.resourceDescription;
     try {
-      const createRes = await fetch(`${ADMIN_RESOURCES_BASE2}/calendars`, {
+      const createRes = await adminFetch(token, `${ADMIN_RESOURCES_BASE}/calendars`, {
         method: "POST",
-        headers: { Authorization: `Bearer ${token}`, "Content-Type": "application/json" },
+        headers: { "Content-Type": "application/json" },
         body: JSON.stringify(body),
         ...signal ? { signal } : {}
       });
@@ -264325,54 +264294,25 @@ async function bulkImportResources(token, filePath4, signal, dryRun = false) {
     }
   };
 }
-async function listBuildings(token, signal) {
-  const res = await fetch(`${ADMIN_RESOURCES_BASE2}/buildings?maxResults=200`, {
-    headers: { Authorization: `Bearer ${token}` },
-    ...signal ? { signal } : {}
-  });
-  if (!res.ok) {
-    const err = await res.text().catch(() => "");
-    return { text: `Admin API error: ${res.status} ${err.slice(0, 200)}`, json: { ok: false, error: res.status } };
-  }
-  const data = await res.json();
-  const buildings = Array.isArray(data.buildings) ? data.buildings : [];
+async function fmtListBuildings(token, signal) {
+  const result = await listBuildingsRaw(token, signal);
+  if (!result.ok) return { text: `Admin API error: ${result.error}`, json: { ok: false, error: result.error } };
+  const buildings = result.data;
   if (buildings.length === 0) return { text: "No buildings found.", json: { ok: true, buildings: [] } };
   const lines = [`${buildings.length} building(s):`, ""];
   for (const b of buildings) {
     lines.push(`  ${b.buildingName || "Unnamed"}`);
     lines.push(`    ID: ${b.buildingId}`);
     if (b.description) lines.push(`    Description: ${b.description}`);
-    if (Array.isArray(b.floorNames) && b.floorNames.length) lines.push(`    Floors: ${b.floorNames.join(", ")}`);
+    if (b.floorNames.length) lines.push(`    Floors: ${b.floorNames.join(", ")}`);
     lines.push("");
   }
   return { text: lines.join("\n"), json: { ok: true, buildings } };
 }
-async function createBuilding(token, params, signal) {
-  const buildingId = params.name.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "").slice(0, 40) || `bld-${Date.now()}`;
-  const body = {
-    buildingId,
-    buildingName: params.name
-  };
-  if (params.description) body.description = params.description;
-  if (params.floors) {
-    const n = Number(params.floors);
-    if (n > 0) {
-      body.floorNames = Array.from({ length: n }, (_, i2) => String(i2 + 1));
-    } else {
-      body.floorNames = params.floors.split(",").map((f3) => f3.trim()).filter(Boolean);
-    }
-  }
-  const res = await fetch(`${ADMIN_RESOURCES_BASE2}/buildings`, {
-    method: "POST",
-    headers: { Authorization: `Bearer ${token}`, "Content-Type": "application/json" },
-    body: JSON.stringify(body),
-    ...signal ? { signal } : {}
-  });
-  if (!res.ok) {
-    const err = await res.text().catch(() => "");
-    return { text: `Admin API create error: ${res.status} ${err.slice(0, 200)}`, json: { ok: false, error: res.status } };
-  }
-  const b = await res.json();
+async function fmtCreateBuilding(token, params, signal) {
+  const result = await createBuildingRaw(token, params, signal);
+  if (!result.ok) return { text: `Admin API create error: ${result.error}`, json: { ok: false, error: result.error } };
+  const b = result.data;
   return {
     text: `Created building: "${b.buildingName}" (id=${b.buildingId})`,
     json: { ok: true, created: true, building: b }
@@ -264441,18 +264381,16 @@ async function bulkImportBuildings(token, filePath4, signal, dryRun = false) {
     const rec = records[i2];
     const row = i2 + 2;
     const name = rec.name || rec.buildingName || "";
-    const bldId = (rec.id || rec.buildingId || name).toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "").slice(0, 40) || `bld-${Date.now()}`;
+    const bldId = slugify2(rec.id || rec.buildingId || name, "bld");
     const body = { buildingId: bldId, buildingName: name };
     if (rec.description) body.description = rec.description;
     if (rec.floors || rec.floorNames) {
-      const f3 = rec.floors || rec.floorNames;
-      const n = Number(f3);
-      body.floorNames = n > 0 ? Array.from({ length: n }, (_, i22) => String(i22 + 1)) : f3.split(",").map((s2) => s2.trim()).filter(Boolean);
+      body.floorNames = parseFloorNames(rec.floors || rec.floorNames);
     }
     try {
-      const createRes = await fetch(`${ADMIN_RESOURCES_BASE2}/buildings`, {
+      const createRes = await adminFetch(token, `${ADMIN_RESOURCES_BASE}/buildings`, {
         method: "POST",
-        headers: { Authorization: `Bearer ${token}`, "Content-Type": "application/json" },
+        headers: { "Content-Type": "application/json" },
         body: JSON.stringify(body),
         ...signal ? { signal } : {}
       });
@@ -264529,12 +264467,13 @@ async function checkAvailability(token, targets, datetime, durationMinutes, sign
 function createGcalField() {
   return { commandId: "gcal", worker: new GcalWorker(), checker: new AlwaysPassChecker11() };
 }
-var GcalWorker, ADMIN_RESOURCES_BASE2, EMAIL_REGEX, AlwaysPassChecker11;
+var GcalWorker, EMAIL_REGEX, AlwaysPassChecker11;
 var init_gcal_field = __esm({
   "commands/google/gcal.field.ts"() {
     init_base2();
     init_google_oauth();
     init_date_tz();
+    init_admin_resources();
     GcalWorker = class extends LiteWorkerAgent {
       commandId = "gcal";
       help = {
@@ -264642,17 +264581,17 @@ var init_gcal_field = __esm({
               const resSub = (ctx.parsed.args?.[1] || "list").toLowerCase();
               if (resSub === "list") {
                 const buildingId = String(ctx.parsed.options.building || "").trim() || void 0;
-                return await listResources(token, buildingId, ctx.abortSignal);
+                return await fmtListResources(token, buildingId, ctx.abortSignal);
               }
               if (resSub === "get") {
                 const resourceId = String(ctx.parsed.args?.[2] || ctx.parsed.options.id || "").trim();
                 if (!resourceId) return { text: "gcal resources get: resourceId is required" };
-                return await getResource(token, resourceId, ctx.abortSignal);
+                return await fmtGetResource(token, resourceId, ctx.abortSignal);
               }
               if (resSub === "create") {
                 const name = String(ctx.parsed.options.name || "").trim();
                 if (!name) return { text: "gcal resources create: --name is required" };
-                return await createResource(token, {
+                return await fmtCreateResource(token, {
                   name,
                   buildingId: String(ctx.parsed.options.building || "").trim() || void 0,
                   capacity: Number(ctx.parsed.options.capacity || "0") || void 0,
@@ -264672,12 +264611,12 @@ var init_gcal_field = __esm({
             if (sub === "buildings") {
               const bldSub = (ctx.parsed.args?.[1] || "list").toLowerCase();
               if (bldSub === "list") {
-                return await listBuildings(token, ctx.abortSignal);
+                return await fmtListBuildings(token, ctx.abortSignal);
               }
               if (bldSub === "create") {
                 const name = String(ctx.parsed.options.name || "").trim();
                 if (!name) return { text: "gcal buildings create: --name is required" };
-                return await createBuilding(token, {
+                return await fmtCreateBuilding(token, {
                   name,
                   floors: String(ctx.parsed.options.floors || "").trim() || void 0,
                   description: String(ctx.parsed.options.description || "").trim() || void 0
@@ -264706,7 +264645,6 @@ var init_gcal_field = __esm({
         }
       ];
     };
-    ADMIN_RESOURCES_BASE2 = "https://admin.googleapis.com/admin/directory/v1/customer/my_customer/resources";
     EMAIL_REGEX = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
     AlwaysPassChecker11 = class extends LiteCheckerAgent {
       commandId = "gcal";
@@ -293291,152 +293229,38 @@ var init_phone_init_field = __esm({
 });
 
 // commands/resource-manager.field.ts
-async function gFetch3(token, url, opts) {
-  return fetch(url, {
-    ...opts,
-    headers: { Authorization: `Bearer ${token}`, ...opts?.headers || {} }
-  });
-}
-async function listBuildings2(token, _signal) {
-  const res = await gFetch3(token, `${ADMIN_RESOURCES_BASE3}/buildings?maxResults=500`);
-  if (!res.ok) {
-    return { text: `Resource Manager: Admin SDK error ${res.status}`, json: { ok: false, error: `Admin SDK: ${res.status}` } };
-  }
-  const data = await res.json();
-  const items = Array.isArray(data.buildings) ? data.buildings : [];
-  if (items.length === 0) {
-    return { text: "No buildings found.", json: { ok: true, buildings: [] } };
-  }
+function formatBuildingsTable(items) {
   const lines = ["## Buildings", ""];
   lines.push("| ID | Name | Floors | Description |");
   lines.push("|---|---|---|---|");
   for (const b of items) {
-    const floors = Array.isArray(b.floorNames) ? b.floorNames.join(", ") : "";
-    lines.push(`| ${b.buildingId || ""} | ${b.buildingName || ""} | ${floors} | ${b.description || ""} |`);
+    const floors = b.floorNames.join(", ");
+    lines.push(`| ${b.buildingId} | ${b.buildingName} | ${floors} | ${b.description} |`);
   }
   lines.push("", `Total: ${items.length} building(s)`);
-  return { text: lines.join("\n"), json: { ok: true, buildings: items } };
+  return lines.join("\n");
 }
-async function listResources2(token, buildingId, capacity, _signal) {
-  let url = `${ADMIN_RESOURCES_BASE3}/calendars?maxResults=500`;
-  const res = await gFetch3(token, url);
-  if (!res.ok) {
-    return { text: `Resource Manager: Admin SDK error ${res.status}`, json: { ok: false, error: `Admin SDK: ${res.status}` } };
-  }
-  const data = await res.json();
-  let items = Array.isArray(data.items) ? data.items : [];
-  if (buildingId) items = items.filter((r2) => String(r2.buildingId || "") === buildingId);
-  if (capacity) items = items.filter((r2) => Number(r2.capacity || 0) >= capacity);
-  if (items.length === 0) {
-    return { text: "No resources found.", json: { ok: true, resources: [] } };
-  }
+function formatResourcesTable(items) {
   const lines = ["## Calendar Resources", ""];
   lines.push("| Name | Building | Capacity | Type | Floor | Email |");
   lines.push("|---|---|---|---|---|---|");
   for (const r2 of items) {
-    lines.push(`| ${r2.resourceName || ""} | ${r2.buildingId || ""} | ${r2.capacity || ""} | ${r2.resourceType || ""} | ${r2.floorName || ""} | ${r2.resourceEmail || ""} |`);
+    lines.push(`| ${r2.resourceName} | ${r2.buildingId} | ${r2.capacity || ""} | ${r2.resourceType} | ${r2.floorName} | ${r2.resourceEmail} |`);
   }
   lines.push("", `Total: ${items.length} resource(s)`);
-  return { text: lines.join("\n"), json: { ok: true, resources: items } };
-}
-async function createBuilding2(token, name, floorsRaw, description, _signal) {
-  const buildingId = name.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "").slice(0, 40) || `bld-${Date.now()}`;
-  const body = { buildingId, buildingName: name };
-  if (description) body.description = description;
-  if (floorsRaw) {
-    const n = Number(floorsRaw);
-    if (!isNaN(n) && n > 0 && Number.isInteger(n)) {
-      body.floorNames = Array.from({ length: n }, (_, i2) => String(i2 + 1));
-    } else {
-      body.floorNames = floorsRaw.split(",").map((f3) => f3.trim()).filter(Boolean);
-    }
-  }
-  const res = await gFetch3(token, `${ADMIN_RESOURCES_BASE3}/buildings`, {
-    method: "POST",
-    headers: { "Content-Type": "application/json" },
-    body: JSON.stringify(body)
-  });
-  if (!res.ok) {
-    const errText = await res.text().catch(() => "");
-    if (res.status === 403) return { text: "Permission denied: Google Workspace admin privileges required.", json: { ok: false, error: "permission_denied" } };
-    return { text: `Failed to create building: ${res.status} ${errText}`, json: { ok: false, error: `Admin SDK: ${res.status}` } };
-  }
-  const created = await res.json();
-  return {
-    text: `Building created: ${created.buildingName} (${created.buildingId})`,
-    json: { ok: true, building: created }
-  };
-}
-async function createResource2(token, opts, _signal) {
-  const resourceId = opts.name.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "").slice(0, 40) || `res-${Date.now()}`;
-  const body = { resourceId, resourceName: opts.name, resourceType: opts.resourceType };
-  if (opts.buildingId) body.buildingId = opts.buildingId;
-  if (opts.capacity) body.capacity = opts.capacity;
-  if (opts.floorName) body.floorName = opts.floorName;
-  if (opts.description) body.resourceDescription = opts.description;
-  const res = await gFetch3(token, `${ADMIN_RESOURCES_BASE3}/calendars`, {
-    method: "POST",
-    headers: { "Content-Type": "application/json" },
-    body: JSON.stringify(body)
-  });
-  if (!res.ok) {
-    const errText = await res.text().catch(() => "");
-    if (res.status === 403) return { text: "Permission denied: Google Workspace admin privileges required.", json: { ok: false, error: "permission_denied" } };
-    return { text: `Failed to create resource: ${res.status} ${errText}`, json: { ok: false, error: `Admin SDK: ${res.status}` } };
-  }
-  const created = await res.json();
-  return {
-    text: `Resource created: ${created.resourceName} (${created.resourceEmail})`,
-    json: { ok: true, resource: created }
-  };
-}
-async function updateBuilding(token, buildingId, body, _signal) {
-  const res = await gFetch3(token, `${ADMIN_RESOURCES_BASE3}/buildings/${encodeURIComponent(buildingId)}`, {
-    method: "PATCH",
-    headers: { "Content-Type": "application/json" },
-    body: JSON.stringify(body)
-  });
-  if (!res.ok) {
-    const errText = await res.text().catch(() => "");
-    if (res.status === 403) return { text: "Permission denied: Google Workspace admin privileges required.", json: { ok: false, error: "permission_denied" } };
-    if (res.status === 404) return { text: `Building "${buildingId}" not found.`, json: { ok: false, error: "not_found" } };
-    return { text: `Failed to update building: ${res.status} ${errText}`, json: { ok: false, error: `Admin SDK: ${res.status}` } };
-  }
-  const updated = await res.json();
-  return {
-    text: `Building updated: ${updated.buildingName} (${updated.buildingId})`,
-    json: { ok: true, building: updated }
-  };
-}
-async function updateResource(token, resourceId, body, _signal) {
-  const res = await gFetch3(token, `${ADMIN_RESOURCES_BASE3}/calendars/${encodeURIComponent(resourceId)}`, {
-    method: "PATCH",
-    headers: { "Content-Type": "application/json" },
-    body: JSON.stringify(body)
-  });
-  if (!res.ok) {
-    const errText = await res.text().catch(() => "");
-    if (res.status === 403) return { text: "Permission denied: Google Workspace admin privileges required.", json: { ok: false, error: "permission_denied" } };
-    if (res.status === 404) return { text: `Resource "${resourceId}" not found.`, json: { ok: false, error: "not_found" } };
-    return { text: `Failed to update resource: ${res.status} ${errText}`, json: { ok: false, error: `Admin SDK: ${res.status}` } };
-  }
-  const updated = await res.json();
-  return {
-    text: `Resource updated: ${updated.resourceName} (${updated.resourceEmail})`,
-    json: { ok: true, resource: updated }
-  };
+  return lines.join("\n");
 }
 function createResourceManagerField() {
   const worker = new ResourceManagerWorker();
   const checker = new ResourceManagerChecker();
   return { worker, checker };
 }
-var ADMIN_RESOURCES_BASE3, ResourceManagerWorker, ResourceManagerChecker;
+var ResourceManagerWorker, ResourceManagerChecker;
 var init_resource_manager_field = __esm({
   "commands/resource-manager.field.ts"() {
     init_base2();
     init_google_oauth();
-    ADMIN_RESOURCES_BASE3 = "https://admin.googleapis.com/admin/directory/v1/customer/my_customer/resources";
+    init_admin_resources();
     ResourceManagerWorker = class extends LiteWorkerAgent {
       commandId = "resource-manager";
       help = {
@@ -293460,20 +293284,34 @@ var init_resource_manager_field = __esm({
             }
             const sub = (ctx.parsed.subcommand || ctx.parsed.args?.[0] || "buildings").toLowerCase();
             if (sub === "buildings" || sub === "list-buildings") {
-              return await listBuildings2(token, ctx.abortSignal);
+              const result = await listBuildingsRaw(token, ctx.abortSignal);
+              if (!result.ok) return { text: `Resource Manager: ${result.error}`, json: { ok: false, error: result.error } };
+              const items = result.data;
+              if (items.length === 0) return { text: "No buildings found.", json: { ok: true, buildings: [] } };
+              return { text: formatBuildingsTable(items), json: { ok: true, buildings: items } };
             }
             if (sub === "resources" || sub === "list-resources") {
               const buildingId = String(ctx.parsed.options.building || ctx.parsed.options.buildingId || "").trim() || void 0;
               const capacityRaw = String(ctx.parsed.options.capacity || "").trim();
               const capacity = capacityRaw ? Math.max(0, Number(capacityRaw) || 0) : void 0;
-              return await listResources2(token, buildingId, capacity, ctx.abortSignal);
+              const result = await listResourcesRaw(token, { buildingId, capacity }, ctx.abortSignal);
+              if (!result.ok) return { text: `Resource Manager: ${result.error}`, json: { ok: false, error: result.error } };
+              const items = result.data;
+              if (items.length === 0) return { text: "No resources found.", json: { ok: true, resources: [] } };
+              return { text: formatResourcesTable(items), json: { ok: true, resources: items } };
             }
             if (sub === "create-building") {
               const name = String(ctx.parsed.options.name || ctx.parsed.prompt || "").trim();
               if (!name) return { text: "resource-manager create-building: --name is required" };
               const floorsRaw = String(ctx.parsed.options.floors || "").trim();
               const description = String(ctx.parsed.options.description || "").trim() || void 0;
-              return await createBuilding2(token, name, floorsRaw, description, ctx.abortSignal);
+              const result = await createBuildingRaw(token, { name, floors: floorsRaw || void 0, description }, ctx.abortSignal);
+              if (!result.ok) {
+                if (result.error === "permission_denied") return { text: "Permission denied: Google Workspace admin privileges required.", json: { ok: false, error: "permission_denied" } };
+                return { text: `Failed to create building: ${result.error}`, json: { ok: false, error: result.error } };
+              }
+              const b = result.data;
+              return { text: `Building created: ${b.buildingName} (${b.buildingId})`, json: { ok: true, building: b } };
             }
             if (sub === "create-resource") {
               const name = String(ctx.parsed.options.name || ctx.parsed.prompt || "").trim();
@@ -293483,7 +293321,14 @@ var init_resource_manager_field = __esm({
               const resourceType = String(ctx.parsed.options.type || "CONFERENCE_ROOM").trim();
               const floorName = String(ctx.parsed.options.floor || "").trim() || void 0;
               const description = String(ctx.parsed.options.description || "").trim() || void 0;
-              return await createResource2(token, { name, buildingId, capacity, resourceType, floorName, description }, ctx.abortSignal);
+              const resourceId = slugify2(name, "res");
+              const result = await createResourceRaw(token, { name, resourceId, buildingId, capacity, resourceType, floorName, description }, ctx.abortSignal);
+              if (!result.ok) {
+                if (result.error === "permission_denied") return { text: "Permission denied: Google Workspace admin privileges required.", json: { ok: false, error: "permission_denied" } };
+                return { text: `Failed to create resource: ${result.error}`, json: { ok: false, error: result.error } };
+              }
+              const r2 = result.data;
+              return { text: `Resource created: ${r2.resourceName} (${r2.resourceEmail})`, json: { ok: true, resource: r2 } };
             }
             if (sub === "update-building") {
               const id = String(ctx.parsed.options.id || "").trim();
@@ -293492,18 +293337,18 @@ var init_resource_manager_field = __esm({
               const name = String(ctx.parsed.options.name || "").trim();
               if (name) body.buildingName = name;
               const floorsRaw = String(ctx.parsed.options.floors || "").trim();
-              if (floorsRaw) {
-                const n = Number(floorsRaw);
-                if (!isNaN(n) && n > 0 && Number.isInteger(n)) {
-                  body.floorNames = Array.from({ length: n }, (_, i2) => String(i2 + 1));
-                } else {
-                  body.floorNames = floorsRaw.split(",").map((f3) => f3.trim()).filter(Boolean);
-                }
-              }
+              if (floorsRaw) body.floorNames = parseFloorNames(floorsRaw);
               const description = String(ctx.parsed.options.description || "").trim();
               if (description) body.description = description;
               if (Object.keys(body).length === 0) return { text: "resource-manager update-building: at least one field to update is required (--name, --floors, --description)" };
-              return await updateBuilding(token, id, body, ctx.abortSignal);
+              const result = await updateBuildingRaw(token, id, body, ctx.abortSignal);
+              if (!result.ok) {
+                if (result.error === "permission_denied") return { text: "Permission denied: Google Workspace admin privileges required.", json: { ok: false, error: "permission_denied" } };
+                if (result.error === "not_found") return { text: `Building "${id}" not found.`, json: { ok: false, error: "not_found" } };
+                return { text: `Failed to update building: ${result.error}`, json: { ok: false, error: result.error } };
+              }
+              const b = result.data;
+              return { text: `Building updated: ${b.buildingName} (${b.buildingId})`, json: { ok: true, building: b } };
             }
             if (sub === "update-resource") {
               const id = String(ctx.parsed.options.id || "").trim();
@@ -293522,7 +293367,14 @@ var init_resource_manager_field = __esm({
               const description = String(ctx.parsed.options.description || "").trim();
               if (description) body.resourceDescription = description;
               if (Object.keys(body).length === 0) return { text: "resource-manager update-resource: at least one field to update is required" };
-              return await updateResource(token, id, body, ctx.abortSignal);
+              const result = await updateResourceRaw(token, id, body, ctx.abortSignal);
+              if (!result.ok) {
+                if (result.error === "permission_denied") return { text: "Permission denied: Google Workspace admin privileges required.", json: { ok: false, error: "permission_denied" } };
+                if (result.error === "not_found") return { text: `Resource "${id}" not found.`, json: { ok: false, error: "not_found" } };
+                return { text: `Failed to update resource: ${result.error}`, json: { ok: false, error: result.error } };
+              }
+              const r2 = result.data;
+              return { text: `Resource updated: ${r2.resourceName} (${r2.resourceEmail})`, json: { ok: true, resource: r2 } };
             }
             return { text: `resource-manager: unknown subcommand "${sub}". Use buildings, resources, create-building, create-resource, update-building, or update-resource.` };
           }

package/dist/ext.cjs

@@ -98004,7 +98004,7 @@ function resolvePackageJsonNearEntrypoint() {
 }
 function resolveMariaLiteVersionInfo() {
   const fallbackName = EXPECTED_PKG_NAME;
-  const fallbackVersion = String(process.env.MARIA_LITE_VERSION || "").trim() || "6.3.1";
+  const fallbackVersion = String(process.env.MARIA_LITE_VERSION || "").trim() || "6.3.2";
   const near = resolvePackageJsonNearEntrypoint();
   if (near) {
     const name = fallbackName;

package/origin/index.meta.json

@@ -1 +1 @@
-{"buildTimestamp":"2026-03-03T15:59:37.666Z","fileCount":952,"indexJsonlRelPath":"src-lite/origin/index.jsonl","schemaVersion":"maria_lite_origin_index_meta_v1","sourceDir":"src-lite/origin","textExtractedCount":952}
+{"buildTimestamp":"2026-03-03T20:12:12.348Z","fileCount":952,"indexJsonlRelPath":"src-lite/origin/index.jsonl","schemaVersion":"maria_lite_origin_index_meta_v1","sourceDir":"src-lite/origin","textExtractedCount":952}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bonginkan/maria-lite",
-  "version": "6.3.1",
+  "version": "6.3.2",
   "description": "MARIA-LITE: lightweight MARIA OS CLI (src-lite).",
   "license": "SEE LICENSE IN LICENSE",
   "author": "Bonginkan Inc.",