pinglet-cli 0.5.4 → 0.6.1

package/dist/commands/login.js

@@ -40,6 +40,7 @@ const readline = __importStar(require("readline"));
 const config_1 = require("../config");
 const api_1 = require("../api");
 const i18n_1 = require("../i18n");
+const lock_1 = require("../lock");
 const LOGIN_TIMEOUT_MS = 180_000;
 function prompt(question) {
     const rl = readline.createInterface({
@@ -58,7 +59,9 @@ function openBrowser(url) {
             ? ["cmd", "/c", "start", "", url]
             : ["xdg-open", url];
     try {
-        (0, child_process_1.spawn)(cmd[0], cmd.slice(1), { stdio: "ignore" }).unref();
+        const child = (0, child_process_1.spawn)(cmd[0], cmd.slice(1), { stdio: "ignore" });
+        child.on("error", () => { });
+        child.unref();
         return true;
     }
     catch {
@@ -106,7 +109,7 @@ function loginViaLoopback(apiBaseUrl, provider, quiet) {
             resolve(token);
         };
         const timer = setTimeout(() => done(null), LOGIN_TIMEOUT_MS);
-        const server = http.createServer((req, res) => {
+        const server = http.createServer(async (req, res) => {
             const url = new URL(req.url ?? "/", "http://127.0.0.1");
             if (url.pathname !== "/callback") {
                 res.statusCode = 404;
@@ -115,8 +118,11 @@ function loginViaLoopback(apiBaseUrl, provider, quiet) {
             }
             const token = url.searchParams.get("token");
             res.setHeader("content-type", "text/html; charset=utf-8");
-            res.end(RESULT_HTML(Boolean(token)));
-            done(token);
+            const valid = Boolean(token) && await (0, api_1.validateUserToken)({ apiBaseUrl }, token);
+            res.statusCode = valid ? 200 : 401;
+            res.end(RESULT_HTML(valid));
+            if (valid)
+                done(token);
         });
         server.on("error", () => done(null));
         server.listen(0, "127.0.0.1", () => {
@@ -172,8 +178,24 @@ async function runLogin(args) {
             process.exitCode = 1;
         return;
     }
+    if (!await (0, api_1.validateUserToken)(config, token)) {
+        console.log((0, i18n_1.t)("login.invalidToken"));
+        if (!quiet)
+            process.exitCode = 1;
+        return;
+    }
+    if (config.userToken && config.userToken !== token) {
+        if (!await (0, api_1.releaseCredential)(config, "user", config.userToken)) {
+            throw new Error((0, i18n_1.t)("logout.failed"));
+        }
+    }
+    await (0, lock_1.withPingletLock)(() => {
+        // Hooks may have added adapter restoration metadata while OAuth was open.
+        const current = (0, config_1.loadConfig)();
+        current.userToken = token;
+        (0, config_1.saveConfig)(current);
+    });
     config.userToken = token;
-    (0, config_1.saveConfig)(config);
     console.log((0, i18n_1.t)("login.saved"));
     for (const [agentType, record] of Object.entries(config.installations)) {
         const linked = await (0, api_1.linkInstallation)(config, record.token);

package/dist/commands/logout.js

@@ -3,18 +3,30 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.runLogout = runLogout;
 const config_1 = require("../config");
 const i18n_1 = require("../i18n");
+const api_1 = require("../api");
+const lock_1 = require("../lock");
 /**
- * `pinglet logout` — 로컬에 저장된 로그인 토큰만 지운다.
- * 통합 설정·installation·캐시는 그대로라 읽기는 계속 되고, 다시 `pinglet login`으로
- * 다른 계정(GitHub/Google)을 연결할 수 있다. 서버 측 토큰 폐기는 하지 않는다 (JWT 만료까지 유효).
+ * Revoke the user session and unlink this device's installations before
+ * removing local credentials. On failure preserve credentials for retry.
  */
-function runLogout() {
+async function runLogout() {
     const config = (0, config_1.loadConfig)();
+    for (const record of Object.values(config.installations)) {
+        if (!await (0, api_1.releaseCredential)(config, "unlink", record.token)) {
+            throw new Error((0, i18n_1.t)("logout.failed"));
+        }
+    }
     if (!config.userToken) {
         console.log((0, i18n_1.t)("logout.notLoggedIn"));
         return;
     }
-    delete config.userToken;
-    (0, config_1.saveConfig)(config);
+    if (!await (0, api_1.releaseCredential)(config, "user", config.userToken)) {
+        throw new Error((0, i18n_1.t)("logout.failed"));
+    }
+    await (0, lock_1.withPingletLock)(() => {
+        const current = (0, config_1.loadConfig)();
+        delete current.userToken;
+        (0, config_1.saveConfig)(current);
+    });
     console.log((0, i18n_1.t)("logout.done"));
 }

package/dist/commands/notify.js

@@ -1,4 +1,37 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runNotify = runNotify;
 const child_process_1 = require("child_process");
@@ -6,12 +39,16 @@ const cache_1 = require("../cache");
 const picker_1 = require("../picker");
 const queue_1 = require("../queue");
 const runtime_1 = require("../runtime");
+const fs = __importStar(require("fs"));
+const config_1 = require("../config");
 /**
  * Codex CLI notify hook 진입점 (experimental).
  * Codex는 turn 완료 시 마지막 인자로 notification JSON을 넘긴다.
  * notify 프로세스는 TUI 밖에서 돌기 때문에 MVP에서는 macOS 알림으로 Ping을 전달한다.
  */
-function runNotify(args) {
+function runNotify(args, eventId) {
+    if (!fs.existsSync(config_1.CONFIG_PATH) || !(0, config_1.loadConfig)().adapters.codex)
+        return;
     let notificationType;
     try {
         const payload = JSON.parse(args[args.length - 1] ?? "");
@@ -31,7 +68,7 @@ function runNotify(args) {
         (0, cache_1.saveState)(state);
         return;
     }
-    (0, queue_1.appendEvent)({ agentType: "CODEX", type: "DELIVERED", messageId: message.id });
+    (0, queue_1.appendEvent)({ eventId, agentType: "CODEX", type: "DELIVERED", messageId: message.id });
     state.seen[message.id] = (state.seen[message.id] ?? 0) + 1;
     (0, runtime_1.runMaintenance)(state, now);
     (0, cache_1.saveState)(state);

package/dist/commands/post.js

@@ -5,6 +5,7 @@ const config_1 = require("../config");
 const api_1 = require("../api");
 const cache_1 = require("../cache");
 const i18n_1 = require("../i18n");
+const pending_post_1 = require("../pending-post");
 const REASON_KEYS = {
     EMPTY: "reason.EMPTY",
     TOO_LONG: "reason.TOO_LONG",
@@ -40,7 +41,12 @@ async function runPost(args) {
         return;
     }
     const config = (0, config_1.loadConfig)();
-    const result = await (0, api_1.createMessage)(config, text, category);
+    const requestId = (0, pending_post_1.pendingPostId)(config, text, category);
+    const result = await (0, api_1.createMessage)(config, text, category, requestId);
+    // Only a definitive response resolves an earlier ambiguous commit. In
+    // particular 401/429 say nothing about whether the previous request committed.
+    if (result.ok)
+        (0, pending_post_1.completePost)(requestId);
     // 슬래시 명령 안에서는 같은 방식의 슬래시 명령을 안내한다.
     const loginCmd = quiet ? "/pinglet-login" : "pinglet login";
     if (!result.ok) {

package/dist/commands/refresh.js

@@ -1,16 +1,53 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runRefresh = runRefresh;
 const config_1 = require("../config");
+const fs = __importStar(require("fs"));
 const api_1 = require("../api");
 const update_1 = require("../update");
 const cache_1 = require("../cache");
 const claude_1 = require("../adapters/claude");
+const lock_1 = require("../lock");
 /**
  * 서버 feed를 미리 받아 Local Feed Cache를 갱신한다 (아키텍처 §6).
  * 설치 당시 오프라인이었다면 installation 등록도 여기서 재시도한다.
  */
 async function runRefresh() {
+    if (!fs.existsSync(config_1.CONFIG_PATH))
+        return;
     const config = (0, config_1.loadConfig)();
     const wanted = [];
     if (config.adapters.claude)
@@ -21,31 +58,37 @@ async function runRefresh() {
         if (!config.installations[agentType]) {
             const record = await (0, api_1.registerInstallation)(config, agentType);
             if (record) {
+                await (0, lock_1.withPingletLock)(() => {
+                    const current = (0, config_1.loadConfig)();
+                    current.installations[agentType] = record;
+                    (0, config_1.saveConfig)(current);
+                });
                 config.installations[agentType] = record;
-                (0, config_1.saveConfig)(config);
             }
         }
     }
-    const records = Object.values(config.installations);
+    const records = wanted.flatMap((agent) => config.installations[agent] ? [config.installations[agent]] : []);
     if (records.length === 0)
         return;
     const onlineCounts = await Promise.all(records.map((r) => (0, api_1.sendHeartbeat)(config, r)));
     const online = onlineCounts.find((n) => n !== null);
     if (online !== undefined) {
-        (0, cache_1.saveOnline)(online);
+        await (0, lock_1.withPingletLock)(() => (0, cache_1.saveOnline)(online));
     }
     const messages = await (0, api_1.fetchFeed)(config, records[0]);
     if (messages) {
-        (0, cache_1.saveFeedMessages)(messages);
-        // spinner 회전과 DELIVERED/QUALIFIED 기록은 statusline이 담당한다 (pool=1).
-        // 여기서는 armed된 메시지가 서버에서 사라진 경우만 즉시 정리한다.
-        const state = (0, cache_1.loadState)();
-        const current = state.current;
-        if (current && !messages.some((m) => m.id === current.messageId)) {
-            (0, claude_1.armSpinnerMessage)(config, messages[0] ?? null);
-            state.current = undefined; // 다음 statusline tick이 정식으로 다음 메시지를 armed한다
-            (0, cache_1.saveState)(state);
-        }
+        await (0, lock_1.withPingletLock)(() => {
+            (0, cache_1.saveFeedMessages)(messages);
+            // spinner 회전과 DELIVERED/QUALIFIED 기록은 statusline이 담당한다 (pool=1).
+            // 여기서는 armed된 메시지가 서버에서 사라진 경우만 즉시 정리한다.
+            const state = (0, cache_1.loadState)();
+            const current = state.current;
+            if (current && !messages.some((m) => m.id === current.messageId)) {
+                (0, claude_1.armSpinnerMessage)((0, config_1.loadConfig)(), messages[0] ?? null);
+                state.current = undefined; // 다음 statusline tick이 정식으로 다음 메시지를 armed한다
+                (0, cache_1.saveState)(state);
+            }
+        });
     }
     // 하루 1회 새 버전 확인 후 npm 전역 설치면 백그라운드 자동 업데이트.
     await (0, update_1.maybeSelfUpdate)(config);

package/dist/commands/statusline.js

@@ -101,6 +101,7 @@ function rotateSpinner(state, now) {
             messageId: prev.messageId,
             visibleMs: prev.visibleMs,
         });
+        prev.visibleMs = 0; // A failed replacement must not account this interval twice.
     }
     const message = (0, picker_1.pickMessage)((0, cache_1.loadFeedMessages)(), state);
     if (!message) {
@@ -108,7 +109,12 @@ function rotateSpinner(state, now) {
         state.current = undefined;
         return;
     }
-    (0, claude_1.armSpinnerMessage)(config, message);
+    if (!(0, claude_1.armSpinnerMessage)(config, message)) {
+        // No delivery/current transition until the settings write actually commits.
+        // Clear attribution of subsequent API time and retry on the next tick.
+        state.current = undefined;
+        return;
+    }
     state.seen[message.id] = (state.seen[message.id] ?? 0) + 1;
     state.delivered ??= {};
     if (!state.delivered[message.id]) {
@@ -135,11 +141,14 @@ function rotateSpinner(state, now) {
  * - flush/refresh 백그라운드 트리거 (Claude 사용 중 항상 호출되므로 이 경로에서)
  */
 function runStatusline() {
+    if (!fs.existsSync(config_1.CONFIG_PATH) || !(0, config_1.loadConfig)().adapters.claude)
+        return;
     const payload = readPayload();
     const state = (0, cache_1.loadState)();
     const now = Date.now();
     trackSpinnerActivity(state, payload);
-    const rotateDue = !state.current || now - state.current.shownAt >= runtime_1.ROTATE_MS;
+    const rotateDue = !state.current || now - state.current.shownAt >= runtime_1.ROTATE_MS ||
+        !(0, cache_1.loadFeedMessages)().some((message) => message.id === state.current?.messageId);
     // 300ms마다 호출되므로 저장/maintenance는 1초 스로틀. 회전 시점에는 항상 저장.
     const saveDue = rotateDue ||
         state.lastTickAt === undefined ||

package/dist/commands/uninstall.js

@@ -39,21 +39,63 @@ const config_1 = require("../config");
 const claude_1 = require("../adapters/claude");
 const codex_1 = require("../adapters/codex");
 const i18n_1 = require("../i18n");
-function runUninstall(args) {
-    const config = (0, config_1.loadConfig)();
-    const claudeRemoved = (0, claude_1.uninstallClaudeIntegration)(config);
-    const codexRemoved = (0, codex_1.uninstallCodexIntegration)(config);
+const api_1 = require("../api");
+const lock_1 = require("../lock");
+const queue_1 = require("../queue");
+const cache_1 = require("../cache");
+const flush_1 = require("./flush");
+async function runUninstall(args) {
+    const restored = await (0, lock_1.withPingletLock)(() => {
+        const config = (0, config_1.loadConfig)();
+        (0, queue_1.bindEvents)();
+        const claudeRemoved = (0, claude_1.uninstallClaudeIntegration)(config);
+        const codexRemoved = (0, codex_1.uninstallCodexIntegration)(config);
+        (0, cache_1.saveState)({ seen: {} });
+        return { config, claudeRemoved, codexRemoved };
+    });
+    if (!restored)
+        return;
+    const { config, claudeRemoved, codexRemoved } = restored;
     console.log(claudeRemoved
         ? "✓ Claude integration removed"
         : "○ Claude integration not installed");
     console.log(codexRemoved
         ? "✓ Codex integration removed"
         : "○ Codex integration not installed");
+    await (0, flush_1.runFlush)();
+    for (const [agent, record] of Object.entries(config.installations)) {
+        if (!await (0, api_1.releaseCredential)(config, "installation", record.token)) {
+            throw new Error((0, i18n_1.t)("uninstall.failed"));
+        }
+        await (0, lock_1.withPingletLock)(() => {
+            const pending = (0, queue_1.readEvents)().filter(event => event.agentType === agent);
+            (0, queue_1.quarantineEvents)(pending, "uninstalled-before-upload");
+            if (pending.length && !args.includes("--purge"))
+                console.log(`○ ${pending.length} unsent events archived in events-quarantine.jsonl (not reassigned on reinstall)`);
+            delete config.installations[agent];
+            (0, config_1.saveConfig)(config);
+        });
+    }
+    // Also retire offline events produced before registration ever succeeded.
+    await (0, lock_1.withPingletLock)(() => {
+        const pending = (0, queue_1.readEvents)();
+        (0, queue_1.quarantineEvents)(pending, "uninstalled-without-registration");
+        if (pending.length && !args.includes("--purge"))
+            console.log(`○ ${pending.length} unregistered events archived in events-quarantine.jsonl`);
+    });
+    if (config.userToken) {
+        if (!await (0, api_1.releaseCredential)(config, "user", config.userToken)) {
+            throw new Error((0, i18n_1.t)("uninstall.failed"));
+        }
+        delete config.userToken;
+        await (0, lock_1.withPingletLock)(() => (0, config_1.saveConfig)(config));
+    }
     if (args.includes("--purge")) {
-        fs.rmSync(config_1.PINGLET_DIR, { recursive: true, force: true });
+        await (0, lock_1.withPingletLock)(() => fs.rmSync(config_1.PINGLET_DIR, { recursive: true, force: true }));
         console.log("✓ ~/.pinglet removed (config / cache / event queue)");
     }
     else {
         console.log((0, i18n_1.t)("uninstall.keep"));
     }
+    console.log((0, i18n_1.t)("uninstall.npm"));
 }

package/dist/config.js

@@ -43,6 +43,7 @@ exports.cliPath = cliPath;
 const fs = __importStar(require("fs"));
 const os = __importStar(require("os"));
 const path = __importStar(require("path"));
+const storage_1 = require("./storage");
 /** package.json의 version — 하드코딩하면 npm version bump와 어긋난다. */
 exports.VERSION = (() => {
     try {
@@ -66,25 +67,36 @@ exports.ONLINE_PATH = path.join(exports.PINGLET_DIR, "online.json");
 exports.UPDATE_PATH = path.join(exports.PINGLET_DIR, "update.json");
 exports.DEFAULT_API_BASE_URL = process.env.PINGLET_API_URL ?? "https://pinglet.halluci.co.kr";
 function ensurePingletDir() {
-    fs.mkdirSync(exports.PINGLET_DIR, { recursive: true });
+    fs.mkdirSync(exports.PINGLET_DIR, { recursive: true, mode: 0o700 });
 }
-function readJsonFile(filePath) {
+function readJsonFile(filePath, strict = false) {
     try {
-        return JSON.parse(fs.readFileSync(filePath, "utf8"));
+        const value = JSON.parse(fs.readFileSync(filePath, "utf8"));
+        if (strict && (!value || typeof value !== "object" || Array.isArray(value))) {
+            throw new Error("Expected a JSON object");
+        }
+        return value;
     }
-    catch {
+    catch (error) {
+        if (strict && !(0, storage_1.isMissing)(error))
+            throw new Error(`Cannot read ${filePath}; original file preserved.`, { cause: error });
         return null;
     }
 }
 function writeJsonFile(filePath, value) {
     ensurePingletDir();
-    const tmp = filePath + ".tmp";
-    fs.writeFileSync(tmp, JSON.stringify(value, null, 2));
-    fs.renameSync(tmp, filePath);
+    (0, storage_1.atomicWrite)(filePath, JSON.stringify(value, null, 2));
 }
 function loadConfig() {
-    const existing = readJsonFile(exports.CONFIG_PATH);
+    const existing = readJsonFile(exports.CONFIG_PATH, true);
     if (existing) {
+        const object = (v) => !!v && typeof v === "object" && !Array.isArray(v);
+        if (typeof existing.apiBaseUrl !== "string" || typeof existing.createdAt !== "string" ||
+            (existing.userToken !== undefined && typeof existing.userToken !== "string") ||
+            (existing.installations !== undefined && !object(existing.installations)) ||
+            (existing.adapters !== undefined && !object(existing.adapters))) {
+            throw new Error(`Invalid ${exports.CONFIG_PATH}; original file preserved.`);
+        }
         existing.installations ??= {};
         existing.adapters ??= {};
         return existing;

package/dist/i18n.js

@@ -11,7 +11,7 @@ Usage: pinglet <command>
 
   install [--api <url>] [--force]   Install the Claude Code integration
           [--claude | --codex]      Codex uses OS notifications; opt in with --codex (experimental)
-  uninstall [--purge]               Remove the integration (--purge: also delete ~/.pinglet)
+  uninstall [--purge]               Restore settings and revoke credentials (--purge: delete ~/.pinglet)
   login [--github | --google]       Link your account (GitHub or Google; pick in the browser if omitted)
         [--token <jwt>]
   logout                            Sign out (keeps the integration and cache)
@@ -43,6 +43,10 @@ Internal commands (called by the integration):
     "login.html.failSub": "Please try again from the terminal.",
     // ---- logout
     "logout.notLoggedIn": "○ You are not logged in.",
+    "logout.failed": "Server sign-out failed. Credentials are preserved; retry pinglet logout when connected.",
+    "uninstall.failed": "Server revocation failed. Local data is preserved; retry pinglet uninstall when connected.",
+    "uninstall.npm": "To remove the CLI package too, run: npm uninstall -g pinglet-cli (npm itself is kept).",
+    "login.invalidToken": "Login could not be verified. Existing credentials were preserved; check your token and connection.",
     "logout.done": "✓ Logged out. Reading still works; run `pinglet login` again to post.",
     // ---- post
     "reason.EMPTY": "empty messages cannot be posted",
@@ -89,7 +93,7 @@ Internal commands (called by the integration):
     "doctor.loggedIn": "Logged in",
     "doctor.notLoggedIn": "Not logged in — reading works; run `pinglet login` to post / react",
     // ---- misc commands
-    "uninstall.keep": "○ ~/.pinglet is kept. Use --purge to remove everything.",
+    "uninstall.keep": "○ Local cache and history are kept. Use --purge to delete ~/.pinglet too.",
     "ping.none": "No Ping to show — one will appear once the feed is received.",
     "postinstall.start": "\npinglet: running first-time setup automatically (`pinglet install`)",
     "postinstall.failed": "pinglet: automatic setup failed. Please run `pinglet install` yourself.",
@@ -99,7 +103,7 @@ Internal commands (called by the integration):
     "codex.existingNotify": "An existing notify setting was found (use --force to back it up and replace).",
     "slash.postDesc": "Post a message to Pinglet so it shows in other developers' terminals",
     "slash.loginDesc": "Link your Pinglet account (GitHub or Google login in the browser; --github/--google to choose)",
-    "slash.logoutDesc": "Sign out of Pinglet (removes the login token on this machine only)",
+    "slash.logoutDesc": "Sign out of Pinglet (revoke this session and unlink this device)",
 };
 const ko = {
     "cli.help": (p) => `pinglet v${p.version} — AI가 생각하는 동안 만나는 개발자 메시지 네트워크
@@ -108,7 +112,7 @@ const ko = {
 
   install [--api <url>] [--force]   Claude Code integration 설치
           [--claude | --codex]      Codex는 OS 알림 방식이라 --codex로 opt-in (experimental)
-  uninstall [--purge]               integration 제거 (--purge: ~/.pinglet까지 삭제)
+  uninstall [--purge]               설정 복원·서버 인증 해제 (--purge: ~/.pinglet까지 삭제)
   login [--github | --google]       계정 연결 (GitHub 또는 Google, 생략 시 브라우저에서 선택)
         [--token <jwt>]
   logout                            로그인 해제 (설치·캐시는 유지)
@@ -138,6 +142,10 @@ const ko = {
     "login.html.fail": "✗ 로그인 실패",
     "login.html.failSub": "터미널에서 다시 시도해 주세요.",
     "logout.notLoggedIn": "○ 로그인 상태가 아닙니다.",
+    "logout.failed": "서버 로그아웃에 실패했습니다. 재시도할 수 있도록 인증 정보를 보존했습니다. 연결 후 pinglet logout을 다시 실행하세요.",
+    "uninstall.failed": "서버 인증 해제에 실패해 로컬 데이터를 보존했습니다. 연결 후 pinglet uninstall을 다시 실행하세요.",
+    "uninstall.npm": "CLI 패키지도 제거하려면: npm uninstall -g pinglet-cli (npm 자체는 유지됩니다).",
+    "login.invalidToken": "로그인을 확인할 수 없습니다. 기존 인증 정보는 보존했습니다. 토큰과 서버 연결을 확인하세요.",
     "logout.done": "✓ 로그아웃했습니다. 읽기는 계속 되고, 메시지 작성은 `pinglet login` 후 가능합니다.",
     "reason.EMPTY": "빈 메시지는 등록할 수 없습니다",
     "reason.TOO_LONG": "메시지가 너무 깁니다 (기본 100자 제한)",
@@ -180,7 +188,7 @@ const ko = {
     "doctor.apiUnreachable": (p) => `API unreachable (${p.api}) — 오프라인 모드로 동작 중`,
     "doctor.loggedIn": "로그인됨",
     "doctor.notLoggedIn": "로그인 안 됨 — 읽기는 가능, 메시지 작성/반응은 `pinglet login` 후",
-    "uninstall.keep": "○ ~/.pinglet은 유지됩니다. 전부 지우려면 --purge를 사용하세요.",
+    "uninstall.keep": "○ 로컬 캐시·기록은 유지됩니다. ~/.pinglet도 지우려면 --purge를 사용하세요.",
     "ping.none": "표시할 Ping이 없습니다 — 서버 feed를 받으면 표시됩니다.",
     "postinstall.start": "\npinglet: 첫 설정을 자동으로 진행합니다 (`pinglet install`)",
     "postinstall.failed": "pinglet: 자동 설정에 실패했습니다. `pinglet install`을 직접 실행해 주세요.",
@@ -189,7 +197,7 @@ const ko = {
     "codex.existingNotify": "기존 notify 설정이 있습니다 (백업 후 교체하려면 --force).",
     "slash.postDesc": "메시지를 Pinglet에 등록해 다른 개발자들의 터미널에 표시",
     "slash.loginDesc": "Pinglet 계정 연결 (브라우저에서 GitHub 또는 Google 로그인, --github/--google로 지정 가능)",
-    "slash.logoutDesc": "Pinglet 로그인 해제 (이 기기의 로그인 토큰만 제거)",
+    "slash.logoutDesc": "Pinglet 로그인 해제 (서버 세션 폐기·이 기기의 계정 연결 해제)",
 };
 const ja = {
     "cli.help": (p) => `pinglet v${p.version} — AIが考えている間に出会う開発者メッセージネットワーク
@@ -198,7 +206,7 @@ const ja = {
 
   install [--api <url>] [--force]   Claude Code integration をインストール
           [--claude | --codex]      Codex は OS 通知方式のため --codex で opt-in (experimental)
-  uninstall [--purge]               integration を削除 (--purge: ~/.pinglet も削除)
+  uninstall [--purge]               設定を復元・認証を解除 (--purge: ~/.pinglet も削除)
   login [--github | --google]       アカウント連携 (GitHub または Google、省略時はブラウザで選択)
         [--token <jwt>]
   logout                            ログアウト (連携設定・キャッシュは維持)
@@ -228,6 +236,10 @@ const ja = {
     "login.html.fail": "✗ ログイン失敗",
     "login.html.failSub": "ターミナルからもう一度お試しください。",
     "logout.notLoggedIn": "○ ログインしていません。",
+    "logout.failed": "サーバーのログアウトに失敗しました。認証情報は保持しています。接続後に pinglet logout を再実行してください。",
+    "uninstall.failed": "サーバーの認証解除に失敗したため、ローカルデータを保持しました。接続後に pinglet uninstall を再実行してください。",
+    "uninstall.npm": "CLI パッケージも削除するには: npm uninstall -g pinglet-cli（npm 本体は保持されます）。",
+    "login.invalidToken": "ログインを確認できませんでした。既存の認証情報は保持しています。トークンと接続を確認してください。",
     "logout.done": "✓ ログアウトしました。閲覧は引き続き可能で、投稿は `pinglet login` 後にできます。",
     "reason.EMPTY": "空のメッセージは投稿できません",
     "reason.TOO_LONG": "メッセージが長すぎます (デフォルト100文字まで)",
@@ -270,7 +282,7 @@ const ja = {
     "doctor.apiUnreachable": (p) => `API unreachable (${p.api}) — オフラインモードで動作中`,
     "doctor.loggedIn": "ログイン済み",
     "doctor.notLoggedIn": "未ログイン — 閲覧は可能、投稿/リアクションは `pinglet login` 後",
-    "uninstall.keep": "○ ~/.pinglet は維持されます。すべて削除するには --purge を使ってください。",
+    "uninstall.keep": "○ ローカルキャッシュと履歴は保持されます。~/.pinglet も削除するには --purge を使ってください。",
     "ping.none": "表示する Ping がありません — サーバーから feed を受信すると表示されます。",
     "postinstall.start": "\npinglet: 初期設定を自動的に行います (`pinglet install`)",
     "postinstall.failed": "pinglet: 自動設定に失敗しました。`pinglet install` を手動で実行してください。",
@@ -279,7 +291,7 @@ const ja = {
     "codex.existingNotify": "既存の notify 設定があります (バックアップして置き換えるには --force)。",
     "slash.postDesc": "メッセージを Pinglet に投稿して他の開発者のターミナルに表示",
     "slash.loginDesc": "Pinglet アカウント連携 (ブラウザで GitHub または Google ログイン、--github/--google で指定可)",
-    "slash.logoutDesc": "Pinglet ログアウト (このマシンのログイントークンのみ削除)",
+    "slash.logoutDesc": "Pinglet ログアウト (サーバーセッション失効・この端末のアカウント連携解除)",
 };
 const tables = { en, ko, ja };
 function t(key, params = {}) {