@gmickel/gno 1.25.1 → 1.26.0

package/src/serve/resident-runtime.ts

@@ -240,6 +240,7 @@ export async function startResidentRuntime(
   const ctxHolder: ContextHolder = {
     current: ctx,
     config: initialConfig,
+    actualConfigPath,
     scheduler: null,
     eventBus: options.eventBus ?? null,
     watchService: null,

package/src/serve/routes/api.ts

@@ -168,6 +168,7 @@ import { handleChanges, handleDiff, handleImpact } from "./changes";
 export interface ContextHolder {
   current: ServerContext;
   config: Config;
+  actualConfigPath?: string;
   scheduler: EmbedScheduler | null;
   eventBus: DocumentEventBus | null;
   watchService: CollectionWatchService | null;

package/src/store/migrations/021-multi-context-identity.ts

@@ -0,0 +1,37 @@
+/**
+ * Migration: allow multiple distinct context records at one logical scope.
+ *
+ * Context resolution already treats text as part of deterministic identity.
+ * The original two-column key accidentally limited each scope to one record.
+ *
+ * @module src/store/migrations/021-multi-context-identity
+ */
+
+import type { Database } from "bun:sqlite";
+
+import type { Migration } from "./runner";
+
+export const migration: Migration = {
+  version: 21,
+  name: "multi_context_identity",
+
+  up(db: Database): void {
+    db.exec(`
+      CREATE TABLE contexts_v21 (
+        scope_type TEXT NOT NULL
+          CHECK (scope_type IN ('global', 'collection', 'prefix')),
+        scope_key TEXT NOT NULL,
+        text TEXT NOT NULL,
+        synced_at TEXT NOT NULL DEFAULT (datetime('now')),
+        PRIMARY KEY (scope_type, scope_key, text)
+      );
+
+      INSERT INTO contexts_v21 (scope_type, scope_key, text, synced_at)
+      SELECT scope_type, scope_key, text, synced_at
+      FROM contexts;
+
+      DROP TABLE contexts;
+      ALTER TABLE contexts_v21 RENAME TO contexts;
+    `);
+  },
+};

package/src/store/migrations/index.ts

@@ -34,6 +34,7 @@ import { migration as m017 } from "./017-document-change-retention-counters";
 import { migration as m018 } from "./018-saved-capsule-registration-epoch";
 import { migration as m019 } from "./019-saved-capsule-registration-generation";
 import { migration as m020 } from "./020-browser-clipper-security";
+import { migration as m021 } from "./021-multi-context-identity";
 
 /** All migrations in order */
 export const migrations = [
@@ -57,4 +58,5 @@ export const migrations = [
   m018,
   m019,
   m020,
+  m021,
 ];

package/src/store/sqlite/adapter.ts

@@ -625,6 +625,57 @@ export class SqliteAdapter implements StorePort, SqliteDbProvider {
     }
   }
 
+  async upsertCollections(
+    collections: Collection[]
+  ): Promise<StoreResult<void>> {
+    try {
+      const db = this.ensureOpen();
+      const stmt = db.prepare(`
+        INSERT INTO collections (name, path, pattern, include, exclude, update_cmd, language_hint, synced_at)
+        VALUES (?, ?, ?, ?, ?, ?, ?, datetime('now'))
+        ON CONFLICT(name) DO UPDATE SET
+          path = excluded.path,
+          pattern = excluded.pattern,
+          include = excluded.include,
+          exclude = excluded.exclude,
+          update_cmd = excluded.update_cmd,
+          language_hint = excluded.language_hint,
+          synced_at = datetime('now')
+        WHERE collections.path IS NOT excluded.path
+          OR collections.pattern IS NOT excluded.pattern
+          OR collections.include IS NOT excluded.include
+          OR collections.exclude IS NOT excluded.exclude
+          OR collections.update_cmd IS NOT excluded.update_cmd
+          OR collections.language_hint IS NOT excluded.language_hint
+      `);
+      const transaction = db.transaction(() => {
+        for (const collection of collections) {
+          stmt.run(
+            collection.name,
+            collection.path,
+            collection.pattern,
+            collection.include.length > 0
+              ? JSON.stringify(collection.include)
+              : null,
+            collection.exclude.length > 0
+              ? JSON.stringify(collection.exclude)
+              : null,
+            collection.updateCmd ?? null,
+            collection.languageHint ?? null
+          );
+        }
+      });
+      transaction();
+      return ok(undefined);
+    } catch (cause) {
+      return err(
+        "QUERY_FAILED",
+        cause instanceof Error ? cause.message : "Failed to upsert collections",
+        cause
+      );
+    }
+  }
+
   async syncContexts(contexts: Context[]): Promise<StoreResult<void>> {
     try {
       const db = this.ensureOpen();
@@ -636,6 +687,8 @@ export class SqliteAdapter implements StorePort, SqliteDbProvider {
         const stmt = db.prepare(`
           INSERT INTO contexts (scope_type, scope_key, text, synced_at)
           VALUES (?, ?, ?, datetime('now'))
+          ON CONFLICT(scope_type, scope_key, text) DO UPDATE SET
+            synced_at = excluded.synced_at
         `);
 
         for (const c of contexts) {
@@ -655,6 +708,36 @@ export class SqliteAdapter implements StorePort, SqliteDbProvider {
     }
   }
 
+  async upsertContexts(contexts: Context[]): Promise<StoreResult<void>> {
+    try {
+      const db = this.ensureOpen();
+      const stmt = db.prepare(`
+        INSERT INTO contexts (scope_type, scope_key, text, synced_at)
+        VALUES (?, ?, ?, datetime('now'))
+        ON CONFLICT(scope_type, scope_key, text) DO NOTHING
+      `);
+      let inserted = 0;
+      const transaction = db.transaction(() => {
+        for (const context of contexts) {
+          inserted += stmt.run(
+            context.scopeType,
+            context.scopeKey,
+            context.text
+          ).changes;
+        }
+      });
+      transaction();
+      if (inserted > 0) this.contextGeneration += 1;
+      return ok(undefined);
+    } catch (cause) {
+      return err(
+        "QUERY_FAILED",
+        cause instanceof Error ? cause.message : "Failed to upsert contexts",
+        cause
+      );
+    }
+  }
+
   async getCollections(): Promise<StoreResult<CollectionRow[]>> {
     try {
       const db = this.ensureOpen();

package/browser-extension/artifacts/gno-browser-clipper-v1.25.1.zip.sha256

@@ -1 +0,0 @@
-454ebbfbe59a6821c471fbc22630dfd804c297a8dc7a4ce3880a032accb76382  gno-browser-clipper-v1.25.1.zip