calendit 1.20260425.6 → 1.20260426.4

package/dist/commands/macos.js

@@ -7,9 +7,9 @@ import { writeStdoutLine } from "../core/logger.js";
 import { logger } from "../core/logger.js";
 import { ValidationError } from "../core/errors.js";
 import { t } from "../core/i18n.js";
-import { eventkitDoctorJson, eventkitListCalendarsJson, hasEventkitTransport, resolveEventkitHelperPath, } from "../core/eventkitHelper.js";
+import { eventkitDoctorJson, eventkitListCalendarsJson, hasEventkitTransport, resolveBridgeSocketPathForRun, resolveEventkitHelperPath, } from "../core/eventkitHelper.js";
 import { getDefaultEventkitFetchUrlFromEnv, getFetchedEventkitBridgePath, materializeEventkitBridgeFromNetwork, formatMebibytes, probeHttpArchiveSizeBytes, } from "../core/eventkitBridgeFetch.js";
-import { resolveEventkitBridgeAppBundlePath, resolveEventkitBridgeRepoPath, } from "../core/macosBridgeApp.js";
+import { installBuiltBridgeAppToSystemApplications, installBuiltBridgeAppToUserApplications, recordLastOpenedBridgeAppBundle, resolveEventkitBridgeAppBundlePath, resolveEventkitBridgeRepoPath, } from "../core/macosBridgeApp.js";
 import { loadConfigIfExists } from "./shared.js";
 import { buildMacosExternalShellLine, buildMacosTerminalSessionLine, openTerminalAndRunShellLine, } from "../core/macosTerminalRelay.js";
 const execFileAsync = promisify(execFile);
