opencode-discord-presence 0.2.5 → 0.2.7

package/dist/config.d.ts

@@ -1,4 +1,4 @@
-import type { PresenceConfig } from "./types/index.js";
+import type { DiscordPresenceOptions, PresenceConfig } from "./types/index.js";
 export declare const DEFAULT_CLIENT_ID = "1466770544748662819";
-export declare function getConfig(): PresenceConfig;
+export declare function getConfig(options?: DiscordPresenceOptions): PresenceConfig;
 //# sourceMappingURL=config.d.ts.map

package/dist/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAEtD,eAAO,MAAM,iBAAiB,wBAAwB,CAAA;AAEtD,wBAAgB,SAAS,IAAI,cAAc,CAK1C"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAY,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAExF,eAAO,MAAM,iBAAiB,wBAAwB,CAAA;AAQtD,wBAAgB,SAAS,CAAC,OAAO,CAAC,EAAE,sBAAsB,GAAG,cAAc,CAU1E"}

package/dist/config.js

@@ -1,8 +1,18 @@
 export const DEFAULT_CLIENT_ID = "1466770544748662819";
-export function getConfig() {
+function parseLanguage(lang) {
+    const normalized = lang?.toLowerCase();
+    if (normalized === "ko" || normalized === "kr" || normalized === "korean")
+        return "ko";
+    return "en";
+}
+export function getConfig(options) {
+    const envEnabled = process.env.OPENCODE_DISCORD_ENABLED;
+    const envClientId = process.env.OPENCODE_DISCORD_CLIENT_ID;
+    const envLanguage = process.env.OPENCODE_DISCORD_LANGUAGE;
     return {
-        enabled: process.env.OPENCODE_DISCORD_ENABLED !== "false",
-        clientId: process.env.OPENCODE_DISCORD_CLIENT_ID || DEFAULT_CLIENT_ID,
+        enabled: options?.enabled ?? envEnabled !== "false",
+        clientId: options?.applicationId ?? envClientId ?? DEFAULT_CLIENT_ID,
+        language: parseLanguage(options?.language ?? envLanguage),
     };
 }
 //# sourceMappingURL=config.js.map

package/dist/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,iBAAiB,GAAG,qBAAqB,CAAA;AAEtD,MAAM,UAAU,SAAS;IACvB,OAAO;QACL,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,wBAAwB,KAAK,OAAO;QACzD,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,0BAA0B,IAAI,iBAAiB;KACtE,CAAA;AACH,CAAC"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,iBAAiB,GAAG,qBAAqB,CAAA;AAEtD,SAAS,aAAa,CAAC,IAAa;IAClC,MAAM,UAAU,GAAG,IAAI,EAAE,WAAW,EAAE,CAAA;IACtC,IAAI,UAAU,KAAK,IAAI,IAAI,UAAU,KAAK,IAAI,IAAI,UAAU,KAAK,QAAQ;QAAE,OAAO,IAAI,CAAA;IACtF,OAAO,IAAI,CAAA;AACb,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,OAAgC;IACxD,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAA;IACvD,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAA;IAC1D,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAA;IAEzD,OAAO;QACL,OAAO,EAAE,OAAO,EAAE,OAAO,IAAI,UAAU,KAAK,OAAO;QACnD,QAAQ,EAAE,OAAO,EAAE,aAAa,IAAI,WAAW,IAAI,iBAAiB;QACpE,QAAQ,EAAE,aAAa,CAAC,OAAO,EAAE,QAAQ,IAAI,WAAW,CAAC;KAC1D,CAAA;AACH,CAAC"}

package/dist/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAQjD,eAAO,MAAM,uBAAuB,EAAE,MAmCrC,CAAA"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAqCjD,eAAO,MAAM,uBAAuB,EAAE,MAmCrC,CAAA"}

package/dist/plugin.js

@@ -1,17 +1,46 @@
+import { homedir } from "node:os";
+import { join } from "node:path";
 import { getConfig } from "./config.js";
 import { DiscordRPCService } from "./services/discord-rpc.js";
+import { getObjectParticle, getTopicParticle } from "./utils/particle.js";
 let rpc = null;
 let currentAgent = "OpenCode";
 let currentModel = "";
