flyspace-cli 0.1.32 → 0.1.34

package/dist/{chunk-6YFDWUNF.js → chunk-KTMAS4TP.js}

@@ -102,6 +102,9 @@ function loadConfig() {
   const autoRespondChannelIds = new Set(
     (process.env["AUTO_RESPOND_CHANNEL_IDS"] ?? "").split(",").map((s) => s.trim()).filter(Boolean)
   );
+  const slackEnglishOnlyExemptChannelIds = new Set(
+    (process.env["SLACK_ENGLISH_ONLY_EXEMPT_CHANNEL_IDS"] ?? "").split(",").map((s) => s.trim()).filter(Boolean)
+  );
   const slack = slackConfigured();
   return {
     slackBotToken: slack ? requireEnv("SLACK_BOT_TOKEN") : void 0,
@@ -118,7 +121,9 @@ function loadConfig() {
     maxBudgetUsd: parseBudget(process.env["MAX_BUDGET_USD"]),
     ownerUserId,
     autoRespondChannelIds,
-    codexModel: process.env["CUSTIE_CODEX_MODEL"]?.trim() || DEFAULT_CODEX_MODEL
+    codexModel: process.env["CUSTIE_CODEX_MODEL"]?.trim() || DEFAULT_CODEX_MODEL,
+    slackEnglishOnly: process.env["SLACK_ENGLISH_ONLY"] === "true",
+    slackEnglishOnlyExemptChannelIds
   };
 }
 
@@ -290,6 +295,15 @@ function resolveLogicalCwd(p) {
 function isUnderLogicalRoot(cwd) {
   return [logicalRoot(), ...workspaceRoots.values()].some((r) => cwd.startsWith(r + sep));
 }
+function toLogicalCwd(cwd) {
+  const fromRoot = relative(logicalRoot(), cwd).split(sep).join("/");
+  if (isLogicalCwd(fromRoot)) return fromRoot;
+  for (const [slug, root] of workspaceRoots) {
+    const name = relative(root, cwd);
+    if (isLogicalCwd(`${slug}/${name}`)) return `${slug}/${name}`;
+  }
+  return cwd;
+}
 function ensureLogicalCwdDir(cwd) {
   if (!isUnderLogicalRoot(cwd) || existsSync2(cwd)) return;
   mkdirSync(cwd, { recursive: true });
@@ -356,6 +370,7 @@ function rowToChannel(row) {
     isDefault: row.is_default === true,
     profile: row.profile ?? "default",
     archivedAt: row.archived_at,
+    greetedAt: row.greeted_at,
     createdAt: row.created_at,
     updatedAt: row.updated_at
   };
@@ -516,7 +531,7 @@ function resolveEffort(explicitEffort, channelId, fallback) {
 function toRow(input) {
   const row = {};
   if (input.name !== void 0) row["name"] = input.name;
-  if (input.cwd !== void 0) row["cwd"] = isLogicalCwd(input.cwd) ? input.cwd : expandPath(input.cwd);
+  if (input.cwd !== void 0) row["cwd"] = isLogicalCwd(input.cwd) ? input.cwd : toLogicalCwd(expandPath(input.cwd));
   if (input.categoryId !== void 0) row["category_id"] = input.categoryId;
   if (input.externalChannelId !== void 0) row["external_channel_id"] = input.externalChannelId;
   if (input.model !== void 0) row["model"] = input.model;
@@ -616,6 +631,12 @@ async function updateChannelById(id, patch) {
   await refreshChannelRegistry();
   return rowToChannel(data);
 }
+async function markChannelGreeted(id) {
+  const { data, error } = await getSupabaseClient().from("channels").update({ greeted_at: (/* @__PURE__ */ new Date()).toISOString() }).eq("id", id).is("greeted_at", null).select("id");
+  if (error) throw new Error(error.message);
+  await refreshChannelRegistry();
+  return (data ?? []).length > 0;
+}
 async function updateChannelsMcpConnections(updates) {
   if (!updates.length) return;
   const supabase = getSupabaseClient();
@@ -2575,14 +2596,15 @@ var workspaceCache = /* @__PURE__ */ new Map();
 async function getWorkspaceBySlug(slug) {
   const cached = workspaceCache.get(slug);
   if (cached && cached.expiresAt > Date.now()) return cached.workspace;
-  const { data, error } = await getSupabaseClient().from("workspaces").select("id, slug, agent_connected_at, projects_setup_at, plan").eq("slug", slug).maybeSingle();
+  const { data, error } = await getSupabaseClient().from("workspaces").select("id, slug, agent_connected_at, projects_setup_at, plan, archived_at").eq("slug", slug).maybeSingle();
   if (error) throw new Error(`getWorkspaceBySlug(${slug}): ${error.message}`);
   const workspace = data ? {
     id: data.id,
     slug: data.slug,
     agentConnectedAt: data.agent_connected_at,
     projectsSetupAt: data.projects_setup_at,
-    plan: data.plan ?? null
+    plan: data.plan ?? null,
+    archivedAt: data.archived_at ?? null
   } : null;
   workspaceCache.set(slug, { workspace, expiresAt: Date.now() + WORKSPACE_CACHE_TTL_MS });
   return workspace;
@@ -2597,29 +2619,70 @@ async function listWorkspaces() {
   if (error) throw new Error(`listWorkspaces: ${error.message}`);
   return data ?? [];
 }
+var TRIAL_DAYS = 14;
 async function listWorkspaceSummaries() {
   const db = getSupabaseClient();
-  const [workspaces, settings, channels, memberships] = await Promise.all([
-    db.from("workspaces").select("id, slug"),
-    db.from("workspace_settings").select("profile, display_name"),
+  const [workspaces, settings, channels, memberships, activity] = await Promise.all([
+    db.from("workspaces").select("id, slug, created_at, agent_connected_at, plan, plan_status, archived_at"),
+    db.from("workspace_settings").select("profile, display_name, logo"),
     db.from("channels").select("profile").is("archived_at", null),
-    db.from("memberships").select("workspace_id").eq("status", "active")
+    db.from("memberships").select("workspace_id, user_id, email, handle, role, accepted_at").eq("status", "active").eq("is_support", false).order("invited_at", { ascending: true }),
+    db.rpc("workspace_last_activity")
   ]);
-  for (const r of [workspaces, settings, channels, memberships]) {
+  for (const r of [workspaces, settings, channels, memberships, activity]) {
     if (r.error) throw new Error(`listWorkspaceSummaries: ${r.error.message}`);
   }
   const displayNames = new Map(
     (settings.data ?? []).map((s) => [s.profile, s.display_name])
   );
+  const logos = new Map(
+    (settings.data ?? []).map((s) => [s.profile, s.logo])
+  );
+  const lastActivity = new Map(
+    (activity.data ?? []).map((a) => [
+      a.profile,
+      a.last_activity_at
+    ])
+  );
   const tally = (keys) => keys.reduce((m, k) => m.set(k, (m.get(k) ?? 0) + 1), /* @__PURE__ */ new Map());
   const channelCounts = tally((channels.data ?? []).map((c) => c.profile));
   const memberCounts = tally((memberships.data ?? []).map((m) => m.workspace_id));
-  return (workspaces.data ?? []).map((w) => ({
-    ...w,
-    displayName: displayNames.get(w.slug) || null,
-    channelCount: channelCounts.get(w.slug) ?? 0,
-    memberCount: memberCounts.get(w.id) ?? 0
-  }));
+  const owners = /* @__PURE__ */ new Map();
+  for (const m of memberships.data ?? []) {
+    if (m.role !== "admin" || owners.has(m.workspace_id)) continue;
+    owners.set(m.workspace_id, {
+      userId: m.user_id,
+      email: m.email,
+      handle: m.handle,
+      joinedAt: m.accepted_at ?? null
+    });
+  }
+  return (workspaces.data ?? []).map((w) => {
+    const createdAt = w.created_at;
+    const planStatus = w.plan_status ?? null;
+    return {
+      id: w.id,
+      slug: w.slug,
+      createdAt,
+      agentConnectedAt: w.agent_connected_at,
+      plan: w.plan ?? null,
+      planStatus,
+      trialEndsAt: planStatus === "trialing" ? new Date(new Date(createdAt).getTime() + TRIAL_DAYS * 864e5).toISOString() : null,
+      archivedAt: w.archived_at ?? null,
+      displayName: displayNames.get(w.slug) || null,
+      logo: logos.get(w.slug) || null,
+      channelCount: channelCounts.get(w.slug) ?? 0,
+      memberCount: memberCounts.get(w.id) ?? 0,
+      lastActivityAt: lastActivity.get(w.slug) ?? null,
+      owner: owners.get(w.id) ?? null
+    };
+  });
+}
+async function setWorkspaceArchived(workspaceId, archived) {
+  const { data, error } = await getSupabaseClient().from("workspaces").update({ archived_at: archived ? (/* @__PURE__ */ new Date()).toISOString() : null }).eq("id", workspaceId).select("slug");
+  if (error) throw new Error(`setWorkspaceArchived(${workspaceId}): ${error.message}`);
+  if (!data?.length) throw new Error("workspace not found");
+  for (const row of data) workspaceCache.delete(row.slug);
 }
 async function createWorkspace(slug) {
   const { data, error } = await getSupabaseClient().from("workspaces").insert({ slug }).select("id, slug").single();
@@ -5383,6 +5446,29 @@ async function forkThreadWithSummary(ctx, deps) {
   return { forked: true, newThreadTs };
 }
 
+// src/slack/reply-language.ts
+var CJK = /[぀-ヿ㐀-䶿一-鿿가-힯豈-﫿]/g;
+var CJK_THRESHOLD = 10;
+var REWRITE_PROMPT = "[system: this Slack channel is English-only. Your previous reply was NOT posted because it was not in English. Rewrite that same reply in English (en-AU spelling): same content, same structure, and keep any [BUTTONS: ...] marker with its labels translated. Do not run any tools and do not mention this rewrite. Output only the rewritten reply.]";
+function isEnglishOnlyChannel(config, channelId) {
+  return config.slackEnglishOnly && !config.slackEnglishOnlyExemptChannelIds.has(channelId);
+}
+function isNonEnglishReply(text) {
+  const prose = text.replace(/```[\s\S]*?```/g, "").replace(/`[^`\n]*`/g, "");
+  return (prose.match(CJK)?.length ?? 0) >= CJK_THRESHOLD;
+}
+async function enforceEnglishReply(text, rewrite) {
+  if (!isNonEnglishReply(text)) return text;
+  try {
+    const rewritten = await rewrite(REWRITE_PROMPT);
+    if (rewritten?.trim()) return rewritten;
+    console.error("[reply-language] rewrite returned nothing \u2014 posting the original");
+  } catch (err) {
+    console.error("[reply-language] rewrite failed \u2014 posting the original:", err);
+  }
+  return text;
+}
+
 // src/store/identity-map.ts
 function identityHandleFor(slackUserId) {
   const raw = process.env.SLACK_IDENTITY_MAP;
@@ -6549,7 +6635,12 @@ ${trimmedDetail.slice(0, 1500)}
         if (codexResponse.sessionId) {
           store.saveSession(channelId, sessionKey, codexResponse.sessionId, "codex");
         }
-        const { cleanedText: cleanedText2, buttons: buttons2 } = extractButtons(codexResponse.text);
+        const codexSessionId = codexResponse.sessionId;
+        const codexText = codexSessionId && isEnglishOnlyChannel(config, channelId) ? await enforceEnglishReply(codexResponse.text, async (p) => {
+          const r = await askCodex(p, cwd, codexOptions, codexSessionId);
+          return r.isError ? null : r.text;
+        }) : codexResponse.text;
+        const { cleanedText: cleanedText2, buttons: buttons2 } = extractButtons(codexText);
         const actionsBlock2 = buttons2 ? buildActionsBlock(buttons2) : null;
         const rtBlocks2 = markdownToBlocks(cleanedText2);
         const messages2 = rtBlocks2.length > 0 ? rtBlocks2.map((b) => ({ blocks: [b], text: blockToFallbackText(b) })) : splitMessage(toSlackMarkdown(cleanedText2)).map((text) => ({ text }));
@@ -6740,7 +6831,21 @@ retry:     ${retryDetail}`);
       } else {
         store.saveSession(channelId, sessionKey, resolved.sessionId);
       }
-      const { cleanedText, buttons } = extractButtons(resolved.text);
+      const replyText = !resolved.isError && resolved.sessionId && isEnglishOnlyChannel(config, channelId) ? await enforceEnglishReply(resolved.text, async (p) => {
+        const r = await askClaude(
+          p,
+          cwd,
+          botName,
+          askOptions,
+          claudeConfigDir,
+          resolved.sessionId,
+          claudeCodeOauthToken
+        );
+        if (r.isError) return null;
+        store.saveSession(channelId, sessionKey, r.sessionId);
+        return r.text;
+      }) : resolved.text;
+      const { cleanedText, buttons } = extractButtons(replyText);
       const actionsBlock = buttons ? buildActionsBlock(buttons) : null;
       const rtBlocks = markdownToBlocks(cleanedText);
       const messages = rtBlocks.length > 0 ? rtBlocks.map((b) => ({ blocks: [b], text: blockToFallbackText(b) })) : splitMessage(toSlackMarkdown(cleanedText)).map((text) => ({ text }));
@@ -6757,7 +6862,7 @@ retry:     ${retryDetail}`);
       }
       if (debug4) {
         console.log(
-          `[response] length=${resolved.text.length} messages=${messages.length} buttons=${buttons?.length ?? 0}`
+          `[response] length=${replyText.length} messages=${messages.length} buttons=${buttons?.length ?? 0}`
         );
       }
       await clearReaction();
@@ -8975,6 +9080,7 @@ export {
   createChannel,
   DefaultChannelError,
   updateChannelById,
+  markChannelGreeted,
   updateChannelsMcpConnections,
   ensureAgentDmChannel,
   ensureGeneralChannel,
@@ -9035,7 +9141,9 @@ export {
   getWorkspaceBySlug,
   getWorkspaceById,
   listWorkspaces,
+  TRIAL_DAYS,
   listWorkspaceSummaries,
+  setWorkspaceArchived,
   createWorkspace,
   deleteWorkspace,
   setWorkspaceStripeSubscription,