@@ -39,6 +39,47 @@ function isConnectFailure(msg) {
 function isInteractiveTty() {
     return Boolean(process.stdin.isTTY && process.stdout.isTTY);
 }
+/** ビルド済み `.app` を `~/Applications` と `/Applications` にコピー（失敗はログのみ）。`CALENDIT_BRIDGE_BUILD_SKIP_INSTALL=1` で無効化。 */
+async function finalizeBridgeInstallCopies(bridgeRoot) {
+    const bundlePath = path.join(bridgeRoot, ".build", "CalenditEventKitBridge.app");
+    if (!fs.existsSync(path.join(bundlePath, "Contents", "Info.plist"))) {
+        return;
+    }
+    if (process.env.CALENDIT_BRIDGE_BUILD_SKIP_INSTALL?.trim() === "1") {
+        logger.info(t("macos.bridge.buildCopySkipped"));
+        return;
+    }
+    const user = await installBuiltBridgeAppToUserApplications(bundlePath);
+    if (user.ok) {
+        logger.info(t("macos.bridge.buildCopyUserOk", { path: user.dest }));
+    }
+    else {
+        logger.warn(t("macos.bridge.buildCopyUserWarn", { message: user.message ?? "" }));
+    }
+    if (process.env.CALENDIT_BRIDGE_BUILD_SKIP_SYSTEM_APP?.trim() === "1") {
+        if (user.ok) {
+            recordLastOpenedBridgeAppBundle(user.dest);
+        }
+        else {
+            recordLastOpenedBridgeAppBundle(bundlePath);
+        }
+        return;
+    }
+    const sys = await installBuiltBridgeAppToSystemApplications(bundlePath);
+    if (sys.ok) {
+        logger.info(t("macos.bridge.buildCopySystemOk", { path: sys.dest }));
+        recordLastOpenedBridgeAppBundle(sys.dest);
+    }
+    else {
+        logger.warn(t("macos.bridge.buildCopySystemSkipped", { message: sys.message ?? "" }));
+        if (user.ok) {
+            recordLastOpenedBridgeAppBundle(user.dest);
+        }
+        else {
+            recordLastOpenedBridgeAppBundle(bundlePath);
+        }
+    }
+}
 /** Run `scripts/build-app-bundle.sh` in `bridgeRoot` and log success. */
 function runBridgeBuildFromRoot(bridgeRoot) {
     const script = path.join(bridgeRoot, "scripts/build-app-bundle.sh");
@@ -155,6 +196,7 @@ export function registerMacosCommands(program, deps) {
             await runBridgeBuildFromRoot(bridgeRoot);
             const outApp = path.join(bridgeRoot, ".build/CalenditEventKitBridge.app");
             logger.info(t("macos.bridge.buildOk", { path: outApp }));
+            await finalizeBridgeInstallCopies(bridgeRoot);
         }
         catch (e) {
             const message = e instanceof Error ? e.message : String(e);
@@ -181,6 +223,7 @@ export function registerMacosCommands(program, deps) {
             await runBridgeBuildFromRoot(bridgeRoot);
             const outApp = path.join(bridgeRoot, ".build/CalenditEventKitBridge.app");
             logger.info(t("macos.bridge.buildOk", { path: outApp }));
+            await finalizeBridgeInstallCopies(bridgeRoot);
         }
         catch (e) {
             const message = e instanceof Error ? e.message : String(e);
@@ -205,6 +248,7 @@ export function registerMacosCommands(program, deps) {
         }
         try {
             await execFileAsync("/usr/bin/open", [p], { shell: false });
+            recordLastOpenedBridgeAppBundle(p);
             logger.info(t("macos.bridge.opened", { path: p }));
         }
         catch (e) {
@@ -317,8 +361,19 @@ export function registerMacosCommands(program, deps) {
             writeStdoutLine("macOS のみ対応です。現在の OS では EventKit ヘルパーを使用できません。");
             return;
         }
+        const socketPath = resolveBridgeSocketPathForRun();
         const p = resolveEventkitHelperPath();
-        writeStdoutLine(`Helper path: ${p ?? "(not found, OK if using bridge only)"}`);
+        if (socketPath) {
+            writeStdoutLine(`EventKit bridge socket: ${socketPath}`);
+            const appPath = resolveEventkitBridgeAppBundlePath();
+            if (appPath) {
+                writeStdoutLine(t("macos.doctor.bridgeAppResolved", { path: appPath }));
+            }
+            else {
+                writeStdoutLine(t("macos.doctor.bridgeAppUnresolved"));
+            }
+        }
+        writeStdoutLine(`eventkit-helper: ${p ?? (socketPath ? "(not used — doctor uses the bridge above)" : "(not found — build from repo or set CALENDIT_EVENTKIT_HELPER)")}`);
         if (!hasEventkitTransport()) {
             writeStdoutLine("EventKit: no helper and no local bridge. Build helper or start CalenditEventKitBridge.app.");
             return;
@@ -328,7 +383,12 @@ export function registerMacosCommands(program, deps) {
             writeStdoutLine(JSON.stringify(j, null, 2));
             if (j.calendarAccess === "denied" && isLikelyIdeIntegratedTerminal()) {
                 writeStdoutLine("");
-                writeStdoutLine(t("macos.external.suggestionWhenDenied"));
+                if (j.transport === "bridge") {
+                    writeStdoutLine(t("macos.doctor.bridgeDeniedHint"));
+                }
+                else {
+                    writeStdoutLine(t("macos.external.suggestionWhenDenied"));
+                }
             }
         }
         catch (e) {

package/dist/commands/shared.js

@@ -2,8 +2,9 @@ import { GoogleCalendarService } from "../services/google.js";
 import { OutlookCalendarService } from "../services/outlook.js";
 import { MockCalendarService } from "../services/mock.js";
 import { MacosCalendarService } from "../services/macos.js";
-import { ConfigError } from "../core/errors.js";
+import { AuthError, ConfigError } from "../core/errors.js";
 import { t } from "../core/i18n.js";
+import { formatOutlookCacheUsernames, pickOutlookMsalAccount } from "../core/outlookAccountMatch.js";
 export async function loadConfigIfExists(config) {
     try {
         await config.load();
@@ -73,10 +74,16 @@ export async function getServiceForContext(deps, contextName) {
     }
     const pca = await auth.getOutlookClient(creds.id, creds.tenantId);
     const accounts = await pca.getTokenCache().getAllAccounts();
-    // Match by username (email) or homeAccountId; fall back to first account
-    const account = ctx.accountId
-        ? (accounts.find((a) => a.username === ctx.accountId || a.homeAccountId === ctx.accountId) ?? accounts[0])
-        : accounts[0];
+    if (accounts.length === 0) {
+        throw new AuthError(t("errors.service.outlookNoMsalAccounts"), t("errors.service.outlookNoMsalAccountsHint"));
+    }
+    const account = pickOutlookMsalAccount(accounts, ctx.accountId);
+    if (!account) {
+        throw new AuthError(t("errors.service.outlookAccountMismatch", {
+            expected: ctx.accountId.trim(),
+            cached: formatOutlookCacheUsernames(accounts),
+        }), t("errors.service.outlookAccountMismatchHint", { expected: ctx.accountId.trim() }));
+    }
     return {
         service: new OutlookCalendarService(pca, account),
         calendarId: ctx.calendarId,

package/dist/core/authStatus.d.ts

@@ -1,7 +1,7 @@
 import type { ContextConfig } from "../types/index.js";
 import type { OutlookCredentials } from "../types/index.js";
 import type { AuthManager } from "./auth.js";
-export type AuthTokenColumn = "OK" | "NOT LOGGED IN" | "EXPIRED" | "NOT CONFIGURED";
+export type AuthTokenColumn = "OK" | "NOT LOGGED IN" | "EXPIRED" | "NOT CONFIGURED" | "ACCOUNT MISMATCH";
 export interface AuthStatusRow {
     context: string;
     service: string;

package/dist/core/authStatus.js

@@ -1,5 +1,6 @@
 import * as fs from "fs/promises";
 import { getGoogleTokenFilePath } from "./config.js";
+import { pickOutlookMsalAccount } from "./outlookAccountMatch.js";
 /** `getServiceForContext` と同じトークンキー */
 export function googleTokenKeyForContext(contextName, ctx) {
     return contextName || ctx.accountId;
@@ -30,11 +31,13 @@ export async function evaluateOutlookToken(auth, creds, ctx) {
     if (accounts.length === 0) {
         return "NOT LOGGED IN";
     }
-    if (!ctx.accountId) {
+    if (!ctx.accountId?.trim()) {
         return "OK";
     }
-    const match = accounts.find((a) => a.username === ctx.accountId || a.homeAccountId === ctx.accountId);
-    return match ? "OK" : "NOT LOGGED IN";
+    const picked = pickOutlookMsalAccount(accounts, ctx.accountId);
+    if (picked)
+        return "OK";
+    return "ACCOUNT MISMATCH";
 }
 export function buildAuthStatusRows(contexts, deps) {
     const entries = Object.entries(contexts).sort(([a], [b]) => a.localeCompare(b));

package/dist/core/calenditInstallRoot.d.ts

@@ -0,0 +1,5 @@
+/**
+ * 実行中の `calendit` が属する npm パッケージのルート（`package.json` の `name` が `calendit` のディレクトリ）。
+ * `dist/` から親を辿って解決する。フル git クローンでは `native/` がこの下に付く。
+ */
+export declare function resolveCalenditPackageRootFromModule(): string | null;

package/dist/core/calenditInstallRoot.js

@@ -0,0 +1,31 @@
+import * as fs from "fs";
+import * as path from "path";
+import { fileURLToPath } from "url";
+/**
+ * 実行中の `calendit` が属する npm パッケージのルート（`package.json` の `name` が `calendit` のディレクトリ）。
+ * `dist/` から親を辿って解決する。フル git クローンでは `native/` がこの下に付く。
+ */
+export function resolveCalenditPackageRootFromModule() {
+    let dir = path.dirname(fileURLToPath(import.meta.url));
+    for (let i = 0; i < 20; i++) {
+        const pkg = path.join(dir, "package.json");
+        if (fs.existsSync(pkg)) {
+            try {
+                const raw = fs.readFileSync(pkg, "utf8");
+                const j = JSON.parse(raw);
+                if (j.name === "calendit") {
+                    return dir;
+                }
+            }
+            catch {
+                // ignore
+            }
+        }
+        const parent = path.dirname(dir);
+        if (parent === dir) {
+            return null;
+        }
+        dir = parent;
+    }
+    return null;
+}

package/dist/core/eventkitBridgeFetch.js

@@ -4,7 +4,7 @@ import { promisify } from "util";
 import * as fs from "fs";
 import * as path from "path";
 import { defaultCalenditDataDir } from "./eventkitHelper.js";
-import { resolveCalenditPackageRootFromModule } from "./macosBridgeApp.js";
+import { resolveCalenditPackageRootFromModule } from "./calenditInstallRoot.js";
 const execFileAsync = promisify(execFile);
 const fsp = fs.promises;
 /** Same `CALENDIT_CONFIG_DIR` rules as the bridge: fetched sources live under defaultCalenditDataDir. */

package/dist/core/eventkitHelper.d.ts

@@ -20,7 +20,7 @@ export declare function resolveBridgeSocketPathForRun(): string | null;
 export declare function resolveBridgeSocketPath(): string | null;
 /** true if a helper binary exists, or a bridge socket path is in use (explicit or auto). */
 export declare function hasEventkitTransport(): boolean;
-/** 優先: CALENDIT_EVENTKIT_HELPER → リポジトリ直下の release ビルド */
+/** 優先: CALENDIT_EVENTKIT_HELPER → cwd 配下の release → calendit パッケージルート配下（cwd が fetch 先などでもリポジトリ版を拾える） */
 export declare function resolveEventkitHelperPath(): string | null;
 /**
  * Run EventKit helper: **bridge** when a socket is resolved, else spawn `eventkit-helper`.

package/dist/core/eventkitHelper.js

@@ -3,6 +3,7 @@ import * as fs from "fs";
 import * as net from "net";
 import * as os from "os";
 import * as path from "path";
+import { resolveCalenditPackageRootFromModule } from "./calenditInstallRoot.js";
 import { t } from "./i18n.js";
 /** Same directory layout as native/eventkit-bridge (Swift). */
 export function defaultCalenditDataDir() {
@@ -298,7 +299,7 @@ async function runEventkitHelperSpawn(args, options) {
         });
     });
 }
-/** 優先: CALENDIT_EVENTKIT_HELPER → リポジトリ直下の release ビルド */
+/** 優先: CALENDIT_EVENTKIT_HELPER → cwd 配下の release → calendit パッケージルート配下（cwd が fetch 先などでもリポジトリ版を拾える） */
 export function resolveEventkitHelperPath() {
     const fromEnv = process.env.CALENDIT_EVENTKIT_HELPER?.trim();
     if (fromEnv && fs.existsSync(fromEnv)) {
@@ -308,6 +309,13 @@ export function resolveEventkitHelperPath() {
     if (fs.existsSync(rel)) {
         return rel;
     }
+    const pkgRoot = resolveCalenditPackageRootFromModule();
+    if (pkgRoot) {
+        const fromPkg = path.join(pkgRoot, "native", "eventkit-helper", ".build", "release", "eventkit-helper");
+        if (fs.existsSync(fromPkg)) {
+            return fromPkg;
+        }
+    }
     return null;
 }
 /**

package/dist/core/macosBridgeApp.d.ts

@@ -1,12 +1,24 @@
-/**
- * Directory of the installed `calendit` npm package (where package.json with name "calendit" lives), or null.
- * Used to locate `native/eventkit-bridge` in a full clone; absent from the published npm tarball.
- */
-export declare function resolveCalenditPackageRootFromModule(): string | null;
+/** Persist which `.app` calendit last opened or installed (helps doctor after cwd / helper path changes). */
+export declare function recordLastOpenedBridgeAppBundle(appPath: string): void;
+export { resolveCalenditPackageRootFromModule } from "./calenditInstallRoot.js";
 /** `native/eventkit-bridge` with `Package.swift` (source tree), or null. */
 export declare function resolveEventkitBridgeRepoPath(): string | null;
 /**
- * Resolve the CalenditEventKitBridge .app path for `calendit macos bridge start`.
- * Order: CALENDIT_EVENTKIT_BRIDGE_APP, ~/Applications, /Applications, repo .build (dev).
+ * Resolve the CalenditEventKitBridge .app path for `calendit macos bridge start` / doctor.
+ * Order: `CALENDIT_EVENTKIT_BRIDGE_APP`, then `/Applications` and `~/Applications` (stable TCC targets),
+ * then `Package.swift` 隣の `.build/`（fetch / clone / `CALENDIT_EVENTKIT_BRIDGE_ROOT`）,
+ * then cwd 配下の開発用 `.build/`, finally the path last recorded by `recordLastOpenedBridgeAppBundle` if still present.
  */
 export declare function resolveEventkitBridgeAppBundlePath(): string | null;
+/** `~/Applications/CalenditEventKitBridge.app` へ上書きコピー（TCC 用の安定パス向け）。 */
+export declare function installBuiltBridgeAppToUserApplications(sourceApp: string): Promise<{
+    ok: boolean;
+    dest: string;
+    message?: string;
+}>;
+/** `/Applications/CalenditEventKitBridge.app` へ上書きコピー（権限が無い場合は失敗し得る）。 */
+export declare function installBuiltBridgeAppToSystemApplications(sourceApp: string): Promise<{
+    ok: boolean;
+    dest: string;
+    message?: string;
+}>;

package/dist/core/macosBridgeApp.js

@@ -1,39 +1,42 @@
 import * as fs from "fs";
+import * as fsp from "fs/promises";
 import * as os from "os";
 import * as path from "path";
-import { fileURLToPath } from "url";
+import { resolveCalenditPackageRootFromModule } from "./calenditInstallRoot.js";
 import { defaultCalenditDataDir } from "./eventkitHelper.js";
 function isAppBundle(p) {
     return p.endsWith(".app") && fs.existsSync(path.join(p, "Contents/Info.plist"));
 }
-/**
- * Directory of the installed `calendit` npm package (where package.json with name "calendit" lives), or null.
- * Used to locate `native/eventkit-bridge` in a full clone; absent from the published npm tarball.
- */
-export function resolveCalenditPackageRootFromModule() {
-    let dir = path.dirname(fileURLToPath(import.meta.url));
-    for (let i = 0; i < 20; i++) {
-        const pkg = path.join(dir, "package.json");
-        if (fs.existsSync(pkg)) {
-            try {
-                const raw = fs.readFileSync(pkg, "utf8");
-                const j = JSON.parse(raw);
-                if (j.name === "calendit") {
-                    return dir;
-                }
-            }
-            catch {
-                // ignore
-            }
-        }
-        const parent = path.dirname(dir);
-        if (parent === dir) {
-            return null;
+/** Last bundle opened or installed by calendit (fallback when search paths miss). */
+const BRIDGE_BUNDLE_PATH_CACHE = "eventkit-bridge-bundle-path.txt";
+function readCachedBridgeAppBundlePath() {
+    const f = path.join(defaultCalenditDataDir(), BRIDGE_BUNDLE_PATH_CACHE);
+    try {
+        const raw = fs.readFileSync(f, "utf8").trim();
+        if (raw && isAppBundle(raw)) {
+            return raw;
         }
-        dir = parent;
+    }
+    catch {
+        /* missing or unreadable */
     }
     return null;
 }
+/** Persist which `.app` calendit last opened or installed (helps doctor after cwd / helper path changes). */
+export function recordLastOpenedBridgeAppBundle(appPath) {
+    const resolved = path.resolve(appPath);
+    if (!isAppBundle(resolved)) {
+        return;
+    }
+    try {
+        fs.mkdirSync(defaultCalenditDataDir(), { recursive: true });
+        fs.writeFileSync(path.join(defaultCalenditDataDir(), BRIDGE_BUNDLE_PATH_CACHE), `${resolved}\n`, "utf8");
+    }
+    catch {
+        /* best-effort */
+    }
+}
+export { resolveCalenditPackageRootFromModule } from "./calenditInstallRoot.js";
 /** `native/eventkit-bridge` with `Package.swift` (source tree), or null. */
 export function resolveEventkitBridgeRepoPath() {
     const override = process.env.CALENDIT_EVENTKIT_BRIDGE_ROOT?.trim();
@@ -59,25 +62,59 @@ export function resolveEventkitBridgeRepoPath() {
     return null;
 }
 /**
- * Resolve the CalenditEventKitBridge .app path for `calendit macos bridge start`.
- * Order: CALENDIT_EVENTKIT_BRIDGE_APP, ~/Applications, /Applications, repo .build (dev).
+ * Resolve the CalenditEventKitBridge .app path for `calendit macos bridge start` / doctor.
+ * Order: `CALENDIT_EVENTKIT_BRIDGE_APP`, then `/Applications` and `~/Applications` (stable TCC targets),
+ * then `Package.swift` 隣の `.build/`（fetch / clone / `CALENDIT_EVENTKIT_BRIDGE_ROOT`）,
+ * then cwd 配下の開発用 `.build/`, finally the path last recorded by `recordLastOpenedBridgeAppBundle` if still present.
  */
 export function resolveEventkitBridgeAppBundlePath() {
     const fromEnv = process.env.CALENDIT_EVENTKIT_BRIDGE_APP?.trim();
     if (fromEnv && isAppBundle(fromEnv)) {
-        return fromEnv;
+        return path.resolve(fromEnv);
+    }
+    const global = "/Applications/CalenditEventKitBridge.app";
+    if (isAppBundle(global)) {
+        return global;
     }
     const homeApps = path.join(os.homedir(), "Applications/CalenditEventKitBridge.app");
     if (isAppBundle(homeApps)) {
         return homeApps;
     }
-    const global = "/Applications/CalenditEventKitBridge.app";
-    if (isAppBundle(global)) {
-        return global;
+    const bridgeRoot = resolveEventkitBridgeRepoPath();
+    if (bridgeRoot) {
+        const fromRepoBuild = path.join(bridgeRoot, ".build", "CalenditEventKitBridge.app");
+        if (isAppBundle(fromRepoBuild)) {
+            return fromRepoBuild;
+        }
     }
     const dev = path.join(process.cwd(), "native/eventkit-bridge/.build/CalenditEventKitBridge.app");
     if (isAppBundle(dev)) {
         return dev;
     }
-    return null;
+    return readCachedBridgeAppBundlePath();
+}
+/** `~/Applications/CalenditEventKitBridge.app` へ上書きコピー（TCC 用の安定パス向け）。 */
+export async function installBuiltBridgeAppToUserApplications(sourceApp) {
+    const dest = path.join(os.homedir(), "Applications", "CalenditEventKitBridge.app");
+    try {
+        await fsp.mkdir(path.dirname(dest), { recursive: true });
+        await fsp.rm(dest, { recursive: true, force: true });
+        await fsp.cp(sourceApp, dest, { recursive: true, force: true });
+        return { ok: true, dest };
+    }
+    catch (e) {
+        return { ok: false, dest, message: e instanceof Error ? e.message : String(e) };
+    }
+}
+/** `/Applications/CalenditEventKitBridge.app` へ上書きコピー（権限が無い場合は失敗し得る）。 */
+export async function installBuiltBridgeAppToSystemApplications(sourceApp) {
+    const dest = "/Applications/CalenditEventKitBridge.app";
+    try {
+        await fsp.rm(dest, { recursive: true, force: true });
+        await fsp.cp(sourceApp, dest, { recursive: true, force: true });
+        return { ok: true, dest };
+    }
+    catch (e) {
+        return { ok: false, dest, message: e instanceof Error ? e.message : String(e) };
+    }
 }

package/dist/core/outlookAccountMatch.d.ts

@@ -0,0 +1,10 @@
+import type { AccountInfo } from "@azure/msal-node";
+/**
+ * MSAL キャッシュ上のアカウントが、コンテキストの `accountId`（メールまたは homeAccountId）に対応するか。
+ */
+export declare function outlookAccountMatchesConfig(account: AccountInfo, configAccountId: string): boolean;
+/**
+ * `accountId` 未指定のときは先頭アカウント。指定時は一致するもののみ（フォールバックしない）。
+ */
+export declare function pickOutlookMsalAccount(accounts: AccountInfo[], accountId: string | undefined): AccountInfo | undefined;
+export declare function formatOutlookCacheUsernames(accounts: AccountInfo[]): string;

package/dist/core/outlookAccountMatch.js

@@ -0,0 +1,30 @@
+function norm(s) {
+    return s.trim().toLowerCase();
+}
+/**
+ * MSAL キャッシュ上のアカウントが、コンテキストの `accountId`（メールまたは homeAccountId）に対応するか。
+ */
+export function outlookAccountMatchesConfig(account, configAccountId) {
+    const want = norm(configAccountId);
+    if (!want)
+        return false;
+    if (norm(account.username) === want)
+        return true;
+    if (account.homeAccountId && norm(account.homeAccountId) === want)
+        return true;
+    return false;
+}
+/**
+ * `accountId` 未指定のときは先頭アカウント。指定時は一致するもののみ（フォールバックしない）。
+ */
+export function pickOutlookMsalAccount(accounts, accountId) {
+    if (accounts.length === 0)
+        return undefined;
+    const id = accountId?.trim();
+    if (!id)
+        return accounts[0];
+    return accounts.find((a) => outlookAccountMatchesConfig(a, id));
+}
+export function formatOutlookCacheUsernames(accounts) {
+    return accounts.map((a) => a.username || a.homeAccountId || "(unknown)").join(", ");
+}

package/dist/generated/locale-keys.d.ts

@@ -1,3 +1,3 @@
 /** Generated by scripts/gen-locale-keys.mjs — do not edit by hand */
-export type LocaleKey = "common.hint" | "config.check.contexts" | "config.check.contextsNone" | "config.check.fileLine" | "config.check.googleNotSet" | "config.check.googleOk" | "config.check.header" | "config.check.outlookNotSet" | "config.check.outlookOk" | "config.check.uiLocale" | "config.cmd.contextDeleted" | "config.cmd.contextSaved" | "config.cmd.googleSaved" | "config.cmd.localeSet" | "config.cmd.macosTransportSet" | "config.cmd.outlookSaved" | "errors.api.prefix" | "errors.apiWithStatus" | "errors.auth.googleLoginHint" | "errors.auth.prefix" | "errors.config.fileNotFound" | "errors.config.fileNotFoundHint" | "errors.config.invalidFormat" | "errors.config.invalidFormatDetails" | "errors.config.prefix" | "errors.config.readFailed" | "errors.config.readFailedHint" | "errors.context.loadFailed" | "errors.context.loadFailedHint" | "errors.context.missing" | "errors.context.missingHint" | "errors.datetime.invalidFormat" | "errors.datetime.invalidParse" | "errors.datetime.invalidParseHint" | "errors.service.googleCredsNotSet" | "errors.service.googleCredsNotSetHint" | "errors.service.outlookCredsNotSet" | "errors.service.outlookCredsNotSetHint" | "errors.unknown" | "errors.validation.prefix" | "eventkit.bridge.bridgeError" | "eventkit.bridge.closedWithoutResponse" | "eventkit.bridge.connectFailed" | "eventkit.bridge.hintStartBridge" | "eventkit.bridge.invalidJson" | "eventkit.bridge.timeout" | "eventkit.bridge.tokenMissing" | "eventkit.helper.exitCode" | "eventkit.helper.hintBuild" | "eventkit.helper.missing" | "eventkit.helper.timeout" | "locale.bootstrap.choiceEn" | "locale.bootstrap.choiceJa" | "locale.bootstrap.prompt" | "macos.bridge.buildFailed" | "macos.bridge.buildNoSource" | "macos.bridge.buildOk" | "macos.bridge.fetchBuildPrompt" | "macos.bridge.fetchCancel" | "macos.bridge.fetchConfirm" | "macos.bridge.fetchFailed" | "macos.bridge.fetchIntro" | "macos.bridge.fetchNoTty" | "macos.bridge.fetchOk" | "macos.bridge.fetchPlan" | "macos.bridge.fetchSizeKnown" | "macos.bridge.fetchSizeUnknown" | "macos.bridge.fetchSkipsExisting" | "macos.bridge.notFound" | "macos.bridge.openFailed" | "macos.bridge.opened" | "macos.external.badSub" | "macos.external.badSubHint" | "macos.external.jsonOnlyForList" | "macos.external.onlyDarwin" | "macos.external.opened" | "macos.external.osascriptFailed" | "macos.external.suggestionWhenDenied" | "macos.setup.canceled" | "macos.setup.contextName" | "macos.setup.contextNameRequired" | "macos.setup.noCalendars" | "macos.setup.noTransport" | "macos.setup.notDarwin" | "macos.setup.pickCalendar" | "macos.setup.saved" | "macos.setup.startBridgePrompt" | "macos.setup.tcc";
+export type LocaleKey = "common.hint" | "config.check.contexts" | "config.check.contextsNone" | "config.check.fileLine" | "config.check.googleNotSet" | "config.check.googleOk" | "config.check.header" | "config.check.outlookNotSet" | "config.check.outlookOk" | "config.check.uiLocale" | "config.cmd.contextDeleted" | "config.cmd.contextSaved" | "config.cmd.googleSaved" | "config.cmd.localeSet" | "config.cmd.macosTransportSet" | "config.cmd.outlookSaved" | "errors.api.prefix" | "errors.apiWithStatus" | "errors.auth.googleLoginHint" | "errors.auth.prefix" | "errors.config.fileNotFound" | "errors.config.fileNotFoundHint" | "errors.config.invalidFormat" | "errors.config.invalidFormatDetails" | "errors.config.prefix" | "errors.config.readFailed" | "errors.config.readFailedHint" | "errors.context.loadFailed" | "errors.context.loadFailedHint" | "errors.context.missing" | "errors.context.missingHint" | "errors.datetime.invalidFormat" | "errors.datetime.invalidParse" | "errors.datetime.invalidParseHint" | "errors.service.googleCredsNotSet" | "errors.service.googleCredsNotSetHint" | "errors.service.outlookAccountMismatch" | "errors.service.outlookAccountMismatchHint" | "errors.service.outlookCredsNotSet" | "errors.service.outlookCredsNotSetHint" | "errors.service.outlookNoMsalAccounts" | "errors.service.outlookNoMsalAccountsHint" | "errors.unknown" | "errors.validation.prefix" | "eventkit.bridge.bridgeError" | "eventkit.bridge.closedWithoutResponse" | "eventkit.bridge.connectFailed" | "eventkit.bridge.hintStartBridge" | "eventkit.bridge.invalidJson" | "eventkit.bridge.timeout" | "eventkit.bridge.tokenMissing" | "eventkit.helper.exitCode" | "eventkit.helper.hintBuild" | "eventkit.helper.missing" | "eventkit.helper.timeout" | "locale.bootstrap.choiceEn" | "locale.bootstrap.choiceJa" | "locale.bootstrap.prompt" | "macos.bridge.buildCopySkipped" | "macos.bridge.buildCopySystemOk" | "macos.bridge.buildCopySystemSkipped" | "macos.bridge.buildCopyUserOk" | "macos.bridge.buildCopyUserWarn" | "macos.bridge.buildFailed" | "macos.bridge.buildNoSource" | "macos.bridge.buildOk" | "macos.bridge.fetchBuildPrompt" | "macos.bridge.fetchCancel" | "macos.bridge.fetchConfirm" | "macos.bridge.fetchFailed" | "macos.bridge.fetchIntro" | "macos.bridge.fetchNoTty" | "macos.bridge.fetchOk" | "macos.bridge.fetchPlan" | "macos.bridge.fetchSizeKnown" | "macos.bridge.fetchSizeUnknown" | "macos.bridge.fetchSkipsExisting" | "macos.bridge.notFound" | "macos.bridge.openFailed" | "macos.bridge.opened" | "macos.doctor.bridgeAppResolved" | "macos.doctor.bridgeAppUnresolved" | "macos.doctor.bridgeDeniedHint" | "macos.external.badSub" | "macos.external.badSubHint" | "macos.external.jsonOnlyForList" | "macos.external.onlyDarwin" | "macos.external.opened" | "macos.external.osascriptFailed" | "macos.external.suggestionWhenDenied" | "macos.setup.canceled" | "macos.setup.contextName" | "macos.setup.contextNameRequired" | "macos.setup.noCalendars" | "macos.setup.noTransport" | "macos.setup.notDarwin" | "macos.setup.pickCalendar" | "macos.setup.saved" | "macos.setup.startBridgePrompt" | "macos.setup.tcc";
 export declare const LOCALE_KEYS: readonly LocaleKey[];

package/dist/generated/locale-keys.js

@@ -35,8 +35,12 @@ export const LOCALE_KEYS = [
     "errors.datetime.invalidParseHint",
     "errors.service.googleCredsNotSet",
     "errors.service.googleCredsNotSetHint",
+    "errors.service.outlookAccountMismatch",
+    "errors.service.outlookAccountMismatchHint",
     "errors.service.outlookCredsNotSet",
     "errors.service.outlookCredsNotSetHint",
+    "errors.service.outlookNoMsalAccounts",
+    "errors.service.outlookNoMsalAccountsHint",
     "errors.unknown",
     "errors.validation.prefix",
     "eventkit.bridge.bridgeError",
@@ -53,6 +57,11 @@ export const LOCALE_KEYS = [
     "locale.bootstrap.choiceEn",
     "locale.bootstrap.choiceJa",
     "locale.bootstrap.prompt",
+    "macos.bridge.buildCopySkipped",
+    "macos.bridge.buildCopySystemOk",
+    "macos.bridge.buildCopySystemSkipped",
+    "macos.bridge.buildCopyUserOk",
+    "macos.bridge.buildCopyUserWarn",
     "macos.bridge.buildFailed",
     "macos.bridge.buildNoSource",
     "macos.bridge.buildOk",
@@ -70,6 +79,9 @@ export const LOCALE_KEYS = [
     "macos.bridge.notFound",
     "macos.bridge.openFailed",
     "macos.bridge.opened",
+    "macos.doctor.bridgeAppResolved",
+    "macos.doctor.bridgeAppUnresolved",
+    "macos.doctor.bridgeDeniedHint",
     "macos.external.badSub",
     "macos.external.badSubHint",
     "macos.external.jsonOnlyForList",

package/dist/locales/en.json

@@ -26,7 +26,11 @@
       "googleCredsNotSet": "Google credentials are not set.",
       "googleCredsNotSetHint": "Run `calendit config set-google --id <id> --secret <secret>`.",
       "outlookCredsNotSet": "Outlook credentials are not set.",
-      "outlookCredsNotSetHint": "Run `calendit config set-outlook --id <id>`."
+      "outlookCredsNotSetHint": "Run `calendit config set-outlook --id <id>`.",
+      "outlookNoMsalAccounts": "No Outlook sign-in found in the MSAL cache.",
+      "outlookNoMsalAccountsHint": "Run `calendit auth login outlook --set <context>`.",
+      "outlookAccountMismatch": "No cached Outlook account matches context accountId \"{expected}\". Cached usernames: {cached}",
+      "outlookAccountMismatchHint": "In the browser sign-in UI, choose \"{expected}\" and run `calendit auth login outlook --set <context>` again. You may have signed in with a different Microsoft account."
     },
     "context": {
       "missing": "Context '{name}' was not found.",
@@ -87,9 +91,14 @@
     "bridge": {
       "openFailed": "Could not open the bridge app: {message}.",
       "opened": "Launched {path}. Wait a few seconds, then run: calendit macos doctor",
-      "notFound": "CalenditEventKitBridge.app not found. Install a release, use Homebrew when available, or in a full clone run: calendit macos bridge build — then: calendit macos bridge start",
+      "notFound": "CalenditEventKitBridge.app not found. After `calendit macos bridge fetch` + `bridge build`, `.build` under the bridge root and ~/Applications are searched automatically. Otherwise install a release, use Homebrew when available, or run `bridge build` then `macos bridge start`.",
       "buildNoSource": "EventKit bridge sources are not available next to this install. Use a full git clone, or set CALENDIT_EVENTKIT_BRIDGE_ROOT to your native/eventkit-bridge directory.",
       "buildOk": "Build finished. App bundle: {path}",
+      "buildCopySkipped": "Skipping post-build copy to Applications (CALENDIT_BRIDGE_BUILD_SKIP_INSTALL=1).",
+      "buildCopyUserOk": "Copied bridge .app to {path} (usable from `calendit macos bridge start`).",
+      "buildCopyUserWarn": "Could not copy to ~/Applications: {message}",
+      "buildCopySystemOk": "Copied bridge .app to {path}",
+      "buildCopySystemSkipped": "Skipped copy to /Applications ({message}). Copy manually or use sudo if you need it there.",
       "buildFailed": "EventKit bridge build failed: {message}",
       "fetchIntro": "Download the calendit repository snapshot from GitHub, extract only native/eventkit-bridge, and place it under your calendit data directory (next to the bridge token when using the default location). A Swift build (see next step) will compile CalenditEventKitBridge.app.",
       "fetchPlan": "• Source archive: {url}\n• Approx. download size: {sizeLine}\n• Extract to: {dest}\n• Then (optional) run the Swift build to create the .app under .build/ in that folder.",
@@ -115,6 +124,11 @@
       "startBridgePrompt": "The bridge does not seem to be running. Open CalenditEventKitBridge.app now?",
       "canceled": "Setup canceled."
     },
+    "doctor": {
+      "bridgeDeniedHint": "Using the bridge, but calendar access is denied. Check System Settings → Privacy & Security → Calendars and grant **CalenditEventKitBridge** full access (TCC applies to the .app, not this terminal).",
+      "bridgeAppResolved": "CalenditEventKitBridge.app (same resolution as `macos bridge start`): {path}",
+      "bridgeAppUnresolved": "CalenditEventKitBridge.app: could not resolve a bundle path (run `macos bridge build` / `bridge start`, or set CALENDIT_EVENTKIT_BRIDGE_APP)."
+    },
     "external": {
       "onlyDarwin": "macOS only.",
       "badSub": "Subcommand must be `doctor`, `list-calendars`, or `shell`.",

package/dist/locales/ja.json

@@ -26,7 +26,11 @@
       "googleCredsNotSet": "Google の認証情報が未設定です。",
       "googleCredsNotSetHint": "`calendit config set-google --id <id> --secret <secret>` を実行してください。",
       "outlookCredsNotSet": "Outlook の認証情報が未設定です。",
-      "outlookCredsNotSetHint": "`calendit config set-outlook --id <id>` を先に実行してください。"
+      "outlookCredsNotSetHint": "`calendit config set-outlook --id <id>` を先に実行してください。",
+      "outlookNoMsalAccounts": "Outlook 用のサインイン情報が MSAL キャッシュにありません。",
+      "outlookNoMsalAccountsHint": "`calendit auth login outlook --set <コンテキスト名>` を実行してください。",
+      "outlookAccountMismatch": "コンテキストの accountId「{expected}」に一致する Outlook アカウントがキャッシュにありません。現在キャッシュされているユーザー名: {cached}",
+      "outlookAccountMismatchHint": "ブラウザのサインイン画面で「{expected}」を選び直して `calendit auth login outlook --set <コンテキスト名>` を再実行してください。別の Microsoft アカウントでログインしている可能性があります。"
     },
     "context": {
       "missing": "コンテキスト '{name}' が見つかりません。",
@@ -87,9 +91,14 @@
     "bridge": {
       "openFailed": "ブリッジ app を起動できません: {message}",
       "opened": "起動しました: {path}。数秒待ってから: calendit macos doctor",
-      "notFound": "CalenditEventKitBridge.app が見つかりません。配布 / Homebrew を使うか、完全なクローン上で: calendit macos bridge build — 次に: calendit macos bridge start",
+      "notFound": "CalenditEventKitBridge.app が見つかりません。`calendit macos bridge fetch` + `bridge build` 後は `.build` や ~/Applications を自動検出します。未ビルドなら配布 / Homebrew、またはクローンで `bridge build` のうえ `macos bridge start` を。",
       "buildNoSource": "EventKit ブリッジのソースがこのインストール近くにありません。git クローン一式を使うか、CALENDIT_EVENTKIT_BRIDGE_ROOT に native/eventkit-bridge を指定するか、**calendit macos bridge fetch** で取得できます。",
       "buildOk": "ビルドが完了しました。{path}",
+      "buildCopySkipped": "環境変数により、ビルド後の Applications へのコピーをスキップしました。",
+      "buildCopyUserOk": "ブリッジ .app をコピーしました: {path}（`calendit macos bridge start` から利用できます）。",
+      "buildCopyUserWarn": "~/Applications へのコピーに失敗しました: {message}",
+      "buildCopySystemOk": "ブリッジ .app をコピーしました: {path}",
+      "buildCopySystemSkipped": "/Applications へのコピーをスキップしました（権限など: {message}）。必要なら手動でコピーするか、`sudo` で同パスへ配置してください。",
       "buildFailed": "EventKit ブリッジのビルドに失敗しました: {message}",
       "fetchIntro": "GitHub 上の calendit リポジトリのスナップショットを取り、**native/eventkit-bridge だけ**を、既定の calendit データ領域（通常は `~/Library/Application Support/calendit/` 配下）に展開します。次のステップで Swift により CalenditEventKitBridge.app をビルドします。",
       "fetchPlan": "• 取得元: {url}\n• おおよそのダウンロード量: {sizeLine}\n• 展開先: {dest}\n• その後（任意）同フォルダで Swift ビルドを実行し、`.build/CalenditEventKitBridge.app` を作ります。",
@@ -115,6 +124,11 @@
       "startBridgePrompt": "ブリッジが起動していない可能性があります。CalenditEventKitBridge.app を開きますか？",
       "canceled": "セットアップを中止しました。"
     },
+    "doctor": {
+      "bridgeDeniedHint": "ブリッジ経由ですがカレンダーが拒否されています。システム設定 → プライバシーとセキュリティ → カレンダー で **CalenditEventKitBridge** のフルアクセスを確認してください（このターミナルではなく .app 側の許可です）。",
+      "bridgeAppResolved": "CalenditEventKitBridge.app（`macos bridge start` と同じ候補解決）: {path}",
+      "bridgeAppUnresolved": "CalenditEventKitBridge.app: 候補を解決できませんでした（`macos bridge build` / `bridge start`、または CALENDIT_EVENTKIT_BRIDGE_APP を設定してください）。"
+    },
     "external": {
       "onlyDarwin": "macOS のみ対応です。",
       "badSub": "サブコマンドは `doctor` / `list-calendars` / `shell` です。",

package/dist/services/outlook.js

@@ -2,6 +2,11 @@ import { AbstractCalendarService } from "./base.js";
 import { ApiError, AuthError } from "../core/errors.js";
 import { logger } from "../core/logger.js";
 import { graphCalendarItemToCalendarInfo, mergeOutlookCalendarsFirstWins } from "../core/outlookCalendarList.js";
+const CALENDAR_LIST_PAGE_SIZE = 100;
+function withListTop(path) {
+    const sep = path.includes("?") ? "&" : "?";
+    return `${path}${sep}$top=${CALENDAR_LIST_PAGE_SIZE}`;
+}
 export class OutlookCalendarService extends AbstractCalendarService {
     pca;
     account;
@@ -83,15 +88,21 @@ export class OutlookCalendarService extends AbstractCalendarService {
     }
     async listCalendars() {
         const layers = [];
-        const topLevel = await this.requestPaginatedList("/me/calendars");
+        const topLevel = await this.requestPaginatedList(withListTop("/me/calendars"));
         layers.push(topLevel.map((item) => graphCalendarItemToCalendarInfo(item)));
-        const groups = await this.requestPaginatedList("/me/calendarGroups");
+        const groups = await this.requestPaginatedList(withListTop("/me/calendarGroups"));
         for (const group of groups) {
             const groupId = group.id;
-            const inGroup = await this.requestPaginatedList(`/me/calendarGroups/${encodeURIComponent(groupId)}/calendars`);
+            const inGroup = await this.requestPaginatedList(withListTop(`/me/calendarGroups/${encodeURIComponent(groupId)}/calendars`));
             layers.push(inGroup.map((item) => graphCalendarItemToCalendarInfo(item)));
         }
-        return mergeOutlookCalendarsFirstWins(layers);
+        const merged = mergeOutlookCalendarsFirstWins(layers);
+        logger.debug("Outlook listCalendars merged", {
+            layerSizes: layers.map((l) => l.length),
+            mergedCount: merged.length,
+            names: merged.map((c) => c.name),
+        });
+        return merged;
     }
     async createCalendar(name) {
         const data = await this.request("/me/calendars", {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "calendit",
-  "version": "1.20260425.06",
+  "version": "1.20260426.4",
   "description": "Terminal-based calendar management tool for Google Calendar, Outlook, and macOS Calendar (EventKit) via CLI",
   "type": "module",
   "main": "dist/index.js",
@@ -19,7 +19,7 @@
     "gen:locales": "node scripts/gen-locale-keys.mjs",
     "check:locales": "node scripts/check-locale-parity.mjs",
     "build": "npm run gen:locales && tsc && node scripts/copy-locales.mjs",
-    "test": "npm run build && node --test tests/unit/outlook-calendar-merge.test.mjs && node --loader ts-node/esm src/test_runner.ts",
+    "test": "npm run build && node --test tests/unit/outlook-calendar-merge.test.mjs tests/unit/outlook-account-match.test.mjs && node --loader ts-node/esm src/test_runner.ts",
     "prepack": "npm test",
     "pack:check": "npm pack --dry-run",
     "ux:link": "npm run build && npm link"