@google/gemini-cli 0.9.0-nightly.20251004.7db79e14 → 0.9.0-nightly.20251005.7f8537a1

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.
@@ -3,10 +3,7 @@
3
3
  * Copyright 2025 Google LLC
4
4
  * SPDX-License-Identifier: Apache-2.0
5
5
  */
6
- import { requestConsentInteractive } from '../../config/extension.js';
7
- import { updateAllUpdatableExtensions, updateExtension, checkForAllExtensionUpdates, } from '../../config/extensions/update.js';
8
6
  import { getErrorMessage } from '../../utils/errors.js';
9
- import { ExtensionUpdateState } from '../state/extensions.js';
10
7
  import { MessageType } from '../types.js';
11
8
  import { CommandKind, } from './types.js';
12
9
  async function listAction(context) {
@@ -14,30 +11,46 @@ async function listAction(context) {
14
11
  type: MessageType.EXTENSIONS_LIST,
15
12
  }, Date.now());
16
13
  }
17
- async function updateAction(context, args) {
14
+ function updateAction(context, args) {
18
15
  const updateArgs = args.split(' ').filter((value) => value.length > 0);
19
16
  const all = updateArgs.length === 1 && updateArgs[0] === '--all';
20
- const names = all ? undefined : updateArgs;
21
- let updateInfos = [];
17
+ const names = all ? null : updateArgs;
22
18
  if (!all && names?.length === 0) {
23
19
  context.ui.addItem({
24
20
  type: MessageType.ERROR,
25
21
  text: 'Usage: /extensions update <extension-names>|--all',
26
22
  }, Date.now());
27
- return;
23
+ return Promise.resolve();
28
24
  }
25
+ let resolveUpdateComplete;
26
+ const updateComplete = new Promise((resolve) => (resolveUpdateComplete = resolve));
27
+ updateComplete.then((updateInfos) => {
28
+ if (updateInfos.length === 0) {
29
+ context.ui.addItem({
30
+ type: MessageType.INFO,
31
+ text: 'No extensions to update.',
32
+ }, Date.now());
33
+ }
34
+ context.ui.addItem({
35
+ type: MessageType.EXTENSIONS_LIST,
36
+ }, Date.now());
37
+ context.ui.setPendingItem(null);
38
+ });
29
39
  try {
30
- await checkForAllExtensionUpdates(context.services.config.getExtensions(), context.ui.dispatchExtensionStateUpdate);
31
40
  context.ui.setPendingItem({
32
41
  type: MessageType.EXTENSIONS_LIST,
33
42
  });
34
- if (all) {
35
- updateInfos = await updateAllUpdatableExtensions(context.services.config.getWorkingDir(),
36
- // We don't have the ability to prompt for consent yet in this flow.
37
- (description) => requestConsentInteractive(description, context.ui.addConfirmUpdateExtensionRequest), context.services.config.getExtensions(), context.ui.extensionsUpdateState, context.ui.dispatchExtensionStateUpdate);
38
- }
39
- else if (names?.length) {
40
- const workingDir = context.services.config.getWorkingDir();
43
+ context.ui.dispatchExtensionStateUpdate({
44
+ type: 'SCHEDULE_UPDATE',
45
+ payload: {
46
+ all,
47
+ names,
48
+ onComplete: (updateInfos) => {
49
+ resolveUpdateComplete(updateInfos);
50
+ },
51
+ },
52
+ });
53
+ if (names?.length) {
41
54
  const extensions = context.services.config.getExtensions();
42
55
  for (const name of names) {
43
56
  const extension = extensions.find((extension) => extension.name === name);
@@ -48,32 +61,17 @@ async function updateAction(context, args) {
48
61
  }, Date.now());
49
62
  continue;
50
63
  }
51
- const updateInfo = await updateExtension(extension, workingDir, (description) => requestConsentInteractive(description, context.ui.addConfirmUpdateExtensionRequest), context.ui.extensionsUpdateState.get(extension.name)?.status ??
52
- ExtensionUpdateState.UNKNOWN, context.ui.dispatchExtensionStateUpdate);
53
- if (updateInfo)
54
- updateInfos.push(updateInfo);
55
64
  }
56
65
  }
57
- if (updateInfos.length === 0) {
58
- context.ui.addItem({
59
- type: MessageType.INFO,
60
- text: 'No extensions to update.',
61
- }, Date.now());
62
- return;
63
- }
64
66
  }
65
67
  catch (error) {
68
+ resolveUpdateComplete([]);
66
69
  context.ui.addItem({
67
70
  type: MessageType.ERROR,
68
71
  text: getErrorMessage(error),
69
72
  }, Date.now());
70
73
  }
71
- finally {
72
- context.ui.addItem({
73
- type: MessageType.EXTENSIONS_LIST,
74
- }, Date.now());
75
- context.ui.setPendingItem(null);
76
- }
74
+ return updateComplete.then((_) => { });
77
75
  }
