octocode-cli 1.2.7 → 1.2.9

package/skills/octocode-research/src/routes/lsp.ts

@@ -93,84 +93,83 @@ lspRoutes.get(
   })
 );
 
-// Helper: Extract locations from LSP result
+type LspLocation = { uri: string; line: number; preview?: string };
+
+function extractStartLine(obj: Record<string, unknown>): number {
+  const range = isObject(obj.range) ? obj.range : {};
+  const start = isObject(range.start) ? range.start : {};
+  return (hasNumberProperty(start, 'line') ? start.line : 0) + 1;
+}
+
+function extractDefinitionLocation(data: Record<string, unknown>): LspLocation[] {
+  if (!hasProperty(data, 'definition') || !isObject(data.definition)) return [];
+  const def = data.definition as Record<string, unknown>;
+  if (typeof def.uri !== 'string') return [];
+
+  return [{
+    uri: def.uri,
+    line: extractStartLine(def),
+    preview: typeof def.preview === 'string' ? def.preview : undefined,
+  }];
+}
+
+function extractReferenceLocations(data: Record<string, unknown>): LspLocation[] {
+  if (!hasProperty(data, 'references')) return [];
+  return safeArray<Record<string, unknown>>(data, 'references').map((ref) => ({
+    uri: safeString(ref, 'uri'),
+    line: extractStartLine(ref),
+    preview: hasStringProperty(ref, 'preview') ? ref.preview : undefined,
+  }));
+}
+
+function extractGenericLocations(data: Record<string, unknown>): LspLocation[] {
+  if (!hasProperty(data, 'locations')) return [];
+  return safeArray<Record<string, unknown>>(data, 'locations').map((loc) => ({
+    uri: safeString(loc, 'uri'),
+    line: extractStartLine(loc),
+    preview: hasStringProperty(loc, 'content') ? loc.content : undefined,
+  }));
+}
+
 function extractLocations(
   data: Record<string, unknown>,
   type: 'definition' | 'references'
-): Array<{ uri: string; line: number; preview?: string }> {
-  // Handle definition results
-  if (type === 'definition' && hasProperty(data, 'definition') && isObject(data.definition)) {
-    const def = data.definition as Record<string, unknown>;
-    if (typeof def.uri === 'string') {
-      const range = isObject(def.range) ? def.range as Record<string, unknown> : {};
-      const start = isObject(range.start) ? range.start as Record<string, unknown> : {};
-      return [
-        {
-          uri: def.uri,
-          line: (typeof start.line === 'number' ? start.line : 0) + 1,
-          preview: typeof def.preview === 'string' ? def.preview : undefined,
-        },
-      ];
-    }
+): LspLocation[] {
+  if (type === 'definition') {
+    const defs = extractDefinitionLocation(data);
+    if (defs.length > 0) return defs;
   }
 
-  // Handle references results
-  if (type === 'references' && hasProperty(data, 'references')) {
-    const refs = safeArray<Record<string, unknown>>(data, 'references');
-    return refs.map((ref) => {
-      const range = isObject(ref.range) ? ref.range : {};
-      const start = isObject(range.start) ? range.start : {};
-      return {
-        uri: safeString(ref, 'uri'),
-        line: (hasNumberProperty(start, 'line') ? start.line : 0) + 1,
-        preview: hasStringProperty(ref, 'preview') ? ref.preview : undefined,
-      };
-    });
+  if (type === 'references') {
+    const refs = extractReferenceLocations(data);
+    if (refs.length > 0) return refs;
   }
 
-  // Handle locations array (generic) - MCP returns range.start.line
-  if (hasProperty(data, 'locations')) {
-    const locs = safeArray<Record<string, unknown>>(data, 'locations');
-    return locs.map((loc) => {
-      const range = isObject(loc.range) ? loc.range : {};
-      const start = isObject(range.start) ? range.start : {};
-      return {
-        uri: safeString(loc, 'uri'),
-        line: (hasNumberProperty(start, 'line') ? start.line : 0) + 1,
-        preview: hasStringProperty(loc, 'content') ? loc.content : undefined,
-      };
-    });
-  }
+  return extractGenericLocations(data);
+}
 
+function getCallsArray(data: Record<string, unknown>): Record<string, unknown>[] {
+  for (const key of ['calls', 'incomingCalls', 'outgoingCalls']) {
+    if (hasProperty(data, key) && Array.isArray(data[key])) {
+      return data[key] as Record<string, unknown>[];
+    }
+  }
   return [];
 }
 
-// Helper: Extract locations from call hierarchy result
 function extractCallHierarchyLocations(
   data: Record<string, unknown>
-): Array<{ uri: string; line: number; preview?: string }> {
-  // Handle calls array
-  let calls: Record<string, unknown>[] = [];
-  if (hasProperty(data, 'calls') && Array.isArray(data.calls)) {
-    calls = data.calls;
-  } else if (hasProperty(data, 'incomingCalls') && Array.isArray(data.incomingCalls)) {
-    calls = data.incomingCalls;
-  } else if (hasProperty(data, 'outgoingCalls') && Array.isArray(data.outgoingCalls)) {
-    calls = data.outgoingCalls;
-  }
-
-  return calls.map((call) => {
+): LspLocation[] {
+  return getCallsArray(data).map((call) => {
     const item = isObject(call.from) ? call.from : isObject(call.to) ? call.to : call;
-    const itemObj = isObject(item) ? item : {};
-    const range = isObject(itemObj.range) ? itemObj.range : {};
-    const start = isObject(range.start) ? range.start : {};
+    const itemObj = isObject(item) ? item as Record<string, unknown> : {};
 
-    const lineFromStart = hasNumberProperty(start, 'line') ? start.line : 0;
+    const lineFromRange = extractStartLine(itemObj) - 1; // undo +1 from extractStartLine
     const lineFromItem = hasNumberProperty(itemObj, 'line') ? itemObj.line : 0;
 
     return {
       uri: safeString(itemObj, 'uri'),
-      line: (lineFromStart || lineFromItem) + 1,
+      line: (lineFromRange || lineFromItem) + 1,
       preview: hasStringProperty(itemObj, 'name') ? itemObj.name : undefined,
     };
   });

package/skills/octocode-research/src/routes/package.ts

@@ -47,81 +47,51 @@ packageRoutes.get(
   }
 );
 
-// Helper: Extract packages from result
-function extractPackages(
-  data: Record<string, unknown>
-): Array<{
+interface PackageInfo {
   name: string;
   version?: string;
   description?: string;
   repository?: string;
-}> {
-  // Handle npm results
-  if (hasProperty(data, 'npmResults') && Array.isArray(data.npmResults)) {
-    return data.npmResults.map((pkg: unknown) => {
-      if (!isObject(pkg)) return { name: '' };
-      return {
-        name: safeString(pkg, 'name'),
-        version: hasStringProperty(pkg, 'version') ? pkg.version : undefined,
-        description: hasStringProperty(pkg, 'description') ? pkg.description : undefined,
-        repository: extractRepositoryUrl(pkg),
-      };
-    });
-  }
+}
 
-  // Handle pypi results
-  if (hasProperty(data, 'pypiResults') && Array.isArray(data.pypiResults)) {
-    return data.pypiResults.map((pkg: unknown) => {
-      if (!isObject(pkg)) return { name: '' };
-      return {
-        name: safeString(pkg, 'name'),
-        version: hasStringProperty(pkg, 'version') ? pkg.version : undefined,
-        description: hasStringProperty(pkg, 'description') ? pkg.description : undefined,
-        repository: hasStringProperty(pkg, 'homepage')
-          ? pkg.homepage
-          : hasStringProperty(pkg, 'project_url')
-            ? pkg.project_url
-            : undefined,
-      };
-    });
+function extractRepositoryUrl(pkg: Record<string, unknown>): string | undefined {
+  if (hasStringProperty(pkg, 'repository')) return pkg.repository;
+  if (hasStringProperty(pkg, 'repoUrl')) return pkg.repoUrl;
+  if (hasProperty(pkg, 'repository') && isObject(pkg.repository)) {
+    const repo = pkg.repository;
+    if (hasStringProperty(repo, 'url')) return repo.url;
   }
+  return undefined;
+}
 
-  // Handle generic packages array (MCP uses 'path' for package name, 'repoUrl' for repository)
-  if (hasProperty(data, 'packages') && Array.isArray(data.packages)) {
-    return data.packages.map((pkg: unknown) => {
-      if (!isObject(pkg)) return { name: '' };
-      return {
-        name: safeString(pkg, 'name') || safeString(pkg, 'path'),
-        version: hasStringProperty(pkg, 'version') ? pkg.version : undefined,
-        description: hasStringProperty(pkg, 'description') ? pkg.description : undefined,
-        repository: extractRepositoryUrl(pkg),
-      };
-    });
-  }
+function extractPypiRepo(pkg: Record<string, unknown>): string | undefined {
+  if (hasStringProperty(pkg, 'homepage')) return pkg.homepage;
+  if (hasStringProperty(pkg, 'project_url')) return pkg.project_url;
+  return undefined;
+}
 
-  // Handle results array (fallback)
-  const results = safeArray<Record<string, unknown>>(data, 'results');
-  return results.map((pkg) => ({
-    name: safeString(pkg, 'name'),
+function toPackageInfo(pkg: unknown, repoFn: (p: Record<string, unknown>) => string | undefined): PackageInfo {
+  if (!isObject(pkg)) return { name: '' };
+  return {
+    name: safeString(pkg, 'name') || safeString(pkg, 'path'),
     version: hasStringProperty(pkg, 'version') ? pkg.version : undefined,
     description: hasStringProperty(pkg, 'description') ? pkg.description : undefined,
-    repository: hasStringProperty(pkg, 'repository') ? pkg.repository : undefined,
-  }));
+    repository: repoFn(pkg),
+  };
 }
 
-// Helper: Extract repository URL from various formats
-function extractRepositoryUrl(pkg: Record<string, unknown>): string | undefined {
-  if (hasStringProperty(pkg, 'repository')) {
-    return pkg.repository;
-  }
-  if (hasStringProperty(pkg, 'repoUrl')) {
-    return pkg.repoUrl;
-  }
-  if (hasProperty(pkg, 'repository') && isObject(pkg.repository)) {
-    const repo = pkg.repository;
-    if (hasStringProperty(repo, 'url')) {
-      return repo.url;
-    }
-  }
-  return undefined;
+function getPackageArray(data: Record<string, unknown>): { items: unknown[]; source: 'npm' | 'pypi' | 'generic' | 'fallback' } {
+  if (hasProperty(data, 'npmResults') && Array.isArray(data.npmResults))
+    return { items: data.npmResults, source: 'npm' };
+  if (hasProperty(data, 'pypiResults') && Array.isArray(data.pypiResults))
+    return { items: data.pypiResults, source: 'pypi' };
+  if (hasProperty(data, 'packages') && Array.isArray(data.packages))
+    return { items: data.packages, source: 'generic' };
+  return { items: safeArray<Record<string, unknown>>(data, 'results'), source: 'fallback' };
+}
+
+function extractPackages(data: Record<string, unknown>): PackageInfo[] {
+  const { items, source } = getPackageArray(data);
+  const repoFn = source === 'pypi' ? extractPypiRepo : extractRepositoryUrl;
+  return items.map((pkg) => toPackageInfo(pkg, repoFn));
 }

package/skills/octocode-research/src/routes/prompts.ts

@@ -9,8 +9,8 @@ export const promptsRoutes = Router();
 // Apply readiness check middleware to all prompts routes
 promptsRoutes.use(checkReadiness);
 
-// Package version for response metadata
-const PACKAGE_VERSION = '2.0.0';
+declare const __PACKAGE_VERSION__: string;
+const PACKAGE_VERSION = __PACKAGE_VERSION__;
 
 interface PromptArg {
   name: string;
@@ -43,7 +43,7 @@ interface PromptInfo {
  *       ]
  *     }
  *   ],
- *   "_meta": { "totalCount": 5, "version": "2.0.0" }
+ *   "_meta": { "totalCount": 5, "version": "2.2.0" }
  * }
  */
 promptsRoutes.get('/list', async (

package/skills/octocode-research/src/routes/tools.ts

@@ -15,8 +15,7 @@
 import { Router, type Request, type Response, type NextFunction } from 'express';
 import { getMcpContent } from '../mcpCache.js';
 import { transformToJsonSchema } from '../types/mcp.js';
-import { zodToJsonSchema } from 'zod-to-json-schema';
-import type { z } from 'zod/v4';
+import { z } from 'zod/v4';
 
 // Import Zod schemas from octocode-mcp (source of truth)
 import {
@@ -66,8 +65,8 @@ export const toolsRoutes = Router();
 // Apply readiness check middleware to all tools routes
 toolsRoutes.use(checkReadiness);
 
-// Package version for response metadata
-const PACKAGE_VERSION = '2.0.0';
+declare const __PACKAGE_VERSION__: string;
+const PACKAGE_VERSION = __PACKAGE_VERSION__;
 
 interface ToolsInfoQuery {
   schema?: string;
@@ -98,20 +97,9 @@ const TOOL_ZOD_SCHEMAS: Record<string, z.ZodType> = {
   packageSearch: PackageSearchQuerySchema,
 };
 
-/**
- * Convert a Zod v4 schema to JSON Schema via zod-to-json-schema.
- * The library expects Zod v3 types; schemas are structurally compatible at runtime.
- */
-function toJsonSchema(
-  schema: z.ZodType,
-  name: string
-): Record<string, unknown> | null {
+function toJsonSchema(schema: z.ZodType): Record<string, unknown> | null {
   try {
-    type ZodToJsonSchemaInput = Parameters<typeof zodToJsonSchema>[0];
-    return zodToJsonSchema(schema as unknown as ZodToJsonSchemaInput, {
-      name,
-      $refStrategy: 'none',
-    }) as Record<string, unknown>;
+    return z.toJSONSchema(schema) as Record<string, unknown>;
   } catch {
     return null;
   }
@@ -119,7 +107,7 @@ function toJsonSchema(
 
 function getToolJsonSchema(toolName: string): Record<string, unknown> | null {
   const zodSchema = TOOL_ZOD_SCHEMAS[toolName];
-  return zodSchema ? toJsonSchema(zodSchema, toolName) : null;
+  return zodSchema ? toJsonSchema(zodSchema) : null;
 }
 
 /**
@@ -378,7 +366,7 @@ toolsRoutes.get('/schemas', async (
  * Response:
  * {
  *   "instructions": "## Expert Code Forensics Agent...",
- *   "_meta": { "charCount": 5432, "version": "2.0.0" }
+ *   "_meta": { "charCount": 5432, "version": "2.2.0" }
  * }
  */
 toolsRoutes.get('/system', async (
@@ -419,7 +407,7 @@ toolsRoutes.get('/system', async (
  *   "success": true,
  *   "system_prompt": "## Expert Code Forensics Agent...",
  *   "tools_schema": { "localSearchCode": {...}, ... },
- *   "_meta": { "promptCharCount": 5432, "toolsCount": 13, "version": "2.0.0" }
+ *   "_meta": { "promptCharCount": 5432, "toolsCount": 13, "version": "2.2.0" }
  * }
  */
 toolsRoutes.get('/initContext', async (