+function getPresenceDetails(agent, idle, language) {
+    if (language === "ko") {
+        if (idle) {
+            return `${agent}${getTopicParticle(agent)} 휴식중`;
+        }
+        return `${agent}${getObjectParticle(agent)} 갈구는중`;
+    }
+    return idle ? `${agent} is idle` : `Working with ${agent}`;
+}
+async function loadConfigFile(directory) {
+    const paths = [
+        join(directory, ".discord-presence.json"),
+        join(homedir(), ".discord-presence.json"),
+    ];
+    for (const configPath of paths) {
+        const file = Bun.file(configPath);
+        if (await file.exists()) {
+            try {
+                return (await file.json());
+            }
+            catch { }
+        }
+    }
+    return undefined;
+}
 export const OpenCodeDiscordPresence = async (ctx) => {
-    const config = getConfig();
+    const fileOptions = await loadConfigFile(ctx.directory);
+    const config = getConfig(fileOptions);
     if (!config.enabled)
         return {};
     rpc = new DiscordRPCService(config.clientId);
     const updatePresence = async (idle = false) => {
         if (!rpc)
             return;
-        const details = idle ? `${currentAgent} is idle` : `Working with ${currentAgent}`;
+        const details = getPresenceDetails(currentAgent, idle, config.language);
         const state = currentModel || undefined;
         await rpc.setPresence(details, state);
     };
@@ -21,7 +50,6 @@ export const OpenCodeDiscordPresence = async (ctx) => {
     }
     return {
         "chat.message": async (input) => {
-            console.log("[discord-presence] DEBUG input:", JSON.stringify(input, null, 2));
             if (input.agent)
                 currentAgent = input.agent;
             if (input.model?.modelID)

package/dist/plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AACvC,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAA;AAE7D,IAAI,GAAG,GAA6B,IAAI,CAAA;AACxC,IAAI,YAAY,GAAG,UAAU,CAAA;AAC7B,IAAI,YAAY,GAAG,EAAE,CAAA;AAErB,MAAM,CAAC,MAAM,uBAAuB,GAAW,KAAK,EAAE,GAAG,EAAE,EAAE;IAC3D,MAAM,MAAM,GAAG,SAAS,EAAE,CAAA;IAC1B,IAAI,CAAC,MAAM,CAAC,OAAO;QAAE,OAAO,EAAE,CAAA;IAE9B,GAAG,GAAG,IAAI,iBAAiB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;IAE5C,MAAM,cAAc,GAAG,KAAK,EAAE,IAAI,GAAG,KAAK,EAAE,EAAE;QAC5C,IAAI,CAAC,GAAG;YAAE,OAAM;QAChB,MAAM,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,GAAG,YAAY,UAAU,CAAC,CAAC,CAAC,gBAAgB,YAAY,EAAE,CAAA;QACjF,MAAM,KAAK,GAAG,YAAY,IAAI,SAAS,CAAA;QACvC,MAAM,GAAG,CAAC,WAAW,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;IACvC,CAAC,CAAA;IAED,MAAM,SAAS,GAAG,MAAM,GAAG,CAAC,OAAO,EAAE,CAAA;IACrC,IAAI,SAAS,EAAE,CAAC;QACd,MAAM,cAAc,CAAC,KAAK,CAAC,CAAA;IAC7B,CAAC;IAED,OAAO;QACL,cAAc,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;YAC9B,OAAO,CAAC,GAAG,CAAC,iCAAiC,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;YAC9E,IAAI,KAAK,CAAC,KAAK;gBAAE,YAAY,GAAG,KAAK,CAAC,KAAK,CAAA;YAC3C,IAAI,KAAK,CAAC,KAAK,EAAE,OAAO;gBAAE,YAAY,GAAG,KAAK,CAAC,KAAK,CAAC,OAAO,CAAA;YAC5D,MAAM,cAAc,CAAC,KAAK,CAAC,CAAA;QAC7B,CAAC;QAED,KAAK,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE;YACzB,IAAI,KAAK,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;gBAClC,MAAM,cAAc,CAAC,IAAI,CAAC,CAAA;YAC5B,CAAC;YACD,IAAI,KAAK,CAAC,IAAI,KAAK,iBAAiB,EAAE,CAAC;gBACrC,MAAM,GAAG,EAAE,KAAK,EAAE,CAAA;YACpB,CAAC;QACH,CAAC;KACF,CAAA;AACH,CAAC,CAAA"}
+{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"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"}

package/dist/types/index.d.ts

@@ -1,7 +1,14 @@
 import type { SetActivity } from "@xhayper/discord-rpc";
+export type Language = "en" | "ko";
 export interface PresenceConfig {
     enabled: boolean;
     clientId: string;
+    language: Language;
+}
+export interface DiscordPresenceOptions {
+    enabled?: boolean;
+    applicationId?: string;
+    language?: string;
 }
 export interface PresenceState {
     agent: string;

package/dist/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAEvD,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,OAAO,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;CACjB;AAED,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,EAAE,OAAO,CAAA;CACd;AAED,YAAY,EAAE,WAAW,EAAE,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAEvD,MAAM,MAAM,QAAQ,GAAG,IAAI,GAAG,IAAI,CAAA;AAElC,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,OAAO,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,QAAQ,CAAA;CACnB;AAED,MAAM,WAAW,sBAAsB;IACrC,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,EAAE,OAAO,CAAA;CACd;AAED,YAAY,EAAE,WAAW,EAAE,CAAA"}

package/dist/utils/particle.d.ts

@@ -0,0 +1,16 @@
+/**
+ * Korean particle utilities
+ * Handles proper particle selection based on whether the preceding character
+ * ends with a consonant (받침) or not.
+ */
+/**
+ * Get the appropriate particle for 을/를 (object marker)
+ * 을 after consonant, 를 after vowel
+ */
+export declare function getObjectParticle(word: string): string;
+/**
+ * Get the appropriate particle for 은/는 (topic marker)
+ * 은 after consonant, 는 after vowel
+ */
+export declare function getTopicParticle(word: string): string;
+//# sourceMappingURL=particle.d.ts.map

package/dist/utils/particle.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"particle.d.ts","sourceRoot":"","sources":["../../src/utils/particle.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAmBH;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAItD;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAIrD"}

package/dist/utils/particle.js

@@ -0,0 +1,42 @@
+/**
+ * Korean particle utilities
+ * Handles proper particle selection based on whether the preceding character
+ * ends with a consonant (받침) or not.
+ */
+/**
+ * Check if a character has a final consonant (받침)
+ */
+function hasFinalConsonant(char) {
+    const code = char.charCodeAt(0);
+    // Korean syllable block range: 0xAC00 ~ 0xD7A3
+    if (code < 0xac00 || code > 0xd7a3) {
+        // Non-Korean character: treat numbers/letters as having no final consonant
+        // except for certain consonant-ending letters
+        const consonantEndingChars = /[lmnr136780]$/i;
+        return consonantEndingChars.test(char);
+    }
+    // Korean syllable: check if it has a final consonant
+    // (code - 0xAC00) % 28 === 0 means no final consonant
+    return (code - 0xac00) % 28 !== 0;
+}
+/**
+ * Get the appropriate particle for 을/를 (object marker)
+ * 을 after consonant, 를 after vowel
+ */
+export function getObjectParticle(word) {
+    if (!word || word.length === 0)
+        return "를";
+    const lastChar = word[word.length - 1];
+    return hasFinalConsonant(lastChar) ? "을" : "를";
+}
+/**
+ * Get the appropriate particle for 은/는 (topic marker)
+ * 은 after consonant, 는 after vowel
+ */
+export function getTopicParticle(word) {
+    if (!word || word.length === 0)
+        return "는";
+    const lastChar = word[word.length - 1];
+    return hasFinalConsonant(lastChar) ? "은" : "는";
+}
+//# sourceMappingURL=particle.js.map

package/dist/utils/particle.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"particle.js","sourceRoot":"","sources":["../../src/utils/particle.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;GAEG;AACH,SAAS,iBAAiB,CAAC,IAAY;IACrC,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAA;IAC/B,+CAA+C;IAC/C,IAAI,IAAI,GAAG,MAAM,IAAI,IAAI,GAAG,MAAM,EAAE,CAAC;QACnC,2EAA2E;QAC3E,8CAA8C;QAC9C,MAAM,oBAAoB,GAAG,gBAAgB,CAAA;QAC7C,OAAO,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IACxC,CAAC;IACD,qDAAqD;IACrD,sDAAsD;IACtD,OAAO,CAAC,IAAI,GAAG,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;AACnC,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,iBAAiB,CAAC,IAAY;IAC5C,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,GAAG,CAAA;IAC1C,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;IACtC,OAAO,iBAAiB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAA;AAChD,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,gBAAgB,CAAC,IAAY;IAC3C,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,GAAG,CAAA;IAC1C,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;IACtC,OAAO,iBAAiB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAA;AAChD,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-discord-presence",
-  "version": "0.2.5",
+  "version": "0.2.7",
   "description": "Discord Rich Presence plugin for OpenCode - Display your current AI agent, model, and status in Discord",
   "type": "module",
   "main": "dist/index.js",