@jingyi0605/codingns 0.2.5 → 0.3.0

package/dist/server/modules/tailscale/tailscale-service.d.ts

@@ -0,0 +1,43 @@
+import type Database from "better-sqlite3";
+import type { InstanceTailscaleRepository } from "../../storage/repositories/instance-tailscale-repository.js";
+import type { TailscalePhase } from "../../types/domain.js";
+import type { TailscaleManager } from "./tailscale-manager.js";
+export interface TailscaleConfigUpdateInput {
+    controlServerUrl?: string | null;
+    hostname?: string | null;
+}
+export interface InstanceTailscaleStatusDto {
+    enabled: boolean;
+    controlServerUrl: string | null;
+    hostname: string | null;
+    phase: TailscalePhase;
+    connected: boolean;
+    loginUrl: string | null;
+    accountName: string | null;
+    tailnetFqdn: string | null;
+    tailnetIpv4: string | null;
+    tailnetIpv6: string | null;
+    reachableBaseUrl: string | null;
+    lastError: string | null;
+    observedAt: string | null;
+    updatedAt: string | null;
+}
+export declare class TailscaleService {
+    private readonly db;
+    private readonly repository;
+    private readonly manager;
+    private readonly defaultStateDir;
+    constructor(db: Database.Database, repository: InstanceTailscaleRepository, manager: TailscaleManager, options: {
+        defaultStateDir?: string;
+        databasePath: string;
+    });
+    restoreOnStartup(): Promise<void>;
+    getStatus(): Promise<InstanceTailscaleStatusDto>;
+    updateConfig(input: TailscaleConfigUpdateInput): Promise<InstanceTailscaleStatusDto>;
+    enable(): Promise<InstanceTailscaleStatusDto>;
+    disable(): Promise<InstanceTailscaleStatusDto>;
+    login(): Promise<InstanceTailscaleStatusDto>;
+    logout(): Promise<InstanceTailscaleStatusDto>;
+    private readStateSnapshot;
+    private buildStatusDto;
+}

package/dist/server/modules/tailscale/tailscale-service.js

