@xopcai/xopc 0.0.433 → 0.0.435

package/dist/src/computer/runtime.js

@@ -1,7 +1,7 @@
 import { createLogger } from "../utils/logger/index.js";
 import { init_logger } from "../utils/logger.js";
 import { resolveEffectiveAgentConfigForSession } from "../config/agent-profile.js";
-import { COMPUTER_CONTROL_TOOL, ComputerActionSchema, ComputerAppSchema, ComputerObservationSchema, ComputerTransportTimingSchema, ComputerWindowSchema, init_src } from "../../packages/computer-control-contract/src/index.js";
+import { COMPUTER_CONTROL_TOOL, ComputerActionSchema, ComputerAppSchema, ComputerObservationSchema, ComputerTransportTimingSchema, ComputerWindowSchema, computerActionInputCount, init_src } from "../../packages/computer-control-contract/src/index.js";
 import { ComputerServiceLimitsSchema, computerModelProfile, init_model_policy } from "./model-policy.js";
 import { getApiKey, init_providers, resolveModel } from "../providers/index.js";
 import { rejectUnbudgetedCloudTransport } from "../providers/xopc-cloud-credit-budget.js";
@@ -14,6 +14,7 @@ import { ComputerFlowCapture, ComputerFlowStore, computerFlowHint, computerFlowM
 import { ComputerNativeTimingSchema, ComputerSessionDiagnostics } from "./diagnostics.js";
 import { executeComputerProgram } from "./program-runtime.js";
 import { ComputerExpectationSchema, ComputerTaskState, verifyComputerExpectation } from "./task-state.js";
+import { executeComputerBatch } from "./batch.js";
 import { randomUUID } from "node:crypto";
 import { z } from "zod";
 import { setTimeout } from "node:timers/promises";
@@ -45,6 +46,16 @@ const Reply = z.object({
 	windows: z.array(ComputerWindowSchema).max(100).optional(),
 	receipt: z.object({
 		actionId: z.string(),
+		inputCount: z.number().int().min(1).max(12).optional(),
+		steps: z.array(z.object({
+			index: z.number().int().min(0).max(11),
+			dispatch: z.enum([
+				"notStarted",
+				"started",
+				"completed",
+				"unknown"
+			])
+		}).strict()).max(12).optional(),
 		dispatch: z.enum([
 			"notStarted",
 			"started",
@@ -264,6 +275,7 @@ var ComputerRuntime = class {
 		const combined = AbortSignal.any([signal, s.controller.signal]);
 		let current;
 		let actions = 0;
+		const receipts = [];
 		let imageRef;
 		const observe = async (observationSignal = combined) => {
 			current?.frame?.fill(0);
@@ -295,12 +307,41 @@ var ComputerRuntime = class {
 			return observation;
 		};
 		try {
-			const result = await executeComputerProgram(input.code, async (method, args, callSignal) => {
+			const host = async (method, args, callSignal) => {
 				callSignal.throwIfAborted();
 				if (!this.getConfig().computer.enabled || Date.now() - s.createdAt >= this.getConfig().computer.maxSessionDurationMs) throw new Error("COMPUTER_SESSION_BUDGET");
 				if (JSON.stringify(computerAgentTurn(owner).binding) !== JSON.stringify(s.binding)) throw new Error("COMPUTER_AGENT_MODEL_CHANGED");
 				await turn.authorize?.(method, args);
 				const hostResult = await (async () => {
+					if (method === "batch") {
+						if (s.mode === "observe") throw new Error("COMPUTER_READ_ONLY");
+						return executeComputerBatch(args, host, {
+							remainingInputs: (input.maxActions ?? 6) - actions,
+							signal: callSignal,
+							state: (id) => {
+								const observation = snapshot(id);
+								let data;
+								try {
+									data = JSON.parse(observation.summary);
+								} catch {
+									data = {
+										text: observation.summary,
+										elements: [],
+										truncated: true
+									};
+								}
+								return {
+									...data,
+									snapshotId: id
+								};
+							},
+							verify: (expect) => {
+								const verification = verifyComputerExpectation(expect, current?.value.observation);
+								s.diagnostics.verify(verification);
+								return verification;
+							}
+						});
+					}
 					if (method === "observe") {
 						const options = z.object({ visual: z.boolean().optional() }).strict().parse(args ?? {});
 						const state = await observe(callSignal);
@@ -328,18 +369,36 @@ var ComputerRuntime = class {
 					if (method === "verify" || method === "waitFor") {
 						const value = z.object({
 							expect: ComputerExpectationSchema,
-							timeoutMs: z.number().int().min(0).max(5e3).optional()
+							timeoutMs: z.number().int().min(0).max(5e3).optional(),
+							fresh: z.boolean().optional()
 						}).strict().parse(args);
 						const deadline = Date.now() + (method === "waitFor" ? value.timeoutMs ?? 2e3 : 0);
 						for (let sample = 0; sample < 20; sample++) {
-							const state = await observe(callSignal);
+							const cached = current?.value.observation;
+							const reuse = sample === 0 && !value.fresh && cached && Date.now() - cached.capturedAt >= 0 && Date.now() - cached.capturedAt <= 5e3;
+							let state;
+							if (reuse) try {
+								state = {
+									...JSON.parse(cached.summary),
+									snapshotId: cached.id
+								};
+							} catch {
+								state = {
+									text: cached.summary,
+									elements: [],
+									truncated: true,
+									snapshotId: cached.id
+								};
+							}
+							else state = await observe(callSignal);
 							const verification = verifyComputerExpectation(value.expect, current.value.observation);
 							s.diagnostics.verify(verification);
 							if (verification?.status === "satisfied" || Date.now() >= deadline || sample === 19) return {
 								...state,
-								verification
+								verification,
+								observationReused: Boolean(reuse)
 							};
-							await setTimeout(100, void 0, { signal: callSignal });
+							await setTimeout(Math.min(25 * 2 ** Math.min(sample, 3), 200, Math.max(0, deadline - Date.now())), void 0, { signal: callSignal });
 						}
 					}
 					if (method === "act") {
@@ -350,7 +409,7 @@ var ComputerRuntime = class {
 							expect: ComputerExpectationSchema.optional()
 						}).strict().parse(args);
 						const before = snapshot(value.snapshotId);
-						if (++actions > (input.maxActions ?? 6)) throw new Error("COMPUTER_ACTION_BUDGET");
+						if ((actions += computerActionInputCount(value.action)) > (input.maxActions ?? 6)) throw new Error("COMPUTER_ACTION_BUDGET");
 						const action = groundComputerAction(value.action, before);
 						s.task.assertProgress(action, before);
 						s.pendingContext = {
@@ -371,7 +430,7 @@ var ComputerRuntime = class {
 						const context = {
 							observationsReused: 0,
 							stabilityObservations: 0,
-							actionsRemaining: 1,
+							actionsRemaining: computerActionInputCount(action),
 							nativeMs: {
 								precheckMs: 0,
 								inputMs: 0,
@@ -382,14 +441,9 @@ var ComputerRuntime = class {
 						imageRef = void 0;
 						current?.frame?.fill(0);
 						current = void 0;
-						const authorizationDeadline = Date.now() + 6e4;
-						let reply = await this.dispatchAction(s, envelope, callSignal, context);
-						while (reply.status === "pending_action") {
-							if (Date.now() >= authorizationDeadline) throw new Error("COMPUTER_AUTHORIZATION_TIMEOUT");
-							await setTimeout(250, void 0, { signal: callSignal });
-							reply = await this.dispatchAction(s, envelope, callSignal, context);
-						}
+						const reply = await this.dispatchAction(s, envelope, callSignal, context);
 						current = context.observation;
+						if (reply.receipt) receipts.push(reply.receipt);
 						if (reply.errorCode || reply.receipt?.dispatch !== "completed") throw new Error(reply.errorCode ?? "COMPUTER_NATIVE_ACTION_FAILED");
 						let state = {};
 						try {
@@ -407,17 +461,20 @@ var ComputerRuntime = class {
 					throw new Error("COMPUTER_INVALID_INPUT");
 				})();
 				return await turn.complete?.(method, hostResult) ?? hostResult;
-			}, s.programStore ??= Object.create(null), combined, input.timeoutMs);
+			};
+			const result = await executeComputerProgram(input.code, host, s.programStore ??= Object.create(null), combined, input.timeoutMs);
 			if (result.status === "program_error") {
 				await this.close(owner);
 				return {
 					...result,
-					sessionId: s.id
+					sessionId: s.id,
+					receipts
 				};
 			}
 			return {
 				...result,
 				sessionId: s.id,
+				receipts,
 				...imageRef ? { imageRef } : {},
 				budget: this.budget(s)
 			};
@@ -466,18 +523,8 @@ var ComputerRuntime = class {
 				signal.throwIfAborted();
 				context.actionsRemaining = (input.maxActions ?? 6) - actionsExecuted;
 				let result = await this.executeInput(owner, step, signal, diagnostics, context);
-				const authorizationDeadline = Date.now() + 6e4;
-				while (result.status === "pending_authorization" || result.status === "pending_action") {
-					const authorizingSession = result.status === "pending_authorization";
-					if (Date.now() >= authorizationDeadline) {
-						await this.close(owner);
-						throw new Error("COMPUTER_AUTHORIZATION_TIMEOUT");
-					}
-					await setTimeout(250, void 0, { signal });
-					result = await this.executeInput(owner, authorizingSession ? { op: "observe" } : step, signal, diagnostics, context);
-					if (authorizingSession && result.status === "ready" && !result.errorCode) result = await this.executeInput(owner, step, signal, diagnostics, context);
-				}
-				if (result.receipt?.dispatch === "completed") actionsExecuted++;
+				if (result.receipt?.dispatch === "completed") actionsExecuted += result.receipt.inputCount ?? 1;
+				else actionsExecuted += result.receipt?.steps?.filter((step) => step.dispatch === "completed").length ?? 0;
 				if (result.errorCode || result.pending || result.receipt && result.receipt.dispatch !== "completed") return finish(result, "handoff");
 				if (result.verified) return finish({
 					...result,
@@ -645,11 +692,16 @@ var ComputerRuntime = class {
 					...reply.value.status !== "stopped" ? { budget: this.budget(s) } : {}
 				};
 			}
-			const status = await this.send(s, {
+			let status = goalContext?.observation ?? await this.send(s, {
 				op: "status",
 				sessionId: s.id,
 				owner
 			}, signal);
+			if (status.value.status === "pending_authorization") status = await this.send(s, {
+				op: "settle",
+				sessionId: s.id,
+				owner
+			}, signal);
 			if (status.value.status === "stopped") {
 				if (status.value.errorCode) s.diagnostics.fail(new Error(status.value.errorCode), "observe", "notStarted");
 				this.forget(s);
@@ -785,6 +837,7 @@ var ComputerRuntime = class {
 						};
 					}
 					const action = groundComputerAction(proposal.action, o);
+					if ((action.kind === "activateSequence" || action.kind === "batch") && !goalContext) throw new Error("COMPUTER_ACTION_BUDGET");
 					const e = {
 						actionId: randomUUID(),
 						sessionId: s.id,
@@ -838,10 +891,10 @@ var ComputerRuntime = class {
 	}
 	async dispatchAction(s, envelope, signal, goalContext) {
 		if (!s.pending) {
-			if (s.actions >= this.getConfig().computer.maxActionsPerSession) throw new Error("COMPUTER_ACTION_BUDGET");
-			s.actions++;
+			if (s.actions + computerActionInputCount(envelope.action) > this.getConfig().computer.maxActionsPerSession || goalContext && computerActionInputCount(envelope.action) > goalContext.actionsRemaining) throw new Error("COMPUTER_ACTION_BUDGET");
+			s.actions += computerActionInputCount(envelope.action);
 			s.pending = envelope;
-			s.diagnostics.propose(envelope.actionId, envelope.action.kind);
+			s.diagnostics.propose(envelope.actionId, envelope.action.kind, computerActionInputCount(envelope.action));
 		}
 		let reply = await this.send(s, {
 			op: "act",
@@ -849,6 +902,21 @@ var ComputerRuntime = class {
 			owner: s.owner,
 			envelope
 		}, signal);
+		if (reply.value.status === "pending_action") {
+			reply.frame?.fill(0);
+			const settled = await this.send(s, {
+				op: "settle",
+				sessionId: s.id,
+				owner: s.owner
+			}, signal);
+			if (settled.value.status !== "pending_action" || settled.value.errorCode) reply = settled;
+			else reply = await this.send(s, {
+				op: "act",
+				sessionId: s.id,
+				owner: s.owner,
+				envelope
+			}, signal);
+		}
 		if (reply.value.receipt && reply.value.receipt.actionId !== envelope.actionId) {
 			reply.frame?.fill(0);
 			throw new Error("COMPUTER_RECEIPT_MISMATCH");
@@ -905,7 +973,7 @@ var ComputerRuntime = class {
 		} else reply.frame?.fill(0);
 		if (reply.value.status === "ready" && reply.value.errorCode === "COMPUTER_OBSERVATION_CHANGED" && !reply.value.receipt) {
 			s.diagnostics.discard();
-			s.actions--;
+			s.actions -= computerActionInputCount(envelope.action);
 			s.pendingContext = void 0;
 			return {
 				...this.present(reply.value),

package/dist/src/computer/semantic-actions.js

@@ -1,6 +1,10 @@
 //#region src/computer/semantic-actions.ts
 /** Ground only an unambiguous single click; never reinterpret double clicks or text entry. */
 function groundComputerAction(action, observation) {
+	if (action.kind === "batch") return {
+		...action,
+		actions: action.actions.map((input) => groundComputerAction(input, observation))
+	};
 	if (action.kind !== "click" || action.count !== 1 || action.point.x < 0 || action.point.y < 0 || action.point.x >= observation.imageWidth || action.point.y >= observation.imageHeight) return action;
 	const kind = action.button === "left" ? "activate" : "showMenu";
 	try {

package/dist/src/config/schema.d.ts

@@ -1787,6 +1787,12 @@ export declare const ConfigSchema: z.ZodDefault<z.ZodObject<{
             direct: "direct";
         }>>;
         adbPath: z.ZodOptional<z.ZodString>;
+        hdcPath: z.ZodOptional<z.ZodString>;
+        hdcVideo: z.ZodOptional<z.ZodObject<{
+            sdkJar: z.ZodOptional<z.ZodString>;
+            devecoPath: z.ZodOptional<z.ZodString>;
+            javaHome: z.ZodOptional<z.ZodString>;
+        }, z.core.$strict>>;
         autoGlmPrompt: z.ZodDefault<z.ZodEnum<{
             current: "current";
             upstream: "upstream";

package/dist/src/extensions/agent-plugins/formats.js

@@ -67,7 +67,8 @@ function readPluginLayout(root, read, safe, importManifest) {
 	};
 	const defaults = has("skills") ? guarded("skills", () => [safe(join(root, "skills"))], []) : [];
 	const declared = paths(overlay.skills, "skills");
-	const skillRoots = [...new Set(dialect === "portable" ? defaults : dialect === "claude" ? [...defaults, ...declared] : overlay.skills === void 0 ? defaults : declared)];
+	const catalogSelection = !path && importManifest?.skills !== void 0;
+	const skillRoots = [...new Set(catalogSelection ? declared : dialect === "portable" ? defaults : dialect === "claude" ? [...defaults, ...declared] : overlay.skills === void 0 ? defaults : declared)];
 	const mcpConfigs = [];
 	if (dialect === "portable" && has("mcp.json")) {
 		const config = guarded("mcp", () => json("mcp.json"), void 0);

package/dist/src/extensions/agent-plugins/inventory.d.ts

@@ -3,6 +3,7 @@ export declare function agentPluginInventoryRow(plugin: InstalledAgentPlugin, st
     components: {
         skills: {
             name: string;
+            description: string;
         }[];
         mcp: {
             connectionAuth?: {
@@ -117,6 +118,7 @@ export declare function listAgentPluginInventory(): {
     components: {
         skills: {
             name: string;
+            description: string;
         }[];
         mcp: {
             connectionAuth?: {

package/dist/src/extensions/agent-plugins/inventory.js

@@ -37,7 +37,10 @@ function agentPluginInventoryRow(plugin, store = new AgentPluginStore()) {
 		canRollback: !!plugin.receipt.previous,
 		...plugin.receipt.provenance ? { provenance: plugin.receipt.provenance } : {},
 		components: {
-			skills: plugin.skills.map((skill) => ({ name: skill.name })),
+			skills: plugin.skills.map((skill) => ({
+				name: skill.name,
+				description: skill.description
+			})),
 			mcp: Object.entries(plugin.servers).map(([name, server]) => ({
 				name,
 				id: pluginServerId(plugin.id, name),

package/dist/src/extensions/agent-plugins/validation.d.ts

@@ -67,6 +67,7 @@ export interface PluginInspection {
     skills: Array<{
         name: string;
         filePath: string;
+        description?: string;
     }>;
     servers: Record<string, PluginServer>;
     capabilities: string[];

package/dist/src/extensions/agent-plugins/validation.js

@@ -204,7 +204,8 @@ function inspectAgentPlugin(rootDir, dataDir = join(rootDir, ".inspection-data")
 			seenSkills.add(name);
 			result.skills.push({
 				name,
-				filePath
+				filePath,
+				description: metadata.description
 			});
 			const references = [...new Set(content.match(/\bmcp__[A-Za-z0-9_-]+__[A-Za-z0-9_-]+|\bfunctions\.(?:exec_command|apply_patch|spawn_agent|send_input|wait_agent)|\$\{(?:CLAUDE_)?PLUGIN_(?:ROOT|DATA|RESOURCES)\}/g) ?? [])].slice(0, 20);
 			const message = references.length ? `Host-specific references need execution verification: ${references.join(", ")}` : "Skill format accepted; business execution is not verified.";

package/dist/src/gateway/agent-builtin-tools.d.ts

@@ -277,4 +277,4 @@ export declare const GATEWAY_BUILTIN_TOOLS: readonly [{
         readonly zh: "使用已验证的参数执行选定的外部工具。";
     };
 }];
-export declare const GATEWAY_BUILTIN_TOOL_IDS: ("automation" | "find" | "image" | "knowledge_search" | "knowledge_get" | "knowledge_write" | "user_context_search" | "user_context_get" | "user_context_update" | "web_search" | "web_fetch" | "browser_use" | "grep" | "session_search" | "read_file" | "list_dir" | "write_file" | "apply_patch" | "exec_command" | "update_plan" | "todo" | "web_extract" | "clarify" | "xopc_tool_execute" | "tool_manual" | "session_status" | "read_media" | "xopc_tool_search" | "xopc_tool_describe" | "phone_use" | "skill_view" | "skills_list" | "image_generate" | "skill_manage" | "skills_marketplace_search" | "computer_use" | "send_message" | "text_to_speech" | "execute_code" | "send_media" | "create_share" | "memory_maintenance" | "skill_install" | "delegate_task" | "create_desktop_pet")[];
+export declare const GATEWAY_BUILTIN_TOOL_IDS: ("automation" | "find" | "image" | "xopc_tool_search" | "knowledge_search" | "knowledge_get" | "knowledge_write" | "user_context_search" | "user_context_get" | "user_context_update" | "web_search" | "web_fetch" | "browser_use" | "grep" | "session_search" | "read_file" | "list_dir" | "write_file" | "apply_patch" | "exec_command" | "update_plan" | "todo" | "web_extract" | "clarify" | "xopc_tool_execute" | "tool_manual" | "session_status" | "read_media" | "xopc_tool_describe" | "phone_use" | "skill_view" | "skills_list" | "image_generate" | "skill_manage" | "skills_marketplace_search" | "computer_use" | "send_message" | "text_to_speech" | "execute_code" | "send_media" | "create_share" | "memory_maintenance" | "skill_install" | "delegate_task" | "create_desktop_pet")[];

package/dist/src/gateway/hono/routes/lazy-bundles.js

@@ -27,6 +27,14 @@ const AUTHENTICATED_LAZY_ROUTE_BUNDLES = [
 			return { register: registerPhoneRoutes };
 		}
 	},
+	{
+		id: "session-input-control",
+		match: (path) => /^\/api\/sessions\/[^/]+\/input-control$/.test(path),
+		load: async () => {
+			const { registerSessionInputControlRoutes } = await import("./session-input-control.js");
+			return { register: registerSessionInputControlRoutes };
+		}
+	},
 	{
 		id: "next-turn-suggestions",
 		match: (path) => /^\/api\/sessions\/[^/]+\/(?:next-turn-suggestion|next-turn-suggestion-feedback)$/.test(path),

package/dist/src/gateway/hono/routes/phone-dependencies.js

@@ -1,4 +1,5 @@
 import { init_paths_state, resolveStateDir } from "../../../config/paths-state.js";
+import { managedHdcPath, managedHosJar, managedJavaHome } from "../../../runtime-tools/harmony-paths.js";
 import { resolveAdbPath } from "../../../phone/adb-driver.js";
 import { getPhoneRuntime } from "../../../phone/runtime.js";
 import { RuntimeError } from "../../../runtime-tools/errors.js";
@@ -16,7 +17,8 @@ function registerPhoneDependencyRoutes(parent, deps) {
 	const manager = () => new PhoneDependencyManager({
 		stateDir: resolveStateDir(),
 		config: deps.service.currentConfig.runtimeTools,
-		adbPath: deps.service.currentConfig.phone.adbPath
+		adbPath: deps.service.currentConfig.phone.adbPath,
+		phone: deps.service.currentConfig.phone
 	});
 	const adbBusy = () => getPhoneRuntime().reports().some((report) => report.status !== "closed");
 	app.use(`${base}/*`, bodyLimit({ maxSize: 8192 }));
@@ -68,7 +70,13 @@ function registerPhoneDependencyRoutes(parent, deps) {
 		return c.json({ ok: true });
 	});
 	app.post(`${base}/:kind/:action/stream`, deps.strictRateLimitMiddleware, async (c) => {
-		const kind = z.enum(["adb", "scrcpy"]).parse(c.req.param("kind"));
+		const kind = z.enum([
+			"adb",
+			"scrcpy",
+			"hdc",
+			"hoscrcpy",
+			"java"
+		]).parse(c.req.param("kind"));
 		const action = z.enum([
 			"install",
 			"repair",
@@ -79,9 +87,9 @@ function registerPhoneDependencyRoutes(parent, deps) {
 			ok: false,
 			message: "Only scrcpy server imports accept a file path"
 		}, 400);
-		if (kind === "adb" && adbBusy()) return c.json({
+		if (kind !== "scrcpy" && adbBusy()) return c.json({
 			ok: false,
-			message: "Close the current phone session before installing or repairing ADB",
+			message: "Close the current phone session before installing or repairing shared phone dependencies",
 			error: "PHONE_DEPENDENCY_BUSY"
 		}, 409);
 		const runtime = manager();
@@ -99,10 +107,23 @@ function registerPhoneDependencyRoutes(parent, deps) {
 			};
 			runtime.on("progress", progress);
 			try {
+				const config = deps.service.currentConfig;
 				await runtime.install(kind, {
 					repair: action === "repair",
-					sourcePath: input.path
+					sourcePath: input.path,
+					beforeCommit: () => {
+						if (kind !== "scrcpy" && adbBusy()) throw new Error("Close active phone sessions before changing shared phone dependencies");
+					}
 				});
+				if (kind === "hdc" || kind === "hoscrcpy" || kind === "java") {
+					const next = structuredClone(config);
+					if (kind === "hdc") next.phone.hdcPath = managedHdcPath();
+					else next.phone.hdcVideo = {
+						...next.phone.hdcVideo,
+						...kind === "java" ? { javaHome: managedJavaHome() } : { sdkJar: managedHosJar() }
+					};
+					if (!(await deps.service.saveConfig(next, config)).saved) throw new Error("Phone configuration changed; refresh before using the installed dependency");
+				}
 				await writes;
 				deps.service.emit("runtime-tools.updated", { dependency: kind });
 				await stream.writeSSE({

package/dist/src/gateway/hono/routes/phone-setup.js

@@ -6,6 +6,7 @@ import { resolveEffectiveAgentConfigForAgent } from "../../../config/agent-profi
 import { phoneModelProfile } from "../../../phone/model-policy.js";
 import { getAllModels, init_providers, isProviderConfiguredSync, resolveModel } from "../../../providers/index.js";
 import { phoneAllowsApp } from "../../../phone/app-access.js";
+import { managedHdcPath, managedHosJar, managedJavaHome } from "../../../runtime-tools/harmony-paths.js";
 import { managedPhoneAdbPath } from "../../../runtime-tools/phone-dependency-catalog.js";
 import "../../../phone/model-adapter.js";
 import { getPhoneRuntime } from "../../../phone/runtime.js";
@@ -31,7 +32,8 @@ function createPhoneSetupService(service) {
 	const manager = () => new PhoneDependencyManager({
 		stateDir: resolveStateDir(),
 		config: service.currentConfig.runtimeTools,
-		adbPath: service.currentConfig.phone.adbPath
+		adbPath: service.currentConfig.phone.adbPath,
+		phone: service.currentConfig.phone
 	});
 	const requireIdle = () => {
 		if (runtime.reports().some((report) => ![
@@ -75,14 +77,26 @@ function createPhoneSetupService(service) {
 		},
 		install: async (kind, repair, mutation) => {
 			mutation?.check();
-			if (kind === "adb") requireIdle();
+			if (kind !== "scrcpy") requireIdle();
 			const config = service.currentConfig;
 			await manager().install(kind, {
 				repair,
 				signal: mutation?.signal,
-				beforeCommit: mutation?.check
+				beforeCommit: () => {
+					mutation?.check();
+					if (kind !== "scrcpy") requireIdle();
+				}
 			});
 			mutation?.check();
+			if (kind === "hdc" || kind === "hoscrcpy" || kind === "java") {
+				const next = structuredClone(config);
+				if (kind === "hdc") next.phone.hdcPath = managedHdcPath();
+				else next.phone.hdcVideo = {
+					...next.phone.hdcVideo,
+					...kind === "java" ? { javaHome: managedJavaHome() } : { sdkJar: managedHosJar() }
+				};
+				if (!(await service.saveConfig(next, config, mutation?.check)).saved) throw new Error("PHONE_SETUP_CONFIG_CONFLICT");
+			}
 			if (kind === "adb" && config.phone.adbPath) {
 				const path = managedPhoneAdbPath(resolveStateDir());
 				await probePhoneAdb(path);
@@ -92,16 +106,17 @@ function createPhoneSetupService(service) {
 				if (!(await service.saveConfig(next, config, mutation?.check)).saved) throw new Error("PHONE_SETUP_CONFIG_CONFLICT");
 			}
 		},
-		registerLocal: async (serial, name, mutation) => {
-			const discovered = (await runtime.discover(service.currentConfig)).find((phone) => phone.serial === serial && phone.state === "device");
+		registerLocal: async (serial, name, mutation, platform = "android") => {
+			const discovered = (await runtime.discover(service.currentConfig, mutation?.signal, platform)).find((phone) => phone.serial === serial && phone.state === "device" && (phone.platform ?? "android") === platform);
 			mutation?.check();
 			if (!discovered) throw new Error("PHONE_SETUP_DEVICE_OFFLINE: Select an online discovered local phone.");
-			if (!runtime.repository.list().some((phone) => phone.serial === serial)) runtime.repository.save({
+			if (!runtime.repository.list().some((phone) => phone.serial === serial && (phone.platform ?? "android") === platform)) runtime.repository.save({
 				serial,
+				platform,
 				name: name?.trim() || discovered.name,
 				enabled: true,
 				appAccess: "selected",
-				allowedApps: ["com.android.settings"]
+				allowedApps: [platform === "harmonyos" ? "com.huawei.hmos.settings" : "com.android.settings"]
 			});
 		},
 		revision: (context, deviceId) => {
@@ -139,12 +154,17 @@ function createPhoneSetupService(service) {
 			const dependencies = await new PhoneDependencyManager({
 				stateDir: resolveStateDir(),
 				config: config.runtimeTools,
-				adbPath: config.phone.adbPath
-			}).status();
+				adbPath: config.phone.adbPath,
+				phone: config.phone
+			}).status(source === "harmonyos" ? [
+				"hdc",
+				"java",
+				"hoscrcpy"
+			] : source ? ["adb", "scrcpy"] : void 0);
 			let localDiscovery = [];
 			let diagnostic;
-			if (source === "local" && dependencies.some((item) => item.kind === "adb" && item.state === "ready")) try {
-				localDiscovery = (await runtime.discover(config)).map(({ serial, name, state, emulator }) => ({
+			if ((source === "local" || source === "harmonyos") && dependencies.some((item) => item.kind === (source === "harmonyos" ? "hdc" : "adb") && item.state === "ready")) try {
+				localDiscovery = (await runtime.discover(config, void 0, source === "harmonyos" ? "harmonyos" : "android")).map(({ serial, name, state, emulator }) => ({
 					serial,
 					name,
 					state,
@@ -163,18 +183,20 @@ function createPhoneSetupService(service) {
 					supported: Boolean(model && phoneModelProfile(model)),
 					configured: Boolean(model && isProviderConfiguredSync(model.provider))
 				},
-				dependencies: dependencies.map(({ kind, state, version, canInstall }) => ({
+				dependencies: dependencies.map(({ kind, state, version, canInstall, distribution, downloadUrl }) => ({
 					kind,
 					state,
 					version,
-					canInstall
+					canInstall,
+					distribution,
+					downloadUrl
 				})),
 				devices: runtime.repository.list().map((device) => ({
 					id: device.id,
 					name: device.name,
-					source: device.connection ? "aliyun" : "local",
+					source: device.platform === "harmonyos" ? "harmonyos" : device.connection ? "aliyun" : "local",
 					enabled: device.enabled,
-					settingsAllowed: phoneAllowsApp(device, "com.android.settings")
+					settingsAllowed: phoneAllowsApp(device, device.platform === "harmonyos" ? "com.huawei.hmos.settings" : "com.android.settings")
 				})),
 				localDiscovery,
 				diagnostic
@@ -200,7 +222,11 @@ function registerPhoneSetupRoutes(app, deps) {
 		]),
 		modelRef: z.string().min(1).max(500).optional(),
 		replaceExisting: z.boolean().optional(),
-		source: z.enum(["local", "aliyun"]).optional(),
+		source: z.enum([
+			"local",
+			"aliyun",
+			"harmonyos"
+		]).optional(),
 		deviceId: z.string().uuid().optional(),
 		expectedRevision: z.number().int().positive().optional()
 	});