@mr-jones123/toji 0.1.1 → 0.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mr-jones123/toji",
-  "version": "0.1.1",
+  "version": "0.2.3",
   "type": "module",
   "description": "Toji Pi extensions for code memory and AI-to-AI comms.",
   "keywords": [

package/packages/toji-mem/src/db/migrations.ts

@@ -3,6 +3,7 @@ import type { TojiDatabase } from "./connection";
 const tables = `
 CREATE TABLE IF NOT EXISTS projects (
   id INTEGER PRIMARY KEY AUTOINCREMENT,
+  project_key TEXT UNIQUE,
   root_path TEXT NOT NULL UNIQUE,
   name TEXT NOT NULL,
   indexed_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP
@@ -113,6 +114,7 @@ CREATE VIRTUAL TABLE IF NOT EXISTS standards_fts USING fts5(
 `;
 
 const indexes = `
+CREATE UNIQUE INDEX IF NOT EXISTS idx_projects_project_key ON projects(project_key);
 CREATE INDEX IF NOT EXISTS idx_files_project_path ON files(project_id, path);
 CREATE INDEX IF NOT EXISTS idx_files_project_name ON files(project_id, name);
 CREATE INDEX IF NOT EXISTS idx_files_lower_path ON files(lower(path));
@@ -141,6 +143,7 @@ export function runMigrations(database: TojiDatabase): void {
 
 function migrateExisting(database: TojiDatabase): void {
   for (const sql of [
+    "ALTER TABLE projects ADD COLUMN project_key TEXT",
     "ALTER TABLE files ADD COLUMN name TEXT NOT NULL DEFAULT ''",
     "ALTER TABLE symbols ADD COLUMN canon_name TEXT NOT NULL DEFAULT ''",
     "ALTER TABLE symbols ADD COLUMN docstring TEXT NOT NULL DEFAULT ''",

package/packages/toji-mem/src/index.ts

@@ -117,7 +117,7 @@ export default function (pi: ExtensionAPI) {
     description: "Return an overview of an indexed project: files by directory, languages, symbols, tests, and graph edge counts. Use this when asked to read or summarize an indexed codebase.",
     parameters: Type.Object({
       projectPath: Type.Optional(Type.String({ description: "Project root path. Defaults to current pi cwd." })),
-      projectId: Type.Optional(Type.Number({ description: "Indexed project id." })),
+      projectId: Type.Optional(Type.Union([Type.Number(), Type.String()], { description: "Indexed project id or hex project key." })),
       includeSymbols: Type.Optional(Type.Boolean({ description: "Include symbols grouped by file. Defaults to true." })),
     }),
     async execute(_toolCallId, params, _signal, onUpdate, ctx) {

package/packages/toji-mem/src/indexer/index-project.ts

@@ -7,7 +7,7 @@ import { walkProjectFiles } from "./file-walker";
 import { getParserForPath, getSupportedExtensions } from "./parsers/registry";
 
 export interface IndexProjectResult {
-  projectId: number;
+  projectId: string;
   rootPath: string;
   indexedFiles: number;
   symbols: number;
@@ -17,14 +17,15 @@ export interface IndexProjectResult {
 
 export async function indexProject(database: TojiDatabase, rootPath: string): Promise<IndexProjectResult> {
   const normalizedRoot = resolve(rootPath);
+  const projectKey = createHash("sha256").update(normalizedRoot).digest("hex").slice(0, 8);
   const project = database
-    .query<{ id: number }, [string, string]>(
-      `INSERT INTO projects (root_path, name, indexed_at)
-       VALUES (?, ?, CURRENT_TIMESTAMP)
-       ON CONFLICT(root_path) DO UPDATE SET indexed_at = CURRENT_TIMESTAMP
+    .query<{ id: number }, [string, string, string]>(
+      `INSERT INTO projects (project_key, root_path, name, indexed_at)
+       VALUES (?, ?, ?, CURRENT_TIMESTAMP)
+       ON CONFLICT(root_path) DO UPDATE SET project_key = excluded.project_key, indexed_at = CURRENT_TIMESTAMP
        RETURNING id`,
     )
-    .get(normalizedRoot, basename(normalizedRoot));
+    .get(projectKey, normalizedRoot, basename(normalizedRoot));
 
   if (!project) throw new Error("Failed to create or update project");
 
@@ -47,7 +48,7 @@ export async function indexProject(database: TojiDatabase, rootPath: string): Pr
       )
       .get(project.id, project.id, project.id);
     return {
-      projectId: project.id,
+      projectId: projectKey,
       rootPath: normalizedRoot,
       indexedFiles: files.length,
       symbols: counts?.symbols ?? 0,
@@ -168,7 +169,7 @@ export async function indexProject(database: TojiDatabase, rootPath: string): Pr
 
   createGraphEdges(database, project.id, files, fileIds, symbolsByFile, importsByFile, callsByFile, relationsByFile);
 
-  return { projectId: project.id, rootPath: normalizedRoot, indexedFiles: files.length, symbols: symbolCount, imports: importCount, calls: callCount };
+  return { projectId: projectKey, rootPath: normalizedRoot, indexedFiles: files.length, symbols: symbolCount, imports: importCount, calls: callCount };
 }
 
 async function hashFiles(rootPath: string, files: string[]): Promise<Map<string, string>> {
@@ -271,7 +272,7 @@ function resolveImportPath(fromPath: string, source: string, files: string[]): s
   if (!source.startsWith(".")) return undefined;
 
   const basePath = normalize(join(dirname(fromPath), source));
-  const candidates = [basePath, `${basePath}.ts`, `${basePath}.tsx`, `${basePath}.js`, `${basePath}.jsx`, `${basePath}.py`, join(basePath, "index.ts")];
+  const candidates = [basePath, `${basePath}.ts`, `${basePath}.tsx`, `${basePath}.js`, `${basePath}.jsx`, `${basePath}.py`, `${basePath}.dart`, join(basePath, "index.ts")];
   return candidates.find((candidate) => files.includes(candidate));
 }
 

