@jnrs/lingshu-smart 2.2.46 → 3.0.0

package/dist/stores/useDebugStore.d.ts

@@ -13,6 +13,10 @@ export declare const useDebugStore: import('pinia').StoreDefinition<"@jnrs/lings
     debugPanelVisible: import('vue').Ref<boolean, boolean>;
     scriptSteps: import('vue').WritableComputedRef<ScriptStep[], ScriptStep[]>;
     setScriptSteps: (list: ScriptStep[]) => void;
+    scriptLooping: import('vue').WritableComputedRef<boolean, boolean>;
+    scriptCaseId: import('vue').ComputedRef<string>;
+    scriptCaseName: import('vue').ComputedRef<string>;
+    ensureScriptCase: () => import('../components/debug/ScriptRunner/script').ScriptCaseData;
     activeCaseId: import('vue').WritableComputedRef<string, string>;
     setWsProxyActiveCaseId: (caseId: string) => void;
     wsProxyManualModified: import('vue').WritableComputedRef<boolean, boolean>;
@@ -40,6 +44,10 @@ export declare const useDebugStore: import('pinia').StoreDefinition<"@jnrs/lings
     debugPanelVisible: import('vue').Ref<boolean, boolean>;
     scriptSteps: import('vue').WritableComputedRef<ScriptStep[], ScriptStep[]>;
     setScriptSteps: (list: ScriptStep[]) => void;
+    scriptLooping: import('vue').WritableComputedRef<boolean, boolean>;
+    scriptCaseId: import('vue').ComputedRef<string>;
+    scriptCaseName: import('vue').ComputedRef<string>;
+    ensureScriptCase: () => import('../components/debug/ScriptRunner/script').ScriptCaseData;
     activeCaseId: import('vue').WritableComputedRef<string, string>;
     setWsProxyActiveCaseId: (caseId: string) => void;
     wsProxyManualModified: import('vue').WritableComputedRef<boolean, boolean>;
@@ -56,7 +64,7 @@ export declare const useDebugStore: import('pinia').StoreDefinition<"@jnrs/lings
     toggleTheme: () => void;
     showDebugPanel: () => void;
     hideDebugPanel: () => void;
-}, "logLevel" | "shadowsEnabled" | "animationsEnabled" | "fpsMode" | "interactionsDisabled" | "locale" | "theme" | "wsProxyManualModified" | "perfStatsCollapsed" | "scriptSteps" | "activeCaseId">, Pick<{
+}, "logLevel" | "shadowsEnabled" | "animationsEnabled" | "fpsMode" | "interactionsDisabled" | "locale" | "theme" | "wsProxyManualModified" | "perfStatsCollapsed" | "scriptSteps" | "scriptLooping" | "scriptCaseId" | "scriptCaseName" | "activeCaseId">, Pick<{
     logLevel: import('vue').WritableComputedRef<LogLevel, LogLevel>;
     shadowsEnabled: import('vue').WritableComputedRef<boolean, boolean>;
     animationsEnabled: import('vue').WritableComputedRef<boolean, boolean>;
@@ -67,6 +75,10 @@ export declare const useDebugStore: import('pinia').StoreDefinition<"@jnrs/lings
     debugPanelVisible: import('vue').Ref<boolean, boolean>;
     scriptSteps: import('vue').WritableComputedRef<ScriptStep[], ScriptStep[]>;
     setScriptSteps: (list: ScriptStep[]) => void;
+    scriptLooping: import('vue').WritableComputedRef<boolean, boolean>;
+    scriptCaseId: import('vue').ComputedRef<string>;
+    scriptCaseName: import('vue').ComputedRef<string>;
+    ensureScriptCase: () => import('../components/debug/ScriptRunner/script').ScriptCaseData;
     activeCaseId: import('vue').WritableComputedRef<string, string>;
     setWsProxyActiveCaseId: (caseId: string) => void;
     wsProxyManualModified: import('vue').WritableComputedRef<boolean, boolean>;
@@ -83,4 +95,4 @@ export declare const useDebugStore: import('pinia').StoreDefinition<"@jnrs/lings
     toggleTheme: () => void;
     showDebugPanel: () => void;
     hideDebugPanel: () => void;
-}, "setScriptSteps" | "setWsProxyActiveCaseId" | "setWsProxyManualModified" | "setPerfStatsCollapsed" | "setLogLevel" | "setShadowsEnabled" | "setAnimationsEnabled" | "setFpsMode" | "setInteractionsDisabled" | "setLocale" | "setTheme" | "toggleTheme" | "showDebugPanel" | "hideDebugPanel">>;
+}, "ensureScriptCase" | "setScriptSteps" | "setWsProxyActiveCaseId" | "setWsProxyManualModified" | "setPerfStatsCollapsed" | "setLogLevel" | "setShadowsEnabled" | "setAnimationsEnabled" | "setFpsMode" | "setInteractionsDisabled" | "setLocale" | "setTheme" | "toggleTheme" | "showDebugPanel" | "hideDebugPanel">>;

