admin/DeskClaw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: ensure OpenClaw skills directory exists and add a clear button to the marketplace search input (#65)

Browse Source
This commit is contained in:
Felix
2026-02-12 16:54:56 +08:00
committed by GitHub
Unverified
parent 582287c74c
commit 541a85a5b0
3 changed files with 43 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
electron/gateway/clawhub.ts
View File

@@ -98,7 +98,10 @@ export class ClawHubService {
const child = spawn(this.cliPath, commandArgs, {
cwd: this.workDir,
shell: isWin && !this.useNodeRunner,
env,
env: {
...env,
CLAWHUB_WORKDIR: this.workDir,
},
});
let stdout = '';

38
electron/main/ipc-handlers.ts
View File

@@ -19,7 +19,7 @@ import {
getAllProvidersWithKeyInfo,
type ProviderConfig,
} from '../utils/secure-storage';
import { getOpenClawStatus, getOpenClawDir, getOpenClawConfigDir, getOpenClawSkillsDir } from '../utils/paths';
import { getOpenClawStatus, getOpenClawDir, getOpenClawConfigDir, getOpenClawSkillsDir, ensureDir } from '../utils/paths';
import { getOpenClawCliCommand, installOpenClawCliMac } from '../utils/openclaw-cli';
import { getSetting } from '../utils/store';
import {
@@ -517,7 +517,9 @@ function registerOpenClawHandlers(): void {
// Get the OpenClaw skills directory (~/.openclaw/skills)
ipcMain.handle('openclaw:getSkillsDir', () => {
return getOpenClawSkillsDir();
const dir = getOpenClawSkillsDir();
ensureDir(dir);
return dir;
});
// Get a shell command to run OpenClaw CLI without modifying PATH
@@ -911,24 +913,24 @@ function registerProviderHandlers(): void {
apiKey: string,
options?: { baseUrl?: string }
) => {
try {
// First try to get existing provider
const provider = await getProvider(providerId);
try {
// First try to get existing provider
const provider = await getProvider(providerId);
// Use provider.type if provider exists, otherwise use providerId as the type
// This allows validation during setup when provider hasn't been saved yet
const providerType = provider?.type || providerId;
const registryBaseUrl = getProviderConfig(providerType)?.baseUrl;
// Prefer caller-supplied baseUrl (live form value) over persisted config.
// This ensures Setup/Settings validation reflects unsaved edits immediately.
const resolvedBaseUrl = options?.baseUrl || provider?.baseUrl || registryBaseUrl;
// Use provider.type if provider exists, otherwise use providerId as the type
// This allows validation during setup when provider hasn't been saved yet
const providerType = provider?.type || providerId;
const registryBaseUrl = getProviderConfig(providerType)?.baseUrl;
// Prefer caller-supplied baseUrl (live form value) over persisted config.
// This ensures Setup/Settings validation reflects unsaved edits immediately.
const resolvedBaseUrl = options?.baseUrl || provider?.baseUrl || registryBaseUrl;
console.log(`[clawx-validate] validating provider type: ${providerType}`);
return await validateApiKeyWithProvider(providerType, apiKey, { baseUrl: resolvedBaseUrl });
} catch (error) {
console.error('Validation error:', error);
return { valid: false, error: String(error) };
}
console.log(`[clawx-validate] validating provider type: ${providerType}`);
return await validateApiKeyWithProvider(providerType, apiKey, { baseUrl: resolvedBaseUrl });
} catch (error) {
console.error('Validation error:', error);
return { valid: false, error: String(error) };
}
}
);
}