assistme 0.3.0 → 0.3.2

package/src/db/supabase.ts

@@ -1,386 +1,43 @@
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";
-import { join } from "path";
-import { homedir } from "os";
-import { callMcpHandler } from "./api-client.js";
-import { log } from "../utils/logger.js";
-
-// ── Auth Store (persists am_ token to disk) ──────────────────────────
-
-const AUTH_DIR = join(homedir(), ".config", "assistme");
-const AUTH_FILE = join(AUTH_DIR, "auth.json");
-
-function ensureAuthDir() {
-  if (!existsSync(AUTH_DIR)) {
-    mkdirSync(AUTH_DIR, { recursive: true, mode: 0o700 });
-  }
-}
-
-function readAuthStore(): Record<string, string> {
-  try {
-    if (existsSync(AUTH_FILE)) {
-      return JSON.parse(readFileSync(AUTH_FILE, "utf-8"));
-    }
-  } catch {
-    // Corrupted file — start fresh
-  }
-  return {};
-}
-
-function writeAuthStore(data: Record<string, string>) {
-  ensureAuthDir();
-  writeFileSync(AUTH_FILE, JSON.stringify(data, null, 2), { mode: 0o600 });
-}
-
-// ── Auth ─────────────────────────────────────────────────────────────
-
-/**
- * Login using an am_ MCP token.
- * Validates against DB via edge function, stores locally.
- */
-export async function loginWithToken(mcpToken: string): Promise<string> {
-  if (!mcpToken.startsWith("am_")) {
-    throw new Error(
-      "Invalid token format. Use an am_ token from the web page."
-    );
-  }
-
-  const result = await callMcpHandler<{ user_id: string; email: string | null }>(
-    "auth.validate_token",
-    {},
-    mcpToken,
-  );
-
-  // Persist token
-  const store = readAuthStore();
-  store["mcp_token"] = mcpToken;
-  writeAuthStore(store);
-
-  return result.user_id;
-}
-
-export async function getCurrentUserId(): Promise<string> {
-  const result = await callMcpHandler<{ user_id: string }>(
-    "auth.validate_token",
-  );
-  return result.user_id;
-}
-
-export async function logout(): Promise<void> {
-  try {
-    writeAuthStore({});
-  } catch {
-    // ignore
-  }
-}
-
-// ── Session Management ─────────────────────────────────────────────
-
-export interface AgentSession {
-  id: string;
-  user_id: string;
-  session_name: string;
-  status: "online" | "offline" | "busy";
-  workspace_path: string | null;
-  agent_version: string | null;
-  started_at: string;
-  last_heartbeat_at: string;
-  ended_at: string | null;
-  metadata: Record<string, unknown>;
-}
-
-export async function createSession(
-  _userId: string,
-  sessionName: string,
-  workspacePath: string,
-  version: string
-): Promise<AgentSession> {
-  const { getConfig } = await import("../utils/config.js");
-  const data = await callMcpHandler<AgentSession>("session.create", {
-    session_name: sessionName,
-    workspace_path: workspacePath,
-    version,
-    model: getConfig().model || null,
-  });
-  return data;
-}
-
-export async function updateHeartbeat(sessionId: string): Promise<void> {
-  try {
-    await callMcpHandler("session.heartbeat", { session_id: sessionId });
-  } catch (err) {
-    log.warn(`Heartbeat update failed: ${err instanceof Error ? err.message : err}`);
-  }
-}
-
-export async function endSession(sessionId: string): Promise<void> {
-  try {
-    await callMcpHandler("session.end", { session_id: sessionId });
-  } catch (err) {
-    log.error(`Failed to end session: ${err instanceof Error ? err.message : err}`);
-  }
-}
-
-export async function setSessionBusy(
-  sessionId: string,
-  busy: boolean
-): Promise<void> {
-  await callMcpHandler("session.set_busy", {
-    session_id: sessionId,
-    busy,
-  });
-}
-
-export async function cleanupStaleSessions(
-  currentSessionId: string,
-  thresholdMs = 120_000
-): Promise<number> {
-  try {
-    const result = await callMcpHandler<{ cleaned: number }>(
-      "session.cleanup_stale",
-      { current_session_id: currentSessionId, threshold_ms: thresholdMs },
-    );
-    return result.cleaned;
-  } catch {
-    return 0;
-  }
-}
-
-export async function getActiveSessions(
-  limit = 5
-): Promise<AgentSession[]> {
-  return callMcpHandler<AgentSession[]>("session.get_active", { limit });
-}
-
-// ── Conversation Management ─────────────────────────────────────────
-
-export async function getOrCreateCliConversation(
-  _userId: string,
-  _sessionId: string
-): Promise<string> {
-  const data = await callMcpHandler<string>("conversation.get_or_create");
-  return data;
-}
-
-// ── Message / Task Management ────────────────────────────────────────
-
-export interface ConversationMessage {
-  id: string;
-  conversation_id: string;
-  sender_id: string;
-  role: "user" | "assistant" | "system";
-  content: string;
-  status: "pending" | "running" | "completed" | "failed" | "cancelled" | null;
-  session_id: string | null;
-  tool_calls: Record<string, unknown> | null;
-  tool_results: Record<string, unknown> | null;
-  metadata: Record<string, unknown>;
-  created_at: string;
-  updated_at: string;
-  prompt: string;
-}
-
-export type AgentTask = ConversationMessage;
-
-export async function createTask(
-  conversationId: string,
-  _userId: string,
-  sessionId: string,
-  prompt: string
-): Promise<ConversationMessage> {
-  const data = await callMcpHandler<Record<string, unknown>>("task.create", {
-    conversation_id: conversationId,
-    session_id: sessionId,
-    prompt,
-  });
-  return { ...data, prompt } as ConversationMessage;
-}
-
-/**
- * Atomically poll ONE pending task and claim it in a single call.
- * Uses FOR UPDATE SKIP LOCKED — concurrent CLIs will never grab the same task.
- * Returns null if no pending task exists.
- */
-export async function pollAndClaimTask(
-  sessionId: string
-): Promise<ConversationMessage | null> {
-  try {
-    const data = await callMcpHandler<Record<string, unknown> | null>(
-      "task.poll_and_claim",
-      { session_id: sessionId },
-    );
-
-    if (!data) return null;
-
-    return {
-      ...data,
-      prompt:
-        (data.metadata as Record<string, unknown>)?.prompt || data.content || "",
-    } as ConversationMessage;
-  } catch (err) {
-    log.warn(`Poll-and-claim failed: ${err instanceof Error ? err.message : err}`);
-    return null;
-  }
-}
-
-export async function claimTask(messageId: string): Promise<boolean> {
-  const data = await callMcpHandler<boolean>("task.claim", {
-    message_id: messageId,
-  });
-  return data;
-}
-
-export async function completeTask(
-  messageId: string,
-  resultSummary: string,
-  tokenUsage?: Record<string, number>
-): Promise<void> {
-  await callMcpHandler("task.complete", {
-    message_id: messageId,
-    result: resultSummary,
-    token_usage: tokenUsage || null,
-  });
-}
-
-export async function failTask(
-  messageId: string,
-  errorMessage: string
-): Promise<void> {
-  try {
-    await callMcpHandler("task.fail", {
-      message_id: messageId,
-      error: errorMessage,
-    });
-  } catch (err) {
-    log.error(`Failed to update task status: ${err instanceof Error ? err.message : err}`);
-  }
-}
-
-// ── Job Run Polling ─────────────────────────────────────────────────
-
-export interface PendingJobRun {
-  id: string;
-  job_id: string;
-  job_name: string;
-  trigger_type: string;
-}
-
 /**
- * Atomically claim one pending job run.
- * Uses FOR UPDATE SKIP LOCKED — concurrent CLIs will never grab the same run.
- * Returns null if no pending job run exists.
+ * Re-export barrel — all consumers import from "db/supabase.js" today.
+ * This file preserves backward compatibility while the actual logic
+ * lives in focused modules under db/.
  */