@@ -0,0 +1,201 @@
+import path from "node:path";
+import { AppError } from "../../shared/errors/app-error.js";
+import { nowIso } from "../../shared/utils/time.js";
+export class TailscaleService {
+    db;
+    repository;
+    manager;
+    defaultStateDir;
+    constructor(db, repository, manager, options) {
+        this.db = db;
+        this.repository = repository;
+        this.manager = manager;
+        this.defaultStateDir = options.defaultStateDir
+            ?? path.join(path.dirname(options.databasePath), "tailscale-state");
+    }
+    async restoreOnStartup() {
+        const snapshot = this.readStateSnapshot();
+        if (!snapshot.hasPersistedConfig) {
+            return;
+        }
+        if (!snapshot.config.enabled) {
+            this.manager.getStatusSync(snapshot.config);
+            return;
+        }
+        await this.manager.restore(snapshot.config);
+    }
+    async getStatus() {
+        const snapshot = this.readStateSnapshot();
+        return this.buildStatusDto(snapshot, await this.manager.getStatus(snapshot.config));
+    }
+    async updateConfig(input) {
+        const snapshot = this.readStateSnapshot();
+        const timestamp = nowIso();
+        const nextConfig = {
+            ...snapshot.config,
+            controlServerUrl: input.controlServerUrl !== undefined
+                ? normalizeControlServerUrl(input.controlServerUrl)
+                : snapshot.config.controlServerUrl,
+            hostname: input.hostname !== undefined
+                ? normalizeHostname(input.hostname)
+                : snapshot.config.hostname,
+            updatedAt: timestamp
+        };
+        const transaction = this.db.transaction(() => {
+            this.repository.upsertConfig(nextConfig);
+            if (nextConfig.enabled) {
+                // 这里只同步状态镜像，不主动发起新的登录动作。
+            }
+        });
+        transaction();
+        if (nextConfig.enabled) {
+            await this.manager.syncConfig(nextConfig);
+        }
+        return await this.getStatus();
+    }
+    async enable() {
+        const snapshot = this.readStateSnapshot();
+        const timestamp = nowIso();
+        const nextConfig = {
+            ...snapshot.config,
+            enabled: true,
+            updatedAt: timestamp
+        };
+        this.repository.upsertConfig(nextConfig);
+        const status = await this.manager.enable(nextConfig);
+        return this.buildStatusDto({
+            config: nextConfig,
+            hasPersistedConfig: true
+        }, status);
+    }
+    async disable() {
+        const snapshot = this.readStateSnapshot();
+        const timestamp = nowIso();
+        const nextConfig = {
+            ...snapshot.config,
+            enabled: false,
+            updatedAt: timestamp
+        };
+        this.repository.upsertConfig(nextConfig);
+        const status = await this.manager.disable(nextConfig);
+        return this.buildStatusDto({
+            config: nextConfig,
+            hasPersistedConfig: true
+        }, status);
+    }
+    async login() {
+        const snapshot = this.readStateSnapshot();
+        if (!snapshot.config.enabled) {
+            throw new AppError({
+                statusCode: 409,
+                errorCode: "TAILSCALE_NOT_ENABLED",
+                detail: "当前实例尚未启用 Tailscale"
+            });
+        }
+        const status = await this.manager.requestLogin(snapshot.config);
+        return this.buildStatusDto(snapshot, status);
+    }
+    async logout() {
+        const snapshot = this.readStateSnapshot();
+        const status = await this.manager.logout(snapshot.config);
+        return this.buildStatusDto(snapshot, status);
+    }
+    readStateSnapshot() {
+        const persistedConfig = this.repository.findConfig();
+        return {
+            config: persistedConfig
+                ?? {
+                    enabled: false,
+                    controlServerUrl: null,
+                    hostname: null,
+                    stateDir: this.defaultStateDir,
+                    updatedAt: nowIso()
+                },
+            hasPersistedConfig: persistedConfig !== null
+        };
+    }
+    buildStatusDto(snapshot, effectiveStatus) {
+        return {
+            enabled: snapshot.config.enabled,
+            controlServerUrl: snapshot.config.controlServerUrl,
+            hostname: snapshot.config.hostname,
+            phase: effectiveStatus.phase,
+            connected: effectiveStatus.connected,
+            loginUrl: effectiveStatus.loginUrl,
+            accountName: effectiveStatus.accountName,
+            tailnetFqdn: effectiveStatus.tailnetFqdn,
+            tailnetIpv4: effectiveStatus.tailnetIpv4,
+            tailnetIpv6: effectiveStatus.tailnetIpv6,
+            reachableBaseUrl: effectiveStatus.reachableBaseUrl,
+            lastError: effectiveStatus.lastError,
+            observedAt: effectiveStatus.observedAt,
+            updatedAt: snapshot.hasPersistedConfig ? snapshot.config.updatedAt : null
+        };
+    }
+}
+function normalizeControlServerUrl(value) {
+    if (value === null) {
+        return null;
+    }
+    const normalized = value.trim();
+    if (normalized.length === 0) {
+        return null;
+    }
+    let parsed;
+    try {
+        parsed = new URL(normalized);
+    }
+    catch {
+        throw new AppError({
+            statusCode: 400,
+            errorCode: "INVALID_INPUT",
+            detail: "controlServerUrl 必须是合法的 http 或 https 地址",
+            field: "controlServerUrl"
+        });
+    }
+    if (parsed.protocol !== "http:" && parsed.protocol !== "https:") {
+        throw new AppError({
+            statusCode: 400,
+            errorCode: "INVALID_INPUT",
+            detail: "controlServerUrl 只允许使用 http 或 https 协议",
+            field: "controlServerUrl"
+        });
+    }
+    if (parsed.username || parsed.password || parsed.search || parsed.hash) {
+        throw new AppError({
+            statusCode: 400,
+            errorCode: "INVALID_INPUT",
+            detail: "controlServerUrl 不能包含账号、查询参数或 hash",
+            field: "controlServerUrl"
+        });
+    }
+    const pathname = parsed.pathname === "/" ? "" : parsed.pathname.replace(/\/+$/, "");
+    return `${parsed.protocol}//${parsed.host}${pathname}`;
+}
+function normalizeHostname(value) {
+    if (value === null) {
+        return null;
+    }
+    const normalized = value.trim();
+    if (normalized.length === 0) {
+        return null;
+    }
+    if (normalized.length > 63) {
+        throw new AppError({
+            statusCode: 400,
+            errorCode: "INVALID_INPUT",
+            detail: "hostname 最长不能超过 63 个字符",
+            field: "hostname"
+        });
+    }
+    if (!/^[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$/.test(normalized)) {
+        throw new AppError({
+            statusCode: 400,
+            errorCode: "INVALID_INPUT",
+            detail: "hostname 只允许字母、数字和连字符，且不能以连字符开头或结尾",
+            field: "hostname"
+        });
+    }
+    return normalized;
+}
+//# sourceMappingURL=tailscale-service.js.map

package/dist/server/modules/tailscale/tailscale-service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tailscale-service.js","sourceRoot":"","sources":["../../../../src/modules/tailscale/tailscale-service.ts"],"names":[],"mappings":"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"}

package/dist/server/routes/git.js

@@ -1,6 +1,7 @@
 export async function registerGitRoutes(app, gitController) {
     app.get("/api/git/status", gitController.getStatus);
     app.get("/api/git/diff", gitController.getDiff);
+    app.get("/api/git/commit-detail", gitController.getCommitDetail);
     app.post("/api/git/stage", gitController.stage);
     app.post("/api/git/unstage", gitController.unstage);
     app.post("/api/git/discard", gitController.discard);

package/dist/server/routes/git.js.map

@@ -1 +1 @@
-{"version":3,"file":"git.js","sourceRoot":"","sources":["../../../src/routes/git.ts"],"names":[],"mappings":"AAIA,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,GAAoB,EACpB,aAA4B;IAE5B,GAAG,CAAC,GAAG,CAAC,iBAAiB,EAAE,aAAa,CAAC,SAAS,CAAC,CAAC;IACpD,GAAG,CAAC,GAAG,CAAC,eAAe,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;IAChD,GAAG,CAAC,IAAI,CAAC,gBAAgB,EAAE,aAAa,CAAC,KAAK,CAAC,CAAC;IAChD,GAAG,CAAC,IAAI,CAAC,kBAAkB,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;IACpD,GAAG,CAAC,IAAI,CAAC,kBAAkB,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;IACpD,GAAG,CAAC,GAAG,CAAC,gBAAgB,EAAE,aAAa,CAAC,QAAQ,CAAC,CAAC;IAClD,GAAG,CAAC,GAAG,CAAC,gBAAgB,EAAE,aAAa,CAAC,SAAS,CAAC,CAAC;IACnD,GAAG,CAAC,IAAI,CAAC,uBAAuB,EAAE,aAAa,CAAC,iBAAiB,CAAC,CAAC;IACnE,GAAG,CAAC,IAAI,CAAC,0BAA0B,EAAE,aAAa,CAAC,cAAc,CAAC,CAAC;IACnE,GAAG,CAAC,IAAI,CAAC,iBAAiB,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;IAClD,GAAG,CAAC,IAAI,CAAC,sBAAsB,EAAE,aAAa,CAAC,cAAc,CAAC,CAAC;IAC/D,GAAG,CAAC,GAAG,CAAC,kBAAkB,EAAE,aAAa,CAAC,UAAU,CAAC,CAAC;IACtD,GAAG,CAAC,GAAG,CAAC,mBAAmB,EAAE,aAAa,CAAC,WAAW,CAAC,CAAC;IACxD,GAAG,CAAC,GAAG,CAAC,eAAe,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;IAChD,GAAG,CAAC,IAAI,CAAC,0BAA0B,EAAE,aAAa,CAAC,YAAY,CAAC,CAAC;IACjE,GAAG,CAAC,GAAG,CAAC,kBAAkB,EAAE,aAAa,CAAC,UAAU,CAAC,CAAC;IACtD,GAAG,CAAC,IAAI,CAAC,sBAAsB,EAAE,aAAa,CAAC,UAAU,CAAC,CAAC;AAC7D,CAAC"}
+{"version":3,"file":"git.js","sourceRoot":"","sources":["../../../src/routes/git.ts"],"names":[],"mappings":"AAIA,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,GAAoB,EACpB,aAA4B;IAE5B,GAAG,CAAC,GAAG,CAAC,iBAAiB,EAAE,aAAa,CAAC,SAAS,CAAC,CAAC;IACpD,GAAG,CAAC,GAAG,CAAC,eAAe,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;IAChD,GAAG,CAAC,GAAG,CAAC,wBAAwB,EAAE,aAAa,CAAC,eAAe,CAAC,CAAC;IACjE,GAAG,CAAC,IAAI,CAAC,gBAAgB,EAAE,aAAa,CAAC,KAAK,CAAC,CAAC;IAChD,GAAG,CAAC,IAAI,CAAC,kBAAkB,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;IACpD,GAAG,CAAC,IAAI,CAAC,kBAAkB,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;IACpD,GAAG,CAAC,GAAG,CAAC,gBAAgB,EAAE,aAAa,CAAC,QAAQ,CAAC,CAAC;IAClD,GAAG,CAAC,GAAG,CAAC,gBAAgB,EAAE,aAAa,CAAC,SAAS,CAAC,CAAC;IACnD,GAAG,CAAC,IAAI,CAAC,uBAAuB,EAAE,aAAa,CAAC,iBAAiB,CAAC,CAAC;IACnE,GAAG,CAAC,IAAI,CAAC,0BAA0B,EAAE,aAAa,CAAC,cAAc,CAAC,CAAC;IACnE,GAAG,CAAC,IAAI,CAAC,iBAAiB,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;IAClD,GAAG,CAAC,IAAI,CAAC,sBAAsB,EAAE,aAAa,CAAC,cAAc,CAAC,CAAC;IAC/D,GAAG,CAAC,GAAG,CAAC,kBAAkB,EAAE,aAAa,CAAC,UAAU,CAAC,CAAC;IACtD,GAAG,CAAC,GAAG,CAAC,mBAAmB,EAAE,aAAa,CAAC,WAAW,CAAC,CAAC;IACxD,GAAG,CAAC,GAAG,CAAC,eAAe,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;IAChD,GAAG,CAAC,IAAI,CAAC,0BAA0B,EAAE,aAAa,CAAC,YAAY,CAAC,CAAC;IACjE,GAAG,CAAC,GAAG,CAAC,kBAAkB,EAAE,aAAa,CAAC,UAAU,CAAC,CAAC;IACtD,GAAG,CAAC,IAAI,CAAC,sBAAsB,EAAE,aAAa,CAAC,UAAU,CAAC,CAAC;AAC7D,CAAC"}

package/dist/server/routes/skills.d.ts

@@ -0,0 +1,3 @@
+import type { FastifyInstance } from "fastify";
+import type { SkillController } from "../modules/skills/skill-controller.js";
+export declare function registerSkillRoutes(app: FastifyInstance, skillController: SkillController): Promise<void>;

package/dist/server/routes/skills.js

@@ -0,0 +1,7 @@
+export async function registerSkillRoutes(app, skillController) {
+    app.get("/api/skills/overview", skillController.getOverview);
+    app.post("/api/skills", skillController.add);
+    app.post("/api/skills/import", skillController.import);
+    app.post("/api/skills/sync", skillController.sync);
+}
+//# sourceMappingURL=skills.js.map

package/dist/server/routes/skills.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"skills.js","sourceRoot":"","sources":["../../../src/routes/skills.ts"],"names":[],"mappings":"AAIA,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,GAAoB,EACpB,eAAgC;IAEhC,GAAG,CAAC,GAAG,CAAC,sBAAsB,EAAE,eAAe,CAAC,WAAW,CAAC,CAAC;IAC7D,GAAG,CAAC,IAAI,CAAC,aAAa,EAAE,eAAe,CAAC,GAAG,CAAC,CAAC;IAC7C,GAAG,CAAC,IAAI,CAAC,oBAAoB,EAAE,eAAe,CAAC,MAAM,CAAC,CAAC;IACvD,GAAG,CAAC,IAAI,CAAC,kBAAkB,EAAE,eAAe,CAAC,IAAI,CAAC,CAAC;AACrD,CAAC"}

package/dist/server/routes/system.d.ts

@@ -0,0 +1,3 @@
+import type { FastifyInstance } from "fastify";
+import type { TailscaleController } from "../modules/tailscale/tailscale-controller.js";
+export declare function registerSystemRoutes(app: FastifyInstance, tailscaleController: TailscaleController): Promise<void>;

package/dist/server/routes/system.js

@@ -0,0 +1,9 @@
+export async function registerSystemRoutes(app, tailscaleController) {
+    app.get("/api/system/tailscale/status", tailscaleController.getStatus);
+    app.put("/api/system/tailscale/config", tailscaleController.updateConfig);
+    app.post("/api/system/tailscale/enable", tailscaleController.enable);
+    app.post("/api/system/tailscale/disable", tailscaleController.disable);
+    app.post("/api/system/tailscale/login", tailscaleController.login);
+    app.post("/api/system/tailscale/logout", tailscaleController.logout);
+}
+//# sourceMappingURL=system.js.map

package/dist/server/routes/system.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"system.js","sourceRoot":"","sources":["../../../src/routes/system.ts"],"names":[],"mappings":"AAIA,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,GAAoB,EACpB,mBAAwC;IAExC,GAAG,CAAC,GAAG,CAAC,8BAA8B,EAAE,mBAAmB,CAAC,SAAS,CAAC,CAAC;IACvE,GAAG,CAAC,GAAG,CAAC,8BAA8B,EAAE,mBAAmB,CAAC,YAAY,CAAC,CAAC;IAC1E,GAAG,CAAC,IAAI,CAAC,8BAA8B,EAAE,mBAAmB,CAAC,MAAM,CAAC,CAAC;IACrE,GAAG,CAAC,IAAI,CAAC,+BAA+B,EAAE,mBAAmB,CAAC,OAAO,CAAC,CAAC;IACvE,GAAG,CAAC,IAAI,CAAC,6BAA6B,EAAE,mBAAmB,CAAC,KAAK,CAAC,CAAC;IACnE,GAAG,CAAC,IAAI,CAAC,8BAA8B,EAAE,mBAAmB,CAAC,MAAM,CAAC,CAAC;AACvE,CAAC"}

package/dist/server/server/create-server.d.ts

@@ -32,6 +32,9 @@ import { GitReadService } from "../modules/git/git-read-service.js";
 import { GitWriteService } from "../modules/git/git-write-service.js";
 import { PreferenceProfileService } from "../modules/preferences/profile-service.js";
 import { QuickPhraseService } from "../modules/preferences/quick-phrase-service.js";
+import { SkillManagerService } from "../modules/skills/skill-manager-service.js";
+import { TailscaleManager } from "../modules/tailscale/tailscale-manager.js";
+import { TailscaleService } from "../modules/tailscale/tailscale-service.js";
 import { SessionChangedFileService } from "../modules/sessions/session-changed-file-service.js";
 import { SessionHistoryService } from "../modules/sessions/session-history-service.js";
 import { SessionLiveRuntimeService } from "../modules/sessions/session-live-runtime-service.js";
@@ -70,6 +73,7 @@ import { DebugTargetRepository } from "../storage/repositories/debug-target-repo
 import { FileContextBindingRepository } from "../storage/repositories/file-context-binding-repository.js";
 import { FrameworkAnalysisResultRepository } from "../storage/repositories/framework-analysis-result-repository.js";
 import { GitRemoteCredentialRepository } from "../storage/repositories/git-remote-credential-repository.js";
+import { ManagedSkillRepository } from "../storage/repositories/managed-skill-repository.js";
 import { PortLeaseRepository } from "../storage/repositories/port-lease-repository.js";
 import { RecentFileRepository } from "../storage/repositories/recent-file-repository.js";
 import { RuntimeBindingRepository } from "../storage/repositories/runtime-binding-repository.js";
@@ -83,6 +87,8 @@ import { SessionMessageOriginRepository } from "../storage/repositories/session-
 import { SessionSendQueueRepository } from "../storage/repositories/session-send-queue-repository.js";
 import { SessionStateRepository } from "../storage/repositories/session-state-repository.js";
 import { SessionStatusSnapshotRepository } from "../storage/repositories/session-status-snapshot-repository.js";
+import { InstanceTailscaleRepository } from "../storage/repositories/instance-tailscale-repository.js";
+import { SkillTargetBindingRepository } from "../storage/repositories/skill-target-binding-repository.js";
 import { TerminalCommandTemplateRepository } from "../storage/repositories/terminal-command-template-repository.js";
 import { TerminalInstanceRepository } from "../storage/repositories/terminal-instance-repository.js";
 import { TerminalLogFileRepository } from "../storage/repositories/terminal-log-file-repository.js";
@@ -129,6 +135,7 @@ export declare function createServer(config: HostConfig): {
             verificationRunRepository: VerificationRunRepository;
             commitRuleProfileRepository: CommitRuleProfileRepository;
             gitRemoteCredentialRepository: GitRemoteCredentialRepository;
+            managedSkillRepository: ManagedSkillRepository;
             recentFileRepository: RecentFileRepository;
             fileContextBindingRepository: FileContextBindingRepository;
             sessionBindingRepository: SessionBindingRepository;
@@ -141,6 +148,8 @@ export declare function createServer(config: HostConfig): {
             sessionSendQueueRepository: SessionSendQueueRepository;
             sessionStateRepository: SessionStateRepository;
             sessionStatusSnapshotRepository: SessionStatusSnapshotRepository;
+            instanceTailscaleRepository: InstanceTailscaleRepository;
+            skillTargetBindingRepository: SkillTargetBindingRepository;
             userQuickPhrasePreferenceRepository: UserQuickPhrasePreferenceRepository;
             userPreferenceProfileRepository: UserPreferenceProfileRepository;
             terminalInstanceRepository: TerminalInstanceRepository;
@@ -190,6 +199,9 @@ export declare function createServer(config: HostConfig): {
             commitOrchestrator: CommitOrchestrator;
             quickPhraseService: QuickPhraseService;
             preferenceProfileService: PreferenceProfileService;
+            skillManagerService: SkillManagerService;
+            tailscaleManager: TailscaleManager;
+            tailscaleService: TailscaleService;
             runtimeObservabilityService: RuntimeObservabilityService;
             sessionHistoryService: SessionHistoryService;
             sessionChangedFileService: SessionChangedFileService;

package/dist/server/server/create-server.js

@@ -63,6 +63,13 @@ import { PreferenceProfileService } from "../modules/preferences/profile-service
 import { QuickPhraseController } from "../modules/preferences/quick-phrase-controller.js";
 import { QuickPhraseService } from "../modules/preferences/quick-phrase-service.js";
 import { ProviderController } from "../modules/provider/provider-controller.js";
+import { SkillController } from "../modules/skills/skill-controller.js";
+import { SkillManagerService } from "../modules/skills/skill-manager-service.js";
+import { createDefaultSkillTargetAdapters } from "../modules/skills/skill-target-adapter.js";
+import { TailscaleManager } from "../modules/tailscale/tailscale-manager.js";
+import { TailscaleController } from "../modules/tailscale/tailscale-controller.js";
+import { TailscaleHelperClient } from "../modules/tailscale/tailscale-helper-client.js";
+import { TailscaleService } from "../modules/tailscale/tailscale-service.js";
 import { SessionController } from "../modules/sessions/session-controller.js";
 import { SessionChangedFileService } from "../modules/sessions/session-changed-file-service.js";
 import { SessionActivityAuthorityService } from "../modules/sessions/session-activity-authority-service.js";
@@ -105,10 +112,12 @@ import { registerPublicRoutes } from "../routes/public.js";
 import { registerProxyRoutes } from "../routes/proxy.js";
 import { registerSessionContextRoutes } from "../routes/session-contexts.js";
 import { registerSessionRoutes } from "../routes/sessions.js";
+import { registerSkillRoutes } from "../routes/skills.js";
 import { registerTerminalRoutes } from "../routes/terminals.js";
 import { registerWorkbenchRoutes } from "../routes/workbench.js";
 import { registerWorktreeRoutes } from "../routes/worktrees.js";
 import { registerWorkspaceRoutes } from "../routes/workspaces.js";
+import { registerSystemRoutes } from "../routes/system.js";
 import { DemoCleanupService, DemoOnlineTracker } from "../modules/demo/demo-cleanup-service.js";
 import { setErrorHandler } from "../shared/http/error-handler.js";
 import { startTerminalDebugEventLoopLagMonitor } from "../shared/utils/terminal-debug-log.js";
@@ -136,6 +145,7 @@ import { DebugTargetRepository } from "../storage/repositories/debug-target-repo
 import { FileContextBindingRepository } from "../storage/repositories/file-context-binding-repository.js";
 import { FrameworkAnalysisResultRepository } from "../storage/repositories/framework-analysis-result-repository.js";
 import { GitRemoteCredentialRepository } from "../storage/repositories/git-remote-credential-repository.js";
+import { ManagedSkillRepository } from "../storage/repositories/managed-skill-repository.js";
 import { PortLeaseRepository } from "../storage/repositories/port-lease-repository.js";
 import { RecentFileRepository } from "../storage/repositories/recent-file-repository.js";
 import { RuntimeBindingRepository } from "../storage/repositories/runtime-binding-repository.js";
@@ -149,6 +159,8 @@ import { SessionMessageOriginRepository } from "../storage/repositories/session-
 import { SessionSendQueueRepository } from "../storage/repositories/session-send-queue-repository.js";
 import { SessionStateRepository } from "../storage/repositories/session-state-repository.js";
 import { SessionStatusSnapshotRepository } from "../storage/repositories/session-status-snapshot-repository.js";
+import { InstanceTailscaleRepository } from "../storage/repositories/instance-tailscale-repository.js";
+import { SkillTargetBindingRepository } from "../storage/repositories/skill-target-binding-repository.js";
 import { TerminalCommandTemplateRepository } from "../storage/repositories/terminal-command-template-repository.js";
 import { TerminalInstanceRepository } from "../storage/repositories/terminal-instance-repository.js";
 import { TerminalLogFileRepository } from "../storage/repositories/terminal-log-file-repository.js";
@@ -204,6 +216,7 @@ export function createServer(config) {
         verificationRunRepository: new VerificationRunRepository(database.db),
         commitRuleProfileRepository: new CommitRuleProfileRepository(database.db),
         gitRemoteCredentialRepository: new GitRemoteCredentialRepository(database.db),
+        managedSkillRepository: new ManagedSkillRepository(database.db),
         recentFileRepository: new RecentFileRepository(database.db),
         fileContextBindingRepository: new FileContextBindingRepository(database.db),
         sessionBindingRepository: new SessionBindingRepository(database.db),
@@ -216,6 +229,8 @@ export function createServer(config) {
         sessionSendQueueRepository: new SessionSendQueueRepository(database.db),
         sessionStateRepository: new SessionStateRepository(database.db),
         sessionStatusSnapshotRepository: new SessionStatusSnapshotRepository(database.db),
+        instanceTailscaleRepository: new InstanceTailscaleRepository(database.db),
+        skillTargetBindingRepository: new SkillTargetBindingRepository(database.db),
         userQuickPhrasePreferenceRepository: new UserQuickPhrasePreferenceRepository(database.db),
         userPreferenceProfileRepository: new UserPreferenceProfileRepository(database.db),
         terminalInstanceRepository: new TerminalInstanceRepository(database.db),
@@ -253,7 +268,7 @@ export function createServer(config) {
     const fileTreeService = new FileTreeService(fileAccessGuard);
     const fileSearchService = new FileSearchService(fileAccessGuard);
     const fileContentService = new FileContentService(fileAccessGuard, recentFileService, repositories.fileContextBindingRepository, fileVersionChecker);
-    const filePreviewService = new FilePreviewService(fileAccessGuard, fileContentService);
+    const filePreviewService = new FilePreviewService(fileAccessGuard, fileContentService, recentFileService);
     const filePreviewLinkService = new FilePreviewLinkService(fileAccessGuard, config.filePreviewTokenSecret);
     const workspaceRepoGuard = new WorkspaceRepoGuard(workspaceService, gitCommandRunner);
     const gitReadService = new GitReadService(gitCommandRunner, workspaceRepoGuard);
@@ -262,6 +277,17 @@ export function createServer(config) {
     const gitRuleRepository = new GitRuleRepository(repositories.commitRuleProfileRepository);
     const quickPhraseService = new QuickPhraseService(repositories.userQuickPhrasePreferenceRepository);
     const preferenceProfileService = new PreferenceProfileService(repositories.userPreferenceProfileRepository);
+    const tailscaleHelperClient = new TailscaleHelperClient();
+    const tailscaleManager = new TailscaleManager(repositories.bootstrapStateRepository, repositories.instanceTailscaleRepository, tailscaleHelperClient, {
+        commandPath: config.tailscaleCliPath,
+        webUiPort: config.webUiPort
+    });
+    const tailscaleService = new TailscaleService(database.db, repositories.instanceTailscaleRepository, tailscaleManager, {
+        databasePath: config.databasePath
+    });
+    const skillManagerService = new SkillManagerService(repositories.managedSkillRepository, repositories.skillTargetBindingRepository, createDefaultSkillTargetAdapters(config), {
+        ssotRootDir: path.join(path.dirname(config.databasePath), "skills")
+    });
     const commitRuleEngine = new CommitRuleEngine();
     const commitDraftService = new CommitDraftService(gitReadService);
     const commitOrchestrator = new CommitOrchestrator(gitRuleRepository, commitRuleEngine, commitDraftService, gitWriteService, repositories.aiFallbackEditRepository);
@@ -271,6 +297,7 @@ export function createServer(config) {
     const sessionHistoryService = new SessionHistoryService(database.db, repositories.workspaceRepository, repositories.sessionBindingRepository, sessionChangedFileService, repositories.sessionIndexRepository, sessionMessageAttachmentService, repositories.sessionStateRepository, repositories.sessionStatusSnapshotRepository, config, sessionActivityAuthorityService, repositories.sessionMessageOriginRepository, repositories.sessionForkRepository, {}, taskManager);
     runtimeObservabilityService = new RuntimeObservabilityService(() => sessionHistoryService.observeBackgroundTaskMetrics(), () => schedulerMetrics.observe(), eventLoopMonitor, taskActivityLog);
     const sessionLiveRuntimeService = new SessionLiveRuntimeService(sessionHistoryService, sessionMessageAttachmentService, workspaceService, sessionChangedFileService, repositories.sessionBindingRepository, repositories.authUserRepository, repositories.sessionSendQueueRepository, repositories.sessionIndexRepository, repositories.sessionStateRepository, repositories.sessionStatusSnapshotRepository, config, sessionActivityAuthorityService);
+    sessionHistoryService.registerLiveActivityObservationResolver((sessionId) => sessionLiveRuntimeService.resolveLiveActivityObservation(sessionId));
     const butlerRuntimeRootDir = path.join(path.dirname(config.databasePath), "butler-runtime");
     const butlerRuntimeConfig = {
         ...config,
@@ -288,8 +315,11 @@ export function createServer(config) {
         claudeCodeHomeDir: path.join(butlerRuntimeRootDir, "follow-up-claude-home")
     };
     const butlerSessionLiveRuntimeService = new SessionLiveRuntimeService(sessionHistoryService, sessionMessageAttachmentService, workspaceService, sessionChangedFileService, repositories.sessionBindingRepository, repositories.authUserRepository, repositories.sessionSendQueueRepository, repositories.sessionIndexRepository, repositories.sessionStateRepository, repositories.sessionStatusSnapshotRepository, butlerRuntimeConfig, sessionActivityAuthorityService);
+    sessionHistoryService.registerLiveActivityObservationResolver((sessionId) => butlerSessionLiveRuntimeService.resolveLiveActivityObservation(sessionId));
     const butlerSummarySessionLiveRuntimeService = new SessionLiveRuntimeService(sessionHistoryService, sessionMessageAttachmentService, workspaceService, sessionChangedFileService, repositories.sessionBindingRepository, repositories.authUserRepository, repositories.sessionSendQueueRepository, repositories.sessionIndexRepository, repositories.sessionStateRepository, repositories.sessionStatusSnapshotRepository, butlerSummaryRuntimeConfig, sessionActivityAuthorityService);
+    sessionHistoryService.registerLiveActivityObservationResolver((sessionId) => butlerSummarySessionLiveRuntimeService.resolveLiveActivityObservation(sessionId));
     const butlerFollowUpSessionLiveRuntimeService = new SessionLiveRuntimeService(sessionHistoryService, sessionMessageAttachmentService, workspaceService, sessionChangedFileService, repositories.sessionBindingRepository, repositories.authUserRepository, repositories.sessionSendQueueRepository, repositories.sessionIndexRepository, repositories.sessionStateRepository, repositories.sessionStatusSnapshotRepository, butlerFollowUpRuntimeConfig, sessionActivityAuthorityService);
+    sessionHistoryService.registerLiveActivityObservationResolver((sessionId) => butlerFollowUpSessionLiveRuntimeService.resolveLiveActivityObservation(sessionId));
     const worktreeManager = new WorktreeManager(workspaceService, repositories.workspaceWorktreeRepository, gitReadService, gitCommandRunner);
     const worktreeSyncService = new WorktreeSyncService(workspaceService, repositories.workspaceWorktreeRepository, gitCommandRunner);
     const worktreeMergeService = new WorktreeMergeService(workspaceService, repositories.workspaceWorktreeRepository, gitReadService, gitCommandRunner, worktreeSyncService);
@@ -339,7 +369,7 @@ export function createServer(config) {
     const butlerFollowUpTerminalSubscription = sessionLiveRuntimeService.registerTerminalStateListener(async (event) => {
         await butlerFollowUpService.handleSessionTerminal(event.sessionId, event.timestamp);
     });
-    const butlerControlSessionService = new ButlerControlSessionService(butlerProfileService, repositories.butlerControlSessionRepository, workspaceService, sessionHistoryService, butlerSessionLiveRuntimeService, butlerContextAggregator, butlerAuthService, butlerRuntimeConfig.codexHomeDir, config.codexHomeDir);
+    const butlerControlSessionService = new ButlerControlSessionService(butlerProfileService, repositories.butlerControlSessionRepository, workspaceService, sessionHistoryService, butlerSessionLiveRuntimeService, butlerContextAggregator, butlerAuthService, skillManagerService, butlerRuntimeConfig.codexHomeDir, config.codexHomeDir);
     const butlerControlActionService = new ButlerControlActionService(butlerProfileService, repositories.butlerControlSessionRepository, repositories.butlerControlEventRepository, butlerProjectService, butlerSessionService, patrolRunService, patrolExecutionService, verificationRunService, butlerContextAggregator);
     const fileContextService = new FileContextService(sessionHistoryService, repositories.fileContextBindingRepository);
     const terminalService = new TerminalService(database.db, repositories.terminalInstanceRepository, repositories.terminalRuntimeSessionRepository, workspaceService, config.terminalIdleTimeoutSeconds, {
@@ -348,7 +378,7 @@ export function createServer(config) {
         terminalLogFileRepository: repositories.terminalLogFileRepository,
         terminalLogSegmentRepository: repositories.terminalLogSegmentRepository
     });
-    const debugTargetService = new DebugTargetService(database.db, workspaceService, repositories.workspaceWorktreeRepository, repositories.debugTargetRepository, repositories.debugServiceRepository, repositories.frameworkAnalysisResultRepository, repositories.debugRuntimeSessionRepository, repositories.portLeaseRepository, repositories.runtimeBindingRepository, repositories.aiFallbackEditRepository, terminalService, repositories.terminalInstanceRepository, taskManager);
+    const debugTargetService = new DebugTargetService(database.db, workspaceService, repositories.workspaceWorktreeRepository, repositories.debugTargetRepository, repositories.debugServiceRepository, repositories.frameworkAnalysisResultRepository, repositories.debugRuntimeSessionRepository, repositories.portLeaseRepository, repositories.runtimeBindingRepository, repositories.aiFallbackEditRepository, repositories.terminalCommandTemplateRepository, terminalService, repositories.terminalInstanceRepository, taskManager);
     const debugRuntimeReconciliationScheduler = new DebugRuntimeReconciliationScheduler(debugTargetService, {
         schedulerMetrics
     });
@@ -371,6 +401,8 @@ export function createServer(config) {
     const sessionController = new SessionController(sessionHistoryService, sessionLiveRuntimeService, repositories.butlerControlSessionRepository);
     const assistantCapabilityController = new AssistantCapabilityController(new AssistantCapabilityService(butlerProjectService, butlerSessionService, sessionHistoryService, sessionLiveRuntimeService, terminalService));
     const providerController = new ProviderController(sessionHistoryService, sessionLiveRuntimeService, config);
+    const skillController = new SkillController(skillManagerService);
+    const tailscaleController = new TailscaleController(tailscaleService);
     const quickPhraseController = new QuickPhraseController(quickPhraseService);
     const profileController = new ProfileController(preferenceProfileService);
     const fileController = new FileController(fileTreeService, fileContentService, fileSearchService, recentFileService, filePreviewService, filePreviewLinkService);
@@ -393,6 +425,7 @@ export function createServer(config) {
     app.setErrorHandler(setErrorHandler);
     app.addHook("onReady", async () => {
         await debugTargetService.runBackgroundRuntimeReconciliation("debug_target.startup_runtime_recovery");
+        await tailscaleService.restoreOnStartup();
     });
     // Demo 模式：自动创建演示用户
     if (config.demoMode) {
@@ -414,6 +447,8 @@ export function createServer(config) {
     void registerButlerRoutes(app, butlerController);
     void registerSessionRoutes(app, sessionController);
     void registerPreferenceRoutes(app, quickPhraseController, profileController);
+    void registerSkillRoutes(app, skillController);
+    void registerSystemRoutes(app, tailscaleController);
     void registerFileRoutes(app, fileController);
     void registerSessionContextRoutes(app, fileContextController);
     void registerTerminalRoutes(app, terminalController);
@@ -442,6 +477,7 @@ export function createServer(config) {
         await sessionLiveRuntimeService.dispose();
         await wsHandle.close();
         gitCommandRunner.dispose();
+        tailscaleHelperClient.dispose();
         database.close();
     });
     return {
@@ -491,6 +527,9 @@ export function createServer(config) {
                 commitOrchestrator,
                 quickPhraseService,
                 preferenceProfileService,
+                skillManagerService,
+                tailscaleManager,
+                tailscaleService,
                 runtimeObservabilityService,
                 sessionHistoryService,
                 sessionChangedFileService,