@xgjktech/xg_cwork_im 1.11.7 → 1.11.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1 +1 @@
1
- {"version":3,"file":"apply-sync-mapping.d.ts","sourceRoot":"","sources":["../../src/apply-sync-mapping.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAE1D,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAUrC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAU7C,MAAM,WAAW,uBAAuB;IAEpC,MAAM,EAAE,UAAU,CAAC;IAEnB,GAAG,EAAE,cAAc,CAAC;IAEpB,EAAE,EAAE,OAAO,CAAC;IAEZ,GAAG,EAAE,GAAG,CAAC;IAET,SAAS,EAAE,MAAM,CAAC;CAErB;AAID,wBAAsB,4BAA4B,CAE9C,GAAG,EAAE,uBAAuB,EAE5B,SAAS,EAAE,OAAO,GAEnB,OAAO,CAAC,IAAI,CAAC,CAwDf"}
1
+ {"version":3,"file":"apply-sync-mapping.d.ts","sourceRoot":"","sources":["../../src/apply-sync-mapping.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAI1D,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAQrC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAU7C,MAAM,WAAW,uBAAuB;IAEpC,MAAM,EAAE,UAAU,CAAC;IAEnB,GAAG,EAAE,cAAc,CAAC;IAEpB,EAAE,EAAE,OAAO,CAAC;IAEZ,GAAG,EAAE,GAAG,CAAC;IAET,SAAS,EAAE,MAAM,CAAC;CAErB;AAID,wBAAsB,4BAA4B,CAE9C,GAAG,EAAE,uBAAuB,EAE5B,SAAS,EAAE,OAAO,GAEnB,OAAO,CAAC,IAAI,CAAC,CAwDf"}
@@ -3,8 +3,8 @@
3
3
  * 处理 IM WebSocket 下发的 openclawApplySyncMapping 信令。
4
4
 
5
5
  */
6
+ import { resolveAgentWorkspaceDir } from "openclaw/plugin-sdk/memory-core-host-engine-foundation";
6
7
  import { normalizeRemoteRootFolderPath, resolveLocalAbsolutePath } from "./project-path-normalize.js";
7
- import { resolveAgentWorkspaceDirFromRuntime } from "./inbound-media-local.js";
8
8
  import { parseSyncMappingParams } from "./sync-mapping-types.js";
9
9
  import { deleteSyncMapping, upsertSyncMapping } from "./sync-service-client.js";
10
10
  const DEFAULT_FILE_PATTERNS = ["**/*"];
@@ -36,8 +36,9 @@ export async function applySyncMappingFromWsParams(ctx, rawParams) {
36
36
  await applyUpsert(ctx, syncBase, params);
37
37
  }
38
38
  async function applyUpsert(ctx, syncBase, params) {
39
- const { config, cfg, rt, log, logPrefix } = ctx;
39
+ const { config, cfg, log, logPrefix } = ctx;
40
40
  const localRoot = params.localRoot;
41
+ const agentId = config.agentId || "main";
41
42
  let remoteRootFolderPath;
42
43
  try {
43
44
  remoteRootFolderPath = normalizeRemoteRootFolderPath(params.remoteRootFolderPath);
@@ -46,9 +47,16 @@ async function applyUpsert(ctx, syncBase, params) {
46
47
  log.error(`${logPrefix} [sync-mapping] remote path: ${String(e)}`);
47
48
  return;
48
49
  }
49
- const workspaceHost = localRoot.kind === "workspace_relative"
50
- ? resolveAgentWorkspaceDirFromRuntime(rt, cfg)
51
- : undefined;
50
+ let workspaceHost;
51
+ if (localRoot.kind === "workspace_relative") {
52
+ try {
53
+ workspaceHost = resolveAgentWorkspaceDir(cfg, agentId);
54
+ }
55
+ catch (e) {
56
+ log.error(`${logPrefix} [sync-mapping] resolveAgentWorkspaceDir(agentId=${agentId}): ${String(e)}`);
57
+ return;
58
+ }
59
+ }
52
60
  let resolvedLocalAbs;
53
61
  try {
54
62
  resolvedLocalAbs = resolveLocalAbsolutePath(localRoot, workspaceHost);
@@ -75,7 +83,7 @@ async function applyUpsert(ctx, syncBase, params) {
75
83
  excludePatterns,
76
84
  ...(syncOpts?.direction ? { syncDirection: syncOpts.direction } : {}),
77
85
  };
78
- log.info(`${logPrefix} [sync-mapping] upsert mappingId=${params.mappingId} localRoot=${resolvedLocalAbs} remote=${remoteRootFolderPath} agent=${config.agentId ?? "main"}`);
86
+ log.info(`${logPrefix} [sync-mapping] upsert mappingId=${params.mappingId} agentId=${agentId} workspaceHost=${workspaceHost ?? "(host_absolute)"} localRoot=${resolvedLocalAbs} remote=${remoteRootFolderPath}`);
79
87
  try {
80
88
  await upsertSyncMapping(syncBase, params.mappingId, body, log);
81
89
  }
@@ -1 +1 @@
1
- {"version":3,"file":"apply-sync-mapping.js","sourceRoot":"","sources":["../../src/apply-sync-mapping.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"apply-sync-mapping.js","sourceRoot":"","sources":["../../src/apply-sync-mapping.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@xgjktech/xg_cwork_im",
3
- "version": "1.11.7",
3
+ "version": "1.11.8",
4
4
  "description": "XG CWork IM channel plugin for OpenClaw",
5
5
  "keywords": [
6
6
  "bot",