78
76
  const listExtensionsCommand = {
79
77
  name: 'list',
@@ -1 +1 @@
1
- {"version":3,"file":"extensionsCommand.js","sourceRoot":"","sources":["../../../../src/ui/commands/extensionsCommand.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"extensionsCommand.js","sourceRoot":"","sources":["../../../../src/ui/commands/extensionsCommand.ts"],"names":[],"mappings":"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"}
@@ -8,7 +8,7 @@ import { ExtensionUpdateState, extensionUpdatesReducer, initialExtensionUpdatesS
8
8
  import { useCallback, useEffect, useMemo, useReducer } from 'react';
9
9
  import { MessageType } from '../types.js';
10
10
  import { checkForAllExtensionUpdates, updateExtension, } from '../../config/extensions/update.js';
11
- import { requestConsentInteractive } from '../../config/extension.js';
11
+ import { requestConsentInteractive, } from '../../config/extension.js';
12
12
  import { checkExhaustive } from '../../utils/checks.js';
13
13
  function confirmationRequestsReducer(state, action) {
14
14
  switch (action.type) {
@@ -18,7 +18,6 @@ function confirmationRequestsReducer(state, action) {
18
18
  return state.filter((r) => r !== action.request);
19
19
  default:
20
20
  checkExhaustive(action);
21
- return state;
22
21
  }
23
22
  }
24
23
  export const useExtensionUpdates = (extensions, addItem, cwd) => {
@@ -42,29 +41,70 @@ export const useExtensionUpdates = (extensions, addItem, cwd) => {
42
41
  });
43
42
  }, [dispatchConfirmUpdateExtensionRequests]);
44
43
  useEffect(() => {
45
- (async () => {
46
- await checkForAllExtensionUpdates(extensions, dispatchExtensionStateUpdate);
47
- })();
48
- }, [extensions, extensions.length, dispatchExtensionStateUpdate]);
44
+ const extensionsToCheck = extensions.filter((extension) => {
45
+ const currentStatus = extensionsUpdateState.extensionStatuses.get(extension.name);
46
+ if (!currentStatus)
47
+ return true;
48
+ const currentState = currentStatus.status;
49
+ return !currentState || currentState === ExtensionUpdateState.UNKNOWN;
50
+ });
51
+ if (extensionsToCheck.length === 0)
52
+ return;
53
+ checkForAllExtensionUpdates(extensionsToCheck, dispatchExtensionStateUpdate, cwd);
54
+ }, [
55
+ extensions,
56
+ extensionsUpdateState.extensionStatuses,
57
+ cwd,
58
+ dispatchExtensionStateUpdate,
59
+ ]);
49
60
  useEffect(() => {
50
61
  if (extensionsUpdateState.batchChecksInProgress > 0) {
51
62
  return;
52
63
  }
64
+ const scheduledUpdate = extensionsUpdateState.scheduledUpdate;
65
+ if (scheduledUpdate) {
66
+ dispatchExtensionStateUpdate({
67
+ type: 'CLEAR_SCHEDULED_UPDATE',
68
+ });
69
+ }
70
+ function shouldDoUpdate(extension) {
71
+ if (scheduledUpdate) {
72
+ if (scheduledUpdate.all) {
73
+ return true;
74
+ }
75
+ return scheduledUpdate.names?.includes(extension.name) === true;
76
+ }
77
+ else {
78
+ return extension.installMetadata?.autoUpdate === true;
79
+ }
80
+ }
53
81
  let extensionsWithUpdatesCount = 0;
82
+ // We only notify if we have unprocessed extensions in the UPDATE_AVAILABLE
83
+ // state.
84
+ let shouldNotifyOfUpdates = false;
85
+ const updatePromises = [];
54
86
  for (const extension of extensions) {
55
87
  const currentState = extensionsUpdateState.extensionStatuses.get(extension.name);
56
88
  if (!currentState ||
57
- currentState.processed ||
58
89
  currentState.status !== ExtensionUpdateState.UPDATE_AVAILABLE) {
59
90
  continue;
60
91
  }
61
- // Mark as processed immediately to avoid re-triggering.
62
- dispatchExtensionStateUpdate({
63
- type: 'SET_PROCESSED',
64
- payload: { name: extension.name, processed: true },
65
- });
66
- if (extension.installMetadata?.autoUpdate) {
67
- updateExtension(extension, cwd, (description) => requestConsentInteractive(description, addConfirmUpdateExtensionRequest), currentState.status, dispatchExtensionStateUpdate)
92
+ const shouldUpdate = shouldDoUpdate(extension);
93
+ if (!shouldUpdate) {
94
+ extensionsWithUpdatesCount++;
95
+ if (!currentState.notified) {
96
+ // Mark as processed immediately to avoid re-triggering.
97
+ dispatchExtensionStateUpdate({
98
+ type: 'SET_NOTIFIED',
99
+ payload: { name: extension.name, notified: true },
100
+ });
101
+ shouldNotifyOfUpdates = true;
102
+ }
103
+ }
104
+ else {
105
+ const updatePromise = updateExtension(extension, cwd, (description) => requestConsentInteractive(description, addConfirmUpdateExtensionRequest), currentState.status, dispatchExtensionStateUpdate);
106
+ updatePromises.push(updatePromise);
107
+ updatePromise
68
108
  .then((result) => {
69
109
  if (!result)
70
110
  return;
@@ -80,17 +120,27 @@ export const useExtensionUpdates = (extensions, addItem, cwd) => {
80
120
  }, Date.now());
81
121
  });
82
122
  }
83
- else {
84
- extensionsWithUpdatesCount++;
85
- }
86
123
  }
87
- if (extensionsWithUpdatesCount > 0) {
124
+ if (shouldNotifyOfUpdates) {
88
125
  const s = extensionsWithUpdatesCount > 1 ? 's' : '';
89
126
  addItem({
90
127
  type: MessageType.INFO,
91
128
  text: `You have ${extensionsWithUpdatesCount} extension${s} with an update available, run "/extensions list" for more information.`,
92
129
  }, Date.now());
93
130
  }
131
+ if (scheduledUpdate) {
132
+ Promise.all(updatePromises).then((results) => {
133
+ const nonNullResults = results.filter((result) => result != null);
134
+ scheduledUpdate.onCompleteCallbacks.forEach((callback) => {
135
+ try {
136
+ callback(nonNullResults);
137
+ }
138
+ catch (e) {
139
+ console.error(getErrorMessage(e));
140
+ }
141
+ });
142
+ });
143
+ }
94
144
  }, [
95
145
  extensions,
96
146
  extensionsUpdateState,
@@ -1 +1 @@
1
- {"version":3,"file":"useExtensionUpdates.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useExtensionUpdates.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"useExtensionUpdates.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useExtensionUpdates.ts"],"names":[],"mappings":"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"}
@@ -58,7 +58,7 @@ describe('useExtensionUpdates', () => {
58
58
  ];
59
59
  const addItem = vi.fn();
60
60
  const cwd = '/test/cwd';
61
- vi.mocked(checkForAllExtensionUpdates).mockImplementation(async (extensions, dispatch) => {
61
+ vi.mocked(checkForAllExtensionUpdates).mockImplementation(async (_extensions, dispatch, _cwd) => {
62
62
  dispatch({
63
63
  type: 'SET_STATE',
64
64
  payload: {
@@ -88,7 +88,7 @@ describe('useExtensionUpdates', () => {
88
88
  });
89
89
  const extension = annotateActiveExtensions([loadExtension({ extensionDir, workspaceDir: tempHomeDir })], tempHomeDir, new ExtensionEnablementManager(ExtensionStorage.getUserExtensionsDir()))[0];
90
90
  const addItem = vi.fn();
91
- vi.mocked(checkForAllExtensionUpdates).mockImplementation(async (extensions, dispatch) => {
91
+ vi.mocked(checkForAllExtensionUpdates).mockImplementation(async (_extensions, dispatch, _cwd) => {
92
92
  dispatch({
93
93
  type: 'SET_STATE',
94
94
  payload: {
@@ -142,7 +142,7 @@ describe('useExtensionUpdates', () => {
142
142
  }),
143
143
  ], tempHomeDir, new ExtensionEnablementManager(ExtensionStorage.getUserExtensionsDir()));
144
144
  const addItem = vi.fn();
145
- vi.mocked(checkForAllExtensionUpdates).mockImplementation(async (extensions, dispatch) => {
145
+ vi.mocked(checkForAllExtensionUpdates).mockImplementation(async (_extensions, dispatch, _cwd) => {
146
146
  dispatch({
147
147
  type: 'SET_STATE',
148
148
  payload: {
@@ -211,7 +211,7 @@ describe('useExtensionUpdates', () => {
211
211
  ];
212
212
  const addItem = vi.fn();
213
213
  const cwd = '/test/cwd';
214
- vi.mocked(checkForAllExtensionUpdates).mockImplementation(async (extensions, dispatch) => {
214
+ vi.mocked(checkForAllExtensionUpdates).mockImplementation(async (_extensions, dispatch, _cwd) => {
215
215
  dispatch({ type: 'BATCH_CHECK_START' });
216
216
  dispatch({
217
217
  type: 'SET_STATE',
@@ -1 +1 @@
1
- {"version":3,"file":"useExtensionUpdates.test.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useExtensionUpdates.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"useExtensionUpdates.test.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useExtensionUpdates.test.ts"],"names":[],"mappings":"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"}
@@ -3,6 +3,7 @@
3
3
  * Copyright 2025 Google LLC
4
4
  * SPDX-License-Identifier: Apache-2.0
5
5
  */
6
+ import type { ExtensionUpdateInfo } from '../../config/extension.js';
6
7
  export declare enum ExtensionUpdateState {
7
8
  CHECKING_FOR_UPDATES = "checking for updates",
8
9
  UPDATED_NEEDS_RESTART = "updated, needs restart",
@@ -15,12 +16,24 @@ export declare enum ExtensionUpdateState {
15
16
  }
16
17
  export interface ExtensionUpdateStatus {
17
18
  status: ExtensionUpdateState;
18
- processed: boolean;
19
+ notified: boolean;
19
20
  }
20
21
  export interface ExtensionUpdatesState {
21
22
  extensionStatuses: Map<string, ExtensionUpdateStatus>;
22
23
  batchChecksInProgress: number;
24
+ scheduledUpdate: ScheduledUpdate | null;
23
25
  }
26
+ export interface ScheduledUpdate {
27
+ names: string[] | null;
28
+ all: boolean;
29
+ onCompleteCallbacks: OnCompleteUpdate[];
30
+ }
31
+ export interface ScheduleUpdateArgs {
32
+ names: string[] | null;
33
+ all: boolean;
34
+ onComplete: OnCompleteUpdate;
35
+ }
36
+ type OnCompleteUpdate = (updateInfos: ExtensionUpdateInfo[]) => void;
24
37
  export declare const initialExtensionUpdatesState: ExtensionUpdatesState;
25
38
  export type ExtensionUpdateAction = {
26
39
  type: 'SET_STATE';
@@ -29,14 +42,20 @@ export type ExtensionUpdateAction = {
29
42
  state: ExtensionUpdateState;
30
43
  };
31
44
  } | {
32
- type: 'SET_PROCESSED';
45
+ type: 'SET_NOTIFIED';
33
46
  payload: {
34
47
  name: string;
35
- processed: boolean;
48
+ notified: boolean;
36
49
  };
37
50
  } | {
38
51
  type: 'BATCH_CHECK_START';
39
52
  } | {
40
53
  type: 'BATCH_CHECK_END';
54
+ } | {
55
+ type: 'SCHEDULE_UPDATE';
56
+ payload: ScheduleUpdateArgs;
57
+ } | {
58
+ type: 'CLEAR_SCHEDULED_UPDATE';
41
59
  };
42
60
  export declare function extensionUpdatesReducer(state: ExtensionUpdatesState, action: ExtensionUpdateAction): ExtensionUpdatesState;
61
+ export {};
@@ -18,6 +18,7 @@ export var ExtensionUpdateState;
18
18
  export const initialExtensionUpdatesState = {
19
19
  extensionStatuses: new Map(),
20
20
  batchChecksInProgress: 0,
21
+ scheduledUpdate: null,
21
22
  };
22
23
  export function extensionUpdatesReducer(state, action) {
23
24
  switch (action.type) {
@@ -29,19 +30,19 @@ export function extensionUpdatesReducer(state, action) {
29
30
  const newStatuses = new Map(state.extensionStatuses);
30
31
  newStatuses.set(action.payload.name, {
31
32
  status: action.payload.state,
32
- processed: false,
33
+ notified: false,
33
34
  });
34
35
  return { ...state, extensionStatuses: newStatuses };
35
36
  }
36
- case 'SET_PROCESSED': {
37
+ case 'SET_NOTIFIED': {
37
38
  const existing = state.extensionStatuses.get(action.payload.name);
38
- if (!existing || existing.processed === action.payload.processed) {
39
+ if (!existing || existing.notified === action.payload.notified) {
39
40
  return state;
40
41
  }
41
42
  const newStatuses = new Map(state.extensionStatuses);
42
43
  newStatuses.set(action.payload.name, {
43
44
  ...existing,
44
- processed: action.payload.processed,
45
+ notified: action.payload.notified,
45
46
  });
46
47
  return { ...state, extensionStatuses: newStatuses };
47
48
  }
@@ -55,6 +56,27 @@ export function extensionUpdatesReducer(state, action) {
55
56
  ...state,
56
57
  batchChecksInProgress: state.batchChecksInProgress - 1,
57
58
  };
59
+ case 'SCHEDULE_UPDATE':
60
+ return {
61
+ ...state,
62
+ // If there is a pre-existing scheduled update, we merge them.
63
+ scheduledUpdate: {
64
+ all: state.scheduledUpdate?.all || action.payload.all,
65
+ names: [
66
+ ...(state.scheduledUpdate?.names ?? []),
67
+ ...(action.payload.names ?? []),
68
+ ],
69
+ onCompleteCallbacks: [
70
+ ...(state.scheduledUpdate?.onCompleteCallbacks ?? []),
71
+ action.payload.onComplete,
72
+ ],
73
+ },
74
+ };
75
+ case 'CLEAR_SCHEDULED_UPDATE':
76
+ return {
77
+ ...state,
78
+ scheduledUpdate: null,
79
+ };
58
80
  default:
59
81
  checkExhaustive(action);
60
82
  }
@@ -1 +1 @@
1
- {"version":3,"file":"extensions.js","sourceRoot":"","sources":["../../../../src/ui/state/extensions.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,MAAM,CAAN,IAAY,oBASX;AATD,WAAY,oBAAoB;IAC9B,qEAA6C,CAAA;IAC7C,wEAAgD,CAAA;IAChD,6CAAqB,CAAA;IACrB,6DAAqC,CAAA;IACrC,iDAAyB,CAAA;IACzB,uCAAe,CAAA;IACf,uDAA+B,CAAA;IAC/B,2CAAmB,CAAA;AACrB,CAAC,EATW,oBAAoB,KAApB,oBAAoB,QAS/B;AAYD,MAAM,CAAC,MAAM,4BAA4B,GAA0B;IACjE,iBAAiB,EAAE,IAAI,GAAG,EAAE;IAC5B,qBAAqB,EAAE,CAAC;CACzB,CAAC;AAcF,MAAM,UAAU,uBAAuB,CACrC,KAA4B,EAC5B,MAA6B;IAE7B,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;QACpB,KAAK,WAAW,CAAC,CAAC,CAAC;YACjB,MAAM,QAAQ,GAAG,KAAK,CAAC,iBAAiB,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YAClE,IAAI,QAAQ,EAAE,MAAM,KAAK,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;gBAC9C,OAAO,KAAK,CAAC;YACf,CAAC;YACD,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;YACrD,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE;gBACnC,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,KAAK;gBAC5B,SAAS,EAAE,KAAK;aACjB,CAAC,CAAC;YACH,OAAO,EAAE,GAAG,KAAK,EAAE,iBAAiB,EAAE,WAAW,EAAE,CAAC;QACtD,CAAC;QACD,KAAK,eAAe,CAAC,CAAC,CAAC;YACrB,MAAM,QAAQ,GAAG,KAAK,CAAC,iBAAiB,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YAClE,IAAI,CAAC,QAAQ,IAAI,QAAQ,CAAC,SAAS,KAAK,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;gBACjE,OAAO,KAAK,CAAC;YACf,CAAC;YACD,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;YACrD,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE;gBACnC,GAAG,QAAQ;gBACX,SAAS,EAAE,MAAM,CAAC,OAAO,CAAC,SAAS;aACpC,CAAC,CAAC;YACH,OAAO,EAAE,GAAG,KAAK,EAAE,iBAAiB,EAAE,WAAW,EAAE,CAAC;QACtD,CAAC;QACD,KAAK,mBAAmB;YACtB,OAAO;gBACL,GAAG,KAAK;gBACR,qBAAqB,EAAE,KAAK,CAAC,qBAAqB,GAAG,CAAC;aACvD,CAAC;QACJ,KAAK,iBAAiB;YACpB,OAAO;gBACL,GAAG,KAAK;gBACR,qBAAqB,EAAE,KAAK,CAAC,qBAAqB,GAAG,CAAC;aACvD,CAAC;QACJ;YACE,eAAe,CAAC,MAAM,CAAC,CAAC;IAC5B,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"extensions.js","sourceRoot":"","sources":["../../../../src/ui/state/extensions.ts"],"names":[],"mappings":"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"}