-export async function pollAndClaimJobRun(
-  _userId: string
-): Promise<PendingJobRun | null> {
-  try {
-    const data = await callMcpHandler<PendingJobRun | null>(
-      "job.claim_pending_run",
-    );
-    return data;
-  } catch (err) {
-    log.debug(`Job run poll failed: ${err instanceof Error ? err.message : err}`);
-    return null;
-  }
-}
-
-// ── Conversation History ─────────────────────────────────────────────
-
-export interface HistoryEntry {
-  prompt: string;
-  response: string;
-}
-
-/**
- * Fetch completed messages from a conversation to build history context.
- * Returns messages in chronological order (oldest first).
- */
-export async function getConversationHistory(
-  conversationId: string,
-  excludeMessageId: string,
-  limit: number = 20
-): Promise<HistoryEntry[]> {
-  try {
-    const rows = await callMcpHandler<Array<Record<string, unknown>>>(
-      "conversation.get_history",
-      {
-        conversation_id: conversationId,
-        exclude_message_id: excludeMessageId,
-        limit,
-      },
-    );
-
-    return (rows || [])
-      .reverse() // chronological order (oldest first)
-      .map((row) => {
-        const prompt =
-          ((row.metadata as Record<string, unknown>)?.prompt as string) || "";
-        const content = (row.content as string) || "";
-        const response =
-          row.status === "failed"
-            ? `[Task failed] ${content}`
-            : content;
-        return { prompt, response };
-      })
-      .filter((entry) => entry.prompt && entry.response);
-  } catch (err) {
-    log.debug(`Failed to fetch conversation history: ${err instanceof Error ? err.message : err}`);
-    return [];
-  }
-}
-
-// ── Event Streaming ─────────────────────────────────────────────────
-
-export type EventType =
-  | "text_delta"
-  | "tool_use_start"
-  | "tool_use_input"
-  | "tool_result"
-  | "thinking"
-  | "error"
-  | "status_change"
-  | "user_action_request";
-
-let eventSequence = 0;
-
-export function resetEventSequence() {
-  eventSequence = 0;
-}
-
-export async function emitEvent(
-  messageId: string,
-  eventType: EventType,
-  eventData: Record<string, unknown>
-): Promise<void> {
-  eventSequence++;
-  try {
-    await callMcpHandler("event.emit", {
-      message_id: messageId,
-      event_type: eventType,
-      event_data: eventData,
-      seq: eventSequence,
-    });
-  } catch (err) {
-    log.warn(`Failed to emit event: ${err instanceof Error ? err.message : err}`);
-  }
-}
-
-// ── Action Request Helpers ──────────────────────────────────────────
-
-export async function setActionRequest(
-  messageId: string,
-  actionData: Record<string, unknown>
-): Promise<void> {
-  await callMcpHandler("action.set_request", {
-    message_id: messageId,
-    action_data: actionData,
-  });
-}
 
