@lumy-pack/line-lore 0.0.1 → 0.0.2

package/dist/index.mjs

@@ -71,10 +71,11 @@ var init_errors = __esm({
 
 // src/git/executor.ts
 import { execa } from "execa";
-async function gitExec(args, options) {
+async function execCommand(command, args, options, errorCode) {
   const { cwd, timeout, allowExitCodes = [] } = options ?? {};
+  const failCode = errorCode ?? LineLoreErrorCode.GIT_COMMAND_FAILED;
   try {
-    const result = await execa("git", args, {
+    const result = await execa(command, args, {
       cwd,
       timeout,
       reject: false
@@ -82,9 +83,9 @@ async function gitExec(args, options) {
     const exitCode = result.exitCode ?? 0;
     if (exitCode !== 0 && !allowExitCodes.includes(exitCode)) {
       throw new LineLoreError(
-        LineLoreErrorCode.GIT_COMMAND_FAILED,
-        `git ${args[0]} failed with exit code ${exitCode}: ${result.stderr}`,
-        { args, exitCode, stderr: result.stderr, cwd }
+        failCode,
+        `${command} ${args[0]} failed with exit code ${exitCode}: ${result.stderr}`,
+        { command, args, exitCode, stderr: result.stderr, cwd }
       );
     }
     return {
@@ -98,17 +99,33 @@ async function gitExec(args, options) {
     if (isTimeout) {
       throw new LineLoreError(
         LineLoreErrorCode.GIT_TIMEOUT,
-        `git ${args[0]} timed out after ${timeout}ms`,
-        { args, timeout, cwd }
+        `${command} ${args[0]} timed out after ${timeout}ms`,
+        { command, args, timeout, cwd }
       );
     }
     throw new LineLoreError(
-      LineLoreErrorCode.GIT_COMMAND_FAILED,
-      `git ${args[0]} failed: ${error instanceof Error ? error.message : String(error)}`,
-      { args, cwd }
+      failCode,
+      `${command} ${args[0]} failed: ${error instanceof Error ? error.message : String(error)}`,
+      { command, args, cwd }
     );
   }
 }
+async function gitExec(args, options) {
+  return execCommand(
+    "git",
+    args,
+    options,
+    LineLoreErrorCode.GIT_COMMAND_FAILED
+  );
+}
+async function shellExec(command, args, options) {
+  return execCommand(
+    command,
+    args,
+    options,
+    LineLoreErrorCode.API_REQUEST_FAILED
+  );
+}
 var init_executor = __esm({
   "src/git/executor.ts"() {
     "use strict";
@@ -294,9 +311,8 @@ async function computePatchId(commitSha, options) {
   const cached = await cache.get(commitSha);
   if (cached) return cached;
   try {
-    const { execa: execaFn } = await import("execa");
     const cwd = options?.cwd ?? ".";
-    const result = await execaFn(
+    const result = await shellExec(
       "bash",
       [
         "-c",
@@ -798,17 +814,16 @@ var GitHubAdapter = class {
   }
   async checkAuth() {
     try {
-      const result = await gitExec(
-        ["gh", "auth", "status", "--hostname", this.hostname].slice(1),
+      const result = await shellExec(
+        "gh",
+        ["auth", "token", "--hostname", this.hostname],
         {
           allowExitCodes: [1]
         }
       );
-      const output = result.stdout + result.stderr;
-      const usernameMatch = /Logged in to .+ as (\S+)/.exec(output);
+      const hasToken = result.exitCode === 0 && result.stdout.trim().length > 0;
       return {
-        authenticated: result.exitCode === 0,
-        username: usernameMatch?.[1],
+        authenticated: hasToken,
         hostname: this.hostname
       };
     } catch {
@@ -818,17 +833,14 @@ var GitHubAdapter = class {
   async getPRForCommit(sha) {
     if (this.scheduler.isRateLimited()) return null;
     try {
-      const result = await gitExec(
-        [
-          "gh",
-          "api",
-          `repos/{owner}/{repo}/commits/${sha}/pulls`,
-          "--hostname",
-          this.hostname,
-          "--jq",
-          ".[0] | {number, title, user: .user.login, html_url, merge_commit_sha, base: .base.ref, merged_at}"
-        ].slice(1)
-      );
+      const result = await shellExec("gh", [
+        "api",
+        `repos/{owner}/{repo}/commits/${sha}/pulls`,
+        "--hostname",
+        this.hostname,
+        "--jq",
+        ".[0] | {number, title, user: .user.login, html_url, merge_commit_sha, base: .base.ref, merged_at}"
+      ]);
       const data = JSON.parse(result.stdout);
       if (!data?.number) return null;
       return {
@@ -846,17 +858,14 @@ var GitHubAdapter = class {
   }
   async getPRCommits(prNumber) {
     try {
-      const result = await gitExec(
-        [
-          "gh",
-          "api",
-          `repos/{owner}/{repo}/pulls/${prNumber}/commits`,
-          "--hostname",
-          this.hostname,
-          "--jq",
-          ".[].sha"
-        ].slice(1)
-      );
+      const result = await shellExec("gh", [
+        "api",
+        `repos/{owner}/{repo}/pulls/${prNumber}/commits`,
+        "--hostname",
+        this.hostname,
+        "--jq",
+        ".[].sha"
+      ]);
       return result.stdout.trim().split("\n").filter(Boolean);
     } catch {
       return [];
@@ -864,19 +873,16 @@ var GitHubAdapter = class {
   }
   async getLinkedIssues(prNumber) {
     try {
-      const result = await gitExec(
-        [
-          "gh",
-          "api",
-          "graphql",
-          "--hostname",
-          this.hostname,
-          "-f",
-          `query=query { repository(owner: "{owner}", name: "{repo}") { pullRequest(number: ${prNumber}) { closingIssuesReferences(first: 10) { nodes { number title url state labels(first: 5) { nodes { name } } } } } } }`,
-          "--jq",
-          ".data.repository.pullRequest.closingIssuesReferences.nodes"
-        ].slice(1)
-      );
+      const result = await shellExec("gh", [
+        "api",
+        "graphql",
+        "--hostname",
+        this.hostname,
+        "-f",
+        `query=query { repository(owner: "{owner}", name: "{repo}") { pullRequest(number: ${prNumber}) { closingIssuesReferences(first: 10) { nodes { number title url state labels(first: 5) { nodes { name } } } } } } }`,
+        "--jq",
+        ".data.repository.pullRequest.closingIssuesReferences.nodes"
+      ]);
       const nodes = JSON.parse(result.stdout);
       if (!Array.isArray(nodes)) return [];
       return nodes.map((node) => ({
@@ -892,17 +898,14 @@ var GitHubAdapter = class {
   }
   async getLinkedPRs(issueNumber) {
     try {
-      const result = await gitExec(
-        [
-          "gh",
-          "api",
-          `repos/{owner}/{repo}/issues/${issueNumber}/timeline`,
-          "--hostname",
-          this.hostname,
-          "--jq",
-          '[.[] | select(.source.issue.pull_request) | .source.issue] | map({number, title, user: .user.login, html_url, merge_commit_sha: .pull_request.merge_commit_sha, base: "main", merged_at: .pull_request.merged_at})'
-        ].slice(1)
-      );
+      const result = await shellExec("gh", [
+        "api",
+        `repos/{owner}/{repo}/issues/${issueNumber}/timeline`,
+        "--hostname",
+        this.hostname,
+        "--jq",
+        '[.[] | select(.source.issue.pull_request) | .source.issue] | map({number, title, user: .user.login, html_url, merge_commit_sha: .pull_request.merge_commit_sha, base: "main", merged_at: .pull_request.merged_at})'
+      ]);
       const prs = JSON.parse(result.stdout);
       if (!Array.isArray(prs)) return [];
       return prs.map((pr) => ({
@@ -920,17 +923,14 @@ var GitHubAdapter = class {
   }
   async getRateLimit() {
     try {
-      const result = await gitExec(
-        [
-          "gh",
-          "api",
-          "rate_limit",
-          "--hostname",
-          this.hostname,
-          "--jq",
-          ".rate | {limit, remaining, reset}"
-        ].slice(1)
-      );
+      const result = await shellExec("gh", [
+        "api",
+        "rate_limit",
+        "--hostname",
+        this.hostname,
+        "--jq",
+        ".rate | {limit, remaining, reset}"
+      ]);
       const data = JSON.parse(result.stdout);
       const info = {
         limit: data.limit ?? 5e3,
@@ -969,16 +969,17 @@ var GitLabAdapter = class {
     this.scheduler = options?.scheduler ?? new RequestScheduler();
   }
   async checkAuth() {
+    if (process.env.GITLAB_TOKEN) {
+      return { authenticated: true, hostname: this.hostname };
+    }
     try {
-      const result = await gitExec(
-        ["glab", "auth", "status", "--hostname", this.hostname].slice(1),
+      const result = await shellExec(
+        "glab",
+        ["auth", "status", "--hostname", this.hostname],
         { allowExitCodes: [1] }
       );
-      const output = result.stdout + result.stderr;
-      const usernameMatch = /Logged in to .+ as (\S+)/.exec(output);
       return {
         authenticated: result.exitCode === 0,
-        username: usernameMatch?.[1],
         hostname: this.hostname
       };
     } catch {
@@ -988,15 +989,12 @@ var GitLabAdapter = class {
   async getPRForCommit(sha) {
     if (this.scheduler.isRateLimited()) return null;
     try {
-      const result = await gitExec(
-        [
-          "glab",
-          "api",
-          `projects/:id/repository/commits/${sha}/merge_requests`,
-          "--hostname",
-          this.hostname
-        ].slice(1)
-      );
+      const result = await shellExec("glab", [
+        "api",
+        `projects/:id/repository/commits/${sha}/merge_requests`,
+        "--hostname",
+        this.hostname
+      ]);
       const mrs = JSON.parse(result.stdout);
       if (!Array.isArray(mrs) || mrs.length === 0) return null;
       const mr = mrs[0];
@@ -1015,15 +1013,12 @@ var GitLabAdapter = class {
   }
   async getPRCommits(prNumber) {
     try {
-      const result = await gitExec(
-        [
-          "glab",
-          "api",
-          `projects/:id/merge_requests/${prNumber}/commits`,
-          "--hostname",
-          this.hostname
-        ].slice(1)
-      );
+      const result = await shellExec("glab", [
+        "api",
+        `projects/:id/merge_requests/${prNumber}/commits`,
+        "--hostname",
+        this.hostname
+      ]);
       const commits = JSON.parse(result.stdout);
       if (!Array.isArray(commits)) return [];
       return commits.map((c) => c.id);
@@ -1033,15 +1028,12 @@ var GitLabAdapter = class {
   }
   async getLinkedIssues(prNumber) {
     try {
-      const result = await gitExec(
-        [
-          "glab",
-          "api",
-          `projects/:id/merge_requests/${prNumber}/closes_issues`,
-          "--hostname",
-          this.hostname
-        ].slice(1)
-      );
+      const result = await shellExec("glab", [
+        "api",
+        `projects/:id/merge_requests/${prNumber}/closes_issues`,
+        "--hostname",
+        this.hostname
+      ]);
       const issues = JSON.parse(result.stdout);
       if (!Array.isArray(issues)) return [];
       return issues.map((issue) => ({
@@ -1057,15 +1049,12 @@ var GitLabAdapter = class {
   }
   async getLinkedPRs(issueNumber) {
     try {
-      const result = await gitExec(
-        [
-          "glab",
-          "api",
-          `projects/:id/issues/${issueNumber}/related_merge_requests`,
-          "--hostname",
-          this.hostname
-        ].slice(1)
-      );
+      const result = await shellExec("glab", [
+        "api",
+        `projects/:id/issues/${issueNumber}/related_merge_requests`,
+        "--hostname",
+        this.hostname
+      ]);
       const mrs = JSON.parse(result.stdout);
       if (!Array.isArray(mrs)) return [];
       return mrs.map((mr) => ({
@@ -1655,18 +1644,20 @@ async function executeBlame(file, lineRange, options) {
 async function analyzeBlameResults(results, options) {
   const uniqueShas = [...new Set(results.map((r) => r.commitHash))];
   const cosmeticMap = /* @__PURE__ */ new Map();
-  for (const sha of uniqueShas) {
-    if (sha === "0".repeat(40)) continue;
-    try {
-      const blameResult = results.find((r) => r.commitHash === sha);
-      if (!blameResult) continue;
-      const file = blameResult.originalFile ?? results.find((r) => r.commitHash === sha)?.lineContent;
-      const diff = await getCosmeticDiff(sha, file ?? "", options);
-      cosmeticMap.set(sha, isCosmeticDiff(diff));
-    } catch {
-      cosmeticMap.set(sha, { isCosmetic: false });
-    }
-  }
+  const zeroSha = "0".repeat(40);
+  await Promise.all(
+    uniqueShas.filter((sha) => sha !== zeroSha).map(async (sha) => {
+      try {
+        const blameResult = results.find((r) => r.commitHash === sha);
+        if (!blameResult) return;
+        const file = blameResult.originalFile ?? results.find((r) => r.commitHash === sha)?.lineContent;
+        const diff = await getCosmeticDiff(sha, file ?? "", options);
+        cosmeticMap.set(sha, isCosmeticDiff(diff));
+      } catch {
+        cosmeticMap.set(sha, { isCosmetic: false });
+      }
+    })
+  );
   return results.map((blame) => {
     const cosmetic = cosmeticMap.get(blame.commitHash);
     return {
@@ -1679,10 +1670,17 @@ async function analyzeBlameResults(results, options) {
 
 // src/core/core.ts
 init_pr_lookup2();
-async function trace(options) {
+function computeFeatureFlags(operatingLevel, options) {
+  return {
+    astDiff: isAstAvailable() && !options.noAst,
+    deepTrace: operatingLevel === 2 && (options.deep ?? false),
+    commitGraph: false,
+    issueGraph: operatingLevel === 2 && (options.graphDepth ?? 0) > 0,
+    graphql: operatingLevel === 2
+  };
+}
+async function detectPlatform2(options) {
   const warnings = [];
-  const nodes = [];
-  const execOptions = { cwd: void 0 };
   let adapter = null;
   let operatingLevel = 0;
   try {
@@ -1690,8 +1688,27 @@ async function trace(options) {
       remoteName: options.remote
     });
     adapter = detectedAdapter;
-    const authStatus = await adapter.checkAuth();
-    if (authStatus.authenticated) {
+  } catch {
+    operatingLevel = 0;
+    warnings.push("Could not detect platform. Running in Level 0 (git only).");
+  }
+  return { adapter, operatingLevel, warnings };
+}
+async function runBlameAndAuth(adapter, options, execOptions) {
+  const warnings = [];
+  const lineRange = parseLineRange(
+    options.endLine ? `${options.line},${options.endLine}` : `${options.line}`
+  );
+  const blameChain = executeBlame(options.file, lineRange, execOptions).then(
+    (results) => analyzeBlameResults(results, execOptions)
+  );
+  const [authResult, blameResult] = await Promise.allSettled([
+    adapter ? adapter.checkAuth() : Promise.resolve({ authenticated: false }),
+    blameChain
+  ]);
+  let operatingLevel = 0;
+  if (adapter && authResult.status === "fulfilled") {
+    if (authResult.value.authenticated) {
       operatingLevel = 2;
     } else {
       operatingLevel = 1;
@@ -1699,22 +1716,14 @@ async function trace(options) {
         "Platform CLI not authenticated. Running in Level 1 (local only)."
       );
     }
-  } catch {
-    operatingLevel = 0;
-    warnings.push("Could not detect platform. Running in Level 0 (git only).");
   }
-  const featureFlags = {
-    astDiff: isAstAvailable() && !options.noAst,
-    deepTrace: operatingLevel === 2 && (options.deep ?? false),
-    commitGraph: false,
-    issueGraph: operatingLevel === 2 && (options.graphDepth ?? 0) > 0,
-    graphql: operatingLevel === 2
-  };
-  const lineRange = parseLineRange(
-    options.endLine ? `${options.line},${options.endLine}` : `${options.line}`
-  );
-  const blameResults = await executeBlame(options.file, lineRange, execOptions);
-  const analyzed = await analyzeBlameResults(blameResults, execOptions);
+  if (blameResult.status === "rejected") {
+    throw blameResult.reason;
+  }
+  return { analyzed: blameResult.value, operatingLevel, warnings };
+}
+async function buildTraceNodes(analyzed, featureFlags, adapter, options, execOptions) {
+  const nodes = [];
   for (const entry of analyzed) {
     const commitNode = {
       type: entry.isCosmetic ? "cosmetic_commit" : "original_commit",
@@ -1757,6 +1766,26 @@ async function trace(options) {
       }
     }
   }
+  return nodes;
+}
+async function trace(options) {
+  const execOptions = { cwd: void 0 };
+  const platform = await detectPlatform2(options);
+  const blameAuth = await runBlameAndAuth(
+    platform.adapter,
+    options,
+    execOptions
+  );
+  const operatingLevel = blameAuth.operatingLevel || platform.operatingLevel;
+  const warnings = [...platform.warnings, ...blameAuth.warnings];
+  const featureFlags = computeFeatureFlags(operatingLevel, options);
+  const nodes = await buildTraceNodes(
+    blameAuth.analyzed,
+    featureFlags,
+    platform.adapter,
+    options,
+    execOptions
+  );
   return { nodes, operatingLevel, featureFlags, warnings };
 }
 async function health(options) {

package/dist/version.d.ts

@@ -1 +1,5 @@
-export declare const VERSION = "0.0.1";
+/**
+ * Current package version from package.json
+ * Automatically synchronized during build process
+ */
+export declare const VERSION = "0.0.2";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lumy-pack/line-lore",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "CLI tool for tracing code lines to their originating Pull Requests via git blame",
   "keywords": [
     "cli",