package/dist/stores/useEditorStore.d.ts

@@ -11,7 +11,7 @@ export declare const useEditorStore: import('pinia').StoreDefinition<"@jnrs/ling
     updateScene: import('@jnrs/shared/lodash').DebouncedFunc<() => void>;
     addLayer: (layer: ILayer) => void;
     addLayerAtPosition: (layer: ILayer, worldX: number, worldY: number) => void;
-    selectLayer: (uuid?: string) => void;
+    selectLayer: (id?: string) => void;
     updateLayer: (layer: ILayer) => void;
     renderLayers: import('@jnrs/shared/lodash').DebouncedFunc<() => void>;
 }, never>, Pick<{
@@ -26,7 +26,7 @@ export declare const useEditorStore: import('pinia').StoreDefinition<"@jnrs/ling
     updateScene: import('@jnrs/shared/lodash').DebouncedFunc<() => void>;
     addLayer: (layer: ILayer) => void;
     addLayerAtPosition: (layer: ILayer, worldX: number, worldY: number) => void;
-    selectLayer: (uuid?: string) => void;
+    selectLayer: (id?: string) => void;
     updateLayer: (layer: ILayer) => void;
     renderLayers: import('@jnrs/shared/lodash').DebouncedFunc<() => void>;
 }, "scene" | "layers" | "currentCase" | "currentLayer">, Pick<{
@@ -41,7 +41,7 @@ export declare const useEditorStore: import('pinia').StoreDefinition<"@jnrs/ling
     updateScene: import('@jnrs/shared/lodash').DebouncedFunc<() => void>;
     addLayer: (layer: ILayer) => void;
     addLayerAtPosition: (layer: ILayer, worldX: number, worldY: number) => void;
-    selectLayer: (uuid?: string) => void;
+    selectLayer: (id?: string) => void;
     updateLayer: (layer: ILayer) => void;
     renderLayers: import('@jnrs/shared/lodash').DebouncedFunc<() => void>;
 }, "initContainer" | "resizeContainer" | "destroyContainer" | "initEditor" | "updateScene" | "addLayer" | "addLayerAtPosition" | "selectLayer" | "updateLayer" | "renderLayers">>;

package/dist/types/app.types.d.ts

