@doist/doistbot-cli 1.0.4 → 1.0.6

package/sandbox/_node_modules/doistbot-repo-config/dist/index.js

@@ -2,19 +2,10 @@ import fs from 'fs';
 import path from 'path';
 import { load as yamlLoad } from 'js-yaml';
 export const CONFIG_FILE_PATH = '.github/doistbot.yml';
-export const DEFAULT_COUNCIL_MODELS = ['gemini', 'openai'];
+export const DEFAULT_REVIEW_MODELS = ['gemini', 'openai', 'deepseek', 'zai'];
 function parseRepoConfigContent(content) {
     return yamlLoad(content);
 }
-function resolveWorkspacePath(workspaceDir, repoPath) {
-    const root = path.resolve(workspaceDir);
-    const resolved = path.resolve(root, repoPath);
-    const relative = path.relative(root, resolved);
-    if (relative.startsWith('..') || path.isAbsolute(relative)) {
-        return null;
-    }
-    return resolved;
-}
 async function fetchFileContent({ octokit, owner, repo, path, ref, logger, }) {
     const params = {
         owner,
@@ -99,80 +90,13 @@ export function getLocalRepoConfig({ workspaceDir, logger, }) {
         return null;
     }
 }
-/**
- * Fetches a custom prompt file from the repository.
- * Returns null if the file doesn't exist.
- */
-export async function getCustomPrompt({ octokit, owner, repo, path, ref, logger, }) {
-    let content;
-    try {
-        content = await fetchFileContent({ octokit, owner, repo, path, ref, logger });
-    }
-    catch (error) {
-        logger.warn('Error fetching custom prompt', {
-            component: 'repo-config',
-            repository: `${owner}/${repo}`,
-            path,
-            error: error instanceof Error ? error.message : String(error),
-        });
-        return null;
-    }
-    if (content !== null) {
-        logger.info('Loaded custom prompt', {
-            component: 'repo-config',
-            repository: `${owner}/${repo}`,
-            path,
-        });
-    }
-    return content;
-}
-export function getLocalCustomPrompt({ workspaceDir, path: promptPath, logger, }) {
-    const resolvedPath = resolveWorkspacePath(workspaceDir, promptPath);
-    if (resolvedPath === null) {
-        logger.warn('Custom prompt path escapes workspace', {
-            component: 'repo-config',
-            path: promptPath,
-        });
-        return null;
-    }
-    if (!fs.existsSync(resolvedPath)) {
-        return null;
-    }
-    try {
-        const content = fs.readFileSync(resolvedPath, 'utf8');
-        logger.info('Loaded local custom prompt', {
-            component: 'repo-config',
-            path: promptPath,
-        });
-        return content;
-    }
-    catch (error) {
-        logger.warn('Failed to load local custom prompt', {
-            component: 'repo-config',
-            path: promptPath,
-            error: error instanceof Error ? error.message : String(error),
-        });
-        return null;
-    }
-}
-export function parseCouncilModelsEnabled(raw, { defaultModels = DEFAULT_COUNCIL_MODELS } = {}) {
-    if (!raw?.trim()) {
-        return [...defaultModels];
-    }
-    const allowedModels = new Set(DEFAULT_COUNCIL_MODELS);
-    const models = [];
-    for (const token of raw.split(',')) {
-        const model = token.trim().toLowerCase();
-        if (!model || !allowedModels.has(model)) {
-            continue;
-        }
-        if (!models.includes(model)) {
-            models.push(model);
-        }
-    }
-    return models.length > 0 ? models : [...defaultModels];
+export function getDefaultReviewModels() {
+    return [...DEFAULT_REVIEW_MODELS];
 }
-export function getDefaultCouncilModels() {
-    return [...DEFAULT_COUNCIL_MODELS];
+export function parseReviewModelsEnabled(value) {
+    const models = value
+        ?.split(',')
+        .map((model) => model.trim())
+        .filter(Boolean) ?? [];
+    return models.length > 0 ? [...new Set(models)] : getDefaultReviewModels();
 }
-export { DEFAULT_REVIEW_ENGINE, parseReviewEngine, resolveReviewEngine } from './review-engine.js';

package/sandbox/dist/core/bot-logins.js

@@ -6,22 +6,9 @@ export const KNOWN_DOISTBOT_LOGINS = new Set([
     'doistbot-app',
     'doistbot-app[bot]',
 ]);
-export const KNOWN_AUTOMATION_LOGINS = new Set([
-    ...KNOWN_DOISTBOT_LOGINS,
-    'dependabot',
-    'dependabot[bot]',
-    'renovate',
-    'renovate[bot]',
-]);
 export function isKnownDoistbotLogin(login) {
     if (!login) {
         return false;
     }
     return KNOWN_DOISTBOT_LOGINS.has(login.toLowerCase());
 }
-export function isKnownAutomationLogin(login) {
-    if (!login) {
-        return false;
-    }
-    return KNOWN_AUTOMATION_LOGINS.has(login.toLowerCase());
-}

package/sandbox/dist/core/check-run.js

@@ -24,6 +24,7 @@ function truncateTitle(value) {
  */
 export async function postCheckRun(params) {
     const { octokit, owner, repo, sha, title, summary, detailsUrl, name, externalId } = params;
+    const checkRunId = params.checkRunId;
     const status = params.status ?? 'completed';
     const conclusion = status === 'completed' ? params.conclusion : undefined;
     const truncatedTitle = truncateTitle(title);
@@ -39,6 +40,21 @@ export async function postCheckRun(params) {
         output: { title: truncatedTitle, summary },
     };
     try {
+        if (checkRunId !== undefined) {
+            await octokit.rest.checks.update({
+                ...payload,
+                check_run_id: checkRunId,
+            });
+            logger.info('Updated known check run', {
+                component: 'check-run',
+                name,
+                sha,
+                status,
+                conclusion,
+                checkRunId,
+            });
+            return;
+        }
         const existing = await octokit.rest.checks.listForRef({
             owner,
             repo,

package/sandbox/dist/core/datadog-metrics.js

@@ -1,17 +1,20 @@
+import { createDatadogMetrics, resolveDatadogApiKey, resolveStandardObservabilityTags, } from 'doistbot-datadog-metrics';
 import { logger } from './logging.js';
 const TASK_COMPLETION_METRIC = 'doistbot.task.completion';
 const TASK_DURATION_METRIC = 'doistbot.task.duration_seconds';
-const DATADOG_REQUEST_TIMEOUT_MS = 5_000;
 let hasWarnedAboutMissingDatadogApiKey = false;
+const { postDatadogMetric } = createDatadogMetrics({ logger });
 function toTaskMetricBaseModel(model) {
     switch (model) {
+        case 'deepseek':
+            return 'deepseek';
         case 'gemini':
         case 'google':
             return 'google';
+        case 'zai':
+            return 'zai';
         case 'openai':
             return 'openai';
-        case 'anthropic':
-            return 'anthropic';
         case 'none':
             return 'none';
     }
@@ -41,57 +44,6 @@ function buildTaskMetricTags({ type, repository, model, outcome, reason, }) {
     }
     return tags;
 }
-// Doist Observability Standard requires service/env/version on metrics submitted
-// directly to the API — the host agent would otherwise inject them.
-function resolveStandardObservabilityTags() {
-    const tags = [];
-    const service = process.env.DD_SERVICE?.trim();
-    const env = process.env.DD_ENV?.trim();
-    const version = process.env.DD_VERSION?.trim();
-    if (service)
-        tags.push(`service:${service}`);
-    if (env)
-        tags.push(`env:${env}`);
-    if (version)
-        tags.push(`version:${version}`);
-    return tags;
-}
-function resolveDatadogApiKey() {
-    const apiKey = process.env.DATADOG_API_KEY?.trim();
-    return apiKey || null;
-}
-function resolveDatadogSite() {
-    return process.env.DATADOG_SITE?.trim() || process.env.DD_SITE?.trim() || 'datadoghq.com';
-}
-async function postDatadogMetric({ apiKey, path, body, }) {
-    const url = `https://api.${resolveDatadogSite()}${path}`;
-    try {
-        const response = await fetch(url, {
-            method: 'POST',
-            signal: AbortSignal.timeout(DATADOG_REQUEST_TIMEOUT_MS),
-            headers: {
-                'Content-Type': 'application/json',
-                'DD-API-KEY': apiKey,
-            },
-            body: JSON.stringify(body),
-        });
-        if (response.ok) {
-            return;
-        }
-        const errorBody = (await response.text()).slice(0, 500);
-        logger.warn('Failed to submit Datadog task metric', {
-            path,
-            status: response.status,
-            errorBody,
-        });
-    }
-    catch (error) {
-        logger.warn('Failed to submit Datadog task metric', {
-            path,
-            error: error instanceof Error ? error.message : String(error),
-        });
-    }
-}
 export async function recordTaskMetrics({ type, repository, model, outcome, durationMs, reason, }) {
     const apiKey = resolveDatadogApiKey();
     if (!apiKey) {

package/sandbox/dist/core/logger-span-processor.js

@@ -0,0 +1,78 @@
+import { SpanStatusCode, trace } from '@opentelemetry/api';
+import { logger } from './logging.js';
+const MAX_ATTR_SERIALIZED_LEN = 4096;
+export function hrTimeToMs(hrTime) {
+    const [seconds, nanos] = hrTime;
+    return Math.round(seconds * 1000 + nanos / 1_000_000);
+}
+function capString(value) {
+    if (value.length <= MAX_ATTR_SERIALIZED_LEN)
+        return value;
+    // Reserve room for the marker so the FINAL emitted value stays <= the cap.
+    const marker = `…[truncated, ${value.length} chars]`;
+    return `${value.slice(0, Math.max(0, MAX_ATTR_SERIALIZED_LEN - marker.length))}${marker}`;
+}
+export function truncateAttrs(attrs) {
+    const out = {};
+    for (const [key, value] of Object.entries(attrs)) {
+        if (key === 'doistbot.kind')
+            continue; // internal marker, never emitted
+        if (typeof value === 'string') {
+            out[key] = capString(value);
+        }
+        else if (value !== null && typeof value === 'object') {
+            // Arrays/objects (e.g. decision paths, parsed-label arrays): keep
+            // the native value if its JSON serialization is under the cap;
+            // otherwise replace it with the truncated serialized string.
+            const json = JSON.stringify(value);
+            out[key] = json.length > MAX_ATTR_SERIALIZED_LEN ? capString(json) : value;
+        }
+        else {
+            out[key] = value; // number / boolean / null — inherently small
+        }
+    }
+    return out;
+}
+// Parent span id access on a finished span is SDK-version-specific. Prefer the
+// newer `parentSpanContext`, fall back to the older `parentSpanId`. Only used
+// in onEnd — onStart derives the parent from the parent Context instead.
+function parentSpanIdOf(span) {
+    const withParentCtx = span;
+    if (withParentCtx.parentSpanContext?.spanId)
+        return withParentCtx.parentSpanContext.spanId;
+    const withParentId = span;
+    return withParentId.parentSpanId ?? null;
+}
+// Span attributes are spread FIRST so task attributes can never overwrite the
+// envelope fields (event/name/span_id/parent_span_id/duration_ms/status/error)
+// that the Datadog pipeline and the visualizer key on. Timestamps come from
+// the logging system, never from meta.
+export class LoggerSpanProcessor {
+    onStart(span, parentContext) {
+        const readable = span;
+        const isTool = readable.attributes['doistbot.kind'] === 'tool';
+        logger.info(`${isTool ? 'tool' : 'phase'}.start: ${readable.name}`, {
+            ...truncateAttrs(readable.attributes),
+            event: isTool ? 'tool.start' : 'phase.start',
+            name: readable.name,
+            span_id: readable.spanContext().spanId,
+            parent_span_id: trace.getSpanContext(parentContext)?.spanId ?? null,
+        });
+    }
+    onEnd(span) {
+        const isTool = span.attributes['doistbot.kind'] === 'tool';
+        const status = span.status.code === SpanStatusCode.ERROR ? 'error' : 'ok';
+        logger.info(`${isTool ? 'tool' : 'phase'}.end: ${span.name}`, {
+            ...truncateAttrs(span.attributes),
+            event: isTool ? 'tool.end' : 'phase.end',
+            name: span.name,
+            span_id: span.spanContext().spanId,
+            parent_span_id: parentSpanIdOf(span),
+            duration_ms: hrTimeToMs(span.duration),
+            status,
+            ...(status === 'error' && span.status.message ? { error: span.status.message } : {}),
+        });
+    }
+    async forceFlush() { }
+    async shutdown() { }
+}