-export async function pollActionResponse(
-  messageId: string
-): Promise<Record<string, unknown> | null> {
-  return callMcpHandler<Record<string, unknown> | null>(
-    "action.poll_response",
-    { message_id: messageId },
-  );
-}
+// Types
+export type {
+  AgentSession,
+  ConversationMessage,
+  AgentTask,
+  PendingJobRun,
+  HistoryEntry,
+  EventType,
+} from "./types.js";
+
+// Auth
+export { loginWithToken, getCurrentUserId, logout } from "./auth.js";
+
+// Session
+export {
+  createSession,
+  updateHeartbeat,
+  endSession,
+  setSessionBusy,
+  cleanupStaleSessions,
+  getActiveSessions,
+} from "./session.js";
+
+// Task
+export { createTask, pollAndClaimTask, claimTask, completeTask, failTask } from "./task.js";
+
+// Conversation
+export { getOrCreateCliConversation, getConversationHistory } from "./conversation.js";
+
+// Event
+export { TaskEventEmitter, resetEventSequence, emitEvent } from "./event.js";
+
+// Action
+export { setActionRequest, pollActionResponse } from "./action.js";
+
+// Job polling
+export { pollAndClaimJobRun } from "./job-poll.js";

package/src/db/task.ts

@@ -0,0 +1,69 @@
+import { callMcpHandler } from "./api-client.js";
+import { log } from "../utils/logger.js";
+import type { ConversationMessage } from "./types.js";
+
+export async function createTask(
+  conversationId: string,
+  sessionId: string,
+  prompt: string
+): Promise<ConversationMessage> {
+  const data = await callMcpHandler<Record<string, unknown>>("task.create", {
+    conversation_id: conversationId,
+    session_id: sessionId,
+    prompt,
+  });
+  return { ...data, prompt } as ConversationMessage;
+}
+
+/**
+ * Atomically poll ONE pending task and claim it in a single call.
+ * Uses FOR UPDATE SKIP LOCKED — concurrent CLIs will never grab the same task.
+ * Returns null if no pending task exists.
+ */
+export async function pollAndClaimTask(sessionId: string): Promise<ConversationMessage | null> {
+  try {
+    const data = await callMcpHandler<Record<string, unknown> | null>("task.poll_and_claim", {
+      session_id: sessionId,
+    });
+
+    if (!data) return null;
+
+    return {
+      ...data,
+      prompt: (data.metadata as Record<string, unknown>)?.prompt || data.content || "",
+    } as ConversationMessage;
+  } catch (err) {
+    log.warn(`Poll-and-claim failed: ${err instanceof Error ? err.message : err}`);
+    return null;
+  }
+}
+
+export async function claimTask(messageId: string): Promise<boolean> {
+  const data = await callMcpHandler<boolean>("task.claim", {
+    message_id: messageId,
+  });
+  return data;
+}
+
+export async function completeTask(
+  messageId: string,
+  resultSummary: string,
+  tokenUsage?: Record<string, number>
+): Promise<void> {
+  await callMcpHandler("task.complete", {
+    message_id: messageId,
+    result: resultSummary,
+    token_usage: tokenUsage || null,
+  });
+}
+
+export async function failTask(messageId: string, errorMessage: string): Promise<void> {
+  try {
+    await callMcpHandler("task.fail", {
+      message_id: messageId,
+      error: errorMessage,
+    });
+  } catch (err) {
+    log.error(`Failed to update task status: ${err instanceof Error ? err.message : err}`);
+  }
+}