@@ -29,7 +29,7 @@ export interface IScene {
  * 方案
  */
 export interface ICase {
-    uuid: string;
+    id: string;
     isActive: boolean;
     title: string;
     scene: IScene;

package/dist/types/components/config.types.d.ts

@@ -31,6 +31,8 @@ export interface IStationSlotConfig extends IBaseConfig, IInteractiveState {
     showShadow?: boolean;
     showText?: boolean;
     inFlow?: boolean;
+    /** 工位可放置的资源数量上限（默认 5）：超出上限时按放置顺序移除最早的资源（保留最近 N 个，先进先出淘汰） */
+    maxResources?: number;
     /** 当前工位放置的资源摘要（运行时注入：资源增删时由 StationSlot 同步回写，不参与持久化） */
     resources?: ISlotResourceSnapshot[];
     /** 最近一次 operating 接收到的原始数据（运行时注入，供点击回调 data 读取） */
@@ -60,6 +62,20 @@ export interface IStationSlotGroupConfig extends Omit<IBaseConfig, 'width' | 'he
     flowOptions: IFlowConfig;
     hideBounds?: boolean;
 }
+/**
+ * 工位层配置（通用：一层=一个工位组）
+ * 统一「工位配置（层级）」数据模型：各类设备均以 stationSlotGroups 数组承载工位层。
+ */
+export interface IStationSlotLayerConfig {
+    /** 层索引（从 1 开始） */
+    index: number;
+    /** 工位组配置 */
+    stationSlotGroup: IStationSlotGroupConfig;
+    /** 层状态灯颜色（默认 '#666' 灰色，运行时由 layerLightColor 驱动） */
+    lightColor?: string;
+    /** 是否显示层状态灯（默认 true） */
+    lightEnabled?: boolean;
+}
 /**
  * 资源
  */

package/dist/types/components/operating.types.d.ts

@@ -1,43 +1,52 @@
 import { IRowData } from '../base.types';
 import { EnumResourceType } from '../enums';
 /**
- * 资源操作
- * handleType: 'add' | 'remove'
+ * 资源操作（对齐 socket-operating-api.md 资源模型字段）
+ * handle_type: 'add' | 'remove'
  */
 export interface IResourceOperating {
-    resourceType: EnumResourceType;
-    resourceId?: string;
+    resource_type: EnumResourceType;
+    resource_id?: string;
     name?: string;
-    color?: string;
-    index: number;
-    /** 层索引（1-based）：多层设备（接驳站/料道等）用于定位资源所在层；缺省时按工位序号在所有层中匹配 */
-    layer?: number;
-    handleType: 'add' | 'remove';
-    rawData: IRowData;
+    resource_color?: string;
+    /** 设备工位序号：资源在工位槽中的索引（1-based） */
+    device_station: number;
+    /** 设备层索引（1-based）：多层设备（接驳站/料道等）用于定位资源所在层；缺省时按工位序号在所有层中匹配 */
+    device_layer?: number;
+    handle_type: 'add' | 'remove';
+    raw_data: IRowData;
 }
 /**
- * 状态灯操作
+ * 状态灯操作（字段缺失即跳过，保持当前状态）
  */
 export interface ILightOperating {
-    color: string;
+    color?: string;
     blinking?: boolean;
     rotating?: boolean;
 }
 /**
- * 进度条操作
+ * 进度条操作（字段缺失即跳过，保持当前状态）
  */
 export interface IProgressOperating {
-    percent: number;
-    textContent: string;
+    percent?: number;
+    text?: string;
+}
+/**
+ * 出入口通道操作（协议层 passage，字段缺失即跳过，保持当前状态）
+ */
+export interface IPassageOperating {
+    in?: boolean;
+    out?: boolean;
 }
 /**
- * 出入口操作
+ * 出入口组件内部操作（isIn / isOut）
+ * 内部渲染组件 Entrance 的入参，与协议层 passage 语义一致，由设备模型将 passage 转换后传入
  */
 export interface IEntranceOperating {
-    isIn: boolean;
-    isOut: boolean;
+    isIn?: boolean;
+    isOut?: boolean;
 }
 /**
  * 子组件运转状态的联合类型
  */
-export type IComponentOperating = IResourceOperating | ILightOperating | IProgressOperating | IEntranceOperating;
+export type IComponentOperating = IResourceOperating | ILightOperating | IProgressOperating | IPassageOperating | IEntranceOperating;

package/dist/types/enums.d.ts

@@ -25,12 +25,32 @@ export declare enum EnumModel {
     PALLET = "Pallet",
     RESOURCE_OPERATION_WINDOW = "ResourceOperationWindow"
 }
+export declare enum EnumDeviceType {
+    MACHINE_TOOL = "machine_tool",
+    LOADING_STATION = "loading_station",
+    SHUTTLE_STATION = "shuttle_station",
+    MATERIAL_TRACK = "material_track",
+    MARKING_MACHINE = "marking_machine",
+    CLEANING_MACHINE = "cleaning_machine",
+    SINGLE_JOINT_ROBOT = "single_joint_robot",
+    DOUBLE_JOINT_ROBOT = "double_joint_robot",
+    RGV = "rgv",
+    RESOURCE_STORE = "resource_store",
+    PALLET = "pallet",
+    RESOURCE_OPERATION_WINDOW = "resource_operation_window"
+}
 export declare enum EnumComponent {
     STATION_SLOT = "StationSlot",
     RESOURCE = "Resource"
 }
 export declare enum EnumResourceType {
-    PALLET = "Pallet",
-    TOOL = "Tool"
+    WORKPIECE = "workpiece",
+    TOOL = "tool",
+    AUXILIARY = "auxiliary"
+}
+export declare enum EnumPalletType {
+    WORKPIECE_PALLET = "workpiece_pallet",
+    TOOL_PALLET = "tool_pallet",
+    AUXILIARY_PALLET = "auxiliary_pallet"
 }
 export type EnumInteractiveUi = EnumModel | EnumComponent;

package/dist/types/guards.d.ts

@@ -3,13 +3,16 @@ export declare function isMachineTool(layer: ILayer | null): layer is import('./
 export declare function hasStationSlotGroup(layer: ILayer | null): layer is Extract<ILayer, {
     stationSlotGroup?: any;
 }>;
-export declare function isStationSlotGroupBoth(layer: ILayer | null): layer is Extract<ILayer, {
+export declare function isStationSlotGroupBoth(layer: ILayer | null): layer is Exclude<Extract<ILayer, {
     stationSlotGroupPallet?: any;
     stationSlotGroupTool?: any;
+}>, {
+    className: EnumModel.PALLET;
 }>;
 export declare function hasStationSlotLayers(layer: ILayer | null): layer is Extract<ILayer, {
     stationSlotGroups?: any[];
 }>;
+export declare function isResourceStore(layer: ILayer | null): layer is import('./index').IResourceStoreConfig;
 export declare function hasFixtureChange(layer: ILayer | null): layer is import('./index').ISingleJointRobotConfig | import('./index').IDoubleJointRobotConfig;
 export declare function isRail(layer: ILayer | null): layer is import('./index').IRailConfig;
 export declare function isShuttleStation(layer: ILayer | null): layer is import('./index').IShuttleStationConfig;

package/dist/types/index.d.ts

@@ -7,6 +7,7 @@ export * from './models/config.types';
 export * from './models/operating.types';
 export * from './components/config.types';
 export * from './components/operating.types';
+export * from './socket.types';
 export * from './guards';
 /**
  * 可交互设备类型

package/dist/types/models/config.types.d.ts

@@ -1,16 +1,17 @@
 import { EnumModel, EnumTag, EnumResourceType } from '../enums';
 import { IRowData, IBaseConfig, IEventState } from '../base.types';
-import { IStationSlotGroupConfig, IFlowConfig } from '../components/config.types';
+import { IStationSlotGroupConfig, IFlowConfig, IStationSlotLayerConfig } from '../components/config.types';
 import { ILayerOperating } from './operating.types';
 /**
  * 设备模型基类
  */
 export interface IModel extends IBaseConfig, IEventState {
-    uuid: string;
+    id: string;
     equipmentName: string;
     nameplate?: string;
     lightEnabled?: boolean;
     nameplateEnabled?: boolean;
+    progressEnabled?: boolean;
     model?: string;
     manufacturer?: string;
     group?: string;
@@ -37,6 +38,7 @@ export interface IMachineToolConfig extends IModel {
     className: EnumModel.MACHINE_TOOL;
     stationContainerDirection?: 'horizontal' | 'vertical';
     stationSlotGroup?: IStationSlotGroupConfig;
+    stationSlotGroups?: IStationSlotLayerConfig[];
 }
 /**
  * 装载站
@@ -45,6 +47,7 @@ export interface ILoadingStationConfig extends IModel {
     className: EnumModel.LOADING_STATION;
     stationContainerDirection?: 'horizontal' | 'vertical';
     stationSlotGroup?: IStationSlotGroupConfig;
+    stationSlotGroups?: IStationSlotLayerConfig[];
 }
 /**
  * 接驳站工位层配置
@@ -90,6 +93,7 @@ export interface IMaterialTrackConfig extends IModel {
 export interface IMarkingMachineConfig extends IModel {
     className: EnumModel.MARKING_MACHINE;
     stationSlotGroup?: IStationSlotGroupConfig;
+    stationSlotGroups?: IStationSlotLayerConfig[];
 }
 /**
  * 清洗机
@@ -97,30 +101,37 @@ export interface IMarkingMachineConfig extends IModel {
 export interface ICleaningMachineConfig extends IModel {
     className: EnumModel.CLEANING_MACHINE;
     stationSlotGroup?: IStationSlotGroupConfig;
+    stationSlotGroups?: IStationSlotLayerConfig[];
 }
 /**
  * 单关节机器人
  */
 export interface ISingleJointRobotConfig extends IModel {
     className: EnumModel.SINGLE_JOINT_ROBOT;
-    currentFixture: EnumResourceType;
+    currentFixture: EnumResourceType | 'none';
+    /** 夹具绑定工位层（多对多）：fixture → 绑定的层 index 列表；未绑定的夹具显示全部层。仅影响画布显隐与资源层索引，不影响协议消息 */
+    fixtureLayerBindings?: Partial<Record<EnumResourceType, number[]>>;
     linkRailId?: string;
     linkTrailerId?: string;
     flowOptions?: IFlowConfig;
     stationSlotGroupPallet?: IStationSlotGroupConfig;
     stationSlotGroupTool?: IStationSlotGroupConfig;
+    stationSlotGroups?: IStationSlotLayerConfig[];
 }
 /**
  * 双关节机器人
  */
 export interface IDoubleJointRobotConfig extends IModel {
     className: EnumModel.DOUBLE_JOINT_ROBOT;
-    currentFixture: EnumResourceType;
+    currentFixture: EnumResourceType | 'none';
+    /** 夹具绑定工位层（多对多）：fixture → 绑定的层 index 列表；未绑定的夹具显示全部层。仅影响画布显隐与资源层索引，不影响协议消息 */
+    fixtureLayerBindings?: Partial<Record<EnumResourceType, number[]>>;
     linkRailId?: string;
     linkTrailerId?: string;
     flowOptions?: IFlowConfig;
     stationSlotGroupPallet?: IStationSlotGroupConfig;
     stationSlotGroupTool?: IStationSlotGroupConfig;
+    stationSlotGroups?: IStationSlotLayerConfig[];
 }
 /**
  * RGV
@@ -131,6 +142,7 @@ export interface IRGVConfig extends IModel {
     flowOptions?: IFlowConfig;
     stationSlotGroupPallet?: IStationSlotGroupConfig;
     stationSlotGroupTool?: IStationSlotGroupConfig;
+    stationSlotGroups?: IStationSlotLayerConfig[];
 }
 /**
  * 轨道
@@ -145,23 +157,42 @@ export interface IRailConfig extends IModel {
  */
 export interface IResourceStoreConfig extends IModel {
     className: EnumModel.RESOURCE_STORE;
+    /** 外层容器布局配置：Flow 对所有工位层整体排布（方向 flow / 换行 flowWrap / 间距 gap / 容器宽高） */
     flowOptions?: IFlowConfig;
+    /** 是否隐藏外层容器边界（默认 true 隐藏；false 时显示容器轮廓） */
+    hideBounds?: boolean;
     stationSlotGroupPallet?: IStationSlotGroupConfig;
     stationSlotGroupTool?: IStationSlotGroupConfig;
+    stationSlotGroups?: IStationSlotLayerConfig[];
 }
 /**
- * 托盘（独立设备）
- * 参考 ResourceStore：带铭牌、状态灯；主体背景色可配置（默认 #3C3C3C）
- * 支持托盘/刀具两个独立工位组
+ * 通用托盘工位层配置
+ */
+export interface IPalletLayerConfig {
+    /** 层索引（从 1 开始） */
+    index: number;
+    /** 工位组配置（层内工位 resourceType 可任意配置，托盘或刀具） */
+    stationSlotGroup: IStationSlotGroupConfig;
+}
+/**
+ * 通用托盘（独立设备）
+ * 参考接驳站：支持多层工位组（每层一个工位组，可任意放置若干层）；
+ * 层内工位 resourceType 可任意配置（托盘/刀具），替代原刀盘功能；
+ * 主体背景色可配置（默认 #3C3C3C），带铭牌、状态灯。
  */
 export interface IPalletConfig extends IModel {
     className: EnumModel.PALLET;
     /** 主体背景色（默认 '#3C3C3C'） */
     backgroundColor?: string;
-    flowOptions?: IFlowConfig;
+    /** 多工位层配置数组（一层=一个工位组） */
+    stationSlotGroups?: IPalletLayerConfig[];
+    /** 兼容旧配置：托盘工位组（无 stationSlotGroups 时迁移为第 1 层） */
     stationSlotGroupPallet?: IStationSlotGroupConfig;
+    /** 兼容旧配置：刀具工位组（无 stationSlotGroups 时迁移为第 2 层） */
     stationSlotGroupTool?: IStationSlotGroupConfig;
     linkEquipId?: string;
+    /** 扩展工位宿主设备 ID（业务 rawData.id）：绑定后本托盘工位并入宿主设备的工位编号空间（合并编号），资源寻址宿主越界时顺延落到本托盘；与宿主共用 device_id 时资源增删寻址逻辑合并（视觉上仍独立） */
+    extendHostId?: string;
 }
 /**
  * 资源操作窗口（独立设备）
@@ -174,8 +205,9 @@ export interface IResourceOperationWindowConfig extends IModel {
     backgroundColor?: string;
     /** 环状矩形边框厚度（默认 10） */
     ringThickness?: number;
-    /** 单一工位组配置（框内托盘，槽位 resourceType 可为 Pallet / Tool） */
+    /** 兼容旧配置：单一工位组配置（框内托盘，槽位 resourceType 可为 Pallet / Tool；无 stationSlotGroups 时迁移为第 1 层） */
     stationSlotGroup?: IStationSlotGroupConfig;
+    stationSlotGroups?: IStationSlotLayerConfig[];
 }
 /**
  * 设备层联合类型

package/dist/types/models/operating.types.d.ts

@@ -1,16 +1,33 @@
 import { EnumModel, EnumResourceType } from '../enums';
 import { IRowData } from '../base.types';
-import { ILightOperating, IProgressOperating, IEntranceOperating, IResourceOperating } from '../components/operating.types';
+import { ILightOperating, IProgressOperating, IPassageOperating, IResourceOperating } from '../components/operating.types';
 /** 操作类型：model 画布模型操作；resource 全局资源操作；resetAll 全部复位操作 */
 export type EnumOperatingType = 'model' | 'resource' | 'resetAll';
 /**
- * 设备运转基类
+ * 设备空间状态（内部 operating 表示：位移字段为画布像素值，角度字段为度；均直接赋值）
+ * 协议层（socket position，比例值）经代理器/分发器换算后写入本对象
+ */
+export interface IPositionOperating {
+    x?: number;
+    y?: number;
+    z?: number;
+    j1?: number;
+    j2?: number;
+    fork_xy?: number;
+    fork_z?: number;
+}
+/**
+ * 设备运转基类（业务字段均为「缺失即跳过」语义：未携带的字段不设置，保持模型当前状态）
  */
 export interface IModelOperating {
     operatingType?: 'model';
     id: string;
     className: EnumModel;
-    rawData: IRowData;
+    /** 设备工位序号：同 id 多实例（同设备多工位 UI）时的目标实例消歧；缺省时回退 resource.device_station */
+    device_station?: number;
+    /** 设备状态（协议 device_state 状态码；画布默认不做任何处理，由使用方按需在代理器自行配置映射） */
+    device_state?: number;
+    raw_data: IRowData;
     resource?: IResourceOperating;
 }
 /**
@@ -21,14 +38,14 @@ export interface IGlobalResourceOperating {
     handleType: 'batchRemove';
     resourceType?: EnumResourceType;
     resourceIds: string[];
-    rawData: IRowData;
+    raw_data: IRowData;
 }
 /**
  * 全部复位操作（不绑定具体设备，画布所有模型按初始配置重建，与「一键复位画布」一致）
  */
 export interface IResetAllOperating {
     operatingType: 'resetAll';
-    rawData?: IRowData;
+    raw_data?: IRowData;
 }
 /**
  * 机床运转状态
@@ -37,10 +54,11 @@ export interface IMachineToolOperating extends IModelOperating {
     className: EnumModel.MACHINE_TOOL;
     light?: ILightOperating;
     progress?: IProgressOperating;
-    entrance?: IEntranceOperating;
-    stationRotatable?: boolean;
+    passage?: IPassageOperating;
+    /** 工位旋转增量（度）：叠加在机床配置的工位容器方向角之上 */
+    station_rotation?: number;
     /** 是否工作中：为 true 时工位容器玻璃背景呼吸闪动（默认 false） */
-    isWorking?: boolean;
+    is_working?: boolean;
 }
 /**
  * 装载站运转状态
@@ -49,8 +67,7 @@ export interface ILoadingStationOperating extends IModelOperating {
     className: EnumModel.LOADING_STATION;
     light?: Omit<ILightOperating, 'rotating'>;
     progress?: IProgressOperating;
-    entrance?: IEntranceOperating;
-    stationRotatable?: boolean;
+    passage?: IPassageOperating;
 }
 /**
  * 接驳站运转状态
@@ -58,21 +75,15 @@ export interface ILoadingStationOperating extends IModelOperating {
 export interface IShuttleStationOperating extends IModelOperating {
     className: EnumModel.SHUTTLE_STATION;
     light?: Omit<ILightOperating, 'rotating'>;
-    /** 各层工位组状态灯颜色，键为层索引（1-based），值为状态码或颜色字符串
-     *  代理器 dictColorMap / objDict 转换后值为颜色字符串；未转换时值为状态数字码
-     * 如 { 1: 'red', 2: 100, 3: 'green' }
-     */
-    layerLightColor?: Record<number, number | string>;
-    /**
-     * 各层工位组状态灯闪烁，键为层索引（1-based），值为是否闪烁（配合 layerLightColor 状态灯使用）
-     * 如 { 1: false, 2: true, 3: true }
-     */
-    layerLightBlinking?: Record<number, boolean>;
-    /**
-     * 各层工位组显示状态，键为层索引（1-based），值为是否可见（通过工位组 visible 属性显隐）
-     * 如 { 1: true, 2: false, 3: true }
-     */
-    layerVisible?: Record<number, boolean>;
+    /** 各层工位组状态灯颜色，键为层索引（1-based），值为颜色字符串或字典值
+     *  如 { 1: '#FF4444', 2: '#00FF7F' } */
+    layer_light_colors?: Record<number, string>;
+    /** 各层工位组状态灯闪烁，键为层索引（1-based）
+     *  如 { 1: false, 2: true, 3: true } */
+    layer_light_blinking?: Record<number, boolean>;
+    /** 各层工位组显示状态，键为层索引（1-based），值为是否可见
+     *  如 { 1: true, 2: false, 3: true } */
+    layer_visible?: Record<number, boolean>;
 }
 /**
  * 料道运转状态
@@ -80,15 +91,8 @@ export interface IShuttleStationOperating extends IModelOperating {
 export interface IMaterialTrackOperating extends IModelOperating {
     className: EnumModel.MATERIAL_TRACK;
     light?: Omit<ILightOperating, 'rotating'>;
-    /** 各层工位组显示状态，键为层索引（1-based），值为是否可见（通过工位组 visible 属性显隐） */
-    layerVisible?: Record<number, boolean>;
-}
-/**
- * 打标机站点状态
- */
-export interface ILaserSiteState {
-    site: number;
-    active: boolean;
+    /** 各层工位组显示状态，键为层索引（1-based），值为是否可见 */
+    layer_visible?: Record<number, boolean>;
 }
 /**
  * 打标机运转状态
@@ -97,8 +101,10 @@ export interface IMarkingMachineOperating extends IModelOperating {
     className: EnumModel.MARKING_MACHINE;
     light?: Omit<ILightOperating, 'rotating'>;
     progress?: IProgressOperating;
-    entrance?: IEntranceOperating;
-    laserSiteNumberArray?: ILaserSiteState[];
+    passage?: IPassageOperating;
+    /** 各激光工位是否打标中，键为工位序号（1-based），值为是否激活
+     *  如 { 1: true, 2: false } */
+    marking_sites?: Record<number, boolean>;
 }
 /**
  * 清洗机运转状态
@@ -107,9 +113,9 @@ export interface ICleaningMachineOperating extends IModelOperating {
     className: EnumModel.CLEANING_MACHINE;
     light?: Omit<ILightOperating, 'rotating'>;
     progress?: IProgressOperating;
-    entrance?: IEntranceOperating;
+    passage?: IPassageOperating;
     /** 是否工作中：为 true 时显示工位容器内的波浪流动效果（默认 false） */
