opencode-swarm-plugin 0.31.7 → 0.33.0

package/src/hive.ts

@@ -22,7 +22,7 @@ import {
   syncMemories,
   type HiveAdapter,
   type Cell as AdapterCell,
-  getSwarmMail,
+  getSwarmMailLibSQL,
   resolvePartialId,
 } from "swarm-mail";
 import { existsSync, readFileSync } from "node:fs";
@@ -508,7 +508,7 @@ export async function getHiveAdapter(projectKey: string): Promise<HiveAdapter> {
     return adapterCache.get(projectKey)!;
   }
 
-  const swarmMail = await getSwarmMail(projectKey);
+  const swarmMail = await getSwarmMailLibSQL(projectKey);
   const db = await swarmMail.getDatabase();
   const adapter = createHiveAdapter(db, projectKey);
 
@@ -1158,7 +1158,7 @@ export const hive_sync = tool({
     );
 
     // 2b. Sync memories to JSONL
-    const swarmMail = await getSwarmMail(projectKey);
+    const swarmMail = await getSwarmMailLibSQL(projectKey);
     const db = await swarmMail.getDatabase();
     const hivePath = join(projectKey, ".hive");
     let memoriesSynced = 0;
@@ -1217,18 +1217,43 @@ export const hive_sync = tool({
       const hasRemote = remoteCheckResult.stdout.trim() !== "";
 
       if (hasRemote) {
-        const pullResult = await withTimeout(
-          runGitCommand(["pull", "--rebase"]),
-          TIMEOUT_MS,
-          "git pull --rebase",
-        );
+        // Check for unstaged changes that would block pull --rebase
+        const statusResult = await runGitCommand(["status", "--porcelain"]);
+        const hasUnstagedChanges = statusResult.stdout.trim() !== "";
+        let didStash = false;
+
+        if (hasUnstagedChanges) {
+          // Stash all changes (including untracked) before pull
+          const stashResult = await runGitCommand(["stash", "push", "-u", "-m", "hive_sync: auto-stash before pull"]);
+          if (stashResult.exitCode === 0) {
+            didStash = true;
+          }
+          // If stash fails (e.g., nothing to stash), continue anyway
+        }
 
-        if (pullResult.exitCode !== 0) {
-          throw new HiveError(
-            `Failed to pull: ${pullResult.stderr}`,
+        try {
+          const pullResult = await withTimeout(
+            runGitCommand(["pull", "--rebase"]),
+            TIMEOUT_MS,
             "git pull --rebase",
-            pullResult.exitCode,
           );
+
+          if (pullResult.exitCode !== 0) {
+            throw new HiveError(
+              `Failed to pull: ${pullResult.stderr}`,
+              "git pull --rebase",
+              pullResult.exitCode,
+            );
+          }
+        } finally {
+          // Pop stash if we stashed
+          if (didStash) {
+            const popResult = await runGitCommand(["stash", "pop"]);
+            if (popResult.exitCode !== 0) {
+              // Stash pop failed - likely a conflict. Log warning but don't fail sync.
+              console.warn(`[hive_sync] Warning: stash pop failed. Your changes are in 'git stash list'. Error: ${popResult.stderr}`);
+            }
+          }
         }
       }
     }

package/src/index.ts

@@ -47,6 +47,8 @@ import { repoCrawlTools } from "./repo-crawl";
 import { skillsTools, setSkillsProjectDirectory } from "./skills";
 import { mandateTools } from "./mandates";
 import { memoryTools } from "./memory-tools";
+import { observabilityTools } from "./observability-tools";
+import { researchTools } from "./swarm-research";
 import {
   guardrailOutput,
   DEFAULT_GUARDRAIL_CONFIG,
@@ -154,7 +156,7 @@ export const SwarmPlugin: Plugin = async (
  * - mandate:file, mandate:vote, mandate:query, etc.
  * - semantic-memory:store, semantic-memory:find, semantic-memory:get, etc.
  */
-    tool: {
+     tool: {
       ...hiveTools,
       ...swarmMailTools,
       ...structuredTools,
@@ -165,6 +167,8 @@ export const SwarmPlugin: Plugin = async (
       ...skillsTools,
       ...mandateTools,
       ...memoryTools,
+      ...observabilityTools,
+      ...researchTools,
     },
 
     /**
@@ -679,3 +683,23 @@ export {
   type OperationResult,
 } from "./memory-tools";
 export type { Memory, SearchResult, SearchOptions } from "swarm-mail";
+
+/**
+ * Re-export swarm-research module
+ *
+ * Includes:
+ * - discoverDocTools - Discover available documentation tools
+ * - getInstalledVersions - Get installed package versions from lockfile
+ * - researchTools - Plugin tools for tool discovery and version detection
+ *
+ * Types:
+ * - DiscoveredTool - Tool discovery result interface
+ * - VersionInfo - Package version information
+ */
+export {
+  discoverDocTools,
+  getInstalledVersions,
+  researchTools,
+  type DiscoveredTool,
+  type VersionInfo,
+} from "./swarm-research";