Merge pull request #15 from odefun/ode_1770277628.637719

feat: add per-user GitHub tokens

Author: LIU9293

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ode",
-  "version": "0.0.25",
+  "version": "0.0.26",
   "description": "Ode - OpenCode chat controller for Slack",
   "module": "packages/core/index.ts",
   "type": "module",

packages/agents/shared.ts

@@ -29,6 +29,9 @@ export function buildSlackSystemPrompt(slack?: SlackContext): string {
     lines.push(`- Channel: ${slack.channelId}`);
     lines.push(`- Thread: ${slack.threadId}`);
     lines.push(`- User: <@${slack.userId}>`);
+    if (slack.hasGitHubToken !== undefined) {
+      lines.push(`- GitHub token available: ${slack.hasGitHubToken ? "yes" : "no"}`);
+    }
   }
 
   lines.push("");

packages/agents/types.ts

@@ -19,6 +19,7 @@ export interface SlackContext {
   threadHistory?: string;
   hasCustomSlackTool?: boolean;
   odeSlackApiUrl?: string;
+  hasGitHubToken?: boolean;
 }
 
 export interface OpenCodeMessageContext {

packages/config/dashboard-config.ts

@@ -4,7 +4,6 @@ export type DashboardConfig = {
     email: string;
     initials?: string;
     avatar?: string;
-    githubToken: string;
     defaultMessageFrequency: "aggressive" | "medium" | "minimum";
   };
   devServers: {
@@ -37,7 +36,6 @@ export const defaultDashboardConfig: DashboardConfig = {
   user: {
     name: "",
     email: "",
-    githubToken: "",
     defaultMessageFrequency: "medium",
   },
   devServers: [],
@@ -140,7 +138,6 @@ export const sanitizeDashboardConfig = (config: unknown): DashboardConfig => {
       email: asString(user.email),
       initials: asString(user.initials, "") || undefined,
       avatar: asString(user.avatar, "") || undefined,
-      githubToken: asString(user.githubToken),
       defaultMessageFrequency: asFrequency(user.defaultMessageFrequency),
     },
     devServers,

packages/config/index.ts

@@ -15,9 +15,12 @@ export {
   getSlackTargetChannels,
   getDefaultCwd,
   getDefaultOpenCodeServerUrl,
+  getGitHubInfoForUser,
   resolveChannelCwd,
   setChannelCwd,
   setChannelWorkingDirectory,
+  setGitHubInfoForUser,
+  clearGitHubInfoForUser,
   getChannelOpenCodeServerUrl,
   setChannelModel,
   setChannelDevServerId,

packages/config/local/ode.ts

@@ -13,7 +13,6 @@ const userSchema = z.object({
   email: z.string().optional().default(""),
   initials: z.string().optional().default(""),
   avatar: z.string().optional().default(""),
-  githubToken: z.string().optional().default(""),
   defaultMessageFrequency: z.enum([
     "minimum",
     "medium",
@@ -61,6 +60,17 @@ const workspaceSchema = z.object({
 
 const odeConfigSchema = z.object({
   user: userSchema,
+  githubInfos: z
+    .record(
+      z.string(),
+      z.object({
+        token: z.string().optional().default(""),
+        gitName: z.string().optional().default(""),
+        gitEmail: z.string().optional().default(""),
+      })
+    )
+    .optional()
+    .default({}),
   devServers: z.array(devServerSchema),
   workspaces: z.array(workspaceSchema),
   updates: updateSchema.optional().default({
@@ -84,9 +94,9 @@ const EMPTY_TEMPLATE: OdeConfig = {
     email: "",
     initials: "",
     avatar: "",
-    githubToken: "",
     defaultMessageFrequency: "medium",
   },
+  githubInfos: {},
   devServers: [],
   workspaces: [],
   updates: {
@@ -231,6 +241,46 @@ export function getChannelDetails(channelId: string): ChannelDetail | null {
   return null;
 }
 
+export type GitHubInfo = {
+  token: string;
+  gitName?: string;
+  gitEmail?: string;
+};
+
+export function getGitHubInfoForUser(userId: string): GitHubInfo | null {
+  const info = loadOdeConfig().githubInfos?.[userId];
+  if (!info) return null;
+  const token = info.token?.trim();
+  if (!token) return null;
+  const gitName = info.gitName?.trim() || undefined;
+  const gitEmail = info.gitEmail?.trim() || undefined;
+  return { token, gitName, gitEmail };
+}
+
+export function setGitHubInfoForUser(userId: string, info: GitHubInfo): void {
+  const config = loadOdeConfig();
+  const githubInfos = { ...(config.githubInfos ?? {}) };
+  const token = info.token.trim();
+  if (token.length === 0) {
+    delete githubInfos[userId];
+  } else {
+    githubInfos[userId] = {
+      token,
+      gitName: info.gitName?.trim() || "",
+      gitEmail: info.gitEmail?.trim() || "",
+    };
+  }
+  saveOdeConfig({ ...config, githubInfos });
+}
+
+export function clearGitHubInfoForUser(userId: string): void {
+  const config = loadOdeConfig();
+  const githubInfos = { ...(config.githubInfos ?? {}) };
+  if (!(userId in githubInfos)) return;
+  delete githubInfos[userId];
+  saveOdeConfig({ ...config, githubInfos });
+}
+
 export type ChannelCwdInfo = {
   cwd: string;
   workingDirectory: string | null;

packages/config/local/settings.ts

@@ -1,5 +1,5 @@
 import { readFileSync, writeFileSync, existsSync, mkdirSync } from "fs";
-import { join, dirname } from "path";
+import { join } from "path";
 import { homedir } from "os";
 import {
   setChannelCwd as setChannelCwdInConfig,
@@ -9,10 +9,6 @@ import { loadSession } from "./sessions";
 const ODE_CONFIG_DIR = join(homedir(), ".config", "ode");
 const SETTINGS_FILE = join(ODE_CONFIG_DIR, "settings.json");
 const AGENTS_DIR = join(ODE_CONFIG_DIR, "agents");
-const GH_CONFIG_DIR = join(homedir(), ".config", "gh");
-const GH_HOSTS_FILENAME = "hosts.yml";
-const GH_HOSTS_FILE = join(GH_CONFIG_DIR, GH_HOSTS_FILENAME);
-const GH_USERS_DIR = join(ODE_CONFIG_DIR, "gh-users");
 
 export interface ChannelSettings {
   threadSessions: Record<string, string>; // threadId -> sessionId
@@ -320,219 +316,3 @@ export function clearOAuthState(): void {
   delete settings.oauthState;
   saveSettings(settings);
 }
-
-export interface GitHubAuthInfo {
-  host: string;
-  user?: string;
-  gitProtocol?: string;
-  hasToken: boolean;
-}
-
-export interface GitHubAuthRecord {
-  host: string;
-  user?: string;
-  token: string;
-  gitProtocol?: string;
-}
-
-export interface GitIdentity {
-  name: string;
-  email: string;
-}
-
-export function normalizeGitHubHost(input: string): string | null {
-  const trimmed = input.trim();
-  if (!trimmed) return null;
-  const noProtocol = trimmed.replace(/^https?:\/\//, "");
-  const host = noProtocol.split(/[/?#]/)[0];
-  return host || null;
-}
-
-function ensureGitHubConfigDir(): void {
-  if (!existsSync(GH_CONFIG_DIR)) {
-    mkdirSync(GH_CONFIG_DIR, { recursive: true });
-  }
-}
-
-function ensureGitHubUserDir(userId: string): void {
-  const userDir = join(GH_USERS_DIR, userId);
-  if (!existsSync(userDir)) {
-    mkdirSync(userDir, { recursive: true });
-  }
-}
-
-export function getGitHubUserConfigDir(userId: string): string {
-  return join(GH_USERS_DIR, userId);
-}
-
-function getGitHubUserHostsFile(userId: string): string {
-  return join(GH_USERS_DIR, userId, GH_HOSTS_FILENAME);
-}
-
-function parseGitHubHosts(contents: string): Record<string, Record<string, string>> {
-  const hosts: Record<string, Record<string, string>> = {};
-  let currentHost: string | null = null;
-
-  for (const line of contents.split(/\r?\n/)) {
-    const trimmed = line.trim();
-    if (!trimmed || trimmed.startsWith("#")) continue;
-
-    if (!line.startsWith(" ") && trimmed.endsWith(":")) {
-      currentHost = trimmed.slice(0, -1).trim();
-      if (currentHost) {
-        hosts[currentHost] = hosts[currentHost] || {};
-      }
-      continue;
-    }
-
-    if (!currentHost) continue;
-    const hostKey = currentHost;
-    const match = trimmed.match(/^([A-Za-z0-9_-]+):\s*(.*)$/);
-    if (!match) continue;
-    const field = match[1];
-    if (!field) continue;
-    hosts[hostKey] = hosts[hostKey] || {};
-    hosts[hostKey][field] = match[2] ?? "";
-  }
-
-  return hosts;
-}
-
-function serializeGitHubHosts(hosts: Record<string, Record<string, string>>): string {
-  const lines: string[] = [];
-  for (const [host, entries] of Object.entries(hosts)) {
-    lines.push(`${host}:`);
-    for (const [key, value] of Object.entries(entries)) {
-      lines.push(`  ${key}: ${value}`);
-    }
-  }
-  return lines.length > 0 ? `${lines.join("\n")}\n` : "";
-}
-
-function readGitHubHosts(filePath: string): Record<string, Record<string, string>> {
-  if (!existsSync(filePath)) return {};
-  const contents = readFileSync(filePath, "utf-8");
-  return parseGitHubHosts(contents);
-}
-
-function writeGitHubHosts(filePath: string, hosts: Record<string, Record<string, string>>): void {
-  const dirPath = dirname(filePath);
-  if (!existsSync(dirPath)) {
-    mkdirSync(dirPath, { recursive: true });
-  }
-  writeFileSync(filePath, serializeGitHubHosts(hosts));
-}
-
-function getGitHubAuthFromFile(filePath: string, host: string): GitHubAuthInfo | null {
-  if (!existsSync(filePath)) return null;
-  const hosts = readGitHubHosts(filePath);
-  const entry = hosts[host];
-  if (!entry) return null;
-  return {
-    host,
-    user: entry.user,
-    gitProtocol: entry.git_protocol,
-    hasToken: Boolean(entry.oauth_token),
-  };
-}
-
-function getGitHubAuthRecordFromFile(filePath: string, host: string): GitHubAuthRecord | null {
-  if (!existsSync(filePath)) return null;
-  const hosts = readGitHubHosts(filePath);
-  const entry = hosts[host];
-  if (!entry?.oauth_token) return null;
-  return {
-    host,
-    user: entry.user,
-    token: entry.oauth_token,
-    gitProtocol: entry.git_protocol,
-  };
-}
-
-function saveGitHubAuthToFile(
-  filePath: string,
-  params: {
-    host: string;
-    user?: string;
-    token: string;
-    gitProtocol?: string;
-  }
-): void {
-  const existing = readGitHubHosts(filePath);
-  const entry = { ...(existing[params.host] || {}) };
-  if (params.user) entry.user = params.user;
-  entry.oauth_token = params.token;
-  entry.git_protocol = params.gitProtocol || entry.git_protocol || "https";
-  existing[params.host] = entry;
-  writeGitHubHosts(filePath, existing);
-}
-
-export function getGitHubAuth(host = "github.com"): GitHubAuthInfo | null {
-  return getGitHubAuthFromFile(GH_HOSTS_FILE, host);
-}
-
-export function getGitHubAuthForUser(
-  userId: string,
-  host = "github.com"
-): GitHubAuthInfo | null {
-  return getGitHubAuthFromFile(getGitHubUserHostsFile(userId), host);
-}
-
-export function getGitHubAuthRecord(host = "github.com"): GitHubAuthRecord | null {
-  return getGitHubAuthRecordFromFile(GH_HOSTS_FILE, host);
-}
-
-export function getGitHubAuthRecordForUser(
-  userId: string,
-  host = "github.com"
-): GitHubAuthRecord | null {
-  return getGitHubAuthRecordFromFile(getGitHubUserHostsFile(userId), host);
-}
-
-export function activateGitHubAuthForUser(
-  userId: string,
-  host = "github.com"
-): GitHubAuthInfo | null {
-  const record = getGitHubAuthRecordForUser(userId, host) ?? getGitHubAuthRecord(host);
-  if (!record) return null;
-  saveGitHubAuth(record);
-  return {
-    host: record.host,
-    user: record.user,
-    gitProtocol: record.gitProtocol,
-    hasToken: true,
-  };
-}
-
-export function getGitIdentityForUser(
-  userId: string,
-  host = "github.com"
-): GitIdentity | null {
-  const record = getGitHubAuthRecordForUser(userId, host) ?? getGitHubAuthRecord(host);
-  if (!record?.user) return null;
-  return {
-    name: record.user,
-    email: `${record.user}@users.noreply.github.com`,
-  };
-}
-
-export function saveGitHubAuth(params: {
-  host: string;
-  user?: string;
-  token: string;
-  gitProtocol?: string;
-}): void {
-  ensureGitHubConfigDir();
-  saveGitHubAuthToFile(GH_HOSTS_FILE, params);
-}
-
-export function saveGitHubAuthForUser(params: {
-  userId: string;
-  host: string;
-  user?: string;
-  token: string;
-  gitProtocol?: string;
-}): void {
-  ensureGitHubUserDir(params.userId);
-  saveGitHubAuthToFile(getGitHubUserHostsFile(params.userId), params);
-}