-    isWorking?: boolean;
+    is_working?: boolean;
 }
 /**
  * 单关节机器人运转状态
@@ -117,10 +123,10 @@ export interface ICleaningMachineOperating extends IModelOperating {
 export interface ISingleJointRobotOperating extends IModelOperating {
     className: EnumModel.SINGLE_JOINT_ROBOT;
     light?: ILightOperating;
-    x?: number;
-    y?: number;
-    j1?: number;
-    currentFixture?: EnumResourceType;
+    /** 空间状态（位移 + 关节，见 IPositionOperating） */
+    position?: IPositionOperating;
+    /** 当前夹持资源类型（none = 空夹具） */
+    current_fixture?: EnumResourceType | 'none';
 }
 /**
  * 双关节机器人运转状态
@@ -128,11 +134,10 @@ export interface ISingleJointRobotOperating extends IModelOperating {
 export interface IDoubleJointRobotOperating extends IModelOperating {
     className: EnumModel.DOUBLE_JOINT_ROBOT;
     light?: ILightOperating;
-    x?: number;
-    y?: number;
-    j1?: number;
-    j2?: number;
-    currentFixture?: EnumResourceType;
+    /** 空间状态（位移 + j1/j2 关节，见 IPositionOperating） */
+    position?: IPositionOperating;
+    /** 当前夹持资源类型（none = 空夹具） */
+    current_fixture?: EnumResourceType | 'none';
 }
 /**
  * RGV运转状态
@@ -140,45 +145,34 @@ export interface IDoubleJointRobotOperating extends IModelOperating {
 export interface IRGVOperating extends IModelOperating {
     className: EnumModel.RGV;
     light?: ILightOperating;
-    x?: number;
-    j1?: number;
-    forkXY?: number;
-    forkZ?: number;
+    /** 空间状态（沿轨道位移 + 车体角度 + 货叉，见 IPositionOperating） */
+    position?: IPositionOperating;
 }
 /**
- * 轨道运转状态
+ * 轨道运转状态（已移除：拖链定位由画布内部联动驱动——设备移动时逐帧跟随，
+ * 不再提供 socket 消息驱动的入口，避免消息侧携带其他设备 id（botId）实现联动）
  */
-export interface IRailOperating extends IModelOperating {
-    className: EnumModel.RAIL;
-    x?: number;
-    botId?: string;
-}
 /**
  * 资源库运转状态
  */
 export interface IResourceStoreOperating extends IModelOperating {
     className: EnumModel.RESOURCE_STORE;
     light?: ILightOperating;
-    x?: number;
+    /** 空间状态（沿轨道位移，见 IPositionOperating） */
+    position?: IPositionOperating;
     resource?: IResourceOperating;
-    /** 各工位背景颜色，键为工位序号 index（1-based），值为状态码或颜色字符串
-     *  代理器转换后值为颜色字符串；未转换时值为状态数字码（内部映射为颜色）
-     *  如 { 1: 'red', 2: 100, 3: '#66DC7A' } */
-    stationColor?: Record<number, number | string>;
 }
 /**
- * 托盘运转状态
+ * 通用托盘运转状态
+ * resource 支持多层工位组：通过 resource.device_layer（1-based）定位到指定层；
+ * 未传入 layer 时默认识别为第一层。
  */
 export interface IPalletOperating extends IModelOperating {
     className: EnumModel.PALLET;
     light?: ILightOperating;
-    x?: number;
-    y?: number;
+    /** 空间状态（沿 X/Y 轴位移，见 IPositionOperating） */
+    position?: IPositionOperating;
     resource?: IResourceOperating;
-    /** 各工位背景颜色，键为工位序号 index（1-based），值为状态码或颜色字符串
-     *  代理器转换后值为颜色字符串；未转换时值为状态数字码（内部映射为颜色）
-     *  如 { 1: 'red', 2: 100, 3: '#66DC7A' } */
-    stationColor?: Record<number, number | string>;
 }
 /**
  * 资源操作窗口运转状态
@@ -187,12 +181,8 @@ export interface IResourceOperationWindowOperating extends IModelOperating {
     className: EnumModel.RESOURCE_OPERATION_WINDOW;
     light?: Omit<ILightOperating, 'rotating'>;
     resource?: IResourceOperating;
-    /** 各工位背景颜色，键为工位序号 index（1-based），值为状态码或颜色字符串
-     *  代理器转换后值为颜色字符串；未转换时值为状态数字码（内部映射为颜色）
-     *  如 { 1: 'red', 2: 100, 3: '#66DC7A' } */
-    stationColor?: Record<number, number | string>;
 }
 /**
  * 设备层运转状态的联合类型
  */
-export type ILayerOperating = IMachineToolOperating | ILoadingStationOperating | IShuttleStationOperating | IMaterialTrackOperating | IMarkingMachineOperating | ICleaningMachineOperating | ISingleJointRobotOperating | IDoubleJointRobotOperating | IRGVOperating | IRailOperating | IResourceStoreOperating | IPalletOperating | IResourceOperationWindowOperating | IGlobalResourceOperating | IResetAllOperating;
+export type ILayerOperating = IMachineToolOperating | ILoadingStationOperating | IShuttleStationOperating | IMaterialTrackOperating | IMarkingMachineOperating | ICleaningMachineOperating | ISingleJointRobotOperating | IDoubleJointRobotOperating | IRGVOperating | IResourceStoreOperating | IPalletOperating | IResourceOperationWindowOperating | IGlobalResourceOperating | IResetAllOperating;