mrvn-cli 0.2.8 → 0.2.10

package/dist/marvin-serve.js

@@ -39,6 +39,26 @@ import * as fs from "fs";
 import * as path from "path";
 import * as os from "os";
 import * as YAML from "yaml";
+function userConfigDir() {
+  return path.join(os.homedir(), ".config", "marvin");
+}
+function userConfigPath() {
+  return path.join(userConfigDir(), "config.yaml");
+}
+function loadUserConfig() {
+  const configPath = userConfigPath();
+  if (!fs.existsSync(configPath)) {
+    return {};
+  }
+  try {
+    const raw = fs.readFileSync(configPath, "utf-8");
+    return YAML.parse(raw) ?? {};
+  } catch (err) {
+    throw new ConfigError(
+      `Failed to parse user config at ${configPath}: ${err}`
+    );
+  }
+}
 function loadProjectConfig(marvinDir) {
   const configPath = path.join(marvinDir, "config.yaml");
   if (!fs.existsSync(configPath)) {
@@ -146,6 +166,11 @@ var DocumentStore = class {
         const raw = fs3.readFileSync(filePath, "utf-8");
         const doc = parseDocument(raw, filePath);
         if (doc.frontmatter.id) {
+          if (this.index.has(doc.frontmatter.id)) {
+            console.warn(
+              `[marvin] Duplicate ID "${doc.frontmatter.id}" in ${file2} \u2014 conflicts with existing entry. Run ID repair to fix.`
+            );
+          }
           this.index.set(doc.frontmatter.id, doc.frontmatter);
         }
       }
@@ -269,14 +294,19 @@ var DocumentStore = class {
     const dirName = this.typeDirs[type];
     const dir = path3.join(this.docsDir, dirName);
     if (!fs3.existsSync(dir)) return `${prefix}-001`;
+    const idPattern = new RegExp(`^${prefix}-(\\d+)$`);
     const files = fs3.readdirSync(dir).filter((f) => f.endsWith(".md"));
     let maxNum = 0;
     for (const file2 of files) {
-      const match = file2.match(new RegExp(`^${prefix}-(\\d+)\\.md$`));
+      const filePath = path3.join(dir, file2);
+      const raw = fs3.readFileSync(filePath, "utf-8");
+      const doc = parseDocument(raw, filePath);
+      const match = doc.frontmatter.id?.match(idPattern);
       if (match) {
         maxNum = Math.max(maxNum, parseInt(match[1], 10));
       }
     }
+    maxNum = Math.max(maxNum, files.length);
     return `${prefix}-${String(maxNum + 1).padStart(3, "0")}`;
   }
   counts() {
@@ -17322,12 +17352,12 @@ var JiraClient = class {
     );
   }
 };
-function createJiraClient() {
-  const host = process.env.JIRA_HOST;
-  const email3 = process.env.JIRA_EMAIL;
-  const apiToken = process.env.JIRA_API_TOKEN;
+function createJiraClient(jiraUserConfig) {
+  const host = jiraUserConfig?.host ?? process.env.JIRA_HOST;
+  const email3 = jiraUserConfig?.email ?? process.env.JIRA_EMAIL;
+  const apiToken = jiraUserConfig?.apiToken ?? process.env.JIRA_API_TOKEN;
   if (!host || !email3 || !apiToken) return null;
-  return new JiraClient({ host, email: email3, apiToken });
+  return { client: new JiraClient({ host, email: email3, apiToken }), host };
 }
 
 // src/skills/builtin/jira/tools.ts
@@ -17337,7 +17367,7 @@ function jiraNotConfiguredError() {
     content: [
       {
         type: "text",
-        text: "Jira is not configured. Set JIRA_HOST, JIRA_EMAIL, and JIRA_API_TOKEN environment variables."
+        text: 'Jira is not configured. Run "marvin config jira" or set JIRA_HOST, JIRA_EMAIL, and JIRA_API_TOKEN environment variables.'
       }
     ],
     isError: true
@@ -17369,6 +17399,7 @@ function findByJiraKey(store, jiraKey) {
   return docs.find((d) => d.frontmatter.jiraKey === jiraKey);
 }
 function createJiraTools(store) {
+  const jiraUserConfig = loadUserConfig().jira;
   return [
     // --- Local read tools ---
     tool19(
@@ -17439,15 +17470,14 @@ function createJiraTools(store) {
         key: external_exports.string().describe("Jira issue key (e.g. 'PROJ-123')")
       },
       async (args) => {
-        const client = createJiraClient();
-        if (!client) return jiraNotConfiguredError();
-        const issue2 = await client.getIssue(args.key);
-        const host = process.env.JIRA_HOST;
+        const jira = createJiraClient(jiraUserConfig);
+        if (!jira) return jiraNotConfiguredError();
+        const issue2 = await jira.client.getIssue(args.key);
         const existing = findByJiraKey(store, args.key);
         if (existing) {
           const fm2 = jiraIssueToFrontmatter(
             issue2,
-            host,
+            jira.host,
             existing.frontmatter.linkedArtifacts
           );
           const doc2 = store.update(
@@ -17464,7 +17494,7 @@ function createJiraTools(store) {
             ]
           };
         }
-        const fm = jiraIssueToFrontmatter(issue2, host);
+        const fm = jiraIssueToFrontmatter(issue2, jira.host);
         const doc = store.create(
           JIRA_TYPE,
           fm,
@@ -17488,10 +17518,9 @@ function createJiraTools(store) {
         maxResults: external_exports.number().optional().describe("Max issues to fetch (default 50)")
       },
       async (args) => {
-        const client = createJiraClient();
-        if (!client) return jiraNotConfiguredError();
-        const result = await client.searchIssues(args.jql, args.maxResults);
-        const host = process.env.JIRA_HOST;
+        const jira = createJiraClient(jiraUserConfig);
+        if (!jira) return jiraNotConfiguredError();
+        const result = await jira.client.searchIssues(args.jql, args.maxResults);
         const created = [];
         const updated = [];
         for (const issue2 of result.issues) {
@@ -17499,7 +17528,7 @@ function createJiraTools(store) {
           if (existing) {
             const fm = jiraIssueToFrontmatter(
               issue2,
-              host,
+              jira.host,
               existing.frontmatter.linkedArtifacts
             );
             store.update(
@@ -17509,7 +17538,7 @@ function createJiraTools(store) {
             );
             updated.push(`${existing.frontmatter.id} (${issue2.key})`);
           } else {
-            const fm = jiraIssueToFrontmatter(issue2, host);
+            const fm = jiraIssueToFrontmatter(issue2, jira.host);
             const doc = store.create(
               JIRA_TYPE,
               fm,
@@ -17538,8 +17567,8 @@ function createJiraTools(store) {
         issueType: external_exports.enum(["Story", "Task", "Bug", "Epic"]).optional().describe("Jira issue type (default: 'Task')")
       },
       async (args) => {
-        const client = createJiraClient();
-        if (!client) return jiraNotConfiguredError();
+        const jira = createJiraClient(jiraUserConfig);
+        if (!jira) return jiraNotConfiguredError();
         const artifact = store.get(args.artifactId);
         if (!artifact) {
           return {
@@ -17556,20 +17585,19 @@ function createJiraTools(store) {
           `Marvin artifact: ${artifact.frontmatter.id} (${artifact.frontmatter.type})`,
           `Status: ${artifact.frontmatter.status}`
         ].join("\n");
-        const jiraResult = await client.createIssue({
+        const jiraResult = await jira.client.createIssue({
           project: { key: args.projectKey },
           summary: artifact.frontmatter.title,
           description,
           issuetype: { name: args.issueType ?? "Task" }
         });
-        const host = process.env.JIRA_HOST;
         const jiDoc = store.create(
           JIRA_TYPE,
           {
             title: artifact.frontmatter.title,
             status: "open",
             jiraKey: jiraResult.key,
-            jiraUrl: `https://${host}/browse/${jiraResult.key}`,
+            jiraUrl: `https://${jira.host}/browse/${jiraResult.key}`,
             issueType: args.issueType ?? "Task",
             priority: "Medium",
             assignee: "",
@@ -17598,8 +17626,8 @@ function createJiraTools(store) {
         id: external_exports.string().describe("Local JI-xxx ID")
       },
       async (args) => {
-        const client = createJiraClient();
-        if (!client) return jiraNotConfiguredError();
+        const jira = createJiraClient(jiraUserConfig);
+        if (!jira) return jiraNotConfiguredError();
         const doc = store.get(args.id);
         if (!doc || doc.frontmatter.type !== JIRA_TYPE) {
           return {
@@ -17610,15 +17638,14 @@ function createJiraTools(store) {
           };
         }
         const jiraKey = doc.frontmatter.jiraKey;
-        await client.updateIssue(jiraKey, {
+        await jira.client.updateIssue(jiraKey, {
           summary: doc.frontmatter.title,
           description: doc.content || void 0
         });
-        const issue2 = await client.getIssue(jiraKey);
-        const host = process.env.JIRA_HOST;
+        const issue2 = await jira.client.getIssue(jiraKey);
         const fm = jiraIssueToFrontmatter(
           issue2,
-          host,
+          jira.host,
           doc.frontmatter.linkedArtifacts
         );
         store.update(args.id, fm, issue2.fields.description ?? "");