package/packages/toji-mem/src/tools/project-overview.ts

@@ -4,7 +4,7 @@ import type { TojiDatabase } from "../db/connection";
 
 export interface ProjectOverviewOptions {
   projectPath?: string;
-  projectId?: number;
+  projectId?: number | string;
   includeSymbols?: boolean;
 }
 
@@ -26,20 +26,36 @@ export function getProjectOverview(database: TojiDatabase, options: ProjectOverv
   };
 
   const overview: Record<string, unknown> = {
-    project,
+    project: {
+      projectId: project.project_key ?? String(project.id),
+      root_path: project.root_path,
+      name: project.name,
+      indexed_at: project.indexed_at,
+    },
     counts,
     languages: database
       .query(`SELECT language, count(*) AS files FROM files WHERE project_id = ? GROUP BY language ORDER BY files DESC`)
       .all(project.id),
     directories: database
       .query(
-        `SELECT CASE WHEN instr(path, '/') = 0 THEN '(root)' ELSE substr(path, 1, instr(path, '/') - 1) END AS directory,
-                count(*) AS files
-         FROM files
-         WHERE project_id = ?
+        `WITH RECURSIVE split(path, directory, rest) AS (
+           SELECT path,
+                  CASE WHEN instr(path, '/') = 0 THEN '(root)' ELSE substr(path, 1, instr(path, '/') - 1) END,
+                  CASE WHEN instr(path, '/') = 0 THEN '' ELSE substr(path, instr(path, '/') + 1) END
+           FROM files
+           WHERE project_id = ?
+           UNION ALL
+           SELECT path,
+                  directory || '/' || substr(rest, 1, instr(rest, '/') - 1),
+                  substr(rest, instr(rest, '/') + 1)
+           FROM split
+           WHERE instr(rest, '/') > 0
+         )
+         SELECT directory, count(*) AS files
+         FROM split
          GROUP BY directory
-         ORDER BY files DESC, directory
-         LIMIT 50`,
+         ORDER BY directory
+         LIMIT 200`,
       )
       .all(project.id),
     edgeTypes: database
@@ -81,19 +97,21 @@ export function getProjectOverview(database: TojiDatabase, options: ProjectOverv
   return overview;
 }
 
-function findProject(database: TojiDatabase, options: ProjectOverviewOptions): { id: number; root_path: string; name: string; indexed_at: string } | undefined {
+function findProject(database: TojiDatabase, options: ProjectOverviewOptions): { id: number; project_key: string | null; root_path: string; name: string; indexed_at: string } | undefined {
   if (options.projectId !== undefined) {
-    return database.query<{ id: number; root_path: string; name: string; indexed_at: string }, [number]>(`SELECT id, root_path, name, indexed_at FROM projects WHERE id = ?`).get(options.projectId);
+    return database
+      .query<{ id: number; project_key: string | null; root_path: string; name: string; indexed_at: string }, [number | string, string]>(`SELECT id, project_key, root_path, name, indexed_at FROM projects WHERE id = ? OR project_key = ?`)
+      .get(options.projectId, String(options.projectId));
   }
 
   if (options.projectPath) {
     return database
-      .query<{ id: number; root_path: string; name: string; indexed_at: string }, [string]>(`SELECT id, root_path, name, indexed_at FROM projects WHERE root_path = ?`)
+      .query<{ id: number; project_key: string | null; root_path: string; name: string; indexed_at: string }, [string]>(`SELECT id, project_key, root_path, name, indexed_at FROM projects WHERE root_path = ?`)
       .get(resolve(options.projectPath));
   }
 
   return database
-    .query<{ id: number; root_path: string; name: string; indexed_at: string }, []>(`SELECT id, root_path, name, indexed_at FROM projects ORDER BY indexed_at DESC, id DESC LIMIT 1`)
+    .query<{ id: number; project_key: string | null; root_path: string; name: string; indexed_at: string }, []>(`SELECT id, project_key, root_path, name, indexed_at FROM projects ORDER BY indexed_at DESC, id DESC LIMIT 1`)
     .get();
 }