@morehao/dsh-github-trending 0.1.4 → 0.2.0

package/lib/index.js

@@ -6,7 +6,7 @@ import {
   createRoutes,
   createTrendingHistoryTool,
   createTrendingRunTool
-} from "./chunk-RXYA5WFW.js";
+} from "./chunk-HIJIQJCZ.js";
 import "./chunk-XLIFTAVL.js";
 
 // src/index.ts

package/lib/internal.d.ts

@@ -2,8 +2,8 @@ import http from 'node:http';
 
 /**
  * 由 scripts/gen-ipc-types.mjs 从 contract/schema/ipc.v1.json 生成，**不要手改**。
- * 上游：https://github.com/morehao/trendradar.git@d3bf720a869732e7a2ee04fa39d32dd50868fd61
- * aggregate：eb7f1ac9e117a709d15d87de89cf30e309c479e62dfa3d320cb8f154d3f1dc1e
+ * 上游：https://github.com/morehao/trendradar.git@5cf0ad26c5748cf2bc9a1cc4ce66a09411d590f7
+ * aggregate：4717074d26d1a6d85c1885bd052d411f81c20b39467cb81c398f565bbe34dcde
  * 重新生成：npm run gen:ipc
  */
 type ErrorCode = "INTERNAL" | "CONFIG_INVALID" | "PAYLOAD_TOO_LARGE" | "FETCH_FAILED" | "FETCH_RATE_LIMITED" | "PARSE_FAILED" | "MODEL_UNAUTHORIZED" | "MODEL_RATE_LIMITED" | "MODEL_TIMEOUT" | "MODEL_FAILED" | "MODEL_BAD_OUTPUT" | "GIT_NOT_INSTALLED" | "REPO_NOT_GIT" | "REPO_DIRTY" | "GIT_OPERATION_FAILED" | "PR_FAILED" | "NOT_MERGEABLE";
@@ -43,6 +43,7 @@ interface RunResult {
 interface StateRun {
     date: string;
     contentHash: string;
+    outputDir?: string;
     runAt: string;
     [key: string]: unknown;
 }
@@ -79,12 +80,14 @@ declare function isRetriable(code: string): boolean;
 type ErrorArea = 'core' | 'model' | 'repo' | 'auth' | 'run';
 declare function areaOf(code: string): ErrorArea;
 /** 每种码一句「下一步怎么做」，避免界面只给码不给路。 */
-declare function hintOf(code: string): string;
+declare function hintOf(code: string, message?: string): string;
 /**
  * 从核心的 stderr 里解出一个结构化错误。
  *
  * 优先级：`error: <CODE>: ...` 的显式码 > 文本归类 > INTERNAL。
- * message 只取最后一条非空行（核心把根因打在最外层，前面的行多是上下文）。
+ * 显式码命中的那一行往往只是首行（如 `error: GIT_OPERATION_FAILED: To github.com:...`），
+ * 真正的根因在其后的多行里（`! [rejected] ... (non-fast-forward)`、`hint: ...`），
+ * 因此把这些诊断行一并保留进 message，避免界面只看到半句。
  */
 declare function classifyStderr(stderr: string): ClassifiedError;
 /**
@@ -206,7 +209,8 @@ declare namespace ipc {
 
 type Provider = string;
 type CommitMode = 'branch' | 'direct';
-type AuthMode = 'device' | 'pat' | 'gh';
+/** 只保留两种真正可用的方式：本机 `gh` 登录态、手动 PAT。历史的 `device` 在归一化时迁移为 `gh`。 */
+type AuthMode = 'pat' | 'gh';
 type Since = 'daily' | 'weekly';
 interface ModelSettings {
     provider: Provider;
@@ -271,6 +275,16 @@ declare const DEFAULT_SETTINGS: Settings;
 /** 核心支持的 provider 默认端点（空字符串 = 必须由用户填）。 */
 declare const PROVIDER_BASE_URLS: Record<string, string>;
 declare const CORE_PROVIDERS: readonly ["deepseek", "openai-compatible"];
+/** 设置页分区；分段保存时只提交并校验对应分区，互不牵连。 */
+declare const SETTINGS_SECTIONS: readonly ["source", "model", "repo", "auth", "scope", "schedule"];
+type SettingsSection = (typeof SETTINGS_SECTIONS)[number];
+/** 校验问题字段 → 所属分区（用于分段保存时只把本分区的问题回给界面）。 */
+declare function sectionOfField(field: string): SettingsSection | undefined;
+/**
+ * 分段保存：只把 `incoming` 里 `section` 的字段合并进 `stored`，其余分区保持已保存值。
+ * 这样一个 tab 的保存不会顺带提交或覆盖其它 tab 里尚未保存的改动。
+ */
+declare function mergeSettingsSection(stored: Settings, incoming: Settings, section: SettingsSection): Settings;
 /**
  * 把任意来源的对象（磁盘上的旧版本、HTTP 请求体、CLI 导入）收敛成完整设置。
  * 未知字段一律丢弃：settings.json 只有以下形状，避免旧版本字段悄悄生效。
@@ -349,18 +363,22 @@ type config_PRSettings = PRSettings;
 type config_Problem = Problem;
 type config_Provider = Provider;
 type config_RepoSettings = RepoSettings;
+declare const config_SETTINGS_SECTIONS: typeof SETTINGS_SECTIONS;
 type config_ScheduleSettings = ScheduleSettings;
 type config_Settings = Settings;
+type config_SettingsSection = SettingsSection;
 type config_Since = Since;
 type config_TrendingSettings = TrendingSettings;
 declare const config_effectiveBaseURL: typeof effectiveBaseURL;
 declare const config_isValidTimezone: typeof isValidTimezone;
+declare const config_mergeSettingsSection: typeof mergeSettingsSection;
 declare const config_normalizeSettings: typeof normalizeSettings;
+declare const config_sectionOfField: typeof sectionOfField;
 declare const config_toCoreConfig: typeof toCoreConfig;
 declare const config_toYaml: typeof toYaml;
 declare const config_validateSettings: typeof validateSettings;
 declare namespace config {
-  export { type config_AuthMode as AuthMode, config_CORE_PROVIDERS as CORE_PROVIDERS, type config_CommitMode as CommitMode, type config_CoreConfig as CoreConfig, config_DEFAULT_SETTINGS as DEFAULT_SETTINGS, type config_GithubSettings as GithubSettings, type config_ModelSettings as ModelSettings, type config_OutputSettings as OutputSettings, config_PROVIDER_BASE_URLS as PROVIDER_BASE_URLS, type config_PRSettings as PRSettings, type config_Problem as Problem, type config_Provider as Provider, type config_RepoSettings as RepoSettings, type config_ScheduleSettings as ScheduleSettings, type config_Settings as Settings, type config_Since as Since, type config_TrendingSettings as TrendingSettings, config_effectiveBaseURL as effectiveBaseURL, config_isValidTimezone as isValidTimezone, config_normalizeSettings as normalizeSettings, config_toCoreConfig as toCoreConfig, config_toYaml as toYaml, config_validateSettings as validateSettings };
+  export { type config_AuthMode as AuthMode, config_CORE_PROVIDERS as CORE_PROVIDERS, type config_CommitMode as CommitMode, type config_CoreConfig as CoreConfig, config_DEFAULT_SETTINGS as DEFAULT_SETTINGS, type config_GithubSettings as GithubSettings, type config_ModelSettings as ModelSettings, type config_OutputSettings as OutputSettings, config_PROVIDER_BASE_URLS as PROVIDER_BASE_URLS, type config_PRSettings as PRSettings, type config_Problem as Problem, type config_Provider as Provider, type config_RepoSettings as RepoSettings, config_SETTINGS_SECTIONS as SETTINGS_SECTIONS, type config_ScheduleSettings as ScheduleSettings, type config_Settings as Settings, type config_SettingsSection as SettingsSection, type config_Since as Since, type config_TrendingSettings as TrendingSettings, config_effectiveBaseURL as effectiveBaseURL, config_isValidTimezone as isValidTimezone, config_mergeSettingsSection as mergeSettingsSection, config_normalizeSettings as normalizeSettings, config_sectionOfField as sectionOfField, config_toCoreConfig as toCoreConfig, config_toYaml as toYaml, config_validateSettings as validateSettings };
 }
 
 declare const PLUGIN_DIR_NAME = "github-trending";
@@ -417,6 +435,8 @@ interface RunRecord {
 interface PendingPr {
     url: string;
     createdAt: string;
+    /** 该 PR 对应的 digest 日期（YYYY-MM-DD）；用于判断「同日重跑」是否真的会撞分支。 */
+    date?: string;
 }
 interface PluginState {
     lastRunAt?: string;
@@ -820,10 +840,11 @@ interface CredentialServices {
 declare function credentialServices(get: (name: string) => unknown): CredentialServices | undefined;
 declare function describeRef(services: CredentialServices | undefined, ref: string, env?: NodeJS.ProcessEnv): Promise<CredentialDescription>;
 declare function resolveRef(services: CredentialServices | undefined, ref: string, env?: NodeJS.ProcessEnv): Promise<ResolvedSecret>;
-/** GitHub token：按 authMode 取，`gh` 模式读本机 gh 的登录态。 */
-declare function resolveGithubToken(services: CredentialServices | undefined, authMode: 'device' | 'pat' | 'gh', tokenRef: string, deps?: {
+/** GitHub token：按 authMode 取，`gh` 模式读本机 gh 的登录态，`pat` 读凭据/环境变量。 */
+declare function resolveGithubToken(services: CredentialServices | undefined, authMode: 'pat' | 'gh', tokenRef: string, deps?: {
     env?: NodeJS.ProcessEnv;
     execGh?: () => Promise<string | undefined>;
+    freshGh?: boolean;
 }): Promise<{
     token?: string;
     source: string;
@@ -840,6 +861,57 @@ declare namespace credentials {
   export { type credentials_CredentialDescription as CredentialDescription, type credentials_CredentialServices as CredentialServices, type credentials_ResolvedSecret as ResolvedSecret, credentials_credentialServices as credentialServices, credentials_describeRef as describeRef, credentials_resolveGithubToken as resolveGithubToken, credentials_resolveRef as resolveRef };
 }
 
+/**
+ * GitHub 认证探测：供设置页「测试认证」按钮调用。
+ *
+ * 只做一次 `GET https://api.github.com/user`，把「有没有 token、token 是否有效」
+ * 一次性验证清楚并回显登录账号；token 不进日志、不进响应明文。
+ */
+
+interface GithubProbeResult {
+    ok: boolean;
+    login?: string;
+    /** token 来源（gh / env / credentials）。 */
+    source?: string;
+    code?: string;
+    message?: string;
+}
+declare function probeGithubAuth(options: {
+    credentials: CredentialServices | undefined;
+    authMode: 'pat' | 'gh';
+    tokenRef: string;
+    env?: NodeJS.ProcessEnv;
+    fetchImpl?: typeof fetch;
+}): Promise<GithubProbeResult>;
+
+type github_GithubProbeResult = GithubProbeResult;
+declare const github_probeGithubAuth: typeof probeGithubAuth;
+declare namespace github {
+  export { type github_GithubProbeResult as GithubProbeResult, github_probeGithubAuth as probeGithubAuth };
+}
+
+interface DefaultBranchResult {
+    branch?: string;
+    /** `origin-head` = 远端默认分支；`head` = 本地当前分支兜底；`none` = 读不到。 */
+    source: 'origin-head' | 'head' | 'none';
+    message?: string;
+}
+/**
+ * 读取仓库默认分支：
+ *   1. `refs/remotes/origin/HEAD` → 远端默认分支（最准确）；
+ *   2. 回退到本地当前分支 `HEAD`（空仓库/未 fetch 时仍能给个值）；
+ *   3. 都失败返回 `none`，由界面提示。
+ */
+declare function readDefaultBranch(repoPath: string, options?: {
+    env?: NodeJS.ProcessEnv;
+}): Promise<DefaultBranchResult>;
+
+type repo_DefaultBranchResult = DefaultBranchResult;
+declare const repo_readDefaultBranch: typeof readDefaultBranch;
+declare namespace repo {
+  export { type repo_DefaultBranchResult as DefaultBranchResult, repo_readDefaultBranch as readDefaultBranch };
+}
+
 /**
  * 从宿主的 provider 目录快速填充模型配置（FR-P-03 / AC-P-03）。
  *
@@ -910,6 +982,18 @@ interface CandidateOptions {
     env?: NodeJS.ProcessEnv;
 }
 declare function listProviderCandidates(options: CandidateOptions): Promise<LlmProviderCandidate[]>;
+/** 宿主当前的默认模型选择（`ctx.agentDefaultModel`）；没有该服务或读取失败时返回 undefined。 */
+interface DefaultSelection {
+    provider: string;
+    model: string;
+    reasoningEffort?: string;
+}
+declare function readDefaultSelection(get: (name: string) => unknown): DefaultSelection | undefined;
+/**
+ * 把「DSH 默认模型」落成模型设置：能匹配到已生效路由就复用其认证形态，
+ * 否则按代理模式（hostProvider = 该路由 id）交给宿主转发。
+ */
+declare function applyDefaultSelection(settings: Settings, selection: DefaultSelection, candidate?: LlmProviderCandidate): Settings;
 /**
  * 把候选落成模型设置。`mode: 'proxy'` 时清空 baseURL 与 apiKeyRef——
  * 端点由插件在运行时注入回环代理地址，留存旧值只会误导。
@@ -923,17 +1007,20 @@ declare function resolveModelKey(settings: Settings, credentials: CredentialServ
 }>;
 
 type quickfill_CandidateOptions = CandidateOptions;
+type quickfill_DefaultSelection = DefaultSelection;
 type quickfill_LlmModelCandidate = LlmModelCandidate;
 type quickfill_LlmProviderCandidate = LlmProviderCandidate;
 type quickfill_LlmServices = LlmServices;
 declare const quickfill_applyCandidate: typeof applyCandidate;
+declare const quickfill_applyDefaultSelection: typeof applyDefaultSelection;
 declare const quickfill_coreProviderFor: typeof coreProviderFor;
 declare const quickfill_credentialServices: typeof credentialServices;
 declare const quickfill_listProviderCandidates: typeof listProviderCandidates;
 declare const quickfill_llmServices: typeof llmServices;
+declare const quickfill_readDefaultSelection: typeof readDefaultSelection;
 declare const quickfill_resolveModelKey: typeof resolveModelKey;
 declare namespace quickfill {
-  export { type quickfill_CandidateOptions as CandidateOptions, type quickfill_LlmModelCandidate as LlmModelCandidate, type quickfill_LlmProviderCandidate as LlmProviderCandidate, type quickfill_LlmServices as LlmServices, quickfill_applyCandidate as applyCandidate, quickfill_coreProviderFor as coreProviderFor, quickfill_credentialServices as credentialServices, quickfill_listProviderCandidates as listProviderCandidates, quickfill_llmServices as llmServices, quickfill_resolveModelKey as resolveModelKey };
+  export { type quickfill_CandidateOptions as CandidateOptions, type quickfill_DefaultSelection as DefaultSelection, type quickfill_LlmModelCandidate as LlmModelCandidate, type quickfill_LlmProviderCandidate as LlmProviderCandidate, type quickfill_LlmServices as LlmServices, quickfill_applyCandidate as applyCandidate, quickfill_applyDefaultSelection as applyDefaultSelection, quickfill_coreProviderFor as coreProviderFor, quickfill_credentialServices as credentialServices, quickfill_listProviderCandidates as listProviderCandidates, quickfill_llmServices as llmServices, quickfill_readDefaultSelection as readDefaultSelection, quickfill_resolveModelKey as resolveModelKey };
 }
 
 /**
@@ -1026,6 +1113,59 @@ declare namespace proxy {
   export { type proxy_LlmLike as LlmLike, type proxy_ProxyHandle as ProxyHandle, type proxy_ProxyOptions as ProxyOptions, proxy_foldMessages as foldMessages, proxy_startProxy as startProxy };
 }
 
+/**
+ * 未合并 PR 的「对账」：把 `state.pendingPr` 和 GitHub 上的真实状态对齐。
+ *
+ * 背景：插件把「上次成功创建的 PR」记在 `pendingPr`，但它不会感知这个 PR 之后
+ * 在 GitHub 上被**合并或关闭**——于是界面/工具会一直显示「未合并」，而且在同日
+ * 重跑时给出误导性的判断。这里做一次只读核对（GET /pulls/{n}）：
+ *
+ *   - open    → 仍是未合并 PR，保留；
+ *   - merged  → 已完成，清掉陈旧记录；
+ *   - closed  → 已放弃，清掉陈旧记录；
+ *   - unknown → 无 token / 解析失败 / 网络异常，先不动（下次再试）。
+ *
+ * 只读、可注入 `fetchImpl`，并对同一 URL 做 60 s 缓存，避免 `/state` 5 s 轮询
+ * 每次都打 GitHub。任何失败都降级为 `unknown`，绝不让对账影响主流程。
+ */
+type PullState = 'open' | 'closed' | 'merged' | 'unknown';
+interface PendingPrStatus {
+    state: PullState;
+    url: string;
+    number?: number;
+    title?: string;
+    reason?: string;
+}
+interface ParsedPullUrl {
+    owner: string;
+    repo: string;
+    number: number;
+}
+/** 只认标准的 `https://github.com/<owner>/<repo>/pull/<n>` 形态。 */
+declare function parsePullUrl(url: string): ParsedPullUrl | undefined;
+/** 清空缓存（测试与「强制刷新」用）。 */
+declare function clearPendingPrCache(): void;
+interface CheckPendingPrOptions {
+    url: string;
+    token?: string;
+    fetchImpl?: typeof fetch;
+    now?: number;
+    /** false = 跳过缓存，强制请求。 */
+    cache?: boolean;
+}
+declare function checkPendingPr(options: CheckPendingPrOptions): Promise<PendingPrStatus>;
+
+type pendingPr_CheckPendingPrOptions = CheckPendingPrOptions;
+type pendingPr_ParsedPullUrl = ParsedPullUrl;
+type pendingPr_PendingPrStatus = PendingPrStatus;
+type pendingPr_PullState = PullState;
+declare const pendingPr_checkPendingPr: typeof checkPendingPr;
+declare const pendingPr_clearPendingPrCache: typeof clearPendingPrCache;
+declare const pendingPr_parsePullUrl: typeof parsePullUrl;
+declare namespace pendingPr {
+  export { type pendingPr_CheckPendingPrOptions as CheckPendingPrOptions, type pendingPr_ParsedPullUrl as ParsedPullUrl, type pendingPr_PendingPrStatus as PendingPrStatus, type pendingPr_PullState as PullState, pendingPr_checkPendingPr as checkPendingPr, pendingPr_clearPendingPrCache as clearPendingPrCache, pendingPr_parsePullUrl as parsePullUrl };
+}
+
 interface RunSummary {
     id: string;
     ok: boolean;
@@ -1186,6 +1326,8 @@ interface RouteDeps {
     scheduler: Scheduler;
     get: (name: string) => unknown;
     env?: NodeJS.ProcessEnv;
+    /** 注入用：pendingPr 对账的 fetch 实现（测试不联网）。 */
+    fetchImpl?: typeof fetch;
     version: string;
     logger?: (event: string, data?: Record<string, unknown>) => void;
 }
@@ -1440,4 +1582,4 @@ declare namespace tools {
   export { tools_createTrendingHistoryTool as createTrendingHistoryTool, tools_createTrendingRunTool as createTrendingRunTool };
 }
 
-export { channel, config, core, credentials, errors, exec, handshake$1 as handshake, importCli, ipc, locate, paths, preflight, proxy, quickfill, release, routes, run, runner, schedule, state, tools };
+export { channel, config, core, credentials, errors, exec, github, handshake$1 as handshake, importCli, ipc, locate, paths, pendingPr, preflight, proxy, quickfill, release, repo, routes, run, runner, schedule, state, tools };

package/lib/internal.js

@@ -4,22 +4,25 @@ import {
   core_exports,
   credentials_exports,
   errors_exports,
+  github_exports,
   handshake_exports,
   import_cli_exports,
   ipc_exports,
   locate_exports,
   paths_exports,
+  pending_pr_exports,
   preflight_exports,
   proxy_exports,
   quickfill_exports,
   release_exports,
+  repo_exports,
   routes_exports,
   run_exports,
   runner_exports,
   schedule_exports,
   state_exports,
   tools_exports
-} from "./chunk-RXYA5WFW.js";
+} from "./chunk-HIJIQJCZ.js";
 import {
   exec_exports
 } from "./chunk-XLIFTAVL.js";
@@ -30,15 +33,18 @@ export {
   credentials_exports as credentials,
   errors_exports as errors,
   exec_exports as exec,
+  github_exports as github,
   handshake_exports as handshake,
   import_cli_exports as importCli,
   ipc_exports as ipc,
   locate_exports as locate,
   paths_exports as paths,
+  pending_pr_exports as pendingPr,
   preflight_exports as preflight,
   proxy_exports as proxy,
   quickfill_exports as quickfill,
   release_exports as release,
+  repo_exports as repo,
   routes_exports as routes,
   run_exports as run,
   runner_exports as runner,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@morehao/dsh-github-trending",
-  "version": "0.1.4",
+  "version": "0.2.0",
   "description": "GitHub 趋势日报插件：每天定时 spawn 本地 trendradar 核心，抓取 Trending、生成中文简介与总结，提交到你的仓库并自动合并 PR。",
   "type": "module",
   "main": "lib/index.js",
@@ -57,7 +57,7 @@
     },
     "core": {
       "repo": "morehao/trendradar",
-      "version": "0.1.0"
+      "version": "0.2.0"
     },
     "client": {
       "platform": "web",