package/src/db/types.ts

@@ -0,0 +1,54 @@
+// ── Shared Types ─────────────────────────────────────────────────────
+
+export interface AgentSession {
+  id: string;
+  user_id: string;
+  session_name: string;
+  status: "online" | "offline" | "busy";
+  workspace_path: string | null;
+  agent_version: string | null;
+  started_at: string;
+  last_heartbeat_at: string;
+  ended_at: string | null;
+  metadata: Record<string, unknown>;
+}
+
+export interface ConversationMessage {
+  id: string;
+  conversation_id: string;
+  sender_id: string;
+  role: "user" | "assistant" | "system";
+  content: string;
+  status: "pending" | "running" | "completed" | "failed" | "cancelled" | null;
+  session_id: string | null;
+  tool_calls: Record<string, unknown> | null;
+  tool_results: Record<string, unknown> | null;
+  metadata: Record<string, unknown>;
+  created_at: string;
+  updated_at: string;
+  prompt: string;
+}
+
+export type AgentTask = ConversationMessage;
+
+export interface PendingJobRun {
+  id: string;
+  job_id: string;
+  job_name: string;
+  trigger_type: string;
+}
+
+export interface HistoryEntry {
+  prompt: string;
+  response: string;
+}
+
+export type EventType =
+  | "text_delta"
+  | "tool_use_start"
+  | "tool_use_input"
+  | "tool_result"
+  | "thinking"
+  | "error"
+  | "status_change"
+  | "user_action_request";

package/src/index.ts

@@ -12,6 +12,7 @@ import { registerScheduleCommands } from "./commands/schedule.js";
 import { registerMemoryCommands } from "./commands/memory.js";
 import { registerSkillCommands } from "./commands/skill.js";
 import { registerJobCommands } from "./commands/job.js";
+import { registerCredentialCommands } from "./commands/credential.js";
 
 loadEnv();
 
@@ -35,5 +36,6 @@ registerScheduleCommands(program); // schedule add/list/toggle/remove
 registerMemoryCommands(program); // memory list/add/search/remove/clear
 registerSkillCommands(program); // skill list/search/create/show/remove
 registerJobCommands(program); // job list/status/schedule
+registerCredentialCommands(program); // credential list/set/get/remove/clear